Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/handleTask/components/mesWorkOrderChecklist/detailDialog.vue

@@ -321,6 +321,20 @@
           }
         }
 
+        const noRemarkWhenFail = this.form.details.find(
+          (v) => v.isPass === 0 && !String(v.remark ?? '').trim()
+        );
+        if (noRemarkWhenFail) {
+          let msg = '审核结果为「否」时必须填写备注';
+          if (noRemarkWhenFail.checkType === CHECK_TYPE.SC) {
+            msg = '生产放行规则中，审核结果为「否」时必须填写备注';
+          } else if (noRemarkWhenFail.checkType === CHECK_TYPE.ZJ) {
+            msg = '质检放行规则中，审核结果为「否」时必须填写备注';
+          }
+          this.$message.warning(msg);
+          return false;
+        }
+
         const changeList = this.form.details
           .filter((v) => v.isPass !== v._originIsPass)
           .map((v) => ({
@@ -329,11 +343,6 @@
             remark: v.remark
           }));
 
-        if (changeList.some((v) => !v.remark?.trim())) {
-          this.$message.warning('请填写备注');
-          return false;
-        }
-
         return {
           formData: this.form,
           changeList

src/views/bpm/handleTask/components/mesWorkOrderChecklist/submit.vue

@@ -108,9 +108,9 @@
       },
 
       async handleAudit(status) {
-        let { formData, changeList } = await this.getTableValue();
-
-        if (!changeList) return;
+        const tableRes = await this.getTableValue();
+        if (!tableRes) return;
+        const { formData, changeList } = tableRes;
 
         let variables = {
           pass: !!status,