From 6f0a85022f6eaf42576860c54528c3eed6c1b20b Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期二, 27 二月 2024 16:57:15 +0800 Subject: [PATCH] 11 --- src/views/project/fund/applyDetail/index.vue | 210 ++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 147 insertions(+), 63 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 8418eb9..eb26d54 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -615,7 +615,7 @@ > <template slot-scope="scope"> <el-button - type="primary" + type="danger" size="mini" @click.native.prevent.stop="deletedowfile(scope.row)" >鍒犻櫎</el-button @@ -801,8 +801,8 @@ <el-option v-for="item in accountlist" :key="item.id" - :label="item.username" - :value="item.username" + :label="item.userid" + :value="item.id" > </el-option> </el-select> @@ -817,16 +817,16 @@ style="margin-bottom: 0" @change="userTypeChange(accountselectform.usertype)" > - <el-radio label="expert">涓撳璐﹀彿</el-radio> - <el-radio label="org">鍗曚綅璐﹀彿</el-radio> - <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鍙�</el-radio> + <el-radio label="expert">涓撳璐︽埛</el-radio> + <el-radio label="org">鍗曚綅璐︽埛</el-radio> + <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鎴�</el-radio> </el-radio-group> </el-form-item> </el-col> </el-row> <el-row v-if="selectionType == 'account' && accountfrom == '2'"> <el-col :span="24"> - <el-form-item label="璐﹀彿鍚嶇О" prop="username"> + <el-form-item label="璐︽埛鍚嶇О" prop="username"> <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" @@ -2260,7 +2260,7 @@ path: "/finance/applyDetail/", query: { id: response.data, - businessType: "2", + businessType: this.businessType, operationType: "update", curCase: this.curCase } @@ -2364,22 +2364,40 @@ //鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃 getAccountList() { listExternalperson().then(res => { - this.accountlist = res.rows; + // this.accountlist = res.rows; //鑾峰彇鍚敤鐨勮处鎴峰垪琛� - for (let j = 0; j < res.length; j++) { + for (let j = 0; j < res.rows.length; j++) { //鍗曚綅璐﹀彿鍒楄〃 - if (res.userstatus == "1") { - this.accountlist.push({ - id: res.id, - userno: res.userno, - username: res.username, - idcardno: res.idcardno, - title: res.title, - depositbank: res.depositbank, - bankcardno: res.bankcardno, - unitno: res.unitno, - unitname: res.unitname - }); + if (res.rows[j].userstatus == "1") { + if (res.rows[j].usertype == "org") { + this.accountlist.push({ + id: res.rows[j].id, + userno: res.rows[j].userno, + username: res.rows[j].username, + idcardno: res.rows[j].idcardno, + title: res.rows[j].title, + depositbank: res.rows[j].depositbank, + bankcardno: res.rows[j].bankcardno, + unitno: res.rows[j].unitno, + unitname: res.rows[j].unitname, + userid: + res.rows[j].username + "锛�" + res.rows[j].bankcardno + "锛�" + }); + } else { + this.accountlist.push({ + id: res.rows[j].id, + userno: res.rows[j].userno, + username: res.rows[j].username, + idcardno: res.rows[j].idcardno, + title: res.rows[j].title, + depositbank: res.rows[j].depositbank, + bankcardno: res.rows[j].bankcardno, + unitno: res.rows[j].unitno, + unitname: res.rows[j].unitname, + userid: + res.rows[j].username + "锛�" + res.rows[j].idcardno + "锛�" + }); + } } } }); @@ -2791,8 +2809,10 @@ flowconclusion: this.checkObj.flowlevelone, flowcontent: this.checkObj.flowconclusion }; + this.$modal.loading("姝e湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒"); checkfund(checkFundObj).then(res => { //鍏抽棴绐楀彛 + this.$modal.closeLoading(); this.$modal.msgSuccess("瀹℃牳瀹屾垚!"); this.$store.dispatch("tagsView/delView", this.$route); this.$router.go(-1); @@ -3235,7 +3255,7 @@ this.tableDatatop = []; this.fileListto = []; this.invoicefileListto = []; - this.pdfimg = ''; + this.pdfimg = ""; this.invoicepdfimg = []; this.pdfimgsrcList = []; this.invoicepdfimgsrcList = []; @@ -3404,11 +3424,39 @@ const index = this.getIndexInArray(this.fileListto, row); const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + const indexann = this.rbDetails[this.atpresent].annexfilesList.findIndex(item => item.name == row.name); + const itemann = this.rbDetails[this.atpresent].annexfilesList.splice( + indexann, + 1 + )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� + this.rbDetails[this.atpresent].annexfilesList.splice( + indexann - 1, + 0, + itemann + ); // 灏唅temann鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + } else { const index = this.getIndexInArray(this.invoicefileListto, row); const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� + + const indexinvo = this.rbDetails[this.atpresent].invoicefilesList.findIndex(item => item.name == row.name); + const iteminvo = this.rbDetails[this.atpresent].invoicefilesList.splice( + indexinvo, + 1 + )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓� + this.rbDetails[this.atpresent].invoicefilesList.splice( + indexinvo - 1, + 0, + iteminvo + ); // 灏唅teminvo鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� } + console.log( + this.rbDetails[this.atpresent].annexfilesList, + "annexfilesList" + ); + console.log(this.fileListto, "fileListto"); + // console.log(this.rbDetails[this.atpresent].invoicefilesList,'invoicefilesList'); }, Downloadfile(row) { window.location.href = row.url; @@ -3423,7 +3471,13 @@ if (this.selectionType == "account") { //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴� this.accountfrom = "1"; - this.accountselectform.accountname = scope.row.beneficiaryname; + if (scope.row.idcardno) { + this.accountselectform.accountname = + scope.row.beneficiaryname + "锛�" + scope.row.idcardno + "锛�"; + } else { + this.accountselectform.accountname = + scope.row.beneficiaryname + "锛�" + scope.row.bankcardno + "锛�"; + } this.accountselectform.accountno = scope.row.beneficiaryno; this.accountselectform.expertunitname = ""; this.accountselectform.expertunitno = ""; @@ -3455,11 +3509,10 @@ if (this.accountfrom == "1") { //璧嬪�间俊鎭� if ( - this.rbDetails[tempIndex].beneficiaryname != - this.accountselectform.accountname + this.rbDetails[tempIndex].userno != this.accountselectform.userno ) { this.accountlist.map(res => { - if (res.username == this.accountselectform.accountname) { + if (res.id == this.accountselectform.accountname) { this.rbDetails[tempIndex].beneficiaryno = res.userno; this.rbDetails[tempIndex].beneficiaryname = res.username; this.rbDetails[tempIndex].depositbank = res.depositbank; @@ -3486,8 +3539,8 @@ //鑾峰彇鐢ㄦ埛缂栧彿 getOnlyCode(this.seqnoParams).then(res => { this.accountform.userno = res.data.currentvalue; - this.accountform.id = null; + this.accountform.id = null; this.accountform.usertype = this.accountselectform.usertype; this.accountform.username = this.accountselectform.username; this.accountform.idcardno = this.accountselectform.idcardno; @@ -3512,53 +3565,84 @@ this.accountform.unitname = res.organizationname; } }); + } else { + this.accountform.userstatus = 1; } addExternalperson(this.accountform).then(response => { if (response.code == 200) { - if (this.accountselectform.usertype == "expert") { + // //閲嶆柊鑾峰彇璐︽埛鍒楄〃 + // listExternalperson().then(res => { + // this.accountlist = res.rows; + // }); + + console.log("addExternalperson", response.data.id); + if (this.accountselectform.usertype == "org") { + this.accountlist.push({ + id: response.data.id, + userno: this.accountform.userno, + username: this.accountform.username, + idcardno: this.accountform.idcardno, + title: this.accountform.title, + depositbank: this.accountform.depositbank, + bankcardno: this.accountform.bankcardno, + unitno: this.accountform.unitno, + unitname: this.accountform.unitname, + userid: + this.accountform.username + + "锛�" + + this.accountform.bankcardno + + "锛�" + }); + this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭紒"); + } else { + this.accountlist.push({ + id: response.data.id, + userno: this.accountform.userno, + username: this.accountform.username, + idcardno: this.accountform.idcardno, + title: this.accountform.title, + depositbank: this.accountform.depositbank, + bankcardno: this.accountform.bankcardno, + unitno: this.accountform.unitno, + unitname: this.accountform.unitname, + userid: + this.accountform.username + + "锛�" + + this.accountform.idcardno + + "锛�" + }); this.$modal.msgSuccess( - "鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒" + "鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭�,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒" ); return; - } else { - this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�"); } - - this.accountselectform.accountno = this.accountselectform.userno; + this.accountselectform.accountno = this.accountform.userno; this.accountselectform.accountname = this.accountselectform.username; - //閲嶆柊鑾峰彇璐︽埛鍒楄〃 - listExternalperson().then(res => { - this.accountlist = res.rows; + //璧嬪�间俊鎭� + this.accountlist.map(res => { + if (res.userno == this.accountselectform.accountno) { + this.rbDetails[tempIndex].beneficiaryno = res.userno; + this.rbDetails[tempIndex].beneficiaryname = res.username; + this.rbDetails[tempIndex].depositbank = res.depositbank; + this.rbDetails[tempIndex].branchbankname = + res.branchbankname; + this.rbDetails[tempIndex].bankcardno = res.bankcardno; + this.rbDetails[tempIndex].phone = res.telephone; - //璧嬪�间俊鎭� - this.accountlist.map(res => { - if (res.username == this.accountselectform.accountname) { - this.rbDetails[tempIndex].beneficiaryno = res.userno; - this.rbDetails[tempIndex].beneficiaryname = - res.username; - this.rbDetails[tempIndex].depositbank = res.depositbank; - this.rbDetails[tempIndex].branchbankname = - res.branchbankname; - this.rbDetails[tempIndex].bankcardno = res.bankcardno; - this.rbDetails[tempIndex].phone = res.telephone; - - if (res.usertype == "org") { - this.rbDetails[tempIndex].idcardno = ""; - this.rbDetails[tempIndex].title = ""; - this.rbDetails[tempIndex].unitno = ""; - this.rbDetails[tempIndex].unitname = ""; - } else { - this.rbDetails[tempIndex].idcardno = res.idcardno; - this.rbDetails[tempIndex].title = res.title; - this.rbDetails[tempIndex].unitno = parseInt( - res.unitno - ); - this.rbDetails[tempIndex].unitname = res.unitname; - } + if (res.usertype == "org") { + this.rbDetails[tempIndex].idcardno = ""; + this.rbDetails[tempIndex].title = ""; + this.rbDetails[tempIndex].unitno = ""; + this.rbDetails[tempIndex].unitname = ""; + } else { + this.rbDetails[tempIndex].idcardno = res.idcardno; + this.rbDetails[tempIndex].title = res.title; + this.rbDetails[tempIndex].unitno = parseInt(res.unitno); + this.rbDetails[tempIndex].unitname = res.unitname; } - }); + } }); } }); -- Gitblit v1.9.3