cloud-web-corejs 1.0.54-dev.35 → 1.0.54-dev.351

package/src/views/user/outLink/view.vue

@@ -56,17 +56,17 @@ export default {
       delete queryParam.urlmobile;
       delete queryParam.url;
 
-      if(purl.indexOf('.html')>=0){
+      if (purl.indexOf('.html') >= 0) {
         let eUrl = purl;
-        let pstr = Object.keys(queryParam).map(key=>{
-          return key+"="+queryParam[key]
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
         }).join("&")
 
-        if(pstr){
-          if(purl.indexOf('.html?')>=0){
-            eUrl = eUrl+'&'+pstr
-          }else{
-            eUrl = eUrl+'?'+pstr
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
           }
         }
 
@@ -81,8 +81,6 @@ export default {
       delete queryParam.thirdparty_info;
       delete queryParam.i18nLang;
 
-
-
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;
@@ -93,27 +91,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      if (urlArr.includes(url)) {
-        this.wfContent = require('@base/views' + url).default;
-      } else if (url.startsWith(t)) {
-        let path = url.slice(t.length);
-        this.wfContent = require('@base/views' + path).default;
-      } else {
-        this.wfContent = require('@/views' + url).default;
-      }
-
-      this.initI18n();
-
+      this.initUserInfo(() => {
+        this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
     },
     getI18nLang() {
       let i18nLang = this.$route.query.i18nLang || "zh";
       return i18nLang;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

package/src/views/user/position/edit.vue

@@ -3,90 +3,127 @@
     <el-form ref="editForm" :model="position">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看岗位') : $t1('新增岗位') }}
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看岗位") : $t1("新增岗位") }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
           </el-button>
         </div>
       </div>
-      <div class="d-cont">
-        <div class="d-item">
-          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
-          <table class="table-detail">
-            <tbody>
-            <tr>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('岗位名称') }}
-              </th>
-              <td>
-                <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="position.name" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('岗位编码') }}
-              </th>
-              <td>
-                <template v-if="dataId">
-                  {{ position.code }}
-                </template>
-                <el-form-item v-else prop="code" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="position.code" clearable/>
-                </el-form-item>
-              </td>
-              <th>{{ $t1('设置') }}</th>
-              <td>
-                <el-checkbox :label="$t1('是否启用')" v-model="position.enabled"></el-checkbox>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('备注') }}</th>
-              <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                          v-model="position.memo"
-                          clearable></el-input>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('创建人') }}</th>
-              <td>{{ position._createBy }}</td>
-              <th>{{ $t1('创建时间') }}</th>
-              <td>{{ position.createDate }}</td>
-              <th>{{ $t1('更新人') }}</th>
-              <td>{{ position._modifyBy }}</td>
-              <th>{{ $t1('更新时间') }}</th>
-              <td>{{ position.modifyDate }}</td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
+      <baseTabs>
+        <baseTabPane :label="$t1('基本信息')">
+          <template #default>
+            <table class="table-detail">
+              <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("岗位名称") }}
+                  </th>
+                  <td>
+                    <el-form-item
+                      prop="name"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        type="text"
+                        autocomplete="off"
+                        v-model="position.name"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("岗位编码") }}
+                  </th>
+                  <td>
+                    <template v-if="dataId">
+                      {{ position.code }}
+                    </template>
+                    <el-form-item
+                      v-else
+                      prop="code"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        type="text"
+                        autocomplete="off"
+                        v-model="position.code"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                  <th>{{ $t1("设置") }}</th>
+                  <td>
+                    <el-checkbox
+                      :label="$t1('是否启用')"
+                      v-model="position.enabled"
+                    ></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("备注") }}</th>
+                  <td colspan="5">
+                    <el-input
+                      type="textarea"
+                      :rows="2"
+                      :placeholder="$t1('请输入内容')"
+                      size="small"
+                      v-model="position.memo"
+                      clearable
+                    ></el-input>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("创建人") }}</th>
+                  <td>{{ position._createBy }}</td>
+                  <th>{{ $t1("创建时间") }}</th>
+                  <td>{{ position.createDate }}</td>
+                  <th>{{ $t1("更新人") }}</th>
+                  <td>{{ position._modifyBy }}</td>
+                  <th>{{ $t1("更新时间") }}</th>
+                  <td>{{ position.modifyDate }}</td>
+                </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
     </el-form>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'positionEdit',
