更改

pages/technology/index.vue

@@ -557,6 +557,7 @@ export default {
         if (r.success) {
           this.$refs.grid.load();
           this.$Message.success("删除成功");
+<<<<<<< HEAD
         }
       });
     },
@@ -589,6 +590,40 @@ export default {
           this.$Message.error("工艺规程送审失败!");
         }
       });
+=======
+        }
+      });
+    },
+    cancel() {
+      this.curId = 0;
+      this.modal = false;
+    },
+    l(key) {
+      let vkey = "routingHeader" + "." + key;
+      return this.$t(vkey) || key;
+    },
+    //送审
+    sendAuditFun(row) {
+      this.documentShow = true;
+      this.$refs.sendAudit.intData(row);
+    },
+    saveDocument() {
+      this.documentShow = true;
+      this.$refs.sendAudit.intData(this.headerInfo);
+    },
+    passDocument() {
+      this.dataListRetrun = [];
+      this.dataListRetrun = this.$refs.sendAudit.returnDataList();
+      this.$http.order.batchstart(this.dataListRetrun).then((res) => {
+        if (res.success) {
+          this.$Message.success("工艺规程送审成功!");
+          this.loaddata();
+          //this.easySearch('')
+        } else {
+          this.$Message.error("工艺规程送审失败!");
+        }
+      });
+>>>>>>> 400f53be818138ddb436bd3614b75749ca6e96c7
       this.documentShow = false;
     },
     //工艺更改
@@ -723,5 +758,4 @@ export default {
   background-color: white;
   border-color: #57a3f3;
 }
-
 </style>