From 2871dd51e0adc895781cf4ddb6979c93abe55b75 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期五, 22 九月 2023 15:54:18 +0800 Subject: [PATCH] 11 --- src/views/project/fund/applyDetail/index.vue | 126 ++++++++++++++++++++++++++++++++--------- 1 files changed, 98 insertions(+), 28 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index aa7619e..943e623 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -128,7 +128,24 @@ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" /> </el-form-item> </el-col>--> - <el-col :span="10"> + <el-col :span="5"> + <el-form-item label="棰勫鐘舵��" prop="infoid"> + <el-select + v-model="form.checkstatus" + filterable + placeholder="璇烽�夋嫨棰勫鐘舵��" + > + <el-option + v-for="item in baselisttages" + :key="item.id" + :label="item.name" + :value="item.id" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="8"> <el-form-item label="鐢宠璇存槑" prop="remark"> <el-input v-model="form.remark" placeholder="鐢宠璇存槑" /> </el-form-item> @@ -773,14 +790,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 +959,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 +1118,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 +1429,7 @@ exportLoading: false, usernamedata: "", jurisdiction: false, - + Routinglevel: 1, // 琛ㄥ崟鍙傛暟 form: {}, experthear: "", @@ -1453,6 +1476,20 @@ ismanager: false, //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧� expertfrom: "1", + baselisttages: [ + { + id: 1, + name: "寰呴瀹�" + }, + { + id: 2, + name: "棰勫閫氳繃绛夊緟鏉愭枡" + }, + { + id: 3, + name: "宸叉敹鍒版姤閿�鏉愭枡" + } + ], //鎹愮尞妗堜緥鍒楄〃 donateList: [], @@ -1587,7 +1624,7 @@ money: "0", startTime: "" }, - + beforehandType: null, //鏈嶅姟璐圭敤鍙傛暟 expenseQueryParams: { pageNum: 1, @@ -1713,6 +1750,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(); @@ -1944,7 +1982,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,13 +2002,17 @@ //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍 //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍 this.form.recordstatus = 0; - + if (!this.form.id) { + this.form.id = this.$route.query.id + } + updateFund(this.form).then(response => { if (response.code == 200) { this.$message({ type: "success", message: "鐢宠鎴愬姛" }); + this.cancel(); } else { this.$message({ type: "error", @@ -2207,24 +2259,33 @@ // }); } - 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(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), @@ -2249,8 +2310,9 @@ // 鍙栨秷鎸夐挳 cancel() { // this.reset(); + console.log(-this.Routinglevel); this.$store.dispatch("tagsView/delView", this.$route); - this.$router.go(-1); + this.$router.go(-this.Routinglevel); }, //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅 @@ -2352,6 +2414,7 @@ getFeeUnitList() { listReportname("org").then(res => { this.feeUnitList = res.data; + console.log(this.feeUnitList); }); }, @@ -2562,8 +2625,12 @@ 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; + } targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅 } + console.log(targetValue, "鍚堣"); this.form.pretaxcost = targetValue; //if (isNaN(parseFloat(tempDetail.taxedamount))) @@ -2994,6 +3061,7 @@ for (let i = 0; i < this.checkedCities.length + 1; i++) { this.rbDetails[i].orderno = i + 1; } + this.calculateTax(); this.batchdialogVisible = false; }, //鏂板涓�琛� @@ -3504,7 +3572,9 @@ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠 updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗 beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓� - destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� + destroyed() { + window.removeEventListener("beforeunload", e => this.beforeunloadFn(e)); + }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴� activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂 }; </script> -- Gitblit v1.9.3