From 8bd4fa8cfbb7f5b83b9d35f4607ba70d745b3577 Mon Sep 17 00:00:00 2001
From: tianqian <277562116@qq.com>
Date: Sat, 6 May 2023 19:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=85=83=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/housemaster/cpts/edit.vue | 50 ++++++++++++---------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/housemaster/cpts/edit.vue b/src/views/modules/housemaster/cpts/edit.vue
index 33646a16f..da8265a74 100644
--- a/src/views/modules/housemaster/cpts/edit.vue
+++ b/src/views/modules/housemaster/cpts/edit.vue
@@ -16,28 +16,29 @@
 						placeholder="请输入"></el-input>
 				</el-form-item>
 				<el-form-item label="类型" prop="type">
-					<el-select class="item_width_2" v-model="fmData.type" placeholder="请选择" filterable clearable>
+					<el-select class="item_width_2" v-model="fmData.type" placeholder="请选择" filterable clearable
+						@change="rule">
 						<el-option v-for="item in typeList" :key="item.value" :label="item.label"
 							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="所属区市" prop="districtId">
-					<el-select class="item_width_2" v-model="fmData.districtId" placeholder="请选择" filterable
-						clearable @change="getstreetList(1)">
+					<el-select class="item_width_2" v-model="fmData.districtId" placeholder="请选择" filterable clearable
+						@change="getstreetList(1)">
 						<el-option v-for="item in districtList" :key="item.id" :label="item.organizationName"
 							:value="item.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="所属镇街" prop="streetId">
-					<el-select class="item_width_2" v-model="fmData.streetId" placeholder="请选择" filterable :disabled="streetList.length==0"
-						clearable @change="getcommunityList(1)">
-						<el-option v-for="item in streetList" :key="item.id" :label="item.organizationName" 
+					<el-select class="item_width_2" v-model="fmData.streetId" placeholder="请选择" filterable
+						:disabled="streetList.length==0" clearable @change="getcommunityList(1)">
+						<el-option v-for="item in streetList" :key="item.id" :label="item.organizationName"
 							:value="item.id"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="所属社区/民居" prop="communityId">
-					<el-select class="item_width_2" v-model="fmData.communityId" placeholder="请选择"  :disabled="communityList.length==0"
-						filterable clearable @change="
+					<el-select class="item_width_2" v-model="fmData.communityId" placeholder="请选择"
+						:disabled="communityList.length==0" filterable clearable @change="
 							getgridList(1);
 							getviliageList(1);
 						">
@@ -46,29 +47,29 @@
 					</el-select>
 				</el-form-item>
 				<el-form-item label="所属网格" prop="gridId">
-					<el-select class="item_width_2" v-model="fmData.gridId" placeholder="请选择" filterable :disabled="gridList.length==0"
-						clearable @change="getviliageList(1)">
+					<el-select class="item_width_2" v-model="fmData.gridId" placeholder="请选择" filterable
+						:disabled="gridList.length==0" clearable @change="getviliageList(1)">
 						<el-option v-for="item in gridList" :key="item.value" :label="item.label"
 							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="所属小区" prop="viliageId">
-					<el-select class="item_width_2" v-model="fmData.viliageId" placeholder="请选择" filterable :disabled="viliageList.length==0"
-						clearable @change="getbuildingList(1)">
+					<el-select class="item_width_2" v-model="fmData.viliageId" placeholder="请选择" filterable
+						:disabled="viliageList.length==0" clearable @change="getbuildingList(1)">
 						<el-option v-for="item in viliageList" :key="item.value" :label="item.label"
 							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="楼栋" prop="buildingId">
-					<el-select class="item_width_2" v-model="fmData.buildingId" placeholder="请选择" filterable :disabled="buildingList.length==0"
-						clearable @change="getunitList(1)">
+					<el-select class="item_width_2" v-model="fmData.buildingId" placeholder="请选择" filterable
+						:disabled="buildingList.length==0" clearable @change="getunitList(1)">
 						<el-option v-for="item in buildingList" :key="item.value" :label="item.label"
 							:value="item.value"></el-option>
 					</el-select>
 				</el-form-item>
 				<el-form-item label="单元" prop="unitId">
-					<el-select class="item_width_2" v-model="fmData.unitId" placeholder="请选择" filterable :disabled="unitList.length==0"
-						clearable>
+					<el-select class="item_width_2" v-model="fmData.unitId" placeholder="请选择" filterable
+						:disabled="unitList.length==0" clearable>
 						<el-option v-for="item in unitList" :key="item.value" :label="item.label"
 							:value="item.value"></el-option>
 					</el-select>
@@ -217,11 +218,7 @@
 						message: '楼栋不能为空',
 						trigger: 'blur'
 					}],
-					unitId: [{
-						required: true,
-						message: '单元不能为空',
-						trigger: 'blur'
-					}],
+					unitId: [],
 				}
 			};
 		},
@@ -232,6 +229,17 @@
 			this.initForm();
 		},
 		methods: {
+			rule() {
+				if (this.fmData.type == "1") {
+					this.dataRule.unitId = [{
+						required: true,
+						message: '单元不能为空',
+						trigger: 'blur'
+					}]
+				}else{
+					this.dataRule.unitId = []
+				}
+			},
 			async initForm() {
 				this.getdistrictList(2);
 				if (this.formType != 'add') {