Merge branch 'master' of http://gitlab.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -35,8 +35,8 @@
                 </div>
                 <div class="choose">
                     <p class="selectTitle">3.操作</p>
-                    <Tabs type="card">
-                        <TabPane label="上料" :disabled="attr1">
+                    <Tabs type="card" :value="tabindex">
+                        <TabPane label="上料" :disabled="attr1" name="1">
                             <div class="filter">
                                 <label style="font-size: 16px"
                                     >上料信息：</label
@@ -106,7 +106,7 @@
                                 <Button type="primary">安装完成</Button>
                             </div>
                         </TabPane>
-                        <TabPane label="下料" :disabled="attr2"
+                        <TabPane label="下料" :disabled="attr2" name="2"
                             ><div class="flex">
                                 <div>
                                     <Table
@@ -158,7 +158,11 @@
                                                 >状态：</span
                                             >
                                             <span class="info">{{
-                                                orderDetail.code
+                                                orderDetail.status == 1
+                                                    ? "待上料"
+                                                    : orderDetail.status == 2
+                                                    ? "运行中"
+                                                    : "待下料"
                                             }}</span>
                                         </p>
                                         <p class="flex">
@@ -181,12 +185,12 @@
                                     <div>
                                         <Button
                                             type="primary"
-                                            @click="feedReady()"
+                                            @click="blankReady()"
                                             >准备下料</Button
                                         >
                                         <Button
                                             type="primary"
-                                            @click="installOver()"
+                                            @click="uninstallOver()"
                                             >拆卸完成</Button
                                         >
                                     </div>
@@ -297,6 +301,7 @@ export default {
             orderDetail: {},
             detailobj: {},
             sectionid: 0,
+            tabindex: "1",
         };
     },
     created() {
@@ -347,9 +352,16 @@ export default {
             this.b = index;
             let status = this.stationList[index].status;
             this.sectionid = this.stationList[index].section;
-            if (status == 1) {
+            if (status == 3) {
+                this.attr1 = true;
+                this.tabindex = "2";
+                this.getRunningDetail(index);
+            } else {
                 this.attr2 = true;
             }
+            if (status == 2) {
+                this.getRunningDetail(index);
+            }
         },
         //获取储位
         getStorages() {
@@ -388,22 +400,48 @@ export default {
                     console.log(err);
                 });
         },
-
+        getRunningDetail(i) {
+            // /acc/AutomationOperate/GetLoadingState?section=4861
+            // 获取已上料的信息
+            this.request(
+                "/acc/AutomationOperate/GetLoadingState?section=" +
+                    this.stationList[i].section,
+                "",
+                "get"
+            )
+                .then((res) => {
+                    if (res.data.ret == 1) {
+                        let obj = res.data.data;
+                        this.orderDetail = Object.assign(
+                            {},
+                            this.orderDetail,
+                            obj
+                        );
+                    } else {
+                        this.$Message.error(this.$t(res.data, msg));
+                    }
+                })
+                .catch((err) => {
+                    console.log(err);
+                });
+        },
         feedReady() {
             // 准备上料
             if (this.sectionid == 0) {
                 this.$Message.error("请选择工位");
+                return false;
             }
             let data = {
                 section: this.sectionid,
                 code: this.orderDetail.orderNumber,
-                guid:this.orderDetail.fixtureGuid,
-                locationid:this.orderDetail.location
+                guid: this.orderDetail.fixtureGuid,
+                locationid: this.orderDetail.location,
             };
             this.request("/acc/AutomationOperate/Loading", data, "post").then(
                 (res) => {
                     if (res.data.ret == 1) {
                         console.log(res.data.data);
+                        this.$Message.success(this.$t(res.data.msg));
                     } else {
                         this.$Message.error(this.$t(res.data.msg));
                     }
@@ -412,12 +450,62 @@ export default {
         },
         installOver() {
             // 安装完成
-
+            if (this.sectionid == 0) {
+                this.$Message.error("请选择工位");
+                return false;
+            }
             let data = {
                 section: 13,
             };
-            this.request("", data, "post").thne((res) => {
+            this.request(
+                "/acc/AutomationOperate/CompalateAssemble",
+                data,
+                "post"
+            ).thne((res) => {
+                if (res.data.ret == 1) {
+                    this.$Message.success(this.$t(res.data.msg));
+                } else {
+                    this.$Message.error(this.$t(res.data.msg));
+                }
+            });
+        },
+        blankReady() {
+            // 准备下料
+            if (this.sectionid == 0) {
+                this.$Message.error("请选择工位");
+                return false;
+            }
+            let data = {
+                section: this.sectionid,
+            };
+            this.request("/acc/AutomationOperate/Unloading", data, "post").thne(
+                (res) => {
+                    if (res.data.ret == 1) {
+                        this.$Message.success(this.$t(res.data.msg));
+                    } else {
+                        this.$Message.error(this.$t(res.data.msg));
+                    }
+                }
+            );
+        },
+        uninstallOver() {
+            // 拆卸完成
+            if (this.sectionid == 0) {
+                this.$Message.error("请选择工位");
+                return false;
+            }
+            let data = {
+                section: this.sectionid,
+            };
+            this.request(
+                "/acc/AutomationOperate/Disassemble",
+                data,
+                "post"
+            ).thne((res) => {
                 if (res.data.ret == 1) {
+                    this.$Message.success(this.$t(res.data.msg));
+                } else {
+                    this.$Message.error(this.$t(res.data.msg));
                 }
             });
         },
@@ -425,7 +513,6 @@ export default {
             this.detailobj = currentRow;
             this.orderDetail.fixtureGuid = this.detailobj.fixtureguid;
             this.orderDetail.location = this.detailobj.locationid;
-
         },
         request(url, data, type) {
             if (type == "get") {