diff --git a/src/views/emis/emisCreditSalesmen/index.vue b/src/views/emis/emisCreditSalesmen/index.vue
index 53b5abd8..6bd8d829 100644
--- a/src/views/emis/emisCreditSalesmen/index.vue
+++ b/src/views/emis/emisCreditSalesmen/index.vue
@@ -125,7 +125,7 @@
- {{ ( ((scope.row.creditMoney + scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.creditMoney + scope.row.tempCreditMoney))*100 ).toFixed(2) }}%
+ {{ ( ((scope.row.tempCreditMoney - scope.row.useMoney)/(scope.row.tempCreditMoney))*100 ).toFixed(2) }}%
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index 94c1e615..0dc3b5e9 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -351,6 +351,16 @@
{{scope.row.waybillDetail.freight}}
+
+
+
+
+ {{scope.row.waybillDetail.freight-scope.row.waybillDetail.realFee}}
+
+ 0
+
+
+
@@ -378,7 +388,6 @@
-
@@ -948,7 +957,22 @@ export default {
}, 0);
sums[index] = sums[index].toFixed(2); //保留2位小数
}
+ else if (
+ column.property === 'waybillDetail.realFee'
+ ) {
+ const values = data.map(item => Number(item.waybillDetail.realFee));
+
+ 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 (
column.property === 'waybillDetail.totalVolume'
) {
diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index 237bf2a5..3ed74c6e 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -1,6 +1,6 @@
-
+