From 47ab0850727b0581c9a427f8a5bc9f03769cfcc7 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 9 Aug 2023 15:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockArticle.js    | 17 +++++++++++------
 .../distributionStockArticleDetails.vue         |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index 74696e44..7091f5ba 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -77,6 +77,11 @@ export default {
       display: false,
       hide: true
     },
+    {
+      label: '运单号',
+      prop: 'waybillNumber',
+      search: true
+    },
     {
       label: '服务号',
       prop: 'serviceNumber'
@@ -124,7 +129,8 @@ export default {
       label: '工厂车次',
       prop: 'factoryTrain',
       search: true
-    }
+    },
+
 
   ],
   columnTakeClice: [
@@ -352,11 +358,10 @@ export default {
       label: '仓库',
       prop: 'warehouse'
     },
-    // {
-    //   label: '包件类型',
-    //   prop: 'conditions',
-    //   search: true
-    // },
+    {
+      label: '运单号',
+      prop: 'waybillNumber',
+    },
     {
       label: '包件状态',
       prop: 'orderPackageStatusName',
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 7ae88547..5797bba3 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -813,7 +813,7 @@ export default {
       this.query.id = this.$route.query.id;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
-        this.page.total = data.total;
+        // this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
         this.selectionClear();