From 1b8cba540092b2377734f6771fcafd6e51e0c7fb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 26 七月 2023 19:41:55 +0800
Subject: [PATCH] 修改了个税计算
---
/dev/null | 0
src/views/project/fund/expertFeeFundApply/index.vue | 31 ++++++++++++++++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index d2ed7c1..6a54eb9 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -1360,6 +1360,8 @@
let totalPreTaxAmount = 0.0;
let totalAfterTaxAmount = 0.0;
let totalAmount = 0.0;
+
+ console.log('1');
//淇濆瓨鍓嶆牎楠屾暟鎹�
for (let k = 0; k < this.fundDetails.length; k++) {
@@ -1408,13 +1410,13 @@
(item) => tempDetail.applytype == item.value
);
if (applytypeIndex > -1) {
- console.log("tempData1", tempData);
+ console.log("tempDetail", tempDetail);
tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
}
+ this.fundDetails[k] = tempDetail;
- this.fundDetails[m] = tempDetail;
//璁＄畻涓◣
//if (isNaN(parseFloat(tempDetail.taxedamount)))
//鑾峰彇鍙傛暟
@@ -1458,23 +1460,29 @@
}
}
}
+ console.log('2');
});
},
// 绗簩姝�
- brforaFn() {
- //闄勪欢澶勭悊
+ brforaFn() {
+ console.log('3');
this.loading = true;
+
+ //鎹愮尞鑰�
+ this.form.donorname = this.curCase.name;
+
+ //闄勪欢澶勭悊
let list = this.fileList;
if (list.length > 0) {
- this.form.annexbankcard = list.map(item => item.url).join(",");
+ this.form.annexfiles = list.map(item => item.url).join(",");
}
-
- //
- this.form.donorname = this.curCase.name;
+ //璐圭敤鍚堣
this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
this.form.amountrequested = this.totalAmount.toFixed(2);
+
+ //淇濆瓨
if (this.form.id != null) {
this.form.recordstatus = -1;
updateFund(this.form).then((res) => {
@@ -1483,8 +1491,6 @@
this.getList();
this.selectDonotor(this.curCase);
- // this.$modal.msgSuccess("淇敼鎴愬姛");
- this.loading = false;
for (let m = 0; m < this.fundDetails.length; m++) {
let tempData = this.fundDetails[m];
if (tempData.id > 0) {
@@ -1493,7 +1499,10 @@
tempData.fundid = this.formData.id;
addFunddetail(tempData).then((res) => { });
}
- }
+ }
+
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.loading = false;
});
} else {
this.form.serviceFunddetails = 0;
diff --git a/src/views/project/travelexpenseslist.rar b/src/views/project/travelexpenseslist.rar
deleted file mode 100644
index 14d769e..0000000
--- a/src/views/project/travelexpenseslist.rar
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3