From d0bdadf07e6940791627f2d890ad59ea6de3c78c Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 10 Aug 2022 21:29:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=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/IONewOrder.vue  | 18 ++++++++++--------
 src/views/warehouse/IOWaitOrder.vue | 12 ++++++++++++
 src/views/warehouse/code.vue        |  4 ++--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/warehouse/IONewOrder.vue b/src/views/warehouse/IONewOrder.vue
index 3c8d0bc..bd89a7e 100644
--- a/src/views/warehouse/IONewOrder.vue
+++ b/src/views/warehouse/IONewOrder.vue
@@ -270,6 +270,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="filterQuery.page"
             ></el-pagination>
         </el-card>
     </div>
@@ -292,6 +293,7 @@ import store from "../../store";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
     site_id: "",
@@ -397,6 +399,7 @@ export default {
         },
         onSubmit() {
             this.loading = true;
+            this.filterQuery.page = 1;
             this.getList();
         },
         handleSizeChange(val) {
@@ -514,11 +517,9 @@ export default {
                 });
         },
         handleSelectionChange(val) {
-            console.log(val);
             this.multipleSelection = val;
         },
         selectUnit(row) {
-            console.log(row.id);
             this.unitUpdateQuery.id = this.curIndex;
             this.unitUpdateQuery.fromCorp = row.name;
             this.unitUpdateQuery.fromCorpId = row.unitid;
@@ -540,7 +541,6 @@ export default {
             // this.filterQuery.statusOrOne = -1;
             filterOrder(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
@@ -658,8 +658,7 @@ export default {
                                 this.list.splice(i, 1);
                                 break;
                             }
-                        }
-                        ;
+                        };
                         this.$message.success("提交成功");
                     } else {
                         this.$message.error(response.message);
@@ -671,10 +670,7 @@ export default {
 
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
-            var corpOrderId = mOrder.remark;
-
             this.errorDetail = mOrder.remark;
-            console.log(corpOrderId + "  " + mOrder + "  " + mOrder.remark);
             this.dialogVisible = true;
         },
 
@@ -690,6 +686,12 @@ export default {
                 this.filterQuery.invWarehouseCode = "";
             }
 
+            if (isBlank(this.filterQuery.locStorageCode)) {
+                this.filterQuery.invWarehouseCode = null;
+                this.subInvList = [];
+                return;
+            }
+
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };
diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue
index 1c3a3ad..162b6c6 100644
--- a/src/views/warehouse/IOWaitOrder.vue
+++ b/src/views/warehouse/IOWaitOrder.vue
@@ -238,6 +238,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="filterQuery.page"
             ></el-pagination>
         </el-card>
 
@@ -314,6 +315,14 @@
                     :show-overflow-tooltip="true"
                 ></el-table-column>
             </el-table>
+
+            <el-pagination
+                :page-size="detailQuery.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
+                :current-page="detailQuery.page"
+            ></el-pagination>
         </el-card>
         <el-dialog
             title="选择往来单位"
@@ -488,7 +497,10 @@ export default {
             },
             detailQuery: {
                 orderId: "",
+                page: 1,
+                limit: 20
             },
+            detailTotal: 0,
             deleteData: {
                 id: "",
                 status: 2,
diff --git a/src/views/warehouse/code.vue b/src/views/warehouse/code.vue
index 70ac2f1..d22a366 100644
--- a/src/views/warehouse/code.vue
+++ b/src/views/warehouse/code.vue
@@ -2,7 +2,7 @@
     <div>
         <el-form :inline="true" :model="query" class="query-form" size="mini">
             <el-form-item class="query-form-item">
-                <el-input v-model="query.code" placeholder="条码查询" style="width: 300px"></el-input>
+                <el-input v-model="query.code" placeholder="条码查询" style="width: 300px" clearable></el-input>
             </el-form-item>
 
             <el-form-item>
@@ -53,7 +53,7 @@
                     <span>{{ scope.row.actDate }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作员" prop="actor" width="180"></el-table-column>
+            <!--<el-table-column label="操作员" prop="actor" width="180"></el-table-column>-->
         </el-table>
 
         <el-pagination