Merge remote-tracking branch 'origin/main' into main

ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue

@@ -796,6 +796,8 @@ export default {
         status: [ {  required: true,message: "整改进度必须选择", trigger: 'blur'}],
         // rectifyMeasure: [ { type: 'string',required: true,message: "整改措施必填", trigger: 'blur'}],
         // rectifyTime: [ { type: 'date',required: true,message: "整改时间必填", trigger: 'blur'}],
+        hiddenDangerImg: [{required:true,message: "隐患照片必填", trigger: 'blur'}],
+        rectifyImg: [{ validator: this.validateRectifyImg,message: "整改照片必填", trigger: 'blur'}],
         hiddenDangerGrade: [ { type: 'string',required: true,message: "隐患级别必填", trigger: 'blur'}],
         // hiddenDangerType: [ { type: 'string',required: true,message: "隐患类型必填", trigger: 'blur'}],
         rectifyMoney: [ {
@@ -1013,6 +1015,14 @@ export default {
       }
 
     },
+    validateRectifyImg(rule, value, callback) {
+      if (this.form.status == 10 && !value) {
+        callback(new Error('整改照片是必填项'));
+        this.$message.warning('整改照片不能为空!');
+      } else {
+        callback();
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const hiddenDangerIds = row.hiddenDangerId || this.ids;