From 575d2a8dd6cb3519f9fe84f6fdc9b6430fb10bb9 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Fri, 29 Sep 2023 23:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E7=9A=84=E5=B7=A5=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=94=B9=E8=BF=9B=EF=BC=8C=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BAusername=E5=AD=97=E6=AE=B5=20=E3=80=90=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=91=E7=BB=9F=E4=B8=80=E9=80=89=E4=BA=BA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8E=BB=E6=8E=89=E8=B4=A6=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selection/UserOrganSelectModal.vue        | 19 ++++-----------
 src/components/selection/UserSelectModal.vue  | 22 ++++--------------
 .../internalWorkGroup/WorkingGroupList.vue    |  8 +++----
 src/views/system/modules/UserModal.vue        | 23 +------------------
 4 files changed, 14 insertions(+), 58 deletions(-)

diff --git a/src/components/selection/UserOrganSelectModal.vue b/src/components/selection/UserOrganSelectModal.vue
index 834df338..91a3eac0 100644
--- a/src/components/selection/UserOrganSelectModal.vue
+++ b/src/components/selection/UserOrganSelectModal.vue
@@ -33,9 +33,9 @@
       <a-form v-if="switchValue === 'user'" layout="inline" @keyup.enter.native="searchQueryUser">
         <a-row :gutter="24">
           <a-col :sm="6">
-            <a-form-item :label="$t('user.account')">
+            <a-form-item :label="$t('user.workNo')">
               <a-input :placeholder="$t('pleaseEnter')"
-                       v-model="queryParamUser.account"></a-input>
+                       v-model="queryParamUser.username"></a-input>
             </a-form-item>
           </a-col>
           <a-col :sm="6">
@@ -44,12 +44,6 @@
                        v-model="queryParamUser.realname"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :sm="6">
-            <a-form-item :label="$t('user.workNo')">
-              <a-input :placeholder="$t('pleaseEnter')"
-                       v-model="queryParamUser.workNo"></a-input>
-            </a-form-item>
-          </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-button style="margin-left: 8px" @click="searchResetUser">{{$t('reset')}}</a-button>
             <a-button style="margin-left: 8px" type="primary" @click="searchQueryUser">{{$t('query')}}</a-button>
@@ -266,8 +260,8 @@ export default {
       queryParamUser: {},
       columnsUser: [
         {
-          title: this.$t('user.account'),
-          dataIndex: 'account',
+          title: this.$t('user.workNo'),
+          dataIndex: 'username',
           align: 'center'
         },
         {
@@ -275,11 +269,6 @@ export default {
           dataIndex: 'name',
           align: 'center'
         },
-        {
-          title: this.$t('user.workNo'),
-          dataIndex: 'workNo',
-          align: 'center'
-        },
         {
           title: this.$t('role'),
           dataIndex: 'role',
diff --git a/src/components/selection/UserSelectModal.vue b/src/components/selection/UserSelectModal.vue
index 3859e1e5..d36b438c 100644
--- a/src/components/selection/UserSelectModal.vue
+++ b/src/components/selection/UserSelectModal.vue
@@ -36,7 +36,7 @@
           <a-col :span="6">
             <a-form-item :label="$t('user.account')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input :placeholder="$t('pleaseEnter')"
-                       v-model="queryParam.account"></a-input>
+                       v-model="queryParam.username"></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="6">
@@ -45,12 +45,6 @@
                        v-model="queryParam.realname"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="6">
-            <a-form-item :label="$t('user.workNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter')"
-                       v-model="queryParam.workNo"></a-input>
-            </a-form-item>
-          </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-button style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
             <a-button style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
@@ -80,7 +74,7 @@
     <p class="modal-content-title">{{ $t('userSelect.selectedPersonnel') }}</p>
     <div v-if="dataSourceRight && dataSourceRight.length > 0" class="name-content">
       <div v-for="(item, index) in dataSourceRight" :key="item.id" class="name-div">
-        {{ item.realname + '(' + item.workNo + ')' }}
+        {{ item.realname + '(' + item.username + ')' }}
         <a-icon type="close" @click="handleDelete(item, index)" />
       </div>
     </div>
@@ -134,7 +128,7 @@ export default {
       },
       columns: [
         {
-          title: this.$t('user.account'),
+          title: this.$t('user.workNo'),
           dataIndex: 'username',
           align: 'center',
           scopedSlots: { customRender: 'text' }
@@ -145,12 +139,6 @@ export default {
           align: 'center',
           scopedSlots: { customRender: 'text' }
         },
-        {
-          title: this.$t('user.workNo'),
-          dataIndex: 'workNo',
-          align: 'center',
-          scopedSlots: { customRender: 'text' }
-        },
         {
           title: this.$t('role'),
           dataIndex: 'roleTxt',
@@ -231,7 +219,7 @@ export default {
       const params = Object.assign({}, this.queryParam)
       params.pageNo = this.ipagination.current
       params.pageSize = this.ipagination.pageSize
-      params.field = 'id,,,avatar,username,realname,sex_dictText,phone,orgCodeTxt,roleTxt,status_dictText,undefined'
+      params.field = 'id,avatar,username,realname,sex_dictText,phone,orgCodeTxt,roleTxt,status_dictText'
       params.column = 'createTime'
       params.order = 'desc'
       this.loadingLeft = true
@@ -310,7 +298,7 @@ export default {
     },
     handleOk () {
       this.$emit('change', this.selectedRowKeys.join(','))
-      this.$emit('nameChange', this.dataSourceRight.map(item => item.realname + '(' + item.workNo + ')').join(','))
+      this.$emit('nameChange', this.dataSourceRight.map(item => item.realname + '(' + item.username + ')').join(','))
       this.close()
     },
     handleCancel () {
diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue
index 0a7a428f..413eb300 100644
--- a/src/views/system/internalWorkGroup/WorkingGroupList.vue
+++ b/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' }
         },
         {
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index 329f7e9b..6423d216 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/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