From 86a787992a5d450b703095b42fada4a9562a3e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 20 Nov 2022 12:24:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9=E8=B4=A6=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E6=89=A3=E9=99=A4=E9=80=80=E8=B4=A7=E5=8D=95=E7=9A=84=E6=AC=A0?=
 =?UTF-8?q?=E6=AC=BE=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       |  2 +-
 .../views/report/modules/DebtAccountList.vue  | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index b8f2303a..c55121f7 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -403,7 +403,7 @@ export const JeecgListMixin = {
         let parseCols = 'initialStock,currentStock,currentStockPrice,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,' +
           'inOutSumPrice,outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' +
           'allPrice,taxMoney,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed,' +
-          'needDebt,finishDebt,debt'
+          'needDebt,realNeedDebt,finishDebt,debt'
         columns.forEach(column => {
           let { key, dataIndex } = column
           if (![key, dataIndex].includes(numKey)) {
diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue
index ddf56463..9343ac86 100644
--- a/jshERP-web/src/views/report/modules/DebtAccountList.vue
+++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue
@@ -50,6 +50,12 @@
         <span slot="numberCustomRender" slot-scope="text, record">
           <a @click="myHandleDetail(record)">{{record.number}}</a>
         </span>
+        <span slot="customTitle">
+        实际欠款
+        <a-tooltip title="实际欠款=本单欠款-退货单欠款（主要针对存在退货的情况）">
+          <a-icon type="question-circle" />
+        </a-tooltip>
+      </span>
       </a-table>
     </section>
     <!-- table区域-end -->
@@ -117,7 +123,10 @@
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:130},
           { title: '操作员', dataIndex: 'userName',width:60},
-          { title: '欠款', dataIndex: 'needDebt',width:70},
+          { title: '本单欠款', dataIndex: 'needDebt',width:70},
+          { dataIndex: 'realNeedDebt',width:80,
+            slots: { title: 'customTitle' }
+          },
           { title: '已收欠款', dataIndex: 'finishDebt',width:70},
           { title: '待收欠款', dataIndex: 'debt',width:70}
         ],
@@ -143,11 +152,11 @@
         this.queryParam.endTime = endTime
         this.columns[2].title = organType
         if(type === '入库') {
-          this.columns[7].title = '已付欠款'
-          this.columns[8].title = '待付欠款'
+          this.columns[8].title = '已付欠款'
+          this.columns[9].title = '待付欠款'
         } else if(type === '出库') {
-          this.columns[7].title = '已收欠款'
-          this.columns[8].title = '待收欠款'
+          this.columns[8].title = '已收欠款'
+          this.columns[9].title = '待收欠款'
         }
         this.model = Object.assign({}, {});
         this.visible = true;
@@ -174,10 +183,10 @@
         console.log(value);
       },
       exportExcel() {
-        let aoa = [['单据编号', this.columns[2].title, '商品信息', '单据日期', '操作员', '欠款', '已收欠款', '待收欠款']]
+        let aoa = [['单据编号', this.columns[2].title, '商品信息', '单据日期', '操作员', '本单欠款', '实际欠款', '已收欠款', '待收欠款']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let item = [ds.number, ds.organName, ds.materialsList, ds.operTimeStr, ds.userName, ds.needDebt, ds.finishDebt, ds.debt]
+          let item = [ds.number, ds.organName, ds.materialsList, ds.operTimeStr, ds.userName, ds.needDebt, ds.realNeedDebt, ds.finishDebt, ds.debt]
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '欠款详情')