From 0fa689e4eaec0c29f60f715aab5f8300eabdd3e9 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 3 Feb 2024 15:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BB=93=E4=BD=8D=E8=B4=A7?=
 =?UTF-8?q?=E6=9E=B6=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/bill/dialog/BillDetail.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index f6ddc0ce..a17e3d6a 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1198,6 +1198,7 @@
           { title: '单价', dataIndex: 'unitPrice'},
           { title: '金额', dataIndex: 'allPrice'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         retailBackColumns: [
@@ -1218,6 +1219,7 @@
           { title: '单价', dataIndex: 'unitPrice'},
           { title: '金额', dataIndex: 'allPrice'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         purchaseOrderColumns: [
@@ -1261,6 +1263,7 @@
           { title: '税额', dataIndex: 'taxMoney'},
           { title: '价税合计', dataIndex: 'taxLastMoney'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         purchaseBackColumns: [
@@ -1285,6 +1288,7 @@
           { title: '税额', dataIndex: 'taxMoney'},
           { title: '价税合计', dataIndex: 'taxLastMoney'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         saleOrderColumns: [
@@ -1328,6 +1332,7 @@
           { title: '税额', dataIndex: 'taxMoney'},
           { title: '价税合计', dataIndex: 'taxLastMoney'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         saleBackColumns: [
@@ -1352,6 +1357,7 @@
           { title: '税额', dataIndex: 'taxMoney'},
           { title: '价税合计', dataIndex: 'taxLastMoney'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         otherInColumns: [
@@ -1372,6 +1378,7 @@
           { title: '单价', dataIndex: 'unitPrice'},
           { title: '金额', dataIndex: 'allPrice'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         otherOutColumns: [
@@ -1392,6 +1399,7 @@
           { title: '单价', dataIndex: 'unitPrice'},
           { title: '金额', dataIndex: 'allPrice'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         allocationOutColumns: [
@@ -1410,6 +1418,7 @@
           { title: '单价', dataIndex: 'unitPrice'},
           { title: '金额', dataIndex: 'allPrice'},
           { title: '重量', dataIndex: 'weight'},
+          { title: '仓位货架', dataIndex: 'position'},
           { title: '备注', dataIndex: 'remark'}
         ],
         assembleColumns: [
@@ -1504,7 +1513,7 @@
         } else if (type === '盘点复盘') {
           this.defColumns = this.stockCheckReplayColumns
         }
-        //判断序列号、批号、有效期、多属性是否有值
+        //判断序列号、批号、有效期、多属性、重量、仓位货架是否有值
         let needAddkeywords = []
         for (let i = 0; i < ds.length; i++) {
           if(ds[i].snList) {
@@ -1522,6 +1531,9 @@
           if(ds[i].weight) {
             needAddkeywords.push('weight')
           }
+          if(ds[i].position) {
+            needAddkeywords.push('position')
+          }
         }
         if(record.status === '3') {
           //部分采购|部分销售的时候显示全部列
@@ -1549,7 +1561,7 @@
           let currentCol = []
           for(let i=0; i<this.defColumns.length; i++){
             //移除列
-            let needRemoveKeywords = ['finishNumber','snList','batchNumber','expirationDate','sku','weight']
+            let needRemoveKeywords = ['finishNumber','snList','batchNumber','expirationDate','sku','weight','position']
             if(needRemoveKeywords.indexOf(this.defColumns[i].dataIndex)===-1) {
               let info = {}
               info.title = this.defColumns[i].title