From 99d1abc8eb607404cb2a8e08e6b1ed779861928c Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 22 四月 2024 10:01:31 +0800 Subject: [PATCH] 11 --- src/views/project/donationdetails/index.vue | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index 4857f79..8af06f5 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -2906,7 +2906,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 +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++) { @@ -3181,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("姝e湪鎻愪氦锛岃绋嶅�欙紒"); @@ -3242,7 +3242,13 @@ this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛"); this.form.donationcategory = this.witnessform.donationcategory; this.Processvalidation(); - this.$modal.closeLoading(); + //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹� + saveDonationwitnessorgan(this.procureddata).then(res => { + if (res == 200) { + this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�"); + } + this.$modal.closeLoading(); + }); }); } else { addDonationwitness(this.witnessform).then(response => { @@ -3257,25 +3263,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) { @@ -3285,7 +3291,7 @@ this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅 - this.transplantdata.infoid = this.infoid; + // this.transplantdata.infoid = this.infoid; console.log(this.form); this.transplantdata.forEach(item => { listDonorchargeorgan({ @@ -3586,7 +3592,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