+  name: "positionEdit",
   props: {
-    _dataId: [String, Number]
+    _dataId: [String, Number],
   },
   components: {},
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       position: {
-        enabled: true
-      }
+        enabled: true,
+      },
     };
   },
   created() {
@@ -103,53 +140,49 @@ export default {
           url: USER_PREFIX + `/position/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
+          success: (res) => {
             this.position = res.objx || {};
-          }
+          },
         });
-      } else {
-        this.position = {
-          enabled: true
-        };
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/position/update` : `/position/save`);
             this.$http({
               url: url,
               method: `post`,
               data: this.position,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 this.$message({
                   message: res.content,
-                  type: 'success',
+                  type: "success",
                   duration: 500,
-                  onClose: t => {
+                  onClose: (t) => {
                     if (this.isEdit) {
                       this.$baseReload();
                     } else {
                       this.$baseReload({
                         updateParam: {
-                          _dataId: res.objx
-                        }
+                          _dataId: res.objx,
+                        },
                       });
                     }
-                  }
+                  },
                 });
-              }
+              },
             });
           });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/position/list.vue

@@ -2,43 +2,62 @@
   <div id="containt">
     <el-tabs v-model="activeName" class="tab-box">
       <el-tab-pane :label="$t1('常规')" name="first">
-        <editView v-if="showEdit" visible-key="showEdit" :_dataId.sync="dataId" :parent-target="_self"
-                  @reload="$reloadHandle"></editView>
+        <editView
+          v-if="showEdit"
+          visible-key="showEdit"
+          :_dataId.sync="dataId"
+          :parent-target="_self"
+          @reload="$reloadHandle"
+        ></editView>
       </el-tab-pane>
       <el-tab-pane :label="$t1('列表')" name="second">
         <div class="grid-height">
-          <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                    @custom="$vxeTableUtil.customHandle">
+          <vxe-grid
+            ref="table-m1"
+            v-bind="vxeOption"
+            @resizable-change="$vxeTableUtil.onColumnWitchChange"
+            @custom="$vxeTableUtil.customHandle"
+          >
             <template #form>
-              <div class="clearfix screen-btns">
-                <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
-                    {{ $t1('新增') }}
+              <tableForm
+                :formData.sync="formData"
+                @searchEvent="searchEvent"
+                @resetEvent="resetEvent"
+              >
+                <template #buttonLeft>
+                  <vxe-button
+                    status="primary"
+                    class="button-sty"
+                    icon="el-icon-plus"
+                    @click="openEditDialog"
+                  >
+                    {{ $t1("新增") }}
                   </vxe-button>
-                  <base-table-export :option="{ title: $t1('岗位导出'), targetRef: 'table-m1'}" :parent-target="_self"/>
-                </div>
-                <div class="fr">
-                  <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                              plain>{{ $t1('重置') }}
+                  <base-table-export
+                    :option="{ title: $t1('岗位导出'), targetRef: 'table-m1' }"
+                    :parent-target="_self"
+                  />
+                </template>
+                <template #buttonRight>
+                  <vxe-button
+                    icon="el-icon-brush"
+                    class="button-sty"
+                    @click="resetEvent"
+                    type="text"
+                    status="primary"
+                    plain
+                    >{{ $t1("重置") }}
                   </vxe-button>
-                  <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                    {{ $t1('搜索') }}
+                  <vxe-button
+                    status="warning"
+                    icon="el-icon-search"
+                    class="button-sty"
+                    @click="searchEvent"
+                  >
+                    {{ $t1("搜索") }}
                   </vxe-button>
-                </div>
-              </div>
-              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData"
-                        @submit="searchEvent" @reset="searchEvent">
-                <vxe-form-item :title="$t1('岗位名称')+':'" field="name">
-                  <template v-slot>
-                    <el-input v-model="formData.name" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
-                  <template v-slot>
-                    <el-input v-model="formData.code" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-              </vxe-form>
+                </template>
+              </tableForm>
             </template>
           </vxe-grid>
         </div>
