From cef0ffebad11bf1444be8ff3d54172c83800c78d Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期一, 07 八月 2023 16:39:29 +0800 Subject: [PATCH] yxh --- src/views/project/fund/expertFeeFundApply/index.vue | 70 ++++++++++++++++++++-------------- 1 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue index 4593a19..b3f77d6 100644 --- a/src/views/project/fund/expertFeeFundApply/index.vue +++ b/src/views/project/fund/expertFeeFundApply/index.vue @@ -568,7 +568,7 @@ getdownloadSS, getdownloadYX, getdownloadBX, - batchUploadFund, + addorupdateFund, getdetailsByItemId } from "@/api/project/fund"; @@ -866,7 +866,7 @@ 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.username = this.defaultperson.nickName; this.form.userno = this.defaultperson.userName; this.form.phone = this.defaultperson.phonenumber; @@ -1027,12 +1027,12 @@ if (response.code == 200) { this.$message({ type: "success", - message: "鐢宠鎴愬姛", + message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�", }); } else { this.$message({ type: "error", - message: "鐢宠澶辫触", + message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�", }); } this.loading = false; @@ -1174,34 +1174,43 @@ //鎹愮尞鑰� 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 +1405,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 +1423,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 +1488,6 @@ /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */ getList() { - console.log("getList", "getList"); this.loading = true; this.queryParams.params = {}; if (null != this.daterangeReporttime && "" != this.daterangeReporttime) { @@ -1486,6 +1496,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