From 21fe2968337eb8eab97adc88750b71c4057e98f8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 17 七月 2024 15:39:46 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 138 +++++++++++++++++++++++----------------------
1 files changed, 70 insertions(+), 68 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 4857f79..ad38fa3 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>
@@ -2028,6 +2030,7 @@
<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
},
@@ -2906,7 +2910,7 @@
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 =>
@@ -2921,7 +2925,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++) {
@@ -2958,7 +2962,7 @@
if (res.code == 200) {
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 => {
@@ -3181,29 +3185,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) {
@@ -3224,6 +3219,7 @@
coordinatedusernameIndex
].reportName;
}
+
//鍗忚皟鍛�2
let coordinatedusernametIndex = this.coordinatorlist1.findIndex(
item => this.witnessform.coordinateduseridt == item.reportNo
@@ -3242,7 +3238,22 @@
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 => {
@@ -3257,25 +3268,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();
+ //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+ 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) {
@@ -3284,51 +3295,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(() => {
@@ -3586,7 +3588,7 @@
},
// 鏇存敼杩涚▼鏁堥獙
Processvalidation() {
- if (this.form.workflow + 1 == this.actives ) {
+ if (this.form.workflow + 1 == this.actives) {
if (this.form.workflow < 6) {
this.form.workflow++;
} else {
--
Gitblit v1.9.3