purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决报表的表格增加合计行的时候匹配的bug

Browse Source
This commit is contained in:
jishenghua
2024-04-10 00:35:35 +08:00
parent 8580f21ade
commit f2fe0ab84f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,17 +479,17 @@ export const JeecgListMixin = {
//分页条数为11、21、31等的时候增加合计行 //分页条数为11、21、31等的时候增加合计行
let numKey = 'rowIndex' let numKey = 'rowIndex'
let totalRow = { [numKey]: '合计' } let totalRow = { [numKey]: '合计' }
//需要合计的列 //需要合计的列，记住最后的逗号不要删除
let parseCols = 'initialStock,currentStock,currentStockPrice,currentWeight,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,' + let parseCols = 'initialStock,currentStock,currentStockPrice,currentWeight,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,' +
'inOutSumPrice,outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' + 'inOutSumPrice,outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' +
'allPrice,taxMoney,currentNumber,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed,' + 'allPrice,taxMoney,currentNumber,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed,' +
'needDebt,realNeedDebt,finishDebt,debt' 'needDebt,realNeedDebt,finishDebt,debt,'
columns.forEach(column => { columns.forEach(column => {
let { key, dataIndex } = column let { key, dataIndex } = column
if (![key, dataIndex].includes(numKey)) { if (![key, dataIndex].includes(numKey)) {
let total = 0 let total = 0
dataSource.forEach(data => { dataSource.forEach(data => {
if(parseCols.indexOf(dataIndex)>-1) { if(parseCols.indexOf(dataIndex+',')>-1) {
if(data[dataIndex]) { if(data[dataIndex]) {
total += Number.parseFloat(data[dataIndex]) total += Number.parseFloat(data[dataIndex])
} else { } else {