From c2e6520d581c505323cd32cffd54c7dac2ebf96f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 14 Oct 2022 12:00:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=BB=BA=E5=9E=9B=E5=85=B3?=
 =?UTF-8?q?=E8=81=94ID=202.=E5=AE=8C=E5=96=84=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/stackOrder.js     |  1 +
 src/views/production/stackCode.vue   | 15 ++-------------
 src/views/production/stackManage.vue | 26 ++++++++++++++++++++------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/api/production/stackOrder.js b/src/api/production/stackOrder.js
index 8cc6dc9..32491bb 100644
--- a/src/api/production/stackOrder.js
+++ b/src/api/production/stackOrder.js
@@ -39,3 +39,4 @@ export function importStackOrder(data) {
         data: data
     })
 }
+
diff --git a/src/views/production/stackCode.vue b/src/views/production/stackCode.vue
index dfec815..bf8dc4c 100644
--- a/src/views/production/stackCode.vue
+++ b/src/views/production/stackCode.vue
@@ -59,7 +59,7 @@ export default {
     data() {
         return {
             query: {
-                code: "",
+                code: null,
                 orderIdFk: null,
                 page: 1,
                 limit: 20,
@@ -76,7 +76,7 @@ export default {
                 path: "",
             });
             this.query = {
-                code: "",
+                code: null,
                 orderIdFk: this.idQuery.orderIdFk,
                 page: 1,
                 limit: 20,
@@ -84,10 +84,6 @@ export default {
             this.getCodeList();
         },
         onSubmit() {
-            this.$router.push({
-                path: "",
-                query: this.query,
-            });
             this.getCodeList();
         },
         handleSizeChange(val) {
@@ -137,13 +133,6 @@ export default {
             });
         }
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    },
     created() {
         // 将参数拷贝进查询对象
         this.query.orderIdFk = this.idQuery.orderIdFk;
diff --git a/src/views/production/stackManage.vue b/src/views/production/stackManage.vue
index afa0054..e07721d 100644
--- a/src/views/production/stackManage.vue
+++ b/src/views/production/stackManage.vue
@@ -43,13 +43,13 @@
                     <el-button
                         type="text"
                         size="small"
-                        @click.native="codeDetail(scope.row.orderId)"
+                        @click.native="codeDetail(scope.row.id)"
                     >详情
                     </el-button>
                     <el-button
                         type="text"
                         size="small"
-                        @click.native="exportStackCode(scope.row.orderId)"
+                        @click.native="exportStackCode(scope.row.id)"
                     >导出
                     </el-button>
                     <el-button
@@ -81,6 +81,7 @@
         <el-dialog
             title="码详情"
             :visible.sync="codeDetailVisible"
+            v-if="codeDetailVisible"
             :append-to-body="true"
             width="70%"
             :close-on-click-modal="false"
@@ -95,6 +96,7 @@
         <el-dialog
             title="导入垛码"
             :visible.sync="importVisible"
+            v-if="importVisible"
             :append-to-body="true"
             width="30%"
             :close-on-click-modal="false"
@@ -116,6 +118,7 @@
         <el-dialog
             :title="formNames[formName]"
             :visible.sync="stackVisible"
+            v-if="stackVisible"
             :append-to-body="true"
             width="60%"
             :close-on-click-modal="false"
@@ -211,7 +214,13 @@
 </template>
 
 <script>
-import {getStackOrderList, deleteStackOrder, updateStack, uploadStack, importStackOrder} from "@/api/production/stackOrder";
+import {
+    getStackOrderList,
+    deleteStackOrder,
+    updateStack,
+    uploadStack,
+    importStackOrder
+} from "@/api/production/stackOrder";
 import {getStackCodeList, deleteCode, addStackCode} from "@/api/production/stackCode";
 import stackCode from "@/views/production/stackCode";
 import {isBlank} from "@/utils/strUtil";
@@ -352,7 +361,7 @@ export default {
                 code: null
             };
             this.codeQuery = {
-                orderIdFk: row.orderId,
+                orderIdFk: row.id,
                 page: 1,
                 limit: 20
             }
@@ -413,7 +422,7 @@ export default {
             addStackCode(params).then((res) => {
                 if (res.code === 20000) {
                     if (isBlank(this.formData.orderId)) {
-                        this.formData.orderId = res.data.orderIdFk;
+                        this.formData.orderId = res.data.stackId;
                         this.codeQuery.orderIdFk = res.data.orderIdFk;
                     }
                     this.getStackCodes();
@@ -482,7 +491,12 @@ export default {
             })
         },
         exportStackCode(orderId) {
-
+            let params = {
+                orderId: orderId,
+                customerId: this.$store.getters.customerId
+            };
+            window.open(BASE_URL + "/udims/stack/order/exportStackOrder" + "?orderId=" + orderId + "&customerId=" + this.$store.getters.customerId);
+            this.getList();
         },
     },
     created() {