From d5e535fbd6b5fae7c3d25403bf8b8fe5a8b5217e Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 17 Jun 2025 22:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=9A=84=E6=89=A9=E5=B1=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=80=BC=EF=BC=8C=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=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      | 60 +++++++------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index c846ea59..fc119faa 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1698,6 +1698,10 @@
           if(ds[i].remark) {
             needAddkeywords.push('remark')
           }
+          if(record.status === '3' || record.purchaseStatus === '3') {
+            //部分采购|部分销售|销售订单转采购订单的场景
+            needAddkeywords.push('finishNumber')
+          }
         }
         let currentCol = [{title:'#',dataIndex:'',align:'center',
           customRender:function(t,r,index){
@@ -1709,60 +1713,40 @@
             }
           }
         }]
-        if(record.status === '3') {
-          //部分采购|部分销售的时候显示全部列
-          for(let i=0; i<this.defColumns.length; i++){
-            currentCol.push(this.defColumns[i])
-          }
-          this.columns = currentCol
-        } else if(record.purchaseStatus === '3') {
-          //将已出库的标题转为已采购，针对销售订单转采购订单的场景
-          for(let i=0; i<this.defColumns.length; i++){
+        for(let i=0; i<this.defColumns.length; i++){
+          //移除列
+          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
             info.dataIndex = this.defColumns[i].dataIndex
             if(this.defColumns[i].width) {
               info.width = this.defColumns[i].width
             }
-            if(this.defColumns[i].dataIndex === 'finishNumber') {
-              info.title = '已采购'
-            }
             if(this.defColumns[i].dataIndex === 'barCode') {
               info.scopedSlots = { customRender: 'customBarCode' }
             }
             currentCol.push(info)
           }
-          this.columns = currentCol
-        } else {
-          for(let i=0; i<this.defColumns.length; i++){
-            //移除列
-            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
-              info.dataIndex = this.defColumns[i].dataIndex
-              if(this.defColumns[i].width) {
-                info.width = this.defColumns[i].width
-              }
-              if(this.defColumns[i].dataIndex === 'barCode') {
-                info.scopedSlots = { customRender: 'customBarCode' }
-              }
-              currentCol.push(info)
+          //添加有数据的列
+          if(needAddkeywords.indexOf(this.defColumns[i].dataIndex)>-1) {
+            let info = {}
+            info.title = this.defColumns[i].title
+            info.dataIndex = this.defColumns[i].dataIndex
+            if(this.defColumns[i].width) {
+              info.width = this.defColumns[i].width
             }
-            //添加有数据的列
-            if(needAddkeywords.indexOf(this.defColumns[i].dataIndex)>-1) {
-              let info = {}
-              info.title = this.defColumns[i].title
-              info.dataIndex = this.defColumns[i].dataIndex
-              if(this.defColumns[i].width) {
-                info.width = this.defColumns[i].width
+            if(record.purchaseStatus === '3') {
+              //将已出库的标题转为已采购，针对销售订单转采购订单的场景
+              if(this.defColumns[i].dataIndex === 'finishNumber') {
+                info.title = '已采购'
               }
-              currentCol.push(info)
             }
+            currentCol.push(info)
           }
-          this.columns = currentCol
         }
+        this.columns = currentCol
       },
       //动态替换扩展字段
       handleChangeOtherField() {