gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化客户和供应商对账单，扣除退货单的欠款金额

Browse Source
This commit is contained in:
季圣华 2022-11-20 12:24:35 +08:00
parent 6e49ae8404
commit 86a787992a
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-web/src/mixins/JeecgListMixin.js
View File

@ -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)) {

23
jshERP-web/src/views/report/modules/DebtAccountList.vue
View File

@ -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), '欠款详情')