From cbb2a855b0ad8d211a0f6cd644ef1b0925ca19b7 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 10 Aug 2023 22:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionStockArticle.js  | 29 +++++++++++++++
 .../distribution/distrilbutionBillLading.js   |  4 +--
 .../distributionStockArticleDetails.vue       | 35 ++++++++++++++++---
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index c426c1dd..7cc526f5 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -129,6 +129,35 @@ export default {
       label: '工厂车次',
       prop: 'factoryTrain',
       search: true
+    },{
+      label: '发货仓',
+      prop: 'sendWarehouseName',
+      search: true
+    },
+    {
+      label: '发货件数（未）',
+      prop: 'trainNumber',
+      search: true
+    },
+    {
+      label: '到货件数',
+      prop: 'handQuantity',
+      search: true
+    },
+    {
+      label: '配送件数',
+      prop: 'deliveryQuantity',
+      search: true
+    },
+    {
+      label: '签收件数',
+      prop: 'signinQuantity',
+      search: true
+    },
+    {
+      label: '冻结数(未)',
+      prop: 'factoryTrain',
+      search: true
     },
 
 
diff --git a/src/option/distribution/distrilbutionBillLading.js b/src/option/distribution/distrilbutionBillLading.js
index 05469e55..bfec2bc6 100644
--- a/src/option/distribution/distrilbutionBillLading.js
+++ b/src/option/distribution/distrilbutionBillLading.js
@@ -226,8 +226,8 @@ export default {
       prop: "orderCode",
     },
     {
-      label: "商城名称",
-      prop: "mallName",
+      label: "商场名称",
+      prop: "marketName",
     },
     // {
     //   label: "品分类",
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 9d10de61..1644b6c2 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -533,7 +533,7 @@ export default {
         },
         {
           prop: 'warehouseEntryTimeEnd',
-          label: '入库时间',
+          label: '最新入库时间',
           type: 4,
           values: '',
           width: '180',
@@ -550,6 +550,33 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        }, {
+          prop: 'sendWarehouseName',
+          label: '发货仓',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'dealerName',
+          label: '经销商名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        }, {
+          prop: 'dealerCode',
+          label: '经销商编码',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
         {
           prop: '',
@@ -1172,7 +1199,7 @@ export default {
       // this.view = true;
       // this.box = true;
       this.materialQRCode = row;
- 
+
       let qr ={
         id : row.id,
         qrCode: row.orderPackageCode
@@ -1180,7 +1207,7 @@ export default {
       showOrderPackgeCode(qr).then(res => {
 
         this.orderPackageCode = res.data
-        
+
         this.arrs.map(item=>{
 			  let strhtml=JSON.parse(JSON.stringify(this.htmls))
 			  for(let key in item){
@@ -1189,7 +1216,7 @@ export default {
 			  console.log(strhtml);
 			  this.html+=strhtml
 		})
-        
+
       });
 
       this.dialogVisible = true;