From aba4aba871c8179990b6cb41cb3d5e2e2f1d5054 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 3 Jan 2024 20:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=93=81=E7=89=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delivery/distributionStockArticle.vue     | 11 +++++++
 .../distributionStockArticleDiscuss.vue       | 10 ++++++
 .../distributionStockArticleMarket.vue        | 10 ++++++
 .../delivery/distributionStockArticleSelf.vue | 33 ++++++++++++-------
 4 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 0a41aecd..38d28a12 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -725,6 +725,17 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        
         {
           prop: 'trays',
           label: '所在托盘',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 47f3bafa..41047c99 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -529,6 +529,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'totalNumber',
           label: '订单总件数',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index e07a60fe..af4ee58e 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -557,6 +557,16 @@ export default {
           sortable: true,
         }
         ,
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'totalNumber',
           label: '订单总件数',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 53d336b0..fe3c9e08 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -644,17 +644,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'totalNumber',
-          label: '订单总件数',
-          type: 1,
-          values: '',
-          width: '160',
-          checkarr: [],
-          fixed: false,
-          isshowSummary: true,
-          sortable: true,
-        },
+  
         {
           prop: 'consigneeUnit',
           label: '收货单位',
@@ -685,6 +675,27 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'brand',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '160',
+          checkarr: [],
+          fixed: false,
+          isshowSummary: true,
+          sortable: true,
+        },
         {
           prop: 'handQuantity',
           label: '在库件数',