From 3537986f6acc7b5268f3aa08ba9deda5c1387271 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 5 Aug 2022 17:47:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=A0=A1=E9=AA=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=8D=95=E6=8D=AE=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=E6=8F=90=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98=202.=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=86=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/warehouse/IOCheckErrOrder.vue     | 8 +++-----
 src/views/warehouse/stockOrderDelSearch.vue | 2 ++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue
index 7c47f02..a0e1783 100644
--- a/src/views/warehouse/IOCheckErrOrder.vue
+++ b/src/views/warehouse/IOCheckErrOrder.vue
@@ -426,6 +426,7 @@
                 v-on:closeManuDialog="closeManuDialog"
                 :orderId="orderId"
                 :orderAction="billAction"
+                :curLocInv="curLocInv"
             ></selectErpOrder>
         </el-dialog>
 
@@ -597,6 +598,7 @@ export default {
             index: null,
             formName: null,
             orderId: "",
+            curLocInv: null,
             formMap: {
                 add: "新增",
                 edit: "编辑",
@@ -711,7 +713,6 @@ export default {
             this.getList();
         },
         handleSelectionChange(val) {
-            console.log(val);
             this.multipleSelection = val;
         },
 
@@ -777,7 +778,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterOrder(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
@@ -885,7 +885,6 @@ export default {
         refresgOrderDetail() {
             orderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.detailList = response.data || [];
                 })
@@ -928,7 +927,6 @@ export default {
             this.successOrderExportPDFSettingVisible = true;
         },
         successOrderExportPDF(row) {
-            console.log(row)
             let tQuery = {
                 orderId: row.id,
                 customerId: store.getters.customerId
@@ -1187,7 +1185,6 @@ export default {
         },
 
         uploadOrderDialog(value) {
-            console.log(value.id + "---" + value.orderid);
             this.uploadQuery = {
                 orderId: value.id,
             };
@@ -1238,6 +1235,7 @@ export default {
         importOrder(row) {
             this.orderId = row.id;
             this.billAction = row.action;
+            this.curLocInv = row.locStorageCode;
             this.addDialogVisible = true;
         },
         invChange() {
diff --git a/src/views/warehouse/stockOrderDelSearch.vue b/src/views/warehouse/stockOrderDelSearch.vue
index e05de37..7af54fd 100644
--- a/src/views/warehouse/stockOrderDelSearch.vue
+++ b/src/views/warehouse/stockOrderDelSearch.vue
@@ -161,6 +161,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
         </el-card>
@@ -239,6 +240,7 @@
                 @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
                 :total="detailTotal"
+                :current-page="detailQuery.page"
             >
             </el-pagination>
         </el-card>