From 6b25c4004057242d40568a06036643792b66b987 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 25 三月 2024 14:38:20 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 9285831..af7326d 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
},
@@ -2819,6 +2825,7 @@
let searchParam = {
infoid: this.infoid
};
+ console.log(this.procureddata, "procureddata");
if (this.actives == 1) {
this.activetele = "鍖诲璇勪及";
@@ -2840,6 +2847,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 +2859,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)
@@ -2892,7 +2894,11 @@
// );
}
});
- } else if (this.actives == 5 && !this.witnessform.id) {
+ } else if (
+ this.actives == 5 &&
+ !this.witnessform.id &&
+ !this.procureddata[0]
+ ) {
// 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
if (this.witnessform.id) {
return;
@@ -2904,7 +2910,11 @@
this.procureddata.infoid = this.infoid;
} else {
this.procureddata = this.allocateddata.filter(
- obj => obj.organname !== "宸﹁倽" && obj.organname !== "鍙宠倽"
+ obj =>
+ obj.organname !== "宸﹀崐鑲�" &&
+ obj.organname !== "鍙冲崐鑲�" &&
+ obj.organname !== "宸﹁倽" &&
+ obj.organname !== "鍙宠倽"
);
this.procureddata.infoid = this.infoid;
}
@@ -3065,11 +3075,11 @@
// 淇濆瓨浜岀骇琛ㄦ寜閽�
Savethedetails() {
console.log(this.actives);
- this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.actives == 1) {
this.medicineform.infoid = this.infoid;
this.$refs["medicineform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.medicineform.id != null) {
updateMedicalevaluation(this.medicineform).then(response => {
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
@@ -3087,8 +3097,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("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.affirmform.id != null) {
this.affirmform.residenceprovincename = this.defultAddresss.sheng;
this.affirmform.residencecityname = this.defultAddresss.shi;
@@ -3098,6 +3110,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();
@@ -3110,6 +3125,7 @@
this.ethicform.infoid = this.infoid;
this.$refs["ethicform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.ethicform.id != null) {
// updateDonateflowchart(this.ethicform).then(response => {
updateEthicalreviewopinions(this.ethicform).then(res => {
@@ -3129,6 +3145,8 @@
} else if (this.actives == 4) {
this.procureddata.infoid = this.infoid;
this.$refs["allocateddataform"].validate(valid => {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
/**
let rows = [];
this.allocateddata.map(item => {
@@ -3179,6 +3197,8 @@
}
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
if (this.witnessform.id != null) {
updateDonationwitness(this.witnessform).then(response => {
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
@@ -3207,6 +3227,8 @@
this.accomplishform.infoid = this.infoid;
this.$refs["accomplishform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
// 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
this.transplantdata.infoid = this.infoid;
console.log(this.form);
@@ -3843,7 +3865,7 @@
"sys_0_1",
"sys_patientstate",
"sys_DonationCategory",
- "sys_Kinship",
+ "sys_kinship",
"sys_Infectious",
"sys_bloodtype_rhd",
"sys_InfoSources",
@@ -3855,7 +3877,8 @@
"sys_CoreAssessConclusion",
"sys_BaseAssessConclusion",
"sys_EthicalReview",
- "materials_DBD"
+ "materials_DBD",
+ "sys_kinshipConfirm"
]
};
</script>
--
Gitblit v1.9.3