From 3323c96f78bb09b1b2d435d863a593c9a099c269 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 22 四月 2024 15:22:04 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/donationdetails/index.vue | 218 +++++++++++++++++++++++++++++++----------------------
1 files changed, 127 insertions(+), 91 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index a5d2237..06225b6 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2401,7 +2401,8 @@
addDonatebaseinfo,
updateDonatebaseinfo,
getDonatebaseinfoflow,
- fileCase
+ fileCase,
+ getDonationNumber
} from "@/api/project/donatebaseinfo";
import {
listMedicalevaluation,
@@ -2905,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 !== "鍙宠倽"
);
@@ -2918,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++) {
@@ -2951,36 +2954,38 @@
return;
}
- if (!this.organList.organtransplant[0]) {
- listDonatecomporgan(searchParam).then(res => {
- if (res.code == 200) {
- if (res.rows[0]) {
- this.transplantdata = res.rows;
- this.transplantdata.infoid = this.infoid;
- } else {
- this.transplantdata = this.allocateddata;
- this.transplantdata = this.transplantdata.map(obj => {
- obj.id = null;
- if (obj.organname == "宸︾溂瑙掕啘"||obj.organname == "鍙崇溂瑙掕啘") {
- obj.transplantstate = 2;
- }
- return obj;
- });
-
- this.transplantdata.infoid = this.infoid;
- }
- for (let i = 0; i < this.transplantdata.length; i++) {
- this.organList.organtransplant.push(
- this.transplantdata[i].organno
- );
- }
+ listDonatecomporgan(searchParam).then(res => {
+ if (res.code == 200) {
+ if (res.rows[0]) {
+ this.transplantdata = res.rows;
+ // this.transplantdata.infoid = this.infoid;
} else {
- // this.$modal.msgError(
- // "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
- // );
+ this.transplantdata = this.allocateddata;
+ this.transplantdata = this.transplantdata.map(obj => {
+ obj.id = null;
+ if (
+ obj.organname == "宸︾溂瑙掕啘" ||
+ obj.organname == "鍙崇溂瑙掕啘"
+ ) {
+ obj.transplantstate = 2;
+ }
+ return obj;
+ });
+
+ this.transplantdata.infoid = this.infoid;
}
- });
- }
+ for (let i = 0; i < this.transplantdata.length; i++) {
+ this.organList.organtransplant.push(
+ this.transplantdata[i].organno
+ );
+ }
+ } else {
+ // this.$modal.msgError(
+ // "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
+ // );
+ }
+ });
+
// 鑾峰彇瀹屾垚鐧昏淇℃伅
listDonatecompletioninfo(searchParam).then(response => {
if (response.code == 200 && response.rows.length) {
@@ -3019,7 +3024,9 @@
this.form.birthday = this.$moment(this.form.birthday).format(
"YYYY-MM-DD HH:mm:ss"
);
+
this.form.diseasetype = this.form.diseasetype.join(",");
+
this.form.infectious = this.form.infectious.join(",");
this.form.selfwill = this.form.selfwill.join(",");
this.form.othercases = this.form.othercases.join(",");
@@ -3077,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;
@@ -3087,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;
@@ -3170,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("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
@@ -3229,26 +3240,48 @@
if (this.witnessform.id != null) {
updateDonationwitness(this.witnessform).then(response => {
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
- this.$modal.closeLoading();
+ this.form.donationcategory = this.witnessform.donationcategory;
+ this.Processvalidation();
+ //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+ saveDonationwitnessorgan(this.procureddata).then(res => {
+ if (res == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+ }
+ this.$modal.closeLoading();
+ });
});
} else {
addDonationwitness(this.witnessform).then(response => {
- this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
- 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("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
- }
- });
-
- //this.form.donationcategory = this.witnessform.donationcategory;
- this.Processvalidation();
}
});
} else if (this.actives == 6) {
@@ -3258,50 +3291,54 @@
this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
// 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
- this.transplantdata.infoid = this.infoid;
- console.log(this.form);
- this.transplantdata.forEach(item => {
- listDonorchargeorgan({
- infoid: item.infoid,
- organno: item.organno
- }).then(res => {
- console.log("aaa");
- if (res.rows[0]) {
- let objfn = res.rows[0];
- console.log(objfn, "sass");
+ // this.transplantdata.infoid = this.infoid;
+ // this.transplantdata.forEach(item => {
+ // listDonorchargeorgan({
+ // infoid: item.infoid,
+ // organno: item.organno
+ // }).then(res => {
+ // console.log("aaa");
+ // if (res.rows[0]) {
+ // let objfn = res.rows[0];
+ // console.log(objfn, "sass");
+ // objfn.caseno = item.caseno;
+ // objfn.hospitalno = item.hospitalno;
+ // objfn.name = item.name;
+ // objfn.receiveTime = item.transplanttime;
+ // console.log(objfn, "sass");
+ // updateDonorchargeorgan(objfn).then(res1 => {});
+ // } else {
+ // item.id = null;
+ // addDonorchargeorgan(item).then(res2 => {});
+ // }
+ // });
+ // });
- objfn.caseno = item.caseno;
- objfn.hospitalno = item.hospitalno;
- objfn.name = item.name;
- objfn.receiveTime = item.transplanttime;
- console.log(objfn, "sass");
- updateDonorchargeorgan(objfn).then(res1 => {});
- } else {
- item.id = null;
- addDonorchargeorgan(item).then(res2 => {});
- }
- });
- });
- saveDonatecomporgan(this.transplantdata).then(res => {
- if (res == 200) {
- this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
- } else {
- this.$modal.msgSuccess(res.msg);
- return;
- }
- });
-
- console.log(this.accomplishform.id, "瀹屾垚id");
// 淇濆瓨纭淇℃伅
if (this.accomplishform.id) {
updateDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
- this.$modal.closeLoading();
+ saveDonatecomporgan(this.transplantdata).then(res => {
+ if (res == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鐧昏淇℃伅淇濆瓨鎴愬姛锛�");
+ } else {
+ this.$modal.msgSuccess(res.msg);
+ }
+ this.$modal.closeLoading();
+ });
});
} else {
addDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
- this.$modal.closeLoading();
+ saveDonatecomporgan(this.transplantdata).then(res => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鐧昏淇℃伅淇濆瓨鎴愬姛锛�");
+ } else {
+ this.$modal.msgError(res.msg);
+ }
+ this.$modal.closeLoading();
+ });
+ this.istb = true;
// this.$modal
// .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
// .then(() => {
@@ -3559,8 +3596,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 {
}
@@ -3568,8 +3605,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();
@@ -3579,8 +3615,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({
@@ -3598,7 +3634,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