Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

# Conflicts:
#	src/views/zdsz/engineeringIndustry/index.vue

src/views/zdsz/engineeringIndustry/index.vue

@@ -288,17 +288,14 @@ export default {
         console.log('校验值', this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList)
         let p = new Promise((resolve, reject) => {
             if(this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngiineeringPhotoBoList.length != 0){
-              this.$message({
-                message: '校验通过',
-                type: 'success'
-              });
-              resolve(true)
+              callback()
+              return true
             }else{
               this.$message({
                 message: 'no pass',
                 type: 'error'
               });
-              reject(new Error('no pass'))
+              return false
             }
         });
         return p;
@@ -451,7 +448,7 @@ export default {
         //   {required: true, message: "施工时间不能为空", trigger: ['blur','change']}
         // ],
         zEngiineeringPhotoBoList: [
-          {required: true, message: "图片不能为空", trigger: 'change', validator: validatePicPass}
+          {message: "图片不能为空", trigger: 'blur', validator: validatePicPass}
         ],
 
       },
@@ -639,6 +636,8 @@ export default {
               this.getList();
             })
           }
+        } else{
+          console.log('error')
         }
       });
     },