Jelajahi Sumber

fix(系统管理): 人员编辑子表校验提示改为中文并补充行号

lihaiting 2 hari lalu
induk
melakukan
69b56f80bb
1 mengubah file dengan 36 tambahan dan 24 penghapusan
  1. 36 24
      src/views/system/organization/components/org-user-edit.vue

+ 36 - 24
src/views/system/organization/components/org-user-edit.vue

@@ -326,7 +326,7 @@
                 :prop="'identityPhotos.' + $index + '.type'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择证照类型',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -343,7 +343,7 @@
                 :prop="'identityPhotos.' + $index + '.code'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请填写证照编号',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -377,7 +377,7 @@
                 :prop="'identityPhotos.' + $index + '.validityStartTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择有效期开始时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -397,7 +397,7 @@
                 :prop="'identityPhotos.' + $index + '.validityEndTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择有效期结束时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -445,7 +445,7 @@
                 :prop="'identityPhotos.' + $index + '.status'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择状态',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -496,7 +496,7 @@
                 :prop="'skills.' + $index + '.name'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请填写技能名称',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -584,7 +584,7 @@
                 :prop="'rewardsPunishments.' + $index + '.type'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择奖惩类型',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -619,7 +619,7 @@
                 :prop="'rewardsPunishments.' + $index + '.startTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择开始时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -639,7 +639,7 @@
                 :prop="'rewardsPunishments.' + $index + '.endTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择结束时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -659,7 +659,7 @@
                 :prop="'rewardsPunishments.' + $index + '.status'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择生效状态',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -732,7 +732,7 @@
                 :prop="'trainRecords.' + $index + '.title'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请填写培训标题',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -757,7 +757,7 @@
                 :prop="'trainRecords.' + $index + '.startTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择开始时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -777,7 +777,7 @@
                 :prop="'trainRecords.' + $index + '.endTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择结束时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -797,7 +797,7 @@
                 :prop="'trainRecords.' + $index + '.status'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择生效状态',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -869,7 +869,7 @@
                 :prop="'attendanceRecords.' + $index + '.type'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择考勤类型',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -895,7 +895,7 @@
                 :prop="'attendanceRecords.' + $index + '.checkTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择签到时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -995,7 +995,7 @@
                 :prop="'contracts.' + $index + '.name'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请填写合同名称',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -1008,7 +1008,7 @@
                 :prop="'contracts.' + $index + '.signTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择签订时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -1028,7 +1028,7 @@
                 :prop="'contracts.' + $index + '.startTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择开始时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -1048,7 +1048,7 @@
                 :prop="'contracts.' + $index + '.endTime'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择结束时间',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -1068,7 +1068,7 @@
                 :prop="'contracts.' + $index + '.status'"
                 :rules="{
                   required: true,
-                  message: '',
+                  message: '请选择生效状态',
                   trigger: ['blur', 'change']
                 }"
               >
@@ -2064,13 +2064,25 @@
         this.$refs.criticalProcessRef.open(list, 'single');
       },
 
+      /* 表格行校验失败时,在提示文案后面补上行号 */
+      getValidateMessage(field, errors) {
+        const message = (errors && errors[0] && errors[0].message) || '';
+        const fields = String(field || '').split('.');
+        if (fields.length > 2 && /^\d+$/.test(fields[1])) {
+          return `${message}(第 ${Number(fields[1]) + 1} 行)`;
+        }
+        return message;
+      },
+
       /* 保存编辑 */
       save() {
         this.$refs.form.validate((valid, obj) => {
           if (obj) {
-            let messages = Object.keys(obj).map((key) => obj[key][0]);
-            if (messages.length > 0) {
-              this.$message.warning(messages[0].message);
+            const fields = Object.keys(obj);
+            if (fields.length > 0) {
+              this.$message.warning(
+                this.getValidateMessage(fields[0], obj[fields[0]])
+              );
             }
           }
           if (!valid) {