From f06564ebbd94e8cca0874604217dfd03f60aa245 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 11 七月 2024 14:09:03 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 76 ++++++++++++++++---------------------
src/views/project/components/orgselect/index.vue | 10 ++++-
2 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/src/views/project/components/orgselect/index.vue b/src/views/project/components/orgselect/index.vue
index ad0b8cd..f33b57f 100644
--- a/src/views/project/components/orgselect/index.vue
+++ b/src/views/project/components/orgselect/index.vue
@@ -43,6 +43,13 @@
value: {
type: [String, Array]
},
+ //鑾峰彇鍒楄〃
+ dataList: {
+ type: Array,
+ default: function() {
+ return [];
+ }
+ },
disabled: {
type: Boolean,
default: false
@@ -94,7 +101,7 @@
return {
pageData: { pageNum: 1, pageSize: 100 },
isLoading: false,
- dataList: [],
+ // dataList: [],
tempList: [],
myValue: this.multiple ? [] : "",
focusEvents: {
@@ -122,7 +129,6 @@
methods: {
renderSelecter() {
this.pageData.PageSize = 100;
- this.dataList = [];
this.myValue = this.value;
this.getdataList();
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 18256b8..ad38fa3 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -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
},
@@ -3185,25 +3189,16 @@
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,6 +3238,15 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
this.form.donationcategory = this.witnessform.donationcategory;
this.Processvalidation();
+
+ 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) {
@@ -3290,32 +3295,17 @@
if (valid) {
this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
- // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
- // 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 => {});
- // }
- // });
- // });
- this.transplantdata.forEach(item=>{
- item.donorname=this.form.name
- })
+ this.transplantdata.forEach(item => {
+ item.donorname = this.form.name;
+ });
+ this.transplantdata.forEach(item => {
+ const objs = this.dataList.find(
+ obj => obj.organizationid == item.hospitalno
+ );
+ if (objs) {
+ item.hospitalname = objs.organizationname;
+ }
+ });
// 淇濆瓨纭淇℃伅
if (this.accomplishform.id) {
updateDonatecompletioninfo(this.accomplishform).then(response => {
--
Gitblit v1.9.3