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

src/views/zdsz/engineeringIndustry/index.vue

@@ -284,6 +284,25 @@ export default {
     EngineePipe
   },
   data() {
+    var validatePicPass = (rule, value, callback) => {
+        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'
+              });
+              return true
+            }else{
+              this.$message({
+                message: 'no pass',
+                type: 'error'
+              });
+              return false
+            }
+        });
+        return p;
+    };
     return {
       // 按钮loading
       buttonLoading: false,
@@ -431,9 +450,9 @@ export default {
         // constructTime: [
         //   {required: true, message: "施工时间不能为空", trigger: ['blur','change']}
         // ],
-        // zEngiineeringPhotoBoList: [
-        //   {required: true, message: "图片不能为空", trigger: ['blur','change']}
-        // ],
+        zEngiineeringPhotoBoList: [
+          {required: true, message: "图片不能为空", trigger: 'change', validator: validatePicPass}
+        ],
 
       },
       currentType: null, // 附件组件类型 put修改 add新增

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -219,17 +219,17 @@ export default {
     ConstructionDetails
   },
   data() {
-      var validatePass = (rule, value, callback) => {
-          console.log('校验值', value)
-          if (value === '') {
-              callback(new Error('请输入密码'));
-          } else {
-          if (this.ruleForm.checkPass !== '') {
-              this.$refs.ruleForm.validateField('checkPass');
-          }
-              callback();
-          }
-      };
+    var validatePicPass = (rule, value, callback) => {
+        console.log('校验值', value)
+        if (value === '') {
+            callback(new Error('请输入密码'));
+        } else {
+        if (this.ruleForm.checkPass !== '') {
+            this.$refs.ruleForm.validateField('checkPass');
+        }
+            callback();
+        }
+    };
     return {
       currentCollapses:[],
       searchParams:{