From 268d425a9a82b1333c1ccb47487e3d5bf6be49a8 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sun, 4 May 2025 13:48:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8E=A7=E5=88=B6=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E7=9A=84=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/BillDetail.vue      | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 414ea2ff..c2827266 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1652,7 +1652,7 @@
         }
         //动态替换扩展字段
         this.handleChangeOtherField()
-        //判断序列号、批号、有效期、多属性、重量、仓位货架是否有值
+        //判断序列号、批号、有效期、多属性、重量、仓位货架、扩展、备注等是否有值
         let needAddkeywords = []
         for (let i = 0; i < ds.length; i++) {
           if(ds[i].snList) {
@@ -1679,6 +1679,21 @@
           if(ds[i].mfrs) {
             needAddkeywords.push('mfrs')
           }
+          if(ds[i].otherField1) {
+            needAddkeywords.push('otherField1')
+          }
+          if(ds[i].otherField2) {
+            needAddkeywords.push('otherField2')
+          }
+          if(ds[i].otherField3) {
+            needAddkeywords.push('otherField3')
+          }
+          if(ds[i].taxRate) {
+            needAddkeywords.push('taxRate')
+          }
+          if(ds[i].remark) {
+            needAddkeywords.push('remark')
+          }
         }
         let currentCol = [{title:'#',dataIndex:'',align:'center',customRender:function(t,r,index){
           return index === ds.length-1?'':parseInt(index)+1}}]
@@ -1709,7 +1724,8 @@
         } else {
           for(let i=0; i<this.defColumns.length; i++){
             //移除列
-            let needRemoveKeywords = ['finishNumber','snList','batchNumber','expirationDate','sku','weight','position','brand','mfrs']
+            let needRemoveKeywords = ['finishNumber','snList','batchNumber','expirationDate','sku','weight','position',
+              'brand','mfrs','otherField1','otherField2','otherField3','taxRate','remark']
             if(needRemoveKeywords.indexOf(this.defColumns[i].dataIndex)===-1) {
               let info = {}
               info.title = this.defColumns[i].title