Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei

src/views/batchRecord/components/editModal.vue

@@ -1527,24 +1527,28 @@
           body.duration = body.duration * 60 * 60 * 1000;
         }
 
-        // 设置物料和产出明细中的  ruleId 、produceTaskId、produceTaskInstanceId
-        body.outputDetails = body.outputDetails.map((i) => {
-          return {
-            ...i,
-            ruleId: body.ruleId,
-            produceTaskId: body.produceTaskId,
-            produceTaskInstanceId: body.produceTaskInstanceId
-          };
-        });
+        if (body.outputDetails) {
+          // 设置物料和产出明细中的  ruleId 、produceTaskId、produceTaskInstanceId
+          body.outputDetails = body.outputDetails.map((i) => {
+            return {
+              ...i,
+              ruleId: body.ruleId,
+              produceTaskId: body.produceTaskId,
+              produceTaskInstanceId: body.produceTaskInstanceId
+            };
+          });
+        }
 
-        body.pickDetails = body.pickDetails.map((i) => {
-          return {
-            ...i,
-            ruleId: body.ruleId,
-            produceTaskId: body.produceTaskId,
-            produceTaskInstanceId: body.produceTaskInstanceId
-          };
-        });
+        if (body.pickDetails) {
+          body.pickDetails = body.pickDetails.map((i) => {
+            return {
+              ...i,
+              ruleId: body.ruleId,
+              produceTaskId: body.produceTaskId,
+              produceTaskInstanceId: body.produceTaskInstanceId
+            };
+          });
+        }
 
         this.butLoading = true;
         console.log('body', body);
@@ -1562,8 +1566,11 @@
           }
           this.butLoading = false;
 
-          // 返回
-          this.handleClose();
+          if (type == 'submit-reset' || type == 'submit') {
+            // 返回
+            this.handleClose();
+          }
+
           this.$emit('reload');
         } catch (error) {
           this.butLoading = false;