From 59c2e6665e5d2dcfe3516af2373f1c8a7c9e2bc2 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期六, 07 十月 2023 14:06:52 +0800 Subject: [PATCH] 1 --- src/views/project/fund/applyDetail/index.vue | 228 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 128 insertions(+), 100 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 7f8e422..f1bebe6 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -72,18 +72,7 @@ }}</el-radio> </el-form-item> </el-col> - <!-- <el-col :span="5"> - <el-form-item label="閾惰鍚嶇О" prop="bankname"> - <el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" /> - </el-form-item> </el-col - ><el-col :span="5"> - <el-form-item label="閾惰璐﹀彿" prop="bankcardno"> - <el-input - v-model="form.bankcardno" - placeholder="璇疯緭鍏ラ摱琛岃处鍙�" - /> - </el-form-item> - </el-col> --> + <el-col :span="5"> <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> @@ -109,26 +98,7 @@ </el-col> </el-row> <el-row style="text-align: left"> - <!-- - <el-col :span="5"> - <el-form-item label="鍚堣閲戦" prop="amountrequested"> - <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" /> - </el-form-item> - </el-col> - --> - - <!-- - <el-col :span="5"> - <el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'"> - <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" /> - </el-form-item> - </el-col> - <el-col :span="5"> - <el-form-item label="绋庡悗閲戦" prop="pretaxcost"> - <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" /> - </el-form-item> - </el-col>--> - <el-col :span="10"> + <el-col :span="8"> <el-form-item label="鐢宠璇存槑" prop="remark"> <el-input v-model="form.remark" placeholder="鐢宠璇存槑" /> </el-form-item> @@ -524,6 +494,21 @@ </template> </el-table-column> <el-table-column + prop="itemdescribe" + align="center" + width="330" + label="椤圭洰璇存槑" + > + <template slot-scope="scope"> + <el-input + type="textarea" + :rows="2" + v-model="scope.row.itemdescribe" + placeholder="椤圭洰璇存槑" + /> + </template> + </el-table-column> + <el-table-column prop="remark" align="center" width="330" @@ -745,8 +730,27 @@ /> </el-table> </el-row> + <el-row style="margin-top: 25px; margin-bottom: 5px" + v-if="operationType == 'check'" + > + <el-col :span="7"> + <el-form-item label="棰勫鐘舵��" prop="infoid"> + <el-radio-group + v-model="form.checkstatus" + align="left" + :disabled="userprofile.nickName != '闄堟厱鍗�'" + > + <el-radio label="1">寰呴瀹�</el-radio> + <el-radio label="2">棰勫閫氳繃绛夊緟鏉愭枡</el-radio> + <el-radio label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio> + </el-radio-group> + </el-form-item> + </el-col> + </el-row> + <el-row + style="margin-top: 5px; margin-bottom: 5px" v-if="operationType == 'check'" > <el-col :span="7"> @@ -758,6 +762,7 @@ </el-form-item> </el-col> </el-row> + <el-row v-if="operationType == 'check'"> <el-col :span="17"> <el-form-item label="瀹℃牳澶囨敞" align="left"> @@ -773,14 +778,21 @@ v-if=" operationType == 'add' || operationType == 'update' || - ismanager == true + ismanager == true || + beforehandType == '1' " >鎻愪氦淇濆瓨</el-button > <el-button + type="success" + @click="handleup" + v-if="operationType == 'add' || operationType == 'update'" + >涓婃姤</el-button + > + <el-button type="primary" @click="checksubmit" - v-if="operationType == 'check'" + v-if="operationType == 'check' && beforehandType != '1'" >鎻愪氦瀹℃牳</el-button > <el-button @click="cancel">鍏� 闂�</el-button> @@ -935,10 +947,10 @@ style="width: 100%" > <el-option - v-for="(spec, index) in unitList" + v-for="(spec, index) in feeUnitList" :key="index" - :label="spec.organizationname" - :value="spec.organizationname" + :label="spec.reportName" + :value="spec.reportName" ></el-option> </el-select> </el-form-item> @@ -1094,28 +1106,27 @@ " > </el-table-column> - <el-table-column + <!-- <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" v-if="form.applytype == '1' || form.applytype == '2'" > - </el-table-column> + </el-table-column> --> - <el-table-column - prop="unitno" + <!-- <el-table-column + prop="beneficiaryname" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'" > - </el-table-column> + </el-table-column> --> <el-table-column prop="beneficiaryname" align="center" label="鍗曚綅/涓汉" width="250" - v-if="form.applytype == '4'" > </el-table-column> <el-table-column @@ -1406,7 +1417,7 @@ exportLoading: false, usernamedata: "", jurisdiction: false, - + Routinglevel: 1, // 琛ㄥ崟鍙傛暟 form: {}, experthear: "", @@ -1453,6 +1464,20 @@ ismanager: false, //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧� expertfrom: "1", + baselisttages: [ + { + id: 1, + name: "寰呴瀹�" + }, + { + id: 2, + name: "棰勫閫氳繃绛夊緟鏉愭枡" + }, + { + id: 3, + name: "宸叉敹鍒版姤閿�鏉愭枡" + } + ], //鎹愮尞妗堜緥鍒楄〃 donateList: [], @@ -1587,7 +1612,7 @@ money: "0", startTime: "" }, - + beforehandType: null, //鏈嶅姟璐圭敤鍙傛暟 expenseQueryParams: { pageNum: 1, @@ -1713,6 +1738,7 @@ this.curId = this.$route.query.id; this.businessType = this.$route.query.businessType; this.operationType = this.$route.query.operationType; + this.beforehandType = this.$route.query.beforehandType; //鑾峰彇璐圭敤椤圭洰绫诲瀷 this.getFeeTypes(); @@ -1790,6 +1816,8 @@ this.reset(); getFund(this.curId).then(response => { + console.log(response.data, "鍒濆"); + this.form = response.data; sessionStorage.removeItem("apiform"); @@ -1840,6 +1868,8 @@ this.reset(); getFund(this.curId).then(response => { + console.log(response.data, "鍒濆"); + this.form = response.data; sessionStorage.removeItem("apiform"); sessionStorage.setItem("apiform", JSON.stringify(this.form)); @@ -1886,6 +1916,7 @@ this.reset(); getFund(this.curId).then(response => { + console.log(response.data, "鍒濆"); this.form = response.data; sessionStorage.removeItem("apiform"); @@ -1944,7 +1975,17 @@ }, /** 涓婃姤鎸夐挳鎿嶄綔 */ - handleUp() { + handleup() { + if ( + (JSON.stringify(this.form) == sessionStorage.getItem("apiform") && + JSON.stringify(this.rbDetails) == + sessionStorage.getItem("apifunddetail")) || + !sessionStorage.getItem("apifunddetail") + ) { + } else { + this.$message.error("璇蜂繚瀛樺悗鍐嶈繘琛屼笂鎶�"); + return; + } this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", { confirmButtonText: "纭畾", cancelButtonText: "鍙栨秷", @@ -1954,6 +1995,9 @@ //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 this.form.recordstatus = 0; + if (!this.form.id) { + this.form.id = this.$route.query.id; + } updateFund(this.form).then(response => { if (response.code == 200) { @@ -1961,6 +2005,7 @@ type: "success", message: "鐢宠鎴愬姛" }); + this.cancel(); } else { this.$message({ type: "error", @@ -2084,44 +2129,6 @@ ].subjecttypename; } this.rbDetails[i] = tempDetail; - /* - //璁$畻涓◣ - //if (isNaN(parseFloat(tempDetail.taxedamount))) - //鑾峰彇鍙傛暟 - this.taxParam.beneficiaryNo = tempDetail.beneficiaryno; - this.taxParam.startTime = this.form.createTime.substring(0, 10); - // 璁$畻绋庡悗閲戦 - if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') { - //鑾峰彇鍙傛暟 - this.taxParam.money = tempDetail.amount.toString(); - getTaxByBeneFiciaryNo(this.taxParam).then((res) => { - if (res.code == 200) { - tempDetail.taxamount = res.data; - tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount; - this.rbDetails[k] = tempDetail; - - this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); - this.totalAmount += parseFloat(tempDetail.amount); - } - }); - } - - // 璁$畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰� - if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') { - //鑾峰彇鍙傛暟 - this.taxParam.money = tempDetail.taxedamount.toString(); - getTaxBeforeByAfterMoney(this.taxParam).then((res) => { - if (res.code == 200) { - tempDetail.taxamount = res.data.nowTax; - tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney); - this.rbDetails[k] = tempDetail; - - this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount); - this.totalAmount += parseFloat(tempDetail.amount); - } - }); - } - */ } //璁$畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛� if (this.businessType == "2") { @@ -2207,30 +2214,44 @@ // }); } - addorupdateFund(this.form).then(response => { - if (response.code === 200) { - this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒"); - } else { - this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg); - } - }); sessionStorage.setItem( "apifunddetail", JSON.stringify(this.rbDetails) ); sessionStorage.setItem("apiform", JSON.stringify(this.form)); - + addorupdateFund(this.form).then(response => { + console.log(this.form); + console.log(response, "淇濆瓨杩斿弬"); + if (response.code === 200) { + this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒"); + this.$store.dispatch("tagsView/delView", this.$route); + this.$router.push({ + path: "/finance/applyDetail/", + query: { + id: response.data, + businessType: "2", + operationType: "update", + curCase: this.curCase + } + }); + this.Routinglevel++; + } else { + this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg); + } + }); //鍏抽棴绐楀彛 this.loading = false; // this.getfundList(); - this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); } }); }, 500), //瀹℃壒鎻愪氦 checksubmit() { + if (this.form.checkstatus != 3 && this.userprofile.nickName == "闄堟厱鍗�") { + this.$modal.msgError("璇风‘璁ゆ敹鍒版潗鏂欏悗鍐嶆彁浜ゅ鏍革紒"); + return; + } let checkFundObj = { // fundid: this.checkObj.fundid, fundid: this.curId, @@ -2249,14 +2270,16 @@ // 鍙栨秷鎸夐挳 cancel() { // this.reset(); + console.log(-this.Routinglevel); this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); + this.$router.go(-this.Routinglevel); }, //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅 getUserProfile() { getUserProfile().then(res => { this.userprofile = res.data; + console.log(this.userprofile); this.standardlevel = res.data.standardlevel; if ( this.userprofile.userName == "admin" || @@ -2352,6 +2375,7 @@ getFeeUnitList() { listReportname("org").then(res => { this.feeUnitList = res.data; + console.log(this.feeUnitList); }); }, @@ -2419,6 +2443,7 @@ //鑾峰彇鏈嶅姟椤圭洰 getRowFeeItems(rowindex, row) { let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); + console.log(list[0]); row.itemlist = list[0].itemDetails; this.$set(this.rbDetails, rowindex, row); }, @@ -2562,19 +2587,18 @@ calculateTax(row, type) { let targetValue = 0; for (let i = 0; i < this.rbDetails.length; i++) { - if(!this.rbDetails[i].amount){ - this.rbDetails[i].amount=0; + if (!this.rbDetails[i].amount) { + this.rbDetails[i].amount = 0; } targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅 } - console.log(targetValue,'鍚堣'); + console.log(targetValue, "鍚堣"); this.form.pretaxcost = targetValue; //if (isNaN(parseFloat(tempDetail.taxedamount))) //鑾峰彇鍙傛暟 // this.taxParam.beneficiaryNo = row.beneficiaryno; // this.taxParam.startTime = this.form.createTime.substring(0, 10); - // if (type == "A") { // // 璁$畻涓◣銆佺◣鍚庨噾棰� // this.taxParam.money = row.amount.toString(); @@ -2986,6 +3010,7 @@ updateBy: null, updateTime: null, uploadflag: null, + itemdescribe: null, uploadtime: null, itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }], servicesscope: null, @@ -3010,6 +3035,7 @@ beneficiaryname: null, beneficiaryno: null, unitname: null, + itemdescribe:null, unitno: null, uintuserno: null, title: null, @@ -3509,7 +3535,9 @@ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + destroyed() { + window.removeEventListener("beforeunload", e => this.beforeunloadFn(e)); + }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> -- Gitblit v1.9.3