---

陈嘉新
1 parent d91d89d7
Showing 2 changed files with 22 additions and 20 deletions
HHECS.Web/src/views/taskManage/taskModel_host.vue
HHECS.Web/src/views/taskManage/taskModel_stacker.vue
@@ -576,7 +576,7 @@
           <!-- <el-button type="primary" @click="dialogFormVisibleTwo = false"
             >创 建</el-button
           > -->
-          <el-button @click="dialogFormVisibleTwo = false">取 消</el-button>
+          <el-button @click="close()">取 消</el-button>
         </div>
       </el-dialog>
     </div>
@@ -680,6 +680,7 @@ export default {
       this.optionsStage = [];
       this.optionsDevice = [];
       this.optionsPick = [];
+      this.optionsAdd = [];
       let params = { Code: data };
       getHostType(params).then((response) => {
         response.data.dictDetails.forEach((x) => {
@@ -988,7 +989,10 @@ export default {
         };
         GetMTaskById(params).then((response) => {
           if (response.code == "Success") {
-            if (response.data.approachPoint == "") {
+            if (
+              response.data.approachPoint == "" ||
+              response.data.approachPoint == null
+            ) {
               response.data.approachPoint = [];
             } else {
               response.data.approachPoint = response.data.approachPoint
@@ -1090,7 +1094,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.remoteTask, 0);
       RemoteTaskEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1100,7 +1103,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.preRemoteTask, 0);
       PreRemoteTaskEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1110,7 +1112,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.from, 0);
       FromEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1120,7 +1121,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.to, 0);
       ToEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1130,7 +1130,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.priority, 0);
       PriorityEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1140,7 +1139,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.length, 0);
       LengthEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1150,7 +1148,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.width, 0);
       WidthEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1160,7 +1157,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.height, 0);
       HeightEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1170,7 +1166,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.weight, 0);
       WeightEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1180,7 +1175,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.goodsType, 0);
       GoodsTypeEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1190,7 +1184,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.mStage, 0);
       MStageEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1200,7 +1193,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.approachPoint, 1);
       ApproachPointEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1210,7 +1202,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.status, 0);
       StatusEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1218,9 +1209,9 @@ export default {
     //当前设备
     currentModify() {
       let prams = this.pramsData(this.elMaintenance.current, 0);
+      console.log(prams, "prams");
       CurrentEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1230,7 +1221,6 @@ export default {
       let prams = this.pramsData(this.elMaintenance.commit, 0);
       CommitEdit(prams).then((response) => {
         if (response.code == "Success") {
-          this.getTableList();
           this.messge(response);
         }
       });
@@ -1261,6 +1251,10 @@ export default {
         type: "success",
       });
     },
+    close() {
+      this.getTableList();
+      this.dialogFormVisibleTwo = false;
+    },
   },
 };
 </script>
@@ -434,7 +434,11 @@
         </div>
       </el-dialog>
  
-      <el-dialog title="堆垛机维护" :visible.sync="dialogFormVisibleTwo">
+      <el-dialog
+        title="堆垛机维护"
+        :visible.sync="dialogFormVisibleTwo"
+        :showClose="false"
+      >
         <div class="containerTwo">
           <div class="box1">
             <div class="dv-title" style="margin-left: 10px">
@@ -898,7 +902,7 @@ export default {
     };
   },
   created() {
-    this.fetchData("MTaskStatus");
+    this.fetchData("SRMTaskStatus");
     this.btnAction();
     this.userCode = this.$store.state.user.name;
   },
@@ -1049,7 +1053,7 @@ export default {
             if (this.optionsAdd.length > 0) {
               this.elAddDialog.type = this.optionsAdd[0].value;
             }
-          } else if (data == "MTaskStatus") {
+          } else if (data == "SRMTaskStatus") {
             this.options.push({ value: x.code, label: x.name });
           } else if (data == "SRMInStation") {
             this.optionsAddEnter.push({ value: x.code, label: x.name });
@@ -1607,6 +1611,10 @@ export default {
         type: "success",
       });
     },
+    close() {
+      this.getTableList();
+      this.dialogFormVisibleTwo = false;
+    },
   },
 };
 </script>