diff --git a/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue b/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
index 36c25dc6..f8a3bdbd 100644
--- a/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
+++ b/src/views/emis/emisSettleInvoiceRel/ApplyInvoiceSubBillRelList.vue
@@ -51,6 +51,12 @@
+
+
+ {{scope.row.waybillDetail.custName}}
+
+
+
diff --git a/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue b/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
index 29e5826f..a0b13a68 100644
--- a/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillMonthSumList.vue
@@ -529,11 +529,10 @@ export default {
return;
}
-
if (
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) => {
const value = Number(curr);
if (!isNaN(value)) {
@@ -542,31 +541,12 @@ export default {
return prev;
}
}, 0);
- sums[index] = sums[index].toFixed(2); //保留2位小数
- }
-
- 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位小数
+ sums[index] = sums[index].toFixed(0);
}
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) => {
const value = Number(curr);
if (!isNaN(value)) {
@@ -575,13 +555,12 @@ export default {
return prev;
}
}, 0);
- sums[index] = sums[index].toFixed(2); //保留2位小数
+ sums[index] = sums[index].toFixed(0);
}
-
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) => {
const value = Number(curr);
if (!isNaN(value)) {
@@ -590,13 +569,13 @@ export default {
return prev;
}
}, 0);
- sums[index] = sums[index].toFixed(5); //保留2位小数
- }
- else if(
- column.property === 'waybillDetail.parcelQty'
- ){
- const values = data.map(item => Number(item.waybillDetail.parcelQty));
- sums[index] = values.reduce((prev, curr) => {
+ sums[index] = sums[index].toFixed(2);
+ }
+ else if (
+ column.property === 'totalVolume'
+ ) {
+ const values = data.map(item => Number(item.totalVolume));
+ sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
@@ -604,16 +583,57 @@ export default {
return prev;
}
}, 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);
return sums
},
-
- /** 导出按钮操作 */
- handleExport() {
+ /** 导出按钮操作 */
+ handleExport() {
const loadingInstance = this.$loading({
text: '正在导出...'
})