From 1d1b39eda88e8573060d5fdbc36437882f1b53a9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 18 Mar 2024 20:14:50 +0800
Subject: [PATCH] 人口采集志愿者组织回显问题及必填项值规避

---
 subPackage/house/member/add.vue   |   14 +++++++++++++-
 subPackage/house/member/index.vue |   31 ++++++++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/subPackage/house/member/add.vue b/subPackage/house/member/add.vue
index 639fd51..d5f8ab5 100644
--- a/subPackage/house/member/add.vue
+++ b/subPackage/house/member/add.vue
@@ -126,7 +126,7 @@
 							<u-icon slot="right" name="arrow-right"></u-icon>
 						</u-form-item>
 
-						<u-form-item v-if="volunteerOrg == '其他'" class="form-item" labelWidth="120" label="其他志愿者组织"
+						<u-form-item v-if="volunteerOrg == '其他'" required class="form-item" labelWidth="120" label="其他志愿者组织"
 							prop="volunteerOrg">
 							<u--input border="none" v-model="form.volunteerOrg" placeholder="请输入其他志愿者组织">
 							</u--input>
@@ -410,6 +410,12 @@
 						type: 'string',
 						required: true,
 						message: '请填写姓名',
+						trigger: ['change', 'blur'],
+					},
+					'volunteerOrgTemp': {
+						type: 'string',
+						required: true,
+						message: '请输入其他志愿者组织',
 						trigger: ['change', 'blur'],
 					},
 					// 'idCard': [{
@@ -716,6 +722,7 @@
 
 			//选择志愿者类型
 			confirmVolunteerOrg(e) {
+				this.form.volunteerOrg = ''
 				const [result] = e.value;
 				this.volunteerOrgTypeIndex = e.indexs[0];
 				this.volunteerOrg = result;
@@ -916,6 +923,11 @@
 						}
 					}
 				}
+				//  重新赋值
+				if(this.form.volunteerOrgTemp){
+					this.form.volunteerOrg = this.form.volunteerOrgTemp
+				}
+				
 				const res = await saveOrUpdateHousehold(this.form)
 				if (res.code !== 200) {
 					uni.showToast({
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index 86ee1fb..92fd515 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -115,9 +115,9 @@
 							<u-icon slot="right" name="arrow-right"></u-icon>
 						</u-form-item>
 
-						<u-form-item v-if="volunteerOrg == '其他'" class="form-item" labelWidth="120" label="其他志愿者组织"
-							prop="volunteerOrg">
-							<u--input border="none" v-model="form.volunteerOrg" placeholder="请输入其他志愿者组织">
+						<u-form-item v-if="volunteerOrg == '其他'" required class="form-item" labelWidth="120" label="其他志愿者组织"
+							prop="volunteerOrgTemp">
+							<u--input border="none" v-model="form.volunteerOrgTemp" placeholder="请输入其他志愿者组织">
 							</u--input>
 						</u-form-item>
 
@@ -378,6 +378,12 @@
 						message: '请填写姓名',
 						trigger: ['change', 'blur'],
 					},
+					'volunteerOrgTemp': {
+						type: 'string',
+						required: true,
+						message: '请输入其他志愿者组织',
+						trigger: ['change', 'blur'],
+					},
 					// 'idCard': [{
 					// 		type: 'string',
 					// 		required: false,
@@ -520,6 +526,7 @@
 				volunteerOrgTypeList: ["信州义警", "蓝天救援", "其他"],
 				volunteerOrgTypeIndex: [0],
 				volunteerOrg: "",
+				volunteerOrgTemp:"",
 				showVolunteerOrg: false,
 				houseTag: ""
 			}
@@ -674,6 +681,7 @@
 
 			//选择志愿者类型
 			confirmVolunteerOrg(e) {
+				this.form.volunteerOrgTemp = "";
 				const [result] = e.value;
 				this.volunteerOrgTypeIndex = e.indexs[0];
 				this.volunteerOrg = result;
@@ -774,6 +782,18 @@
 								.nativePlaceCityAdName, data.nativePlaceAdName
 							]
 						}
+						if(data.volunteerOrg){
+							// 信州义警", "蓝天救援", "其他
+							if(data.volunteerOrg !='信州义警' && data.volunteerOrg !='蓝天救援'){
+								this.form.volunteerOrgTemp = data.volunteerOrg;
+								this.form.volunteerOrg = '其他'
+								this.volunteerOrg = '其他'
+							}else{
+								this.form.volunteerOrg = data.volunteerOrg
+								this.volunteerOrg = data.volunteerOrg
+							}
+						}
+						
 						if (data.residentAdName) {
 							this.residentad =
 								`${data.residentProvinceAdName}-${data.residentCityAdName}-${data.residentAdName}`
@@ -873,6 +893,11 @@
 						}
 					}
 				}
+				
+				//  重新赋值
+				if(this.form.volunteerOrgTemp){
+					this.form.volunteerOrg = this.form.volunteerOrgTemp
+				}
 
 				delete this.form.userHouseLabelVOList;
 

--
Gitblit v1.9.3