From 8db00ac3588290b95e1fe6a870b55077bf6ea030 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 08:48:27 +0800
Subject: [PATCH] 培训报名,保安员批量上传提示修改

---
 src/views/securityGuard/securityGuard.vue |    2 
 src/views/trainingRegistration/index.vue  |   66 +++++++++++++++++----------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index e5a5688..75b273f 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -400,7 +400,7 @@
             propsHttp: {
               res: "data",
             },
-            tip: "请上传 zip 压缩文件",
+            tip: "请上传 zip 压缩文件,照片文件名以身份证号码命名",
             action: "/api/blade-resource/oss/endpoint/put-file-zip",
           },
         ],
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 372c962..ff71b3a 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -154,30 +154,30 @@
         menuWidth: 380,
         dialogClickModal: false,
         column: [
-          {
-            label: "考试人数",
-            prop: "number",
-            type: 'number',
-            span: 12,
-            precision:0,
-            step:50,
-            mock:{
-              type:'number',
-              max:1000,
-              min:0,
-              precision:0
-            },
-            rules: [
-              {
-                required: true,
-                message: "请输入考试人数",
-                trigger: "blur",
-              },
-            ],
-            minRows: 0,
-            maxRows: 1000,
-            value:50,
-          },
+          // {
+          //   label: "考试人数",
+          //   prop: "number",
+          //   type: 'number',
+          //   span: 12,
+          //   precision:0,
+          //   step:50,
+          //   mock:{
+          //     type:'number',
+          //     max:1000,
+          //     min:0,
+          //     precision:0
+          //   },
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入考试人数",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          //   minRows: 0,
+          //   maxRows: 1000,
+          //   value:50,
+          // },
           {
             label: "序号开始",
             prop: "serialStart",
@@ -582,14 +582,14 @@
       var that = this;
       row.startTime = row.startTime + ":00";
       row.endTime = row.endTime + ":00";
-      if(row.number!=((row.serialEnd-row.serialStart)+1)){
-          this.$message({
-            type: "error",
-            message: "考试人数与序号不匹配!",
-          });
-         done();
-         return;
-      }
+      // if(row.number!=((row.serialEnd-row.serialStart)+1)){
+      //     this.$message({
+      //       type: "error",
+      //       message: "考试人数与序号不匹配!",
+      //     });
+      //    done();
+      //    return;
+      // }
 
       var s = new Date(row.startTime);
       var e = new Date(row.endTime);
@@ -601,6 +601,8 @@
          done();
          return;
       }
+
+      row['number'] = (row.serialEnd-row.serialStart)+1;
       
       addExam(Object.assign(row, this.search)).then(
         () => {

--
Gitblit v1.9.3