From ad0f326640b66b63e28dc52139f03ae4822f260a Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 15 四月 2024 10:36:59 +0800 Subject: [PATCH] 11 --- src/views/project/donationdetails/index.vue | 59 ++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 34 insertions(+), 25 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index 0d56879..4857f79 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -2912,6 +2912,8 @@ obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�" && + obj.organname !== "宸﹀鍙�" && + obj.organname !== "鍙充笁鍙�" && obj.organname !== "宸﹁倽" && obj.organname !== "鍙宠倽" ); @@ -3082,7 +3084,9 @@ } updateDonatebaseinfo(this.form).then(response => { this.$modal.msgSuccess("淇濆瓨鎴愬姛"); - Modifydonationattachment(this.donatelist).then(res => {}); + Modifydonationattachment(this.donatelist).then(res => { + this.listDonateannex(); + }); this.Getbasicinformation(); // this.Processvalidation(); this.open = false; @@ -3092,7 +3096,9 @@ addDonatebaseinfo(this.form).then(response => { if (response.code == 200) { this.$modal.msgSuccess("鏂板鎴愬姛"); - Modifydonationattachment(this.donatelist).then(res => {}); + Modifydonationattachment(this.donatelist).then(res => { + this.listDonateannex(); + }); this.Getbasicinformation(); // this.Processvalidation(); this.open = false; @@ -3240,22 +3246,26 @@ }); } else { addDonationwitness(this.witnessform).then(response => { - this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛"); - this.form.donationcategory = this.witnessform.donationcategory; - let data = JSON.parse(JSON.stringify(this.form)); - data.diseasetype = ""; - data.infectious = data.infectious.join(","); - data.selfwill = data.selfwill.join(","); - data.othercases = data.othercases.join(","); - data.infosources = data.infosources.join(","); - data.kinship = data.kinship.join(","); - data.patientstate = data.patientstate.join(","); - getDonationNumber(data).then(res => { - this.form.donorno = res.msg; - this.Processvalidation(); - }); - this.istb = true; - this.$modal.closeLoading(); + if (response.code === 200) { + this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛"); + this.form.donationcategory = this.witnessform.donationcategory; + let data = JSON.parse(JSON.stringify(this.form)); + data.diseasetype = ""; + data.infectious = data.infectious.join(","); + data.selfwill = data.selfwill.join(","); + data.othercases = data.othercases.join(","); + data.infosources = data.infosources.join(","); + data.kinship = data.kinship.join(","); + data.patientstate = data.patientstate.join(","); + getDonationNumber(data).then(res => { + this.form.donorno = res.msg; + this.istb = true; + this.Processvalidation(); + }); + this.$modal.closeLoading(); + } else { + this.$modal.msgError("鑾峰彇瑙佽瘉淇℃伅鏂板澶辫触"); + } }); } @@ -3576,8 +3586,8 @@ }, // 鏇存敼杩涚▼鏁堥獙 Processvalidation() { - if (this.form.workflow + 1 == this.actives || this.actives == 6) { - if (this.form.workflow <= 6) { + if (this.form.workflow + 1 == this.actives ) { + if (this.form.workflow < 6) { this.form.workflow++; } else { } @@ -3585,8 +3595,7 @@ // this.GetAttacheddata(); } else if (this.form.workflow > this.actives) { this.submitForm(); - Modifydonationattachment(this.donatelist).then(res => {}); - this.listDonateannex(); + // Modifydonationattachment(this.donatelist).then(res => {}); // this.GetAttacheddata(); } else { this.submitForm(); @@ -3596,8 +3605,8 @@ }, // 鎻愪氦褰掓。 Reportforreview() { - if (this.form.workflow == 9) { - this.form.workflow = 8; + if (this.form.workflow == 8) { + this.form.workflow = 7; this.submitForm(); this.$router.go(-1); this.$message({ @@ -3615,7 +3624,7 @@ if (res.code == 500) { this.$message.error(res.msg); } else { - this.form.workflow = 9; + this.form.workflow = 8; this.submitForm(); this.$message({ type: "success", -- Gitblit v1.9.3