From c27ea97634aec2b6c8f0e6c535d809f1c809f0d0 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 09 四月 2024 15:07:17 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 84 ++++++++++++++++++++++++-----------------
src/api/project/donatebaseinfo.js | 8 ++++
src/views/project/donatebaseinfo/index.vue | 4 +-
3 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/src/api/project/donatebaseinfo.js b/src/api/project/donatebaseinfo.js
index 61fadb7..5bc8517 100644
--- a/src/api/project/donatebaseinfo.js
+++ b/src/api/project/donatebaseinfo.js
@@ -16,6 +16,14 @@
method: 'get'
})
}
+// 鑾峰彇鎹愮尞缂栧彿
+export function getDonationNumber(data) {
+ return request({
+ url: '/project/donatebaseinfo/donatenumber',
+ method: 'post',
+ data: data
+ })
+}
// 鏌ヨ鎹愮尞宸ヤ綔娴�
export function getDonatebaseinfoflow(id) {
return request({
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 15e7d3b..4c5b069 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -888,8 +888,8 @@
updateDonatebaseinfo,
exportDonatebaseinfo,
downloadbaseinfo,
- getdonatorno
- // exportProvincemessage,
+ getDonationNumber,
+ getdonatorno,
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 3a681b3..0d56879 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,
@@ -2951,38 +2952,38 @@
return;
}
- 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) {
@@ -3021,7 +3022,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(",");
@@ -3231,11 +3234,26 @@
if (this.witnessform.id != null) {
updateDonationwitness(this.witnessform).then(response => {
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
+ this.form.donationcategory = this.witnessform.donationcategory;
+ this.Processvalidation();
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();
});
@@ -3248,9 +3266,6 @@
this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
}
});
-
- //this.form.donationcategory = this.witnessform.donationcategory;
- this.Processvalidation();
}
});
} else if (this.actives == 6) {
@@ -3271,7 +3286,6 @@
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;
--
Gitblit v1.9.3