From 6b25c4004057242d40568a06036643792b66b987 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 25 三月 2024 14:38:20 +0800 Subject: [PATCH] 11 --- src/views/project/donationdetails/index.vue | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index a95f530..af7326d 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -2825,6 +2825,7 @@ let searchParam = { infoid: this.infoid }; + console.log(this.procureddata, "procureddata"); if (this.actives == 1) { this.activetele = "鍖诲璇勪及"; @@ -2893,7 +2894,11 @@ // ); } }); - } else if (this.actives == 5 && !this.witnessform.id) { + } else if ( + this.actives == 5 && + !this.witnessform.id && + !this.procureddata[0] + ) { // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅 if (this.witnessform.id) { return; @@ -2905,7 +2910,11 @@ this.procureddata.infoid = this.infoid; } else { this.procureddata = this.allocateddata.filter( - obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�" + obj => + obj.organname !== "宸﹀崐鑲�" && + obj.organname !== "鍙冲崐鑲�" && + obj.organname !== "宸﹁倽" && + obj.organname !== "鍙宠倽" ); this.procureddata.infoid = this.infoid; } @@ -3066,11 +3075,11 @@ // 淇濆瓨浜岀骇琛ㄦ寜閽� Savethedetails() { console.log(this.actives); - this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.actives == 1) { this.medicineform.infoid = this.infoid; this.$refs["medicineform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.medicineform.id != null) { updateMedicalevaluation(this.medicineform).then(response => { this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛"); @@ -3091,6 +3100,7 @@ this.affirmform.kinship = this.kinship.join(","); this.$refs["affirmform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.affirmform.id != null) { this.affirmform.residenceprovincename = this.defultAddresss.sheng; this.affirmform.residencecityname = this.defultAddresss.shi; @@ -3115,6 +3125,7 @@ this.ethicform.infoid = this.infoid; this.$refs["ethicform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.ethicform.id != null) { // updateDonateflowchart(this.ethicform).then(response => { updateEthicalreviewopinions(this.ethicform).then(res => { @@ -3134,6 +3145,8 @@ } else if (this.actives == 4) { this.procureddata.infoid = this.infoid; this.$refs["allocateddataform"].validate(valid => { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); + /** let rows = []; this.allocateddata.map(item => { @@ -3184,6 +3197,8 @@ } if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); + if (this.witnessform.id != null) { updateDonationwitness(this.witnessform).then(response => { this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛"); @@ -3212,6 +3227,8 @@ this.accomplishform.infoid = this.infoid; this.$refs["accomplishform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); + // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅 this.transplantdata.infoid = this.infoid; console.log(this.form); -- Gitblit v1.9.3