From 3b7aabfe05743f678dbeda05b5c75a155353c5eb Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 11 三月 2024 13:15:12 +0800 Subject: [PATCH] 11 --- src/views/project/donationdetails/index.vue | 48 +++++++++++------------ src/views/project/fund/performancedetails/index.vue | 39 +++++++++++++++---- 2 files changed, 54 insertions(+), 33 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index 125cb03..044770b 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -1404,14 +1404,14 @@ label="绉绘鍖婚櫌" align="center" width="230" - prop="gainhospitalno" + prop="transplanthospitalno" > <template slot-scope="scope"> <div class="elldiv"> <org-selecter ref="tranHosSelect" :org-type="'4'" - v-model="scope.row.gainhospitalno" + v-model="scope.row.transplanthospitalno" /> </div> </template> @@ -2053,7 +2053,7 @@ label="绉绘鍖婚櫌" align="center" width="220" - prop="transplanthospitalname" + prop="transplanthospitalno" v-if="actives == 6" > <template slot-scope="scope"> @@ -2103,8 +2103,8 @@ size="small" style="width: 100%" v-model="scope.row.transplanttime" - type="datetime" - value-format="yyyy-MM-dd HH:mm:ss" + type="date" + value-format="yyyy-MM-dd" placeholder="閫夋嫨绉绘鏃堕棿" > </el-date-picker> @@ -2571,20 +2571,20 @@ allocateddataform: {}, procureddata: [], transplantdata: [], - sysOrganlistL:[ - {label:'蹇冭剰', value:'C38',}, - {label:'鑲濊剰', value:'C22',}, - {label:'宸﹁偩', value:'C64L',}, - {label:'鍙宠偩', value:'C64R',}, - {label:'鍏ㄨ偤', value:'C34',}, - {label:'宸﹁偤', value:'C34L',}, - {label:'鍙宠偤', value:'C34R',}, - {label:'灏忚偁', value:'C17',}, - {label:'鑳拌吅', value:'C25',}, - {label:'閬椾綋', value:'C00',}, - {label:'宸︾溂瑙掕啘', value:'C69L',}, - {label:'鍙崇溂瑙掕啘', value:'C69R',}, - {label:'鍏朵粬', value:'C01',}, + sysOrganlistL: [ + { label: "蹇冭剰", value: "C38" }, + { label: "鑲濊剰", value: "C22" }, + { label: "宸﹁偩", value: "C64L" }, + { label: "鍙宠偩", value: "C64R" }, + { label: "鍏ㄨ偤", value: "C34" }, + { label: "宸﹁偤", value: "C34L" }, + { label: "鍙宠偤", value: "C34R" }, + { label: "灏忚偁", value: "C17" }, + { label: "鑳拌吅", value: "C25" }, + { label: "閬椾綋", value: "C00" }, + { label: "宸︾溂瑙掕啘", value: "C69L" }, + { label: "鍙崇溂瑙掕啘", value: "C69R" }, + { label: "鍏朵粬", value: "C01" } ], witnessform: { infoid: null @@ -3229,9 +3229,9 @@ saveDonatecomporgan(this.transplantdata).then(res => { if (res == 200) { this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�"); - }else{ - this.$modal.msgSuccess(res.msg); - return + } else { + this.$modal.msgSuccess(res.msg); + return; } }); console.log(this.accomplishform.id, "瀹屾垚id"); @@ -3246,9 +3246,7 @@ this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛"); this.$modal.closeLoading(); this.$modal - .confirm( - '妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�' - ) + .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�") .then(() => { this.$router.push({ path: "/finance/donorchargedetail/", diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue index eb1b9c3..d51f2ee 100644 --- a/src/views/project/fund/performancedetails/index.vue +++ b/src/views/project/fund/performancedetails/index.vue @@ -147,6 +147,7 @@ align="center" label="搴忓彿" width="88" + fixed > <template slot-scope="scope"> <el-input v-model="scope.row.orderno" placeholder="搴忓彿" /> @@ -157,6 +158,7 @@ align="center" label="鏈嶅姟绫诲瀷" width="200" + fixed > <template slot-scope="scope"> <el-select @@ -194,6 +196,21 @@ :value="dict.id" ></el-option> </el-select> + </template> + </el-table-column> + <el-table-column + prop="amount" + align="center" + label="缁╂晥鏃ユ湡" + width="260" + > + <template slot-scope="scope"> + <el-date-picker + v-model="scope.row.jxrq" + type="date" + placeholder="閫夋嫨鏃ユ湡" + > + </el-date-picker> </template> </el-table-column> <el-table-column @@ -237,7 +254,6 @@ align="center" label="鎵g◣閲戦" width="120" - > <template slot-scope="scope"> <el-input @@ -2531,7 +2547,6 @@ this.pdfVisible = true; if (this.rbDetails[index].annexfilesList) { - const fetchPromises = this.rbDetails[index].annexfilesList.map( (value, indexson) => { const pdfimg = this.Networkheader + "/prod-api" + value.url; @@ -2584,10 +2599,14 @@ ); Promise.all(fetchPromises).then(invoicefileListto => { - this.invoicefileListto = invoicefileListto.filter(item => item !== null); + this.invoicefileListto = invoicefileListto.filter( + item => item !== null + ); this.invoicepdfimg = this.invoicefileListto[0].url; console.log(this.invoicepdfimg, "invoicepdfimg"); - this.invoicepdfimgsrcList = this.invoicefileListto.map(item => item.url); + this.invoicepdfimgsrcList = this.invoicefileListto.map( + item => item.url + ); }); this.previewpdf = true; @@ -2703,8 +2722,10 @@ 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 indexann = this.rbDetails[ + this.atpresent + ].annexfilesList.findIndex(item => item.name == row.name); const itemann = this.rbDetails[this.atpresent].annexfilesList.splice( indexann, 1 @@ -2718,8 +2739,10 @@ 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 indexinvo = this.rbDetails[ + this.atpresent + ].invoicefilesList.findIndex(item => item.name == row.name); const iteminvo = this.rbDetails[this.atpresent].invoicefilesList.splice( indexinvo, 1 -- Gitblit v1.9.3