From da1557e34fc51f38499ef6c8e0c0637632a86198 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Thu, 4 Nov 2021 15:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=AD=A3=E5=88=99=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/student/list/index.vue | 14 +++++++----
 src/pages/system/list/staff.vue  | 40 ++++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index 49b94c8..c30583f 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -151,7 +151,7 @@
                             <el-row :gutter="20">
                                 <el-col :span="12">
                                     <el-form-item prop="workNumber" label="学生学号">
-                                        <el-input v-model="form.workNumber" placeholder="" @blur="worknumberChange"></el-input>
+                                        <el-input v-model="form.workNumber" placeholder="学生学号"></el-input>
                                     </el-form-item>
                                     <el-form-item prop="userName" label="学生姓名">
                                         <el-input v-model="form.userName" placeholder="请输入学生姓名"></el-input>
@@ -266,7 +266,8 @@ export default {
             } else {
                 var pattern = /^[A-Za-z0-9]*$/;
                 if(pattern.test(value)){
-                    this.accountChange()
+                    this.accountChange();
+                    callback();
                 }else{
                     callback(new Error('请输入正确账号格式'));
                 }
@@ -278,7 +279,8 @@ export default {
             } else {
                 var pattern = /^[A-Za-z0-9]*$/;
                 if(pattern.test(value)){
-                    this.worknumberChange()
+                    this.worknumberChange();
+                    callback();
                 }else{
                     callback(new Error('请输入正确学生学号格式'));
                 }
@@ -759,11 +761,11 @@ export default {
                     if (this.isAdd) {
                         this.showTree = false;
                         this.$post(`${this.api.getDetailByAccount}?workNumber=${this.form.workNumber}&platformId=${Setting.platformId}&type=1`).then(res => {
-                            this.form = res.data;
+                            this.showTree = true;
                             let classId = res.data.classList.map(e => e.id);
                             this.form.classId = classId.toString();
                             delete this.form.classList;
-                            this.showTree = true;
+                            // this.showTree = true;
                             this.accountReapeat = false;
                             this.$refs.form.clearValidate();
                         }).catch(res => {});
@@ -774,6 +776,7 @@ export default {
             }
         },
         worknumberChange() {
+            console.log(this.form)
             if (this.form.workNumber) {
                 let url = "";
                 if (this.isAdd && !this.form.accountId) {
@@ -782,6 +785,7 @@ export default {
                     url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&accountId=${this.form.accountId}&workNumber=${this.form.workNumber}&account=`;
                 }
                 this.$post(url).then(res => {
+                    console.log(res)
                     if (res.status === 200) {
                         this.workNumberReapeat = false;
                     }
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index 704cad2..33d0aa8 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -47,7 +47,7 @@
                    width="30%" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
             <el-form ref="teacherForm" :model="teacherForm" :rules="rules" label-width="140px" :disabled="isDetail">
                 <el-form-item prop="account" label="账号">
-                    <el-input v-model.trim="teacherForm.account" placeholder="请输入职工账号" @blur="accountChange"></el-input>
+                    <el-input v-model.trim="teacherForm.account" placeholder="请输入职工账号"></el-input>
                 </el-form-item>
                 <el-form-item prop="userName" label="用户姓名">
                     <el-input v-model.trim="teacherForm.userName" placeholder="请输入员工姓名"></el-input>
@@ -66,7 +66,7 @@
                     <el-input disabled v-model.trim="teacherForm.uniqueIdentification" placeholder="请输入职工工号获取唯一标识"></el-input>
                 </el-form-item>
                 <el-form-item prop="workNumber" label="工号">
-                    <el-input v-model.trim="teacherForm.workNumber" placeholder="请输入职工工号" @blur="workNumberChange"></el-input>
+                    <el-input v-model.trim="teacherForm.workNumber" placeholder="请输入职工工号"></el-input>
                 </el-form-item>
                 <template v-for="item in teacherForm.roleAndDeptList">
                     <el-form-item :label="`${item.roleName}所属部门`">
@@ -127,6 +127,32 @@ import TeacherSide from "./staffSide";
 
 export default {
     data() {
+        var accountPass = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入账号'));
+            } else {
+                var pattern = /^[A-Za-z0-9]*$/;
+                if(pattern.test(value)){
+                    this.accountChange();
+                    callback();
+                }else{
+                    callback(new Error('请输入正确账号格式'));
+                }
+            }
+        };
+        var workNumberPass = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入职工工号'));
+            } else {
+                var pattern = /^[0-9]*$/;
+                if(pattern.test(value)){
+                    this.workNumberChange();
+                    callback();
+                }else{
+                    callback(new Error('职工工号必须为数字'));
+                }
+            }
+        };
         return {
             exportCode: "",
             headers: {
@@ -150,12 +176,7 @@ export default {
             },
             rules: {
                 account: [
-                    { required: true, message: "请输入职工账号", trigger: "blur" },
-                    {
-                        pattern: /^[A-Za-z0-9]*$/,
-                        message: "请输入正确的账号",
-                        trigger: "blur"
-                    }
+                    { validator: accountPass, trigger: 'blur' }
                 ],
                 userName: [
                     { required: true, message: "请输入用户姓名", trigger: "blur" }
@@ -164,8 +185,7 @@ export default {
                     { required: true, message: "请选择账号角色", trigger: "change" }
                 ],
                 workNumber: [
-                    { required: true, message: "请输入职工工号", trigger: "blur" },
-                    // { pattern: /^[0-9]*$/, message: "职工工号必须为数字", trigger: "blur"}
+                    { validator: workNumberPass , trigger: 'blur' }
                 ],
                 uniqueIdentification: [
                     // { required: true, message: '请输入唯一标识', trigger: 'blur' },