From 733457daf115deb6088984c3c55dc5bcc906d28c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 09 八月 2023 23:53:58 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/expertFeeFundApply/index.vue | 90 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 44 deletions(-)
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index 4593a19..cfeb349 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -24,7 +24,7 @@
</el-row>
</el-form>
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
<el-row>
@@ -47,7 +47,7 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
- <el-col :span="16">
+ <el-col :span="18">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
<el-row :gutter="4" align="right" class="mb8">
@@ -568,7 +568,7 @@
getdownloadSS,
getdownloadYX,
getdownloadBX,
- batchUploadFund,
+ addorupdateFund,
getdetailsByItemId
} from "@/api/project/fund";
@@ -626,7 +626,6 @@
},
name: "fundApply",
-
dicts: [
//"sys_consolationfundlevel",
//"sys_OrganizationType",
@@ -863,10 +862,10 @@
this.istrue += 2;
this.reset();
this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.name = this.curCase.name;
this.form.infoid = this.curCase.id;
- console.log("defaultperson", this.defaultperson);
+ this.form.donorno = this.curCase.donorno;
+ this.form.donorname = this.curCase.name;
+
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
this.form.phone = this.defaultperson.phonenumber;
@@ -895,8 +894,6 @@
this.isopen = 0;
this.reset();
this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
this.dialogOpen = true;
this.title = "淇敼璐圭敤鐢宠";
this.dialogType = "edit";
@@ -906,7 +903,6 @@
this.form = response.data;
// this.form.recordstate =-1;
// this.form.recordstatus = response.data.recordstatus + "";
- this.form.name = this.curCase.name;
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
getownFundDetail(id).then((res) => {
@@ -949,8 +945,6 @@
this.isopen = 0;
this.reset();
this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
this.dialogOpen = true;
this.title = "鏌ョ湅璐圭敤鐢宠";
this.dialogType = "detail";
@@ -958,7 +952,6 @@
getFund(id).then((response) => {
this.form = response.data;
- this.form.name = this.curCase.name;
let listFundflowparams = {
fundid: row.id,
fundtype: 2,
@@ -1022,17 +1015,17 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;
-
+ console.log("updateFund", row);
updateFund(row).then((response) => {
if (response.code == 200) {
this.$message({
type: "success",
- message: "鐢宠鎴愬姛",
+ message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�",
});
} else {
this.$message({
type: "error",
- message: "鐢宠澶辫触",
+ message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�",
});
}
this.loading = false;
@@ -1171,37 +1164,43 @@
this.form.serviceFunddetails = this.fundDetails;
if (this.form.id != null) {
- //鎹愮尞鑰�
- this.form.donorname = this.curCase.name;
-
- updateFund(this.form).then((response) => {
- if (response.code === 200) {
- this.loading = false;
- for (let m = 0; m < this.fundDetails.length; m++) {
- if (this.fundDetails[m].id > 0) {
- updateFunddetail(this.fundDetails[m]).then((response2) => { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); });
- } else {
- addFunddetail(this.fundDetails[m]).then((response2) => { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); });
- }
- }
- this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
- } else {
- this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
- }
-
- });
+ // updateFund(this.form).then((response) => {
+ // if (response.code === 200) {
+ // this.loading = false;
+ // for (let m = 0; m < this.fundDetails.length; m++) {
+ // if (this.fundDetails[m].id > 0) {
+ // updateFunddetail(this.fundDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); } });
+ // } else {
+ // addFunddetail(this.fundDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); } });
+ // }
+ // }
+ // this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
+ // } else {
+ // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+ // }
+ // });
} else {
this.form.recordstatus = -1;
- batchUploadFund(this.form).then((response) => {
- if (response.code === 200) {
- this.selectDonotor(this.curCase);
- } else {
- this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
- }
- });
+ // addorupdateFund(this.form).then((response) => {
+ // if (response.code === 200) {
+ // this.selectDonotor(this.curCase);
+ // } else {
+ // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+ // }
+ // });
}
+
+ addorupdateFund(this.form).then((response) => {
+ if (response.code === 200) {
+ this.selectDonotor(this.curCase);
+ this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
+ } else {
+ this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+ }
+ });
+
//鍏抽棴绐楀彛
this.loading = false;
this.dialogOpen = false;
@@ -1396,8 +1395,8 @@
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
getUsermsg() {
getUserProfile().then((response) => {
+ console.log("getUserProfile", response);
this.defaultperson = response.data;
- console.log("this.defaultperson", this.defaultperson);
this.standardlevel = response.data.standardlevel;
if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
this.ismanager = true;
@@ -1414,9 +1413,11 @@
row.servicesscopename = item.expensedescribe;
if (row.servicesscopename.includes("绋庡悗")) {
row.amount = 0.0;
+ row.taxamount = 0.0;
row.taxedamount = item.expense;
} else {
row.amount = item.expense;
+ row.taxamount = 0.0;
row.taxedamount = 0.0;
}
@@ -1477,7 +1478,6 @@
/** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
getList() {
- console.log("getList", "getList");
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
@@ -1486,6 +1486,8 @@
this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
}
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
+
+ console.log("111", this.queryParams);
listDonatebaseinfo(this.queryParams).then((response) => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
--
Gitblit v1.9.3