From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/enterprise/additionSubtractionApplication.vue | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 7451a80..b3c9821 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -125,6 +125,7 @@
</div>
</div>
<el-table
+ v-if="item"
:data="activeName === '0' ? form.addDetailList : form.delDetailList"
border
show-summary
@@ -373,7 +374,20 @@
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '鎬讳环'
- } else if (index === 7) {
+ } else if (this.item.hasDispatchUnit === 1 && index === 6) {
+ let total = 0
+ if (this.activeName === '0') {
+ this.form.addDetailList.forEach(item => {
+ total += item.fee || 0
+ })
+ sums[index] = (total || 0).toFixed(2)
+ } else {
+ this.form.delDetailList.forEach(item => {
+ total += item.reducePrice
+ })
+ sums[index] = (total || 0).toFixed(2)
+ }
+ } else if (this.item.hasDispatchUnit !== 1 && index === 7) {
let total = 0
if (this.activeName === '0') {
this.form.addDetailList.forEach(item => {
--
Gitblit v1.9.3