From 801c4683a965ebb6a65a80db08017511c76bd82a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 11 Dec 2024 14:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8F=B7=E5=90=8C=E6=AD=A5=E8=81=8C?=
 =?UTF-8?q?=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/info.vue | 18 +++++++++++-------
 src/views/system/staff.vue | 33 ---------------------------------
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/views/setting/info.vue b/src/views/setting/info.vue
index bf7efa2..78addc1 100644
--- a/src/views/setting/info.vue
+++ b/src/views/setting/info.vue
@@ -70,6 +70,10 @@
                     :value="item.value"></el-option>
                 </el-select>
               </li>
+              <li>
+                <label>工号：</label>
+                <el-input size="small" v-model="form.workNumber" clearable></el-input>
+              </li>
             </div>
           </ul>
         </div>
@@ -150,8 +154,8 @@
           <ul class="list">
             <div class="line info imp">
               <li style="width: 334px;margin-right: 90px">
-                <label>学号：</label>
-                <el-input class="m-r-10" size="small" v-model="form.workNumber" clearable disabled></el-input>
+                <label>账号：</label>
+                <el-input class="m-r-10" size="small" v-model="form.account" clearable disabled></el-input>
               </li>
               <li>
                 <label>手机号：</label>
@@ -397,6 +401,7 @@ export default {
         userInfo.account = userAccount.account
         userInfo.phone = userAccount.phone
         userInfo.workNumber = userAccount.workNumber
+        userInfo.id = userAccount.id
         this.form = userInfo
         this.originAccount = this.form.account
         this.archivesList = result.personalFileList
@@ -498,11 +503,6 @@ export default {
       })
       let data = {
         userId: form.userId,
-        userAccountList: [{
-          id: form.accountId,
-          account: form.account,
-          userId: form.userId,
-        }],
         hrUserInfo: {
           provinceId: form.provinceId,
           cityId: form.cityId,
@@ -516,6 +516,10 @@ export default {
           userName: form.userName,
           wechatId: form.wechatId
         },
+        userAccount: {
+          workNumber: form.workNumber,
+          id: form.id
+        },
         personalFileList,
       }
       this.$post(this.api.updatePersonCenter, data).then(res => {
diff --git a/src/views/system/staff.vue b/src/views/system/staff.vue
index c77acb5..e9bf3ff 100644
--- a/src/views/system/staff.vue
+++ b/src/views/system/staff.vue
@@ -182,19 +182,6 @@ export default {
         }
       }
     }
-    const workNumberPass = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入工号'))
-      } else {
-        const pattern = /^[A-Za-z0-9]*$/
-        if (pattern.test(value)) {
-          this.worknumberChange()
-          callback()
-        } else {
-          callback(new Error('请输入正确工号格式'))
-        }
-      }
-    }
     const phonePass = (rule, value, callback) => {
       if (value) {
         const pattern = /^1[3456789]\d{9}$/
@@ -262,9 +249,6 @@ export default {
         userName: [
           { required: true, validator: userNamePass, trigger: "blur" }
         ],
-        workNumber: [
-          { required: true, validator: workNumberPass, trigger: 'blur' }
-        ],
         roleList: [
           { required: true, message: "请选择授权角色", trigger: "change" }
         ],
@@ -284,7 +268,6 @@ export default {
       staffVisible: false,
       accountReapeat: false,
       workNumberReapeat: false,
-      originWorkNumber: '',
       phoneRepeat: false,
       emailRepeat: false,
       casProps: {
@@ -539,7 +522,6 @@ export default {
           data.staffArchitectureId = archId
         }
         this.form = data
-        this.originWorkNumber = data.workNumber
       }).catch(res => { })
     },
     // 获取角色数据
@@ -548,21 +530,6 @@ export default {
         this.roleList = res.rolePage.records
       }).catch(res => { })
     },
-    // 工号判重
-    worknumberChange () {
-      const form = this.form
-      const { workNumber } = form
-      if (workNumber === this.originWorkNumber) {
-        this.workNumberReapeat = false
-      } else {
-        const { accountId } = form
-        this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=2&workNumber=${workNumber}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
-          this.workNumberReapeat = false
-        }).catch(err => {
-          this.workNumberReapeat = true
-        })
-      }
-    },
     // 手机号判重
     phoneChange () {
       const form = this.form