From d496c1cb3a49eb7b05641840d2bfbddc72751306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Tue, 6 Sep 2022 18:27:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=95=99=E8=82=B2(=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E5=9F=B9=E8=AE=AD):=E6=B7=BB=E5=8A=A0=E5=9F=B9?=
 =?UTF-8?q?=E8=AE=AD=E7=85=A7=E7=89=87=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laborManage/safetyTrainManage.vue         | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue
index cab13b73..3b7f4c7b 100644
--- a/src/views/projectFront/laborManage/safetyTrainManage.vue
+++ b/src/views/projectFront/laborManage/safetyTrainManage.vue
@@ -287,7 +287,7 @@
             </div>
           </el-form-item>
           <!-- 培训照片 -->
-          <el-form-item :label="$t('message.laborDev.photo')" prop="photo" >
+          <el-form-item :label="$t('message.laborDev.photo')" prop="listPic" >
             <div class="form-photo" >
               <el-upload
                 v-for="i in 3" :key="i"
@@ -515,7 +515,13 @@ export default {
       message: this.$t("message.personnelPosition.mandatory"),
       trigger: "blur",
     }
-
+    // const validatePass = (rule, value, callback) => {
+    //   if(rule.length != 3){
+    //     callback(new Error('请添加培训照片(3张)!'));
+    //   }else{
+    //     callback();
+    //   }
+    //   };
     return {
       uploadaurl:'',
       fileList:[],
@@ -545,14 +551,16 @@ export default {
         eduEndTime: '',
         eduType: 1,
         list: [],
+        listPic: [],
         workernum: 0,
         projectSn: this.$store.state.projectSn,
       },
       cardFormRules: {
         eduCourseName: [validateConfig],
         eduTime: [validateConfig],
-        list: [validateConfig],
         uploadAttachments: [validateConfig],
+        list:[],
+        listPic:[],
       },
       isAdd: false,
       allPersonList: [],
@@ -580,7 +588,7 @@ export default {
       const imageUrl = res.data[0].imageUrl
       // console.log(res.data[0].imageUrl)
       this.cardForm[`edu${num === 1 ? 'Before': num === 2 ? 'In' : 'After'}Photo`] = imageUrl
-      console.log(this.eduPhoto1,this.eduPhoto2,this.eduPhoto3, num);
+      // console.log(this.eduPhoto1,this.eduPhoto2,this.eduPhoto3, num);
     },
     handleSuccess(file,fileList){
       console.log('成功的file',file)
@@ -748,6 +756,10 @@ export default {
             this.$message.error(this.$t("message.laborMange.errorHint"));
             return;
           }
+          if(this.cardForm.eduBeforePhoto == "" || this.cardForm.eduInPhoto == "" ||this.cardForm.eduAfterPhoto == ""){
+            this.$message.error('请添加培训照片(3张)!');
+            return;
+          }
           this.cardForm.workernum = this.cardForm.list.length;
           var json = this.cardForm;
           var arr = [];