aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-07 08:00:12 +08:00
parent 9a93c2b1d8
commit cc52a2802a
2 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
View File

@ -51,6 +51,12 @@
<dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" /> <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('月结客户')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillDetail.paymentType==2 || scope.row.waybillDetail.paymentType==4 || scope.row.waybillDetail.paymentType==5">{{scope.row.waybillDetail.custName}}</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/> <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" width="120" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80" /> <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" width="80" />
<el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="120" /> <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" width="120" />

98
src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
View File

@ -529,11 +529,10 @@ export default {
return; return;
} }
if ( if (
column.property === 'totalNum' column.property === 'totalNum'
) { ) {
const values = data.map(item => Number(item.waybillDetail.billWeight)); const values = data.map(item => Number(item.totalNum));
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr); const value = Number(curr);
if (!isNaN(value)) { if (!isNaN(value)) {
@ -542,31 +541,12 @@ export default {
return prev; return prev;
} }
}, 0); }, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数 sums[index] = sums[index].toFixed(0);
}
else if (
column.property === 'waybillDetail.volumeWeight'
) {
const values = data.map(item => Number(item.waybillDetail.volumeWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
} }
else if ( else if (
column.property === 'waybillDetail.freight' column.property === 'parcelQty'
) { ) {
const values = data.map(item => Number(item.waybillDetail.freight)); const values = data.map(item => Number(item.parcelQty));
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr); const value = Number(curr);
if (!isNaN(value)) { if (!isNaN(value)) {
@ -575,13 +555,12 @@ export default {
return prev; return prev;
} }
}, 0); }, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数 sums[index] = sums[index].toFixed(0);
} }
else if ( else if (
column.property === 'waybillDetail.totalVolume' column.property === 'totalBillWeight'
) { ) {
const values = data.map(item => Number(item.waybillDetail.totalVolume)); const values = data.map(item => Number(item.totalBillWeight));
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr); const value = Number(curr);
if (!isNaN(value)) { if (!isNaN(value)) {
@ -590,13 +569,13 @@ export default {
return prev; return prev;
} }
}, 0); }, 0);
sums[index] = sums[index].toFixed(5); //保留2位小数 sums[index] = sums[index].toFixed(2);
} }
else if( else if (
column.property === 'waybillDetail.parcelQty' column.property === 'totalVolume'
){ ) {
const values = data.map(item => Number(item.waybillDetail.parcelQty)); const values = data.map(item => Number(item.totalVolume));
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr); const value = Number(curr);
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr; return prev + curr;
@ -604,16 +583,57 @@ export default {
return prev; return prev;
} }
}, 0); }, 0);
sums[index]; sums[index] = sums[index].toFixed(2);
}
else if (
column.property === 'totalVolumeWeight'
) {
const values = data.map(item => Number(item.totalVolumeWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2);
}
else if (
column.property === 'totalSettlementWeight'
) {
const values = data.map(item => Number(item.totalSettlementWeight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2);
}
else if (
column.property === 'totalFreight'
) {
const values = data.map(item => Number(item.totalFreight));
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] = sums[index].toFixed(2);
} }
}); });
// console.log(sums); // console.log(sums);
return sums return sums
}, },
/** 导出按钮操作 */
/** 导出按钮操作 */ handleExport() {
handleExport() {
const loadingInstance = this.$loading({ const loadingInstance = this.$loading({
text: '正在导出...' text: '正在导出...'
}) })