From 997508894a3f7ac797c718f855e8dbcb9935d5ad Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 30 Mar 2024 14:49:59 +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=E7=9A=84=EF=BC=8C=E6=98=8E=E7=BB=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=BA=8F=E5=8F=B7=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=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    |  8 +++++---
 .../src/views/financial/dialog/FinancialDetail.vue | 14 ++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index a17e3d6a..6674e2a5 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1535,12 +1535,15 @@
             needAddkeywords.push('position')
           }
         }
+        let currentCol = [{title:'#',dataIndex:'',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}}]
         if(record.status === '3') {
           //部分采购|部分销售的时候显示全部列
-          this.columns = this.defColumns
+          for(let i=0; i<this.defColumns.length; i++){
+            currentCol.push(this.defColumns[i])
+          }
+          this.columns = currentCol
         } else if(record.purchaseStatus === '3') {
           //将已出库的标题转为已采购，针对销售订单转采购订单的场景
-          let currentCol = []
           for(let i=0; i<this.defColumns.length; i++){
             let info = {}
             info.title = this.defColumns[i].title
@@ -1558,7 +1561,6 @@
           }
           this.columns = currentCol
         } else {
-          let currentCol = []
           for(let i=0; i<this.defColumns.length; i++){
             //移除列
             let needRemoveKeywords = ['finishNumber','snList','batchNumber','expirationDate','sku','weight','position']
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 7cb5104b..7ef52a2d 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -442,38 +442,40 @@
           batchSetStatusUrl: '/accountHead/batchSetStatus'
         },
         advanceInColumns: [
+          { title: '#',dataIndex:'',width:'5%',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}},
           { title: '账户名称',dataIndex: 'accountName',width: '30%'},
           { title: '金额',dataIndex: 'eachAmount', width: '30%'},
           { title: '备注',dataIndex: 'remark', width: '30%'}
         ],
         giroColumns: [
+          { title: '#',dataIndex:'',width:'5%',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}},
           { title: '账户名称',dataIndex: 'accountName',width: '30%'},
           { title: '金额',dataIndex: 'eachAmount', width: '30%'},
           { title: '备注',dataIndex: 'remark', width: '30%'}
         ],
         itemInColumns: [
+          { title: '#',dataIndex:'',width:'5%',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}},
           { title: '收入项目',dataIndex: 'inOutItemName',width: '30%'},
           { title: '金额',dataIndex: 'eachAmount', width: '30%'},
           { title: '备注',dataIndex: 'remark', width: '30%'}
         ],
         itemOutColumns: [
+          { title: '#',dataIndex:'',width:'5%',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}},
           { title: '支出项目',dataIndex: 'inOutItemName',width: '30%'},
           { title: '金额',dataIndex: 'eachAmount', width: '30%'},
           { title: '备注',dataIndex: 'remark', width: '30%'}
         ],
         moneyInColumns: [
-          {
-            title: '销售单据编号', dataIndex: 'billNumber', width: '20%'
-          },
+          { title: '#',dataIndex:'',width:'5%',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}},
+          { title: '销售单据编号', dataIndex: 'billNumber', width: '20%' },
           { title: '应收欠款',dataIndex: 'needDebt', width: '10%'},
           { title: '已收欠款',dataIndex: 'finishDebt', width: '10%'},
           { title: '本次收款',dataIndex: 'eachAmount', width: '10%'},
           { title: '备注',dataIndex: 'remark', width: '20%'}
         ],
         moneyOutColumns: [
-          {
-            title: '采购单据编号', dataIndex: 'billNumber', width: '20%'
-          },
+          { title: '#',dataIndex:'',width:'5%',align:'center',customRender:function(t,r,index){return parseInt(index)+1;}},
+          { title: '采购单据编号', dataIndex: 'billNumber', width: '20%' },
           { title: '应付欠款',dataIndex: 'needDebt', width: '10%'},
           { title: '已付欠款',dataIndex: 'finishDebt', width: '10%'},
           { title: '本次付款',dataIndex: 'eachAmount', width: '10%'},