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 | 133 ++++++++++++++++++++++++--------------------
1 files changed, 73 insertions(+), 60 deletions(-)
diff --git a/src/views/project/donorcharge/donorchargedetail/index.vue b/src/views/project/donorcharge/donorchargedetail/index.vue
index d2975c7..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>
@@ -103,9 +103,9 @@
value-format="yyyy-MM-dd HH:mm:ss" placeholder="绉绘鏃堕棿">
</el-date-picker> </template>
</el-table-column>
- <el-table-column prop="remark" align="center" label="澶囨敞">
+ <el-table-column prop="organchargedesc" align="center" label="澶囨敞">
<template slot-scope="scope">
- <el-input v-model="scope.row.remark" placeholder="澶囨敞" />
+ <el-input v-model="scope.row.organchargedesc" placeholder="澶囨敞" />
</template>
</el-table-column>
</el-table>
@@ -232,8 +232,8 @@
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { regionDataPlus, CodeToText } from "element-china-area-data";
-import { getDonorcharge, addDonorcharge, updateDonorcharge, listDonorchargeorgan, getDonorchargeorgan, delDonorchargeorgan, addDonorchargeorgan, updateDonorchargeorgan, exportDonorchargeorgan } from "@/api/project/donorcharge";
-import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
+import { getDonorcharge, addDonorcharge, updateDonorcharge } from "@/api/project/donorcharge";
+import { listDonorchargeorgan, delDonorchargeorgan, saveDonorchargeorgan } from "@/api/project/donorcharge";
import { listDonatecomporgan } from "@/api/project/donatecompletioninfo";
import { listOrgancharge } from "@/api/project/organcharge";
import Li_area_select from "@/components/Address";
@@ -321,6 +321,8 @@
userprofile: {},
// 琛ㄥ崟鍙傛暟
form: {},
+ // 鍒楄〃鍙傛暟
+ table: {},
reimbursementList: [],
// 琛ㄥ崟鏍￠獙
@@ -396,7 +398,7 @@
this.$refs["table"].doLayout();
});
},
-
+
destroyed() {
window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
@@ -663,7 +665,7 @@
this.operationType = this.$route.query.operation;
this.curId = this.$route.query.id;
this.curCase = this.$route.query.data;
- console.log("this.$route.query",this.$route.query);
+ console.log("this.$route.query", this.$route.query);
if (this.operationType == "add") {
this.title = "鏂板缓妗堜緥鍣ㄥ畼璐圭敤琛�";
@@ -764,15 +766,17 @@
handleUpdate() {
this.reset();
this.open = true;
+ this.title = "淇敼鎹愮尞妗堜緥鍣ㄥ畼璐圭敤琛�";
getDonorcharge(this.curId).then(response => {
this.form = response.data;
- this.open = true;
- this.title = "淇敼鎹愮尞妗堜緥鍣ㄥ畼璐圭敤琛�";
+ console.log("getDonorcharge", response);
//鍣ㄥ畼璐圭敤淇℃伅
this.organParams.donorchargeid = this.curId;
+ console.log("this.organParams", this.organParams);
listDonorchargeorgan(this.organParams).then(res => {
+ console.log("listDonorchargeorgan", res);
this.donorchargeorgans = res.rows;
if (this.donorchargeorgans.length > 0) {
} else {
@@ -808,20 +812,57 @@
submitForm: debounce(function (data) {
this.$refs["form"].validate(valid => {
if (valid) {
- if (this.form.id != null) {
- updateDonorcharge(this.form).then(response => {
- if (response.code == 200) {
- this.$modal.msgSuccess("淇濆瓨鎴愬姛锛�");
+ //鏍￠獙銆佽垂鐢ㄥ悎璁�
+ 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);
}
- this.open = false;
+ 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;
+ }
+
+ updateDonorcharge(this.form).then(res1 => {
+ if (res1.code == 200) {
+ saveDonorchargeorgan(this.donorchargeorgans).then(res2 => {
+ if (res2.code == 200) {
+ this.$modal.msgSuccess("淇濆瓨鎴愬姛锛�");
+ this.open = false;
+ }
+ });
+ }
});
} else {
addDonorcharge(this.form).then(response => {
if (response.code == 200) {
- console.log(response);
- this.$modal.msgSuccess("淇濆瓨鎴愬姛锛�");
+ console.log("addDonorcharge", response);
+ //淇濆瓨鍓嶆牎楠屾暟鎹�
+ for (let k = 0; k < this.donorchargeorgans.length; k++) {
+ this.donorchargeorgans[k].donorchargeid = response.data.id;
+ }
+ saveDonorchargeorgan(this.donorchargeorgans).then(res2 => {
+ if (res2.code == 200) {
+ this.$modal.msgSuccess("淇濆瓨鎴愬姛锛�");
+ this.open = false;
+ }
+ });
}
- this.open = false;
});
}
}
@@ -829,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