From 415969d7e150018536783838fcf8f36901b5a752 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期四, 04 一月 2024 14:40:00 +0800 Subject: [PATCH] yxh --- src/views/project/fund/applyDetail/index.vue | 133 +++++--------------------------------------- 1 files changed, 15 insertions(+), 118 deletions(-) diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue index 5f8b9ac..ccfa55b 100644 --- a/src/views/project/fund/applyDetail/index.vue +++ b/src/views/project/fund/applyDetail/index.vue @@ -1200,11 +1200,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)); // this.form.recordstate =-1; @@ -1252,8 +1249,6 @@ 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)); @@ -1263,7 +1258,7 @@ //涓氬姟鏄庣粏 getownFundDetail(this.curId).then(res => { this.rbDetails = res.data; - console.log("this.feeBlocks", this.feeBlocks); + for (let m = 0; m < this.rbDetails.length; m++) { this.rbDetails[m].itemlist = []; this.getRowFeeItems(m, this.rbDetails[m]); @@ -1271,10 +1266,6 @@ //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭� this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter( r => r.itemid == this.rbDetails[m].itemid - ); - console.log( - "this.rbDetails[m].rowfeeblocks", - this.rbDetails[m].rowfeeblocks ); } @@ -1300,10 +1291,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)); //闄勪欢澶勭悊 @@ -1454,22 +1443,6 @@ return; } - /* - if ( - tempDetail.idcardno == null && - this.businessType != "3" && - this.businessType != "4" - ) { - console.log(1122); - this.$modal.msgWarning( - "鏈嶅姟椤圭洰琛ㄤ腑锛岀" + - (k + 1).toString() + - "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝~鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�" - ); - return; - } - */ - if (this.businessType == "1") { if (tempDetail.servicesscope == null) { this.$modal.msgWarning( @@ -1614,8 +1587,6 @@ sessionStorage.setItem("apiform", JSON.stringify(this.form)); addorupdateFund(this.form) .then(response => { - console.log(this.form); - console.log(response, "淇濆瓨杩斿弬"); if (response.code === 200) { if (this.form.id) { this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒"); @@ -1650,29 +1621,15 @@ }); }, 500), - //瀹℃壒鎻愪氦 - // checksubmit() { - // console.log(this.checkObj.flowlevelone); - // if ( - // this.form.checkstatus != 3 && - // this.userprofile.nickName == "闄堟厱鍗�" && - // this.checkObj.flowlevelone == 1 - // ) { - // this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�"); - // return; - // } - // this.Savenow(); - // console.log("淇濆瓨骞跺鎵�"); - // }, checksubmit() { - console.log(this.checkObj.flowlevelone); //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂� - if (this.checkObj.flowlevelone == 2 && !this.checkObj.flowconclusion && this.checkObj.flowconclusion.trim() != "") { - this.$modal.msgError("璇疯緭鍏ュ鏍镐笉閫氳繃鐨勮鏄庝俊鎭紝鏂逛究缁忓姙浜轰慨鏀圭敵璇峰崟锛�"); - return; + if (this.checkObj.flowlevelone == 2) { + if (!this.checkObj.flowconclusion) { + this.$modal.msgError("璇疯緭鍏ュ鏍镐笉閫氳繃鐨勮鏄庝俊鎭紝鏂逛究缁忓姙浜轰慨鏀圭敵璇峰崟锛�"); + return; + } } - else { - + else if (this.checkObj.flowlevelone == 2) { if (this.userprofile.nickName == "闄堟厱鍗�") { //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂� if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) { @@ -1681,17 +1638,15 @@ } //妫�鏌ヤ釜绋庤绠� - // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) { - // this.$modal.msgError( - // "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁$畻锛�" - // ); - // return; - // } if (this.form.applytype == "1" && this.form.fundtaxtime == null) { this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁$畻锛�"); return; } } + } + else { + this.$modal.msgError("璇峰厛閫夋嫨瀹℃壒缁撴灉鍐嶆彁浜わ紒"); + return; } this.Savenow(); @@ -1708,7 +1663,6 @@ getUserProfile() { getUserProfile().then(res => { this.userprofile = res.data; - console.log(this.userprofile); this.standardlevel = res.data.standardlevel; if ( this.userprofile.userName == "admin" || @@ -1764,29 +1718,6 @@ }); } } - - /** - for (let j = 0; j < this.accountlist.length; j++) { - //鍗曚綅璐﹀彿鍒楄〃 - if (this.accountlist[j].usertype == "org") { - this.feeAccountList.push({ - id: this.accountlist[j].id, - reportNo: this.accountlist[j].userno, - reportName: this.accountlist[j].username, - depositbank: this.accountlist[j].depositbank, - branchbankname: this.accountlist[j].branchbankname, - bankcardno: this.accountlist[j].bankcardno - }); - } - //涓撳璐﹀彿鍒楄〃 - else if (res.rows[j].usertype == "expert") { - this.expertAccountList.push({ - expertNo: this.accountlist[j].id, - exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")" - }); - } - } - */ }); }, @@ -1794,7 +1725,7 @@ getUserAccount() { this.accountlist.map(res => { if (res.username == this.form.username) { - this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank; + this.form.bankname = res.depositbank; this.form.bankcardno = res.bankcardno; this.form.phone = res.telephone; } @@ -1806,7 +1737,6 @@ listOrganization(3).then(response => { for (let i = 0; i < response.rows.length; i++) { this.unitList.push({ - //organizationid: response.rows[i].organizationid, organizationid: response.rows[i].id, organizationname: response.rows[i].organizationname }); @@ -1864,8 +1794,7 @@ //鑾峰彇鏈嶅姟椤圭洰 getRowFeeItems(rowindex, row) { - let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); - console.log(list[0]); + let list = this.feeItemTypes.filter(r => r.itemType == row.applytype); row.itemlist = list[0].itemDetails; this.$set(this.rbDetails, rowindex, row); }, @@ -1887,22 +1816,11 @@ row.amount = 0.0; row.taxamount = 0.0; row.taxedamount = item.expense; - - //璁$畻绋庡墠閲戦 - // this.calculateTax(row, "B"); } else { row.amount = item.expense; row.taxamount = 0.0; row.taxedamount = 0.0; - - //璁$畻绋庡悗閲戦 - // this.calculateTax(row, "A"); } - - // this.form.serviceFunddetails = 0; - // this.rbDetails.map(item => { - // this.form.serviceFunddetails += item.amount; - // }); } }); }, @@ -1994,7 +1912,6 @@ } targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅 } - console.log(targetValue, "鍚堣"); this.form.pretaxcost = targetValue; }, @@ -2246,7 +2163,6 @@ // 鎵嬪姩璁$畻 Manualcalculationfn() { ManualCalculation(this.rbDetails).then(res => { - console.log(res); if (res.code == 200) { sessionStorage.removeItem("apiform"); sessionStorage.removeItem("apifunddetail"); @@ -2559,8 +2475,6 @@ uploadSccess(response, file, fileList) { this.rbDetails; //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆 - console.log(response); - console.log(file); if (this.activeName == 1) { if (response.code == 200) { // this.form.filename = file.raw.name; @@ -2573,7 +2487,6 @@ this.pdfimgsrcList.push( this.Networkheader + "/prod-api" + response.fileName ); - console.log(this.pdfimgsrcList); this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�"; this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; this.rbDetails[this.atpresent].annexfilesList = this.fileListto; @@ -2582,7 +2495,6 @@ } } else { if (response.code == 200) { - // this.form.filename = file.raw.name; this.previewpdf = true; this.$modal.msgSuccess(response.msg); this.invoicefileListto.push({ @@ -2592,15 +2504,12 @@ this.invoicepdfimgsrcList.push( this.Networkheader + "/prod-api" + response.fileName ); - console.log(this.invoicepdfimgsrcList); this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�"; this.pdfimg = this.Networkheader + "/prod-api" + response.fileName; this.rbDetails[ this.atpresent ].invoicefilesList = this.invoicefileListto; - console.log(this.rbDetails[this.atpresent]); } else { - console.log(response.msg); } } }, @@ -2615,11 +2524,9 @@ this.tableDatatop.push(row); this.atpresent = index; this.pdfVisible = true; - console.log(this.rbDetails[index]); if (this.rbDetails[index].annexfilesList) { this.previewpdf = true; this.fileListto = this.rbDetails[index].annexfilesList; - console.log(this.fileListto); this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url; this.fileListto.forEach(item => { this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url); @@ -2633,7 +2540,6 @@ if (this.rbDetails[index].invoicefilesList) { this.previewpdf = true; this.invoicefileListto = this.rbDetails[index].invoicefilesList; - console.log(this.invoicefileListto); this.invoicepdfimg = this.Networkheader + "/prod-api" + this.invoicefileListto[0].url; this.invoicefileListto.forEach(item => { @@ -2641,8 +2547,6 @@ this.Networkheader + "/prod-api" + item.url ); }); - console.log(this.invoicepdfimgsrcList); - console.log(this.invoicepdfimg); } else { this.invoicefileListto = []; this.invoicepdfimg = ""; @@ -2659,7 +2563,6 @@ // 鐐瑰嚮宸蹭笂浼犳枃浠� downFile(item) { if (this.activeName == 1) { - console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; let name = item.name.split("."); @@ -2680,7 +2583,6 @@ this.previewpdf = false; } } else { - console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem"); this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name; let name = item.name.split("."); @@ -2692,8 +2594,6 @@ this.previewpdf = true; if (item.url) { this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url; - console.log(this.invoicepdfimg, "pdfimg"); - console.log(this.invoicepdfimgsrcList, "imglist"); } else { this.invoicepdfimg = this.Networkheader + "/prod-api" + item.response.url; @@ -2748,8 +2648,7 @@ this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣� } }, - Downloadfile(row) { - console.log(row); + Downloadfile(row) { window.location.href = this.Networkheader + "/prod-api" + row.url; }, @@ -2783,7 +2682,6 @@ this.accountselectform.expertunitname = scope.row.unitname; this.accountselectform.expertunitno = scope.row.unitno; } - this.showselectiondialog = true; }, @@ -2821,7 +2719,6 @@ } else if (this.accountfrom == "2") { //淇濆瓨鏂板璐﹀彿 //鑾峰彇鐢ㄦ埛缂栧彿 - // this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1; getOnlyCode(this.seqnoParams).then((res) => { this.accountform.userno = res.data.currentvalue; this.accountform.id = null; @@ -2923,7 +2820,7 @@ } return; } - console.log(11); + if (regex.test(row.idcardno)) { row.error = ""; } else { -- Gitblit v1.9.3