From ad73e0a2d99cca3c0ce39823be23bdae61fb0349 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Mon, 5 May 2025 23:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=98=8E=E7=BB=86=E8=A1=8C=E7=9A=84?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/mixins/BillListMixin.js    | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index d4c0ca99..a9180825 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -870,7 +870,7 @@ export const BillListMixin = {
       }
       //动态替换扩展字段
       this.handleChangeOtherField()
-      //判断序列号、批号、有效期、多属性、重量、仓位货架是否有值
+      //判断序列号、批号、有效期、多属性、重量、仓位货架、扩展、备注等是否有值
       let needAddkeywords = []
       for (let i = 0; i < ds.length; i++) {
         if(ds[i].snList) {
@@ -897,6 +897,21 @@ export const BillListMixin = {
         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 = []
       if(record.status === '3') {
@@ -926,7 +941,8 @@ export const BillListMixin = {
       } else {
         for(let i=0; i<this.defDetailColumns.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.defDetailColumns[i].dataIndex)===-1) {
             let info = {}
             info.title = this.defDetailColumns[i].title