Explorar o código

工号和同步bug修复

cyy hai 1 ano
pai
achega
e8b907cfb2

+ 2 - 2
src/views/component/personnelFile/components/personnelInfo.vue

@@ -37,11 +37,11 @@
                 </div>
                 <div class="contentFooter">
                     <el-row :gutter="20">
-                        <!-- <el-col :span="8" class="contentFooterC">
+                        <el-col :span="8" class="contentFooterC">
                             <p>工号:</p>
                             <el-input v-if="buttonType===1" v-model="submitperInfoData.jianDingZiGeZ" class="leftFont" size="mini" />
                             <span v-else>{{ submitperInfoData.jianDingZiGeZ }}</span>
-                        </el-col> -->
+                        </el-col>
                         <el-col :span="8" class="contentFooterC">
                             <p>性别:</p>
                             <!-- <el-input class="leftFont" v-if="buttonType===1" v-model="submitperInfoData.gender" size="mini" /> -->

+ 18 - 16
src/views/component/personnelFile/constants/option.js

@@ -15,16 +15,17 @@ export const checkTime = (rule, value, callback) => {
 export const checkTimeNull = (rule, value, callback) => {
     if (!value) {
         callback();
+    } else {
+        setTimeout(() => {
+            const nowTime = new Date().getTime();
+            const valueTime = new Date(value).getTime();
+            if (nowTime < valueTime) {
+                callback(new Error("请选择小于当前日期的时间"));
+            } else {
+                callback();
+            }
+        }, 100);
     }
-    setTimeout(() => {
-        const nowTime = new Date().getTime();
-        const valueTime = new Date(value).getTime();
-        if (nowTime < valueTime) {
-            callback(new Error("请选择小于当前日期的时间"));
-        } else {
-            callback();
-        }
-    }, 100);
 };
 export const checkLength = (rule, value, callback) => {
     if (!value) {
@@ -41,14 +42,15 @@ export const checkLength = (rule, value, callback) => {
 export const checkLengthNull = (rule, value, callback) => {
     if (!value) {
         callback();
+    } else {
+        setTimeout(() => {
+            if (value.length > 200) {
+                callback(new Error("请将字数限制在200以内"));
+            } else {
+                callback();
+            }
+        }, 100);
     }
-    setTimeout(() => {
-        if (value.length > 200) {
-            callback(new Error("请将字数限制在200以内"));
-        } else {
-            callback();
-        }
-    }, 100);
 };
 export const optional = (rule, value, callback) => {
     if (!value) {

+ 3 - 2
src/views/component/personnelFile/index.vue

@@ -164,7 +164,8 @@ export default {
             getInfo({ id: val }).then(res => {
                 this.personInfoData = res.data
                 console.log(this.personInfoData, '111')
-                this.stauts = this.personInfoData.ryjbqkInfoPoList[0]?.shiFouGuoShen
+                this.stauts = this.personInfoData.ryjbqkInfoPoList.length > 0 ? this.personInfoData.ryjbqkInfoPoList[0].shiFouGuoShen : ''
+
                 // 保存基本数据
                 simulated.baseDataObj.ryjbqk.data = res.data.ryjbqkInfoPoList[0]
                 this.$set(this.baseData, 'ryjbqk', simulated.baseDataObj.ryjbqk)
@@ -375,7 +376,7 @@ export default {
                 this.personInfoData = data
             }
             if ((this.btnType === 'save' || this.btnType === 'agree' || this.btnType === 'submit' || this.btnType === 'sendBack') && this.tipsControls === false && !this.checkData(this.personInfoData)) {
-                this.tipsMess('请检查表单数据是否填写正确')
+                this.tipsMess('请检查姓名、性别和工号是否填写正确')
             }
         },
         tipsShow (val, name) {