From 77662163869f698c3aee33ebabe6110c96709f8d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 20 三月 2024 17:57:54 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 220 ++++++++++++++++++++++++++-----------------------------
1 files changed, 104 insertions(+), 116 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 2fe2221..a95f530 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -6,20 +6,17 @@
<div>
<el-steps direction="vertical" :active="workflow">
<el-step title="娼滃湪鎹愮尞" icon="el-icon-user">
- <template
- slot="description"
- v-if="Processdata.donatebaseinfo.createtime"
- >
+ <template slot="description" v-if="donatebaseinfo.createtime">
<p>
鎻愪氦锛�<span
- >{{ Processdata.donatebaseinfo.createperson }}
- {{ parseTime(Processdata.donatebaseinfo.createtime) }}</span
+ >{{ donatebaseinfo.createperson }}
+ {{ parseTime(donatebaseinfo.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span
- >{{ Processdata.donatebaseinfo.updateperson }}
- {{ parseTime(Processdata.donatebaseinfo.updatetime) }}</span
+ >{{ donatebaseinfo.updateperson }}
+ {{ parseTime(donatebaseinfo.updatetime) }}</span
>
</p>
</template>
@@ -29,24 +26,17 @@
icon="el-icon-edit-outline"
description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
>
- <template
- slot="description"
- v-if="Processdata.medicalevaluation.createtime"
- >
+ <template slot="description" v-if="medicalevaluation.createtime">
<p>
鎻愪氦锛�<span>
- {{ Processdata.medicalevaluation.createperson }}
- {{
- parseTime(Processdata.medicalevaluation.createtime)
- }}</span
+ {{ medicalevaluation.createperson }}
+ {{ parseTime(medicalevaluation.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.medicalevaluation.updateperson }}
- {{
- parseTime(Processdata.medicalevaluation.updatetime)
- }}</span
+ {{ medicalevaluation.updateperson }}
+ {{ parseTime(medicalevaluation.updatetime) }}</span
>
</p>
</template>
@@ -58,22 +48,18 @@
>
<template
slot="description"
- v-if="Processdata.relativesconfirmation.createtime"
+ v-if="relativesconfirmation.createtime"
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.relativesconfirmation.createperson }}
- {{
- parseTime(Processdata.relativesconfirmation.createtime)
- }}</span
+ {{ relativesconfirmation.createperson }}
+ {{ parseTime(relativesconfirmation.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.relativesconfirmation.updateperson }}
- {{
- parseTime(Processdata.relativesconfirmation.updatetime)
- }}</span
+ {{ relativesconfirmation.updateperson }}
+ {{ parseTime(relativesconfirmation.updatetime) }}</span
>
</p>
</template>
@@ -83,24 +69,17 @@
description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
icon="el-icon-s-order"
>
- <template
- slot="description"
- v-if="Processdata.donateflowcharts.createtime"
- >
+ <template slot="description" v-if="donateflowcharts.createtime">
<p>
鎻愪氦锛�<span>
- {{ Processdata.donateflowcharts.createperson }}
- {{
- parseTime(Processdata.donateflowcharts.createtime)
- }}</span
+ {{ donateflowcharts.createperson }}
+ {{ parseTime(donateflowcharts.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donateflowcharts.updateperson }}
- {{
- parseTime(Processdata.donateflowcharts.updatetime)
- }}</span
+ {{ donateflowcharts.updateperson }}
+ {{ parseTime(donateflowcharts.updatetime) }}</span
>
</p>
</template>
@@ -112,22 +91,18 @@
>
<template
slot="description"
- v-if="Processdata.donateorgansService.createtime"
+ v-if="donateorgansService.createtime"
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.donateorgansService.createperson }}
- {{
- parseTime(Processdata.donateorgansService.createtime)
- }}</span
+ {{ donateorgansService.createperson }}
+ {{ parseTime(donateorgansService.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donateorgansService.updateperson }}
- {{
- parseTime(Processdata.donateorgansService.updatetime)
- }}</span
+ {{ donateorgansService.updateperson }}
+ {{ parseTime(donateorgansService.updatetime) }}</span
>
</p>
</template>
@@ -137,24 +112,17 @@
description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
icon="el-icon-s-management"
>
- <template
- slot="description"
- v-if="Processdata.donationwitness.createtime"
- >
+ <template slot="description" v-if="donationwitness.createtime">
<p>
鎻愪氦锛�<span>
- {{ Processdata.donationwitness.createperson }}
- {{
- parseTime(Processdata.donationwitness.createtime)
- }}</span
+ {{ donationwitness.createperson }}
+ {{ parseTime(donationwitness.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donationwitness.updateperson }}
- {{
- parseTime(Processdata.donationwitness.updatetime)
- }}</span
+ {{ donationwitness.updateperson }}
+ {{ parseTime(donationwitness.updatetime) }}</span
>
</p>
</template>
@@ -166,22 +134,18 @@
>
<template
slot="description"
- v-if="Processdata.donatecompletioninfo.createtime"
+ v-if="donatecompletioninfo.createtime"
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.donatecompletioninfo.createperson }}
- {{
- parseTime(Processdata.donatecompletioninfo.createtime)
- }}</span
+ {{ donatecompletioninfo.createperson }}
+ {{ parseTime(donatecompletioninfo.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donatecompletioninfo.updateperson }}
- {{
- parseTime(Processdata.donatecompletioninfo.updatetime)
- }}</span
+ {{ donatecompletioninfo.updateperson }}
+ {{ 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>
@@ -2531,9 +2499,11 @@
},
affirmform: {
infoid: null,
- organdecision: []
+ organdecision: [],
+ kinship: []
},
organdecision: [],
+ kinship: [],
ethicform: {
infoid: null
},
@@ -2611,7 +2581,13 @@
showTerminationBtn: 0, //缁堟鐘舵�� 0-鏈粓姝� 1-宸茬粓姝�
// 娴佺▼鏁版嵁锛歞onatebaseinfo[createtime,updatetime]銆乵edicalevaluation銆乺elativesconfirmation銆乨onateflowcharts銆乨onateorgansService銆乨onationwitness銆乨onatecompletioninfo
Processdata: {},
-
+ donatebaseinfo: {},
+ medicalevaluation: {},
+ relativesconfirmation: {},
+ donateflowcharts: {},
+ donateorgansService: {},
+ donationwitness: {},
+ donatecompletioninfo: {},
//鐪佸競鍖洪粯璁ゅ�艰缃紝鍙负绌�
searchAddress: {
sheng: "",
@@ -2799,7 +2775,18 @@
Getbasicinformation() {
// 宸︿晶娴佺▼鏁版嵁
getDonatebaseinfoflow(this.infoid).then(res => {
- this.Processdata = res.data;
+ 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("渚ц竟鏍忎俊鎭幏鍙栧け璐�");
+ }
});
// 琛ㄥ崟鏁版嵁
@@ -2840,9 +2827,7 @@
};
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];
@@ -2854,14 +2839,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 = {};
@@ -2872,14 +2858,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)
@@ -2888,9 +2866,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) {
@@ -2899,7 +2875,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]) {
@@ -2917,19 +2893,20 @@
// );
}
});
- } else if (this.actives == 5 && !this.witnessform.infoid) {
+ } else if (this.actives == 5 && !this.witnessform.id) {
// 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
- if (this.witnessform.infoid) {
+ if (this.witnessform.id) {
return;
}
-
listDonationwitnessorgan(searchParam).then(res => {
if (res.code == 200) {
if (res.rows[0]) {
this.procureddata = res.rows;
this.procureddata.infoid = this.infoid;
} else {
- this.procureddata = this.allocateddata;
+ this.procureddata = this.allocateddata.filter(
+ obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�"
+ );
this.procureddata.infoid = this.infoid;
}
this.organList.organprocured = [];
@@ -2958,7 +2935,7 @@
});
} else if (this.actives == 6) {
this.activetele = "瀹屾垚鐧昏";
- if (this.accomplishform.infoid) {
+ if (this.accomplishform.id) {
return;
}
@@ -3111,6 +3088,7 @@
} 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) {
if (this.affirmform.id != null) {
@@ -3122,6 +3100,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();
@@ -3251,6 +3232,7 @@
console.log(objfn, "sass");
updateDonorchargeorgan(objfn).then(res1 => {});
} else {
+ item.id = null;
addDonorchargeorgan(item).then(res2 => {});
}
});
@@ -3275,15 +3257,15 @@
addDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
this.$modal.closeLoading();
- this.$modal
- .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
- .then(() => {
- this.$router.push({
- path: "/finance/donorchargedetail/",
- query: { id: 0, operation: "add", data: this.form }
- });
- })
- .catch(() => {});
+ // this.$modal
+ // .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
+ // .then(() => {
+ // this.$router.push({
+ // path: "/finance/donorchargedetail/",
+ // query: { gxinzt: true, operation: "add", data: this.form, }
+ // });
+ // })
+ // .catch(() => {});
});
}
@@ -3512,7 +3494,7 @@
infoid: this.infoid,
donorno: this.form.donorno,
organstate: 1,
- transplantstate:1,
+ transplantstate: 1
});
}
} else {
@@ -3543,7 +3525,7 @@
this.submitForm();
Modifydonationattachment(this.donatelist).then(res => {});
this.listDonateannex();
- this.GetAttacheddata();
+ // this.GetAttacheddata();
} else {
this.submitForm();
// this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
@@ -3555,6 +3537,11 @@
if (this.form.workflow == 9) {
this.form.workflow = 8;
this.submitForm();
+ this.$router.go(-1);
+ this.$message({
+ type: "success",
+ message: "鎾ら攢鎴愬姛!"
+ });
} else {
this.$confirm("鍗冲皢杩涜妗堜緥褰掓。, 纭鎵�鏈夋暟鎹凡淇濆瓨?", "鎻愮ず", {
confirmButtonText: "纭畾",
@@ -3861,7 +3848,7 @@
"sys_0_1",
"sys_patientstate",
"sys_DonationCategory",
- "sys_Kinship",
+ "sys_kinship",
"sys_Infectious",
"sys_bloodtype_rhd",
"sys_InfoSources",
@@ -3873,7 +3860,8 @@
"sys_CoreAssessConclusion",
"sys_BaseAssessConclusion",
"sys_EthicalReview",
- "materials_DBD"
+ "materials_DBD",
+ "sys_kinshipConfirm"
]
};
</script>
--
Gitblit v1.9.3