From 26c14f0c6defe02f2b6f15b498bcd454461ee7a8 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 05 一月 2024 14:01:43 +0800
Subject: [PATCH] yxh
---
src/views/project/donorcharge/donorchargedetail/index.vue | 83 +++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 45 deletions(-)
diff --git a/src/views/project/donorcharge/donorchargedetail/index.vue b/src/views/project/donorcharge/donorchargedetail/index.vue
index cda6d51..0030fae 100644
--- a/src/views/project/donorcharge/donorchargedetail/index.vue
+++ b/src/views/project/donorcharge/donorchargedetail/index.vue
@@ -47,9 +47,9 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="5">
- <el-form-item label="搴旀敹閲戦" prop="chargeamount">
- <el-input v-model="form.chargeamount" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" :disabled="true" />
+ <el-col :span="10">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -57,9 +57,9 @@
<el-input v-model="form.chargeamounted" placeholder="璇疯緭鍏ュ疄鏀堕噾棰�" :disabled="true" />
</el-form-item>
</el-col>
- <el-col :span="10">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
+ <el-col :span="5">
+ <el-form-item label="搴旀敹閲戦" prop="chargeamount">
+ <el-input v-model="form.chargeamount" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
@@ -774,7 +774,7 @@
//鍣ㄥ畼璐圭敤淇℃伅
this.organParams.donorchargeid = this.curId;
- console.log("this.organParams", this.organParams);
+ console.log("this.organParams", this.organParams);
listDonorchargeorgan(this.organParams).then(res => {
console.log("listDonorchargeorgan", res);
this.donorchargeorgans = res.rows;
@@ -812,6 +812,27 @@
submitForm: debounce(function (data) {
this.$refs["form"].validate(valid => {
if (valid) {
+ //鏍￠獙銆佽垂鐢ㄥ悎璁�
+ let ChargeSum = 0;
+ let ChargeamountSum = 0;
+ let organname="";
+
+ try {
+ for (let i = 0; i < this.donorchargeorgans.length; i++) {
+ organname += this.donorchargeorgans[i].organname+",";
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].organcharge))) {
+ ChargeSum += parseFloat(this.donorchargeorgans[i].organcharge);
+ }
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].amount))) {
+ ChargeamountSum += parseFloat(this.donorchargeorgans[i].amount);
+ }
+ }
+ this.form.donateorgan = organname.substring(0,organname.lastIndexOf(","));
+ this.form.chargeamount = ChargeSum.toFixed(2);
+ this.form.chargeamounted = ChargeamountSum.toFixed(2);
+ } catch { }
+
+ //淇濆瓨
if (this.form.id != null) {
for (let k = 0; k < this.donorchargeorgans.length; k++) {
this.donorchargeorgans[k].donorchargeID = this.form.id;
@@ -849,51 +870,23 @@
}, 500),
//璁＄畻璐圭敤鍚堣
- sumTotalFee() {
- let allSum = 0;
+ chargeSum() {
+ let ChargeSum = 0;
+ let ChargeamountSum = 0;
- //鎹愮尞鑰呭灞炶垂鐢�
- if (!isNaN(parseFloat(this.form.donoramount))) {
- allSum += parseFloat(this.form.donoramount);
- }
-
- //鎶ラ攢鏄庣粏璐圭敤
+ //璐圭敤鍚堣
try {
for (let i = 0; i < this.donorchargeorgans.length; i++) {
- /*
- let totalFee = 0;
- //璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.donorchargeorgans[i].total))) {
- totalFee += parseFloat(this.donorchargeorgans[i].total);
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].organcharge))) {
+ ChargeSum += parseFloat(this.donorchargeorgans[i].organcharge);
}
- if (!isNaN(parseFloat(this.donorchargeorgans[i].cityfee))) {
- totalFee += parseFloat(this.donorchargeorgans[i].cityfee);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].hotelexpense))) {
- totalFee += parseFloat(this.donorchargeorgans[i].hotelexpense);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].otherexpense))) {
- totalFee += parseFloat(this.donorchargeorgans[i].otherexpense);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].foodexpenses))) {
- totalFee += parseFloat(this.donorchargeorgans[i].foodexpenses);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].foodallowance))) {
- totalFee += parseFloat(this.donorchargeorgans[i].foodallowance);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].otherfeeamount))) {
- totalFee += parseFloat(this.donorchargeorgans[i].otherfeeamount);
- }
- this.donorchargeorgans[i].total = parseFloat(totalFee).toFixed(2);
- this.$set(this.donorchargeorgans, i, this.donorchargeorgans[i]);
- */
-
- if (!isNaN(parseFloat(this.donorchargeorgans[i].total))) {
- allSum += parseFloat(this.donorchargeorgans[i].total);
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].amount))) {
+ ChargeamountSum += parseFloat(this.donorchargeorgans[i].amount);
}
}
- this.form.amountrequested = allSum.toFixed(2);
+ this.form.chargeamount = ChargeSum.toFixed(2);
+ this.form.chargeamounted = ChargeamountSum.toFixed(2);
} catch { }
},
--
Gitblit v1.9.3