From d0e398271e1f67f1036b5e680173b4b16e3a3c16 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 8 Mar 2023 10:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IOFinishCode.vue               |  3 +++
 src/views/inventory/trace/invUdiTraceOrder.vue | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/inout/IOFinishCode.vue b/src/views/inout/IOFinishCode.vue
index 0584f79c..11f59a80 100644
--- a/src/views/inout/IOFinishCode.vue
+++ b/src/views/inout/IOFinishCode.vue
@@ -89,6 +89,7 @@ export default {
     return {
       query: {
         code: "",
+        orderId:"",
         corpOrderId: "",
         page: 1,
         limit: 20,
@@ -113,6 +114,7 @@ export default {
       });
       this.query = {
         code: "",
+        orderId:"",
         corpOrderId: "",
         page: 1,
         limit: 20,
@@ -136,6 +138,7 @@ export default {
     },
 
     getCodeList() {
+      debugger
       this.loading = true;
       this.query.orderId = this.idQuery.billNo;
       findByOrderId(this.query) //查找该单号下的所有条码
diff --git a/src/views/inventory/trace/invUdiTraceOrder.vue b/src/views/inventory/trace/invUdiTraceOrder.vue
index 0e937a6b..403260a4 100644
--- a/src/views/inventory/trace/invUdiTraceOrder.vue
+++ b/src/views/inventory/trace/invUdiTraceOrder.vue
@@ -110,13 +110,13 @@
       </el-table>
 
 
-      <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :current-page="filterQuery.page"
+      <pagination
+        v-show="total>0"
         :total="total"
-      ></el-pagination>
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
     </el-card>
 
     <el-card class="el-card" v-if="true" id="printJS-form">
@@ -292,6 +292,7 @@ export default {
       },
       idQuery: {
         id: "",
+        billNo:""
       },
       curIndex: "",
       adListNoDataText: "无数据",
@@ -389,7 +390,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
 
@@ -463,8 +464,10 @@ export default {
       // this.dialogTableVisible = true;
     },
     intentDetail(row) {
+      debugger
       this.codeDetailVisible = true;
       this.idQuery.id = row.id;
+      this.idQuery.billNo=row.billNo;
     },
     closeDialog() {
       this.successOrderExportPDFSettingVisible = false;