From 0b5a704e49545b4059b9eebe247adea8ec14911f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 05 六月 2025 11:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/donationdetails/index.vue | 190 ++++++++++++++++++++++++++--------------------
1 files changed, 107 insertions(+), 83 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 200960f..6d1dd35 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -1324,7 +1324,7 @@
prop="organno"
/>
<el-table-column
- label="绯荤粺缂栧彿"
+ label="鍒嗛厤绯荤粺缂栧彿"
align="center"
width="120"
prop="caseno"
@@ -1332,12 +1332,12 @@
<template slot-scope="scope">
<el-input
v-model="scope.row.caseno"
- placeholder="绯荤粺缂栧彿"
+ placeholder="鍒嗛厤绯荤粺缂栧彿"
/>
</template>
</el-table-column>
<el-table-column
- label="鎺ユ敹鏃堕棿"
+ label="鍒嗛厤鎺ユ敹鏃堕棿"
align="center"
width="200"
prop="applicanttime"
@@ -1350,7 +1350,7 @@
v-model="scope.row.applicanttime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎺ユ敹鏃堕棿"
+ placeholder="閫夋嫨鍒嗛厤鎺ユ敹鏃堕棿"
>
</el-date-picker>
</template>
@@ -1379,6 +1379,7 @@
<org-selecter
ref="tranHosSelect"
:org-type="'4'"
+ :dataList="dataList"
v-model="scope.row.transplanthospitalno"
/>
</div>
@@ -1788,6 +1789,7 @@
<org-selecter
ref="tranHosSelect"
:org-type="'4'"
+ :dataList="dataList"
v-model="scope.row.gainhospitalno"
/>
</div>
@@ -2022,12 +2024,13 @@
align="center"
width="220"
prop="hospitalno"
- v-if="actives == 6"
+
>
<template slot-scope="scope">
<org-selecter
ref="tranHosSelect"
:org-type="'4'"
+ :dataList="dataList"
v-model="scope.row.hospitalno"
style="width: 100%"
/>
@@ -2496,6 +2499,7 @@
type: "success"
}
],
+ dataList: [],
medicineform: {
infoid: null
},
@@ -2752,6 +2756,7 @@
created() {
this.Getnetworkheader();
+ this.getdataList();
this.infoid = this.$route.query.id;
},
mounted() {
@@ -2791,6 +2796,7 @@
}
});
+
// 琛ㄥ崟鏁版嵁
getDonatebaseinfo(this.infoid).then(response => {
this.form = response.data;
@@ -2799,10 +2805,14 @@
} else {
this.showTerminationBtn = 0;
}
+
+
this.actives = response.data.workflow;
this.workflow = response.data.workflow;
response.data.sex = parseInt(response.data.sex);
this.form.id = response.data.id;
+
+
this.form.diseasetype = this.form.diseasetype.split(",");
this.form.infectious = this.form.infectious.split(",");
this.form.selfwill = this.form.selfwill.split(",");
@@ -2810,6 +2820,8 @@
this.form.infosources = this.form.infosources.split(",");
this.form.kinship = this.form.kinship.split(",");
this.form.patientstate = this.form.patientstate.split(",");
+
+
this.open = true;
this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
this.registerAddresss.sheng = response.data.registerprovincename;
@@ -2818,6 +2830,8 @@
this.residenceAddresss.shi = response.data.residencecityname;
this.residenceAddresss.qu = response.data.residencetownname;
this.registerAddresss.qu = response.data.registertownname;
+
+
// 鑾峰彇浜岀骇琛�
this.GetAttacheddata();
});
@@ -2906,12 +2920,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 +2935,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,12 +2967,15 @@
if (this.transplantdata[0] && !this.istb) {
return;
}
+ console.log("瀹屾垚鐧昏鍔犺浇鏁版嵁...");
listDonatecomporgan(searchParam).then(res => {
- if (res.code == 200) {
+ if (res.code == 200) {
+ console.log("listDonatecomporgan 鏁版嵁锛�", res.rows);
+
if (res.rows[0]) {
this.transplantdata = res.rows;
- this.transplantdata.infoid = this.infoid;
+ // this.transplantdata.infoid = this.infoid;
} else {
this.transplantdata = this.allocateddata;
this.transplantdata = this.transplantdata.map(obj => {
@@ -2986,7 +3005,9 @@
// 鑾峰彇瀹屾垚鐧昏淇℃伅
listDonatecompletioninfo(searchParam).then(response => {
- if (response.code == 200 && response.rows.length) {
+ if (response.code == 200 && response.rows.length) {
+ console.log("listDonatecompletioninfo 鏁版嵁锛�", response.rows[0]);
+
this.accomplishform = response.rows[0];
this.accomplishform.infoid = this.infoid;
} else {
@@ -2999,9 +3020,9 @@
if (!this.allocateddata[0]) {
listDonateorgan(searchParam).then(res => {
if (res.code == 200) {
+ console.log("listDonateorgan 鏁版嵁锛�", res.rows);
if (res.rows[0]) {
this.allocateddata = res.rows;
- console.log("this.allocateddata", this.allocateddata);
this.allocateddataform.allocateddata = this.allocateddata;
}
this.organList.organallocated = [];
@@ -3082,7 +3103,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 +3115,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,29 +3200,20 @@
}
});
} else if (this.actives == 4) {
- this.procureddata.infoid = this.infoid;
+ // this.procureddata.infoid = this.infoid;
this.$refs["allocateddataform"].validate(valid => {
this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
- /**
- let rows = [];
- this.allocateddata.map(item => {
- if (item.id) {
- item.applicanttime = formatDate(item.applicanttime);
- updateDonateorgan(item).then(response => { });
- } else {
- item.infoid=this.infoid;
- rows.push(item);
- }
- });
- if (rows.length) {
- addOrganallocation(rows).then(res => {
- this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞淇℃伅鏂板鎴愬姛");
- });
- }
- */
this.allocateddata.map(item => {
item.applicanttime = formatDate(item.applicanttime);
+ });
+ this.allocateddata.forEach(item => {
+ const objs = this.dataList.find(
+ obj => obj.organizationid == item.transplanthospitalno
+ );
+ if (objs) {
+ item.transplanthospitalname = objs.organizationname;
+ }
});
saveDonateorgan(this.allocateddata).then(res => {
if (res.code == 200) {
@@ -3218,6 +3234,7 @@
coordinatedusernameIndex
].reportName;
}
+
//鍗忚皟鍛�2
let coordinatedusernametIndex = this.coordinatorlist1.findIndex(
item => this.witnessform.coordinateduseridt == item.reportNo
@@ -3236,12 +3253,26 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
this.form.donationcategory = this.witnessform.donationcategory;
this.Processvalidation();
- this.$modal.closeLoading();
+
+ this.procureddata.forEach(item => {
+ const objs = this.dataList.find(
+ obj => obj.organizationid == item.gainhospitalno
+ );
+ if (objs) {
+ item.gainhospitalname = objs.organizationname;
+ }
+ });
+ //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+ saveDonationwitnessorgan(this.procureddata).then(res => {
+ if (res == 200) {
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+ }
+ this.$modal.closeLoading();
+ });
});
} else {
addDonationwitness(this.witnessform).then(response => {
if (response.code === 200) {
-
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
this.form.donationcategory = this.witnessform.donationcategory;
let data = JSON.parse(JSON.stringify(this.form));
@@ -3252,26 +3283,25 @@
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{
+ //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+ 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) {
@@ -3280,51 +3310,42 @@
if (valid) {
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");
- 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 => {});
- }
- });
+ item.donorname = this.form.name;
});
- saveDonatecomporgan(this.transplantdata).then(res => {
- if (res == 200) {
- this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
- } else {
- this.$modal.msgSuccess(res.msg);
- return;
+ this.transplantdata.forEach(item => {
+ const objs = this.dataList.find(
+ obj => obj.organizationid == item.hospitalno
+ );
+ if (objs) {
+ item.hospitalname = objs.organizationname;
}
});
-
- 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("瀹屾垚鐧昏鎴愬姛");
+ 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.closeLoading();
// this.$modal
// .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
// .then(() => {
@@ -3354,6 +3375,10 @@
this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
}
// }
+ },
+ // 鑾峰彇閮ㄩ棬鏁版嵁缂撳瓨
+ getdataList() {
+ this.$store.dispatch("getdataList").then(() => {});
},
// 鍣ㄥ畼鍒嗛厤鏍忕洰鎺у埗
changeorganState(value) {
@@ -3582,8 +3607,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 {
}
@@ -3591,8 +3616,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();
@@ -3602,8 +3626,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({
@@ -3621,7 +3645,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