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

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

@@ -45,7 +45,8 @@
                                     type="text"
                                     class="searchInput"
                                     style="width: 300px"
-                                    @keyup.enter="getWorkOrderInfo()"
+                                    v-model="code"
+                                    @on-keyup.enter="getWorkOrderInfo()"
                                 />
                             </div>
                             <div class="row">
@@ -105,25 +106,33 @@
                                             <span class="infoLabel"
                                                 >工单信息：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                         <p class="flex">
                                             <span class="infoLabel"
                                                 >产品编号：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                         <p class="flex">
                                             <span class="infoLabel"
                                                 >产品名称：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                         <p class="flex">
                                             <span class="infoLabel"
                                                 >工件编号：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                     </div>
                                     <div class="row">
@@ -131,19 +140,25 @@
                                             <span class="infoLabel"
                                                 >状态：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                         <p class="flex">
                                             <span class="infoLabel"
                                                 >储位编号：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                         <p class="flex">
                                             <span class="infoLabel"
                                                 >工装编号：</span
                                             >
-                                            <span class="info"></span>
+                                            <span class="info">{{
+                                                orderDetail.code
+                                            }}</span>
                                         </p>
                                     </div>
                                     <div>
@@ -173,7 +188,8 @@
                                 class="tableClass"
                                 :data="data1"
                                 :columns="columns1"
-                                :max-height="200"
+                                @on-current-change="handleRowChange"
+                                highlight-row
                             ></Table>
                         </div>
                         <div slot="footer">
@@ -209,15 +225,13 @@ export default {
             attr1: false, //上料、下料、上下料
             attr2: false, //上料、下料、上下料
             modal: false,
+            code: "", //工令单
             columns1: [
                 {
                     title: this.$t("1008"),
                     key: "xuhao",
                     render: (h, params) => {
-                        return h(
-                            "span",
-                            params.index + 1
-                        );
+                        return h("span", params.index + 1);
                     },
                     width: 70,
                 },
@@ -244,10 +258,7 @@ export default {
                     title: this.$t("1008"),
                     key: "xuhao",
                     render: (h, params) => {
-                        return h(
-                            "span",
-                            params.index+ 1
-                        );
+                        return h("span", params.index + 1);
                     },
                     width: 70,
                 },
@@ -265,6 +276,8 @@ export default {
                 },
             ],
             data2: [],
+            orderDetail: {},
+            detailobj:{}
         };
     },
     created() {
@@ -326,7 +339,6 @@ export default {
                     if (res.data.ret == 1) {
                         this.data1 = res.data.data;
                         this.data2 = res.data.data;
-
                     }
                 })
                 .catch((err) => {
@@ -335,9 +347,17 @@ export default {
         },
         // 获取工单信息
         getWorkOrderInfo() {
-            this.request("", "", "")
+            let data = {
+                code: this.code,
+            };
+
+            this.request("/acc/AutomationOperate/ScanCode", data, "get")
                 .then((res) => {
                     if (res.data.ret == 1) {
+                        console.log(res.data.data);
+                        this.orderDetail = res.data.data;
+                    } else {
+                        this.$Message.error(this.$t(res.data, msg));
                     }
                 })
                 .catch((err) => {
@@ -349,28 +369,31 @@ export default {
             // 准备上料
 
             let data = {
-                  section: 13,
+                section: 13,
                 code: "234324",
             };
-            this.request("/acc/AutomationOperate/Loading", data, "post").thne((res) => {
-                if (res.data.ret == 1) {
+            this.request("/acc/AutomationOperate/Loading", data, "post").thne(
+                (res) => {
+                    if (res.data.ret == 1) {
+                    }
                 }
-            });
+            );
         },
         installOver() {
             // 安装完成
 
             let data = {
-                section: 13
+                section: 13,
             };
-            this.request("", data, "post").thne(
-                (res) => {
-                    if (res.data.ret == 1) {
-                    }
+            this.request("", data, "post").thne((res) => {
+                if (res.data.ret == 1) {
                 }
-            );
+            });
         },
+        handleRowChange(currentRow, oldCurrentRow) {
+            this.detailobj = currentRow;
 
+        },
         request(url, data, type) {
             if (type == "get") {
                 return this.axios