From 18342786629417972a8c6468ef83450b88dae4f8 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 22 四月 2024 15:01:59 +0800 Subject: [PATCH] 11 --- src/views/project/donationdetails/index.vue | 418 +++++++++++++++++++++++++++++++++-------------------------- 1 files changed, 235 insertions(+), 183 deletions(-) diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue index 1ce9e1c..06225b6 100644 --- a/src/views/project/donationdetails/index.vue +++ b/src/views/project/donationdetails/index.vue @@ -6,10 +6,7 @@ <div> <el-steps direction="vertical" :active="workflow"> <el-step title="娼滃湪鎹愮尞" icon="el-icon-user"> - <template - slot="description" - v-if="donatebaseinfo.createtime" - > + <template slot="description" v-if="donatebaseinfo.createtime"> <p> 鎻愪氦锛�<span >{{ donatebaseinfo.createperson }} @@ -29,24 +26,17 @@ icon="el-icon-edit-outline" description="璇峰厛瀹屾垚鍓嶉儴姝ラ" > - <template - slot="description" - v-if="medicalevaluation.createtime" - > + <template slot="description" v-if="medicalevaluation.createtime"> <p> 鎻愪氦锛�<span> {{ medicalevaluation.createperson }} - {{ - parseTime(medicalevaluation.createtime) - }}</span + {{ parseTime(medicalevaluation.createtime) }}</span > </p> <p> 鏇存柊锛�<span> {{ medicalevaluation.updateperson }} - {{ - parseTime(medicalevaluation.updatetime) - }}</span + {{ parseTime(medicalevaluation.updatetime) }}</span > </p> </template> @@ -63,17 +53,13 @@ <p> 鎻愪氦锛�<span> {{ relativesconfirmation.createperson }} - {{ - parseTime(relativesconfirmation.createtime) - }}</span + {{ parseTime(relativesconfirmation.createtime) }}</span > </p> <p> 鏇存柊锛�<span> {{ relativesconfirmation.updateperson }} - {{ - parseTime(relativesconfirmation.updatetime) - }}</span + {{ parseTime(relativesconfirmation.updatetime) }}</span > </p> </template> @@ -83,24 +69,17 @@ description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-s-order" > - <template - slot="description" - v-if="donateflowcharts.createtime" - > + <template slot="description" v-if="donateflowcharts.createtime"> <p> 鎻愪氦锛�<span> {{ donateflowcharts.createperson }} - {{ - parseTime(donateflowcharts.createtime) - }}</span + {{ parseTime(donateflowcharts.createtime) }}</span > </p> <p> 鏇存柊锛�<span> {{ donateflowcharts.updateperson }} - {{ - parseTime(donateflowcharts.updatetime) - }}</span + {{ parseTime(donateflowcharts.updatetime) }}</span > </p> </template> @@ -117,17 +96,13 @@ <p> 鎻愪氦锛�<span> {{ donateorgansService.createperson }} - {{ - parseTime(donateorgansService.createtime) - }}</span + {{ parseTime(donateorgansService.createtime) }}</span > </p> <p> 鏇存柊锛�<span> {{ donateorgansService.updateperson }} - {{ - parseTime(donateorgansService.updatetime) - }}</span + {{ parseTime(donateorgansService.updatetime) }}</span > </p> </template> @@ -137,24 +112,17 @@ description="璇峰厛瀹屾垚鍓嶉儴姝ラ" icon="el-icon-s-management" > - <template - slot="description" - v-if="donationwitness.createtime" - > + <template slot="description" v-if="donationwitness.createtime"> <p> 鎻愪氦锛�<span> {{ donationwitness.createperson }} - {{ - parseTime(donationwitness.createtime) - }}</span + {{ parseTime(donationwitness.createtime) }}</span > </p> <p> 鏇存柊锛�<span> {{ donationwitness.updateperson }} - {{ - parseTime(donationwitness.updatetime) - }}</span + {{ parseTime(donationwitness.updatetime) }}</span > </p> </template> @@ -171,17 +139,13 @@ <p> 鎻愪氦锛�<span> {{ donatecompletioninfo.createperson }} - {{ - parseTime(donatecompletioninfo.createtime) - }}</span + {{ parseTime(donatecompletioninfo.createtime) }}</span > </p> <p> 鏇存柊锛�<span> {{ donatecompletioninfo.updateperson }} - {{ - parseTime(donatecompletioninfo.updatetime) - }}</span + {{ parseTime(donatecompletioninfo.updatetime) }}</span > </p> </template> @@ -609,7 +573,7 @@ > <el-checkbox-group v-model="form.kinship"> <el-checkbox - v-for="dict in dict.type.sys_Kinship" + v-for="dict in dict.type.sys_kinship" :key="dict.value" :label="dict.value" > @@ -1078,13 +1042,17 @@ <el-row> <el-col :span="12"> <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign"> - <el-checkbox-group v-model="organdecision"> + <el-checkbox-group v-model="kinship"> <el-checkbox - v-for="item in kinshiplist" - :key="item" - :label="item" + v-for="item in dict.type.sys_kinshipConfirm" + :label="item.value" + :value="item.value" > - {{ item == "瀛愬コ" ? item + "(浜�)" : item }} + {{ + item.label == "鎴愬勾瀛愬コ" + ? item.label + "(浜�)" + : item.label + }} </el-checkbox> </el-checkbox-group> </el-form-item> @@ -2433,7 +2401,8 @@ addDonatebaseinfo, updateDonatebaseinfo, getDonatebaseinfoflow, - fileCase + fileCase, + getDonationNumber } from "@/api/project/donatebaseinfo"; import { listMedicalevaluation, @@ -2517,6 +2486,7 @@ infoid: 736, drawer: false, form: {}, + istb: false, activeName: "", tableDatafile: [ { @@ -2531,9 +2501,11 @@ }, affirmform: { infoid: null, - organdecision: [] + organdecision: [], + kinship: [] }, organdecision: [], + kinship: [], ethicform: { infoid: null }, @@ -2611,13 +2583,13 @@ showTerminationBtn: 0, //缁堟鐘舵�� 0-鏈粓姝� 1-宸茬粓姝� // 娴佺▼鏁版嵁锛歞onatebaseinfo[createtime,updatetime]銆乵edicalevaluation銆乺elativesconfirmation銆乨onateflowcharts銆乨onateorgansService銆乨onationwitness銆乨onatecompletioninfo Processdata: {}, - donatebaseinfo:{}, - medicalevaluation:{}, - relativesconfirmation:{}, - donateflowcharts:{}, - donateorgansService:{}, - donationwitness:{}, - donatecompletioninfo:{}, + donatebaseinfo: {}, + medicalevaluation: {}, + relativesconfirmation: {}, + donateflowcharts: {}, + donateorgansService: {}, + donationwitness: {}, + donatecompletioninfo: {}, //鐪佸競鍖洪粯璁ゅ�艰缃紝鍙负绌� searchAddress: { sheng: "", @@ -2805,17 +2777,17 @@ Getbasicinformation() { // 宸︿晶娴佺▼鏁版嵁 getDonatebaseinfoflow(this.infoid).then(res => { - if (res.code==200) { + if (res.code == 200) { this.Processdata = res.data; - this.donatebaseinfo=this.Processdata.donatebaseinfo; - this.medicalevaluation=this.Processdata.medicalevaluation; - this.relativesconfirmation=this.Processdata.relativesconfirmation; - this.donateflowcharts=this.Processdata.donateflowcharts; - this.donateorgansService=this.Processdata.donateorgansService; - this.donationwitness=this.Processdata.donationwitness; - this.donatecompletioninfo=this.Processdata.donatecompletioninfo; - }else{ - this.$message.error('渚ц竟鏍忎俊鎭幏鍙栧け璐�'); + this.donatebaseinfo = this.Processdata.donatebaseinfo; + this.medicalevaluation = this.Processdata.medicalevaluation; + this.relativesconfirmation = this.Processdata.relativesconfirmation; + this.donateflowcharts = this.Processdata.donateflowcharts; + this.donateorgansService = this.Processdata.donateorgansService; + this.donationwitness = this.Processdata.donationwitness; + this.donatecompletioninfo = this.Processdata.donatecompletioninfo; + } else { + this.$message.error("渚ц竟鏍忎俊鎭幏鍙栧け璐�"); } }); @@ -2855,11 +2827,10 @@ let searchParam = { infoid: this.infoid }; + console.log(this.procureddata, "procureddata"); if (this.actives == 1) { this.activetele = "鍖诲璇勪及"; - if (this.medicineform.infoid) { - return; - } + listMedicalevaluation(searchParam).then(response => { if (response.code == 200 && response.rows[0]) { this.medicineform = response.rows[0]; @@ -2871,14 +2842,15 @@ }); } else if (this.actives == 2) { this.activetele = "鎹愮尞纭"; - if (this.affirmform.infoid) { - return; - } + listRelativesconfirmation(searchParam).then(response => { if (response.code == 200 && response.rows[0]) { this.affirmform = response.rows[0]; if (this.affirmform.organdecision) { this.organdecision = this.affirmform.organdecision.split(","); + } + if (this.affirmform.kinship) { + this.kinship = this.affirmform.kinship.split(","); } if (!this.affirmform) { this.affirmform = {}; @@ -2889,14 +2861,6 @@ this.defultAddresss.sheng = this.affirmform.residenceprovincename; this.defultAddresss.shi = this.affirmform.residencecityname; this.defultAddresss.qu = this.affirmform.residencetownname; - // if (this.affirmform.kinship) { - // this.affirmform.kinship = this.affirmform.kinship.split(","); - // } - // if (this.affirmform.organdecision) { - // this.affirmform.organdecision = this.affirmform.organdecision.split( - // "," - // ); - // } } else { // this.$modal.msgError( // "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response) @@ -2905,9 +2869,7 @@ }); } else if (this.actives == 3) { this.activetele = "浼︾悊瀹℃煡"; - if (this.ethicform.infoid) { - return; - } + //listDonateflowchart(searchParam).then(response => { listEthicalreviewopinions(searchParam).then(response => { if (response.code == 200 && response.rows.length) { @@ -2916,7 +2878,7 @@ console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖"); } }); - } else if (this.actives == 4 && !this.allocateddata[0]) { + } else if (this.actives == 4) { listDonateorgan(searchParam).then(res => { if (res.code == 200) { if (res.rows[0]) { @@ -2934,9 +2896,9 @@ // ); } }); - } else if (this.actives == 5 && !this.witnessform.infoid) { + } else if (this.actives == 5) { // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅 - if (this.witnessform.infoid) { + if (this.procureddata[0] && !this.istb) { return; } @@ -2944,10 +2906,22 @@ 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 !== '鍙宠倽');; - this.procureddata.infoid = this.infoid; + this.procureddata = this.allocateddata.filter( + obj => + obj.organname !== "宸﹀崐鑲�" && + obj.organname !== "鍙冲崐鑲�" && + obj.organname !== "宸﹀鍙�" && + obj.organname !== "鍙充笁鍙�" && + obj.organname !== "宸﹁倽" && + obj.organname !== "鍙宠倽" + ); + this.procureddata = this.procureddata.map(obj => { + obj.id = null; + return obj; + }); + // this.procureddata.infoid = this.infoid; } this.organList.organprocured = []; for (let i = 0; i < this.procureddata.length; i++) { @@ -2966,6 +2940,7 @@ if (response.data) { this.witnessform = response.data; this.witnessform.infoid = this.infoid; + this.istb = false; } } else { // this.$modal.msgError( @@ -2975,32 +2950,42 @@ }); } else if (this.actives == 6) { this.activetele = "瀹屾垚鐧昏"; - if (this.accomplishform.infoid) { + if (this.transplantdata[0] && !this.istb) { return; } - if (!this.organList.organtransplant[0]) { - 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.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) { @@ -3013,6 +2998,22 @@ } else if (this.actives == 0) { this.activetele = "娼滃湪鎹愮尞"; } + if (!this.allocateddata[0]) { + listDonateorgan(searchParam).then(res => { + if (res.code == 200) { + if (res.rows[0]) { + this.allocateddata = res.rows; + console.log("this.allocateddata", this.allocateddata); + this.allocateddataform.allocateddata = this.allocateddata; + } + this.organList.organallocated = []; + for (let i = 0; i < res.rows.length; i++) { + this.organList.organallocated.push(this.allocateddata[i].organno); + } + } else { + } + }); + } }, /** 淇濆瓨涓昏〃鎸夐挳 */ @@ -3023,7 +3024,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(","); @@ -3081,7 +3084,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; @@ -3091,7 +3096,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; @@ -3106,11 +3113,11 @@ // 淇濆瓨浜岀骇琛ㄦ寜閽� Savethedetails() { console.log(this.actives); - this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.actives == 1) { this.medicineform.infoid = this.infoid; this.$refs["medicineform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.medicineform.id != null) { updateMedicalevaluation(this.medicineform).then(response => { this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛"); @@ -3128,8 +3135,10 @@ } else if (this.actives == 2) { this.affirmform.infoid = this.infoid; this.affirmform.organdecision = this.organdecision.join(","); + this.affirmform.kinship = this.kinship.join(","); this.$refs["affirmform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.affirmform.id != null) { this.affirmform.residenceprovincename = this.defultAddresss.sheng; this.affirmform.residencecityname = this.defultAddresss.shi; @@ -3139,6 +3148,9 @@ this.$modal.closeLoading(); }); } else { + this.affirmform.residenceprovincename = this.defultAddresss.sheng; + this.affirmform.residencecityname = this.defultAddresss.shi; + this.affirmform.residencetownname = this.defultAddresss.qu; addRelativesconfirmation(this.affirmform).then(response => { this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛"); this.$modal.closeLoading(); @@ -3151,6 +3163,7 @@ this.ethicform.infoid = this.infoid; this.$refs["ethicform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); if (this.ethicform.id != null) { // updateDonateflowchart(this.ethicform).then(response => { updateEthicalreviewopinions(this.ethicform).then(res => { @@ -3168,8 +3181,10 @@ } }); } else if (this.actives == 4) { - this.procureddata.infoid = this.infoid; + // this.procureddata.infoid = this.infoid; this.$refs["allocateddataform"].validate(valid => { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); + /** let rows = []; this.allocateddata.map(item => { @@ -3220,78 +3235,110 @@ } if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); + if (this.witnessform.id != null) { updateDonationwitness(this.witnessform).then(response => { this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛"); - this.$modal.closeLoading(); + this.form.donationcategory = this.witnessform.donationcategory; + this.Processvalidation(); + //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹� + saveDonationwitnessorgan(this.procureddata).then(res => { + if (res == 200) { + this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�"); + } + this.$modal.closeLoading(); + }); }); } else { addDonationwitness(this.witnessform).then(response => { - this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛"); - this.$modal.closeLoading(); + if (response.code === 200) { + 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.istb = true; + this.Processvalidation(); + }); + //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹� + 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("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�"); - } - }); - - this.form.donationcategory = this.witnessform.donationcategory; - this.Processvalidation(); } }); } else if (this.actives == 6) { this.accomplishform.infoid = this.infoid; this.$refs["accomplishform"].validate(valid => { if (valid) { + this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒"); + // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅 - 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"); + // 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 => {}); + // } + // }); + // }); - 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 { - addDonorchargeorgan(item).then(res2 => {}); - } - }); - }); - saveDonatecomporgan(this.transplantdata).then(res => { - if (res == 200) { - this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�"); - } else { - this.$modal.msgSuccess(res.msg); - return; - } - }); - - 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("瀹屾垚鐧昏鎴愬姛"); - this.$modal.closeLoading(); + 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 // .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�") // .then(() => { @@ -3529,7 +3576,7 @@ infoid: this.infoid, donorno: this.form.donorno, organstate: 1, - transplantstate:1, + transplantstate: 1 }); } } else { @@ -3549,8 +3596,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 { } @@ -3558,8 +3605,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(); @@ -3569,9 +3615,14 @@ }, // 鎻愪氦褰掓。 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({ + type: "success", + message: "鎾ら攢鎴愬姛!" + }); } else { this.$confirm("鍗冲皢杩涜妗堜緥褰掓。, 纭鎵�鏈夋暟鎹凡淇濆瓨?", "鎻愮ず", { confirmButtonText: "纭畾", @@ -3583,7 +3634,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", @@ -3878,7 +3929,7 @@ "sys_0_1", "sys_patientstate", "sys_DonationCategory", - "sys_Kinship", + "sys_kinship", "sys_Infectious", "sys_bloodtype_rhd", "sys_InfoSources", @@ -3890,7 +3941,8 @@ "sys_CoreAssessConclusion", "sys_BaseAssessConclusion", "sys_EthicalReview", - "materials_DBD" + "materials_DBD", + "sys_kinshipConfirm" ] }; </script> -- Gitblit v1.9.3