修改首件两检的bug

src/views/produce/components/picking/index.vue

@@ -406,7 +406,6 @@
           ids: this.workListIds,
           taskId: this.taskObj.id
         };
-        console.log('1111122222', this.clientEnvironmentId);
         if (this.clientEnvironmentId == 21) {
           znworkorderList(param).then((res) => {
             let arr = res.map((e) => {

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -610,20 +610,6 @@
         });
 
         this.form.status = formStatus;
-
-        // this.form.items.forEach((item) => {
-        //   if (item[resultField] == 1) {
-        //     item.status = itemStatus;
-        //   }
-        // });
-
-        // const allPass = this.form.items.every(
-        //   (item) => item[resultField] == 1
-        // );
-
-        // if (allPass) {
-        //   this.form.status = formStatus;
-        // }
       },
 
       addInspection() {
@@ -646,7 +632,31 @@
         const payload = this.buildInspectionPayload(items);
         const res = await addInspectionsTerm(payload);
 
-        this.form = res;
+        const {
+          firstArticleCode,
+          selfCheckTime,
+          specialCheckTime,
+          processDrawingValid,
+          deviceValid,
+          toolingQualifiedValid,
+          ncProgramValid,
+          measuringToolValid,
+          materialSemiFinishedValid
+        } = this.form;
+
+        this.form = {
+          ...this.form,
+          ...res,
+          firstArticleCode,
+          processDrawingValid,
+          deviceValid,
+          toolingQualifiedValid,
+          ncProgramValid,
+          measuringToolValid,
+          materialSemiFinishedValid,
+          ...(this.type === 1 ? { selfCheckTime } : {}),
+          ...(this.type === 2 ? { specialCheckTime } : {})
+        };
       },
 
       buildInspectionPayload(items) {
@@ -705,18 +715,18 @@
         const data = await getDetail(this.item.id);
 
         [
-          { key: 'processDrawingValid', value: 1 },
-          { key: 'deviceValid', value: 1 },
-          { key: 'toolingQualifiedValid', value: 1 },
-          { key: 'measuringToolValid', value: 1 },
-          { key: 'ncProgramValid', value: 1 },
-          { key: 'materialSemiFinishedValid', value: 1 }
-        ].forEach((item) => {
-          if (data[item.key] !== 0) {
-            data[item.key] = 1;
+          'processDrawingValid',
+          'deviceValid',
+          'toolingQualifiedValid',
+          'measuringToolValid',
+          'ncProgramValid',
+          'materialSemiFinishedValid'
+        ].forEach((key) => {
+          if (data[key] !== 0) {
+            data[key] = 1;
           }
         });
-        // this.form = { ...data };
+
         this.form = {
           ...this.form,
           ...data,