From f8a755f1ea3218575198d605795d72e701bdbe28 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 21 三月 2024 11:12:00 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 9285831..a95f530 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -573,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"
>
@@ -1042,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>
@@ -2495,9 +2499,11 @@
},
affirmform: {
infoid: null,
- organdecision: []
+ organdecision: [],
+ kinship: []
},
organdecision: [],
+ kinship: [],
ethicform: {
infoid: null
},
@@ -2840,6 +2846,9 @@
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 = {};
this.affirmform.residenceprovincename = "";
@@ -2849,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)
@@ -2904,7 +2905,7 @@
this.procureddata.infoid = this.infoid;
} else {
this.procureddata = this.allocateddata.filter(
- obj => obj.organname !== "宸﹁倽" && obj.organname !== "鍙宠倽"
+ obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�"
);
this.procureddata.infoid = this.infoid;
}
@@ -3087,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) {
@@ -3098,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();
@@ -3843,7 +3848,7 @@
"sys_0_1",
"sys_patientstate",
"sys_DonationCategory",
- "sys_Kinship",
+ "sys_kinship",
"sys_Infectious",
"sys_bloodtype_rhd",
"sys_InfoSources",
@@ -3855,7 +3860,8 @@
"sys_CoreAssessConclusion",
"sys_BaseAssessConclusion",
"sys_EthicalReview",
- "materials_DBD"
+ "materials_DBD",
+ "sys_kinshipConfirm"
]
};
</script>
--
Gitblit v1.9.3