From 99d1abc8eb607404cb2a8e08e6b1ed779861928c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 22 四月 2024 10:01:31 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 38 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 0d56879..8af06f5 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2906,12 +2906,14 @@
if (res.code == 200) {
if (res.rows[0]) {
this.procureddata = res.rows;
- this.procureddata.infoid = this.infoid;
+ // this.procureddata.infoid = this.infoid;
} else {
this.procureddata = this.allocateddata.filter(
obj =>
obj.organname !== "宸﹀崐鑲�" &&
obj.organname !== "鍙冲崐鑲�" &&
+ obj.organname !== "宸﹀鍙�" &&
+ obj.organname !== "鍙充笁鍙�" &&
obj.organname !== "宸﹁倽" &&
obj.organname !== "鍙宠倽"
);
@@ -2919,7 +2921,7 @@
obj.id = null;
return obj;
});
- this.procureddata.infoid = this.infoid;
+ // this.procureddata.infoid = this.infoid;
}
this.organList.organprocured = [];
for (let i = 0; i < this.procureddata.length; i++) {
@@ -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;
@@ -3175,7 +3181,7 @@
}
});
} else if (this.actives == 4) {
- this.procureddata.infoid = this.infoid;
+ // this.procureddata.infoid = this.infoid;
this.$refs["allocateddataform"].validate(valid => {
this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
@@ -3236,36 +3242,46 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
this.form.donationcategory = this.witnessform.donationcategory;
this.Processvalidation();
- this.$modal.closeLoading();
+ //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+ saveDonationwitnessorgan(this.procureddata).then(res => {
+ if (res == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+ }
+ this.$modal.closeLoading();
+ });
});
} 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();
+ });
+ //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+ saveDonationwitnessorgan(this.procureddata).then(res => {
+ if (res == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+ }
+ this.$modal.closeLoading();
+ });
+ } else {
+ this.$modal.msgError("鑾峰彇瑙佽瘉淇℃伅鏂板澶辫触");
+ this.$modal.closeLoading();
+ }
});
}
-
- //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
- this.procureddata.infoid = this.infoid;
- saveDonationwitnessorgan(this.procureddata).then(res => {
- if (res == 200) {
- this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
- }
- });
}
});
} else if (this.actives == 6) {
@@ -3275,7 +3291,7 @@
this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
// 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
- this.transplantdata.infoid = this.infoid;
+ // this.transplantdata.infoid = this.infoid;
console.log(this.form);
this.transplantdata.forEach(item => {
listDonorchargeorgan({
@@ -3576,8 +3592,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 +3601,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 +3611,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 +3630,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