【修改】工作组的工号字段处理改进，更换为username字段

【修改】统一选人组件去掉账号字段和查询条件

src/views/system/internalWorkGroup/WorkingGroupList.vue

@@ -69,12 +69,12 @@
           <a-row :gutter="24">
             <a-col :span="8">
               <a-form-item :label="$t('system.internalWorkGroup.name')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.name')" v-model="queryParam.userName"></a-input>
+                <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.name')" v-model="queryParam.realname"></a-input>
               </a-form-item>
             </a-col>
             <a-col :span="8">
               <a-form-item :label="$t('system.internalWorkGroup.workNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.workNo')" v-model="queryParam.userWorkNo"></a-input>
+                <a-input :placeholder="$t('pleaseEnter')+$t('system.internalWorkGroup.workNo')" v-model="queryParam.username"></a-input>
               </a-form-item>
             </a-col>
             <template v-if="toggleSearchStatus">
@@ -172,14 +172,14 @@ export default {
           title: this.$t('system.internalWorkGroup.name'),
           align: 'center',
           width: 180,
-          dataIndex: 'userName',
+          dataIndex: 'realname',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('system.internalWorkGroup.workNo'),
           align: 'center',
           width: 180,
-          dataIndex: 'userWorkNo',
+          dataIndex: 'username',
           scopedSlots: { customRender: 'text' }
         },
         {

src/views/system/modules/UserModal.vue

@@ -48,10 +48,6 @@
           <a-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="model.realname" :maxLength="50" :disabled="disableSubmit" />
         </a-form-model-item>
 
-        <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入工号" v-model="model.workNo" />
-        </a-form-model-item>
-
         <!--<a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
         <!--<j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]"/>-->
         <!--</a-form-model-item>-->
@@ -185,15 +181,13 @@ export default {
           pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
           message: this.$t('user.passwordConsists')
         },
-          { validator: this.validateToNextPassword, trigger: 'change' }],
+        { validator: this.validateToNextPassword, trigger: 'change' }],
         confirmpassword: [{ required: true, message: this.$t('user.reenterLoginPassword') },
           { validator: this.compareToFirstPassword }],
         realname: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.userName') }],
         phone: [{ validator: this.validatePhone }],
         email: [{ validator: this.validateEmail }],
         roles: {},
-        workNo: [{ required: true, message: this.$t('pleaseEnter') + this.$t('user.workNo') },
-          { validator: this.validateWorkNo }]
       },
       departIdShow: false,
       title: this.$t('operation'),
@@ -480,21 +474,6 @@ export default {
         }
       })
     },
-    validateWorkNo (rule, value, callback) {
-      const params = {
-        tableName: 'sys_user',
-        fieldName: 'work_no',
-        fieldVal: value,
-        dataId: this.userId
-      }
-      duplicateCheck(params).then((res) => {
-        if (res.success) {
-          callback()
-        } else {
-          callback(new Error(this.$t('user.workNoExists')))
-        }
-      })
-    },
     handleConfirmBlur (e) {
       const value = e.target.value
       this.confirmDirty = this.confirmDirty || !!value