@@ -48,18 +67,18 @@
 </template>
 
 <script>
-import editView from './edit.vue';
-
+import editView from "./edit.vue";
+import tableForm from "@base/components/table/tableForm.vue";
 export default {
-  name: 'position:list',
-  components: {editView},
+  name: "position:list",
+  components: { tableForm, editView },
   data() {
     return {
-      activeName: 'second',
+      activeName: "second",
       dataId: 0,
       showEdit: false,
       vxeOption: {},
-      formData: {}
+      formData: {},
     };
   },
   mounted() {
@@ -67,85 +86,85 @@ export default {
   },
   methods: {
     searchEvent() {
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     resetEvent() {
       this.formData = {};
-      this.$refs['table-m1'].commitProxy('reload');
+      this.$refs["table-m1"].commitProxy("reload");
     },
     openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
-      this.activeName = 'first';
-      this.$openEditView('showEdit');
+      this.dataId = !id || typeof id == "object" ? 0 : id;
+      this.activeName = "first";
+      this.$openEditView("showEdit");
     },
     initTableList() {
       let that = this;
       let tableOption = {
         vue: this,
-        tableRef: 'table-m1',
-        tableName: 'basic_position_list-m2',
-        path: USER_PREFIX + '/position/listCurrentPage',
+        tableRef: "table-m1",
+        tableName: "basic_position_list-m2",
+        path: USER_PREFIX + "/position/listCurrentPage",
         param: () => {
           return this.formData;
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t1('岗位名称'),
-            field: 'name',
+            title: this.$t1("岗位名称"),
+            field: "name",
             width: 150,
-            fixed: 'left'
+            fixed: "left",
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
-          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
+          }, */
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
           {
-            field: 'enabled',
-            title: this.$t1('是否启用'),
+            field: "enabled",
+            title: this.$t1("是否启用"),
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.enabled) {
                   return [
                     <div class="txt-status">
-                      <span>{this.$t1('启用')}</span>
-                    </div>
+                      <span>{this.$t1("启用")}</span>
+                    </div>,
                   ];
                 } else {
                   return [
                     <div class="txt-status disable">
-                      <span>{this.$t1('禁用')}</span>
-                    </div>
+                      <span>{this.$t1("禁用")}</span>
+                    </div>,
                   ];
                 }
-              }
-            }
+              },
+            },
           },
           {
-            field: 'createDate',
-            title: this.$t1('创建时间'),
-            width: 150
+            field: "createDate",
+            title: this.$t1("创建时间"),
+            width: 150,
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
-            width: 150
+            field: "_createBy",
+            title: this.$t1("创建人"),
+            width: 150,
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
-            width: 150
+            field: "_modifyBy",
+            title: this.$t1("更新人"),
+            width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
+            fixed: "right",
+            title: "",
             sortable: false,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 return [
                   <div>
                     <a
@@ -155,19 +174,32 @@ export default {
                         this.openEditDialog(row.id);
                       }}
                     >
-                      <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
+                      <el-tooltip
+                        enterable={false}
+                        effect="dark"
+                        content={this.$t1("查看")}
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-edit" />
                       </el-tooltip>
                     </a>
-                  </div>
+                  </div>,
                 ];
-              }
-            }
-          }
-        ]
+              },
+            },
+          },
+        ],
+        searchColumns: [
+          {
+            title: this.$t1("岗位名称"),
+            field: "name",
+            type: "input",
+            common: true,
+          },
+        ],
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         this.vxeOption = opts;
       });
     },
@@ -175,14 +207,14 @@ export default {
       let that = this;
       that.$excelImport({
         prefix: USER_PREFIX,
-        excel: USER_PREFIX + '/excelTemplate/position/position.xlsx',
+        excel: USER_PREFIX + "/excelTemplate/position/position.xlsx",
         multi: false,
-        saveUrl: USER_PREFIX + '/position/save',
+        saveUrl: USER_PREFIX + "/position/save",
         callback: () => {
           that.searchEvent();
-        }
+        },
       });
-    }
-  }
+    },
+  },
 };
 </script>