From 9fd3a74d789b371c10fa50b9f200bdb63a6eac2e Mon Sep 17 00:00:00 2001
From: "LAPTOP-7F135LL2\\jly" <48982819@qq.com>
Date: Mon, 10 Jul 2023 17:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/communityYantai/buildForm.vue        |  862 +--
 .../base/communityYantai/communityForm.vue    | 1164 ++--
 .../modules/base/communityYantai/roomForm.vue |  873 +--
 .../base/organization/organization.vue        | 5794 +++++++++--------
 .../estateManagement/cpts/edit.vue            |  535 +-
 src/views/modules/housemaster/cpts/edit.vue   | 1127 ++--
 6 files changed, 5625 insertions(+), 4730 deletions(-)

diff --git a/src/views/modules/base/communityYantai/buildForm.vue b/src/views/modules/base/communityYantai/buildForm.vue
index 9f56b1241..f3afb717d 100644
--- a/src/views/modules/base/communityYantai/buildForm.vue
+++ b/src/views/modules/base/communityYantai/buildForm.vue
@@ -1,26 +1,51 @@
 <template>
-	<div>
-		<div class="dialog-h-content scroll-h">
-			<el-form ref="ref_form" :inline="true" :model="dataForm" :rules="dataRule" :disabled="formType === 'detail'" class="form">
-				<el-form-item label="所属小区" label-width="150px" style="display: block">
-					<span>{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
-				</el-form-item>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form"
+                     :inline="true"
+                     :model="dataForm"
+                     :rules="dataRule"
+                     :disabled="formType === 'detail'"
+                     class="form">
+                <el-form-item label="所属小区"
+                              label-width="150px"
+                              style="display: block">
+                    <span>{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
+                </el-form-item>
 
-				<el-form-item label="楼栋名称" prop="buildingName" label-width="150px" style="display: block">
-					<el-input class="item_width_1" maxlength="10" placeholder="请输入楼栋名称" v-model="dataForm.buildingName"></el-input>
-				</el-form-item>
-				<el-form-item label="楼栋编码" prop="coding" label-width="150px" style="display: block">
-					<el-input class="item_width_2" maxlength="50" placeholder="请输入楼栋编码" v-model="dataForm.coding"></el-input>
-					<el-button style="margin-left: 10px" type="primary" size="small" @click="handleCode">生成</el-button>
-				</el-form-item>
-				<el-form-item label="楼栋类型" prop="type" label-width="150px" style="display: block">
-					<el-radio-group v-model="buildType">
-						<el-radio :label="'1'">商品房</el-radio>
-						<el-radio :label="'2'">自建房</el-radio>
-						<el-radio :label="'3'">别墅</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<!-- <el-form-item label="排序"
+                <el-form-item label="楼栋名称"
+                              prop="buildingName"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              maxlength="10"
+                              placeholder="请输入楼栋名称"
+                              v-model="dataForm.buildingName"></el-input>
+                </el-form-item>
+                <el-form-item label="楼栋编码"
+                              prop="coding"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_2"
+                              maxlength="50"
+                              placeholder="请输入楼栋编码"
+                              v-model="dataForm.coding"></el-input>
+                    <el-button style="margin-left: 10px"
+                               type="primary"
+                               size="small"
+                               @click="handleCode">生成</el-button>
+                </el-form-item>
+                <el-form-item label="楼栋类型"
+                              prop="type"
+                              label-width="150px"
+                              style="display: block">
+                    <el-radio-group v-model="buildType">
+                        <el-radio :label="'1'">商品房</el-radio>
+                        <el-radio :label="'2'">自建房</el-radio>
+                        <el-radio :label="'3'">别墅</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <!-- <el-form-item label="排序"
                       prop="sort"
                       style="display: block"
                       label-width="150px">
@@ -28,67 +53,122 @@
                            v-model="dataForm.sort"
                            label="排序"></el-input-number>
         </el-form-item> -->
-				<el-form-item label="单元数" style="display: block" prop="totalUnitNum" label-width="150px">
-					<el-input-number class="item_width_4" v-model="dataForm.totalUnitNum" :min="1" :max="9999" label="单元数"></el-input-number>
-				</el-form-item>
-				<el-form-item label="层数" style="display: block" prop="totalFloorNum" label-width="150px">
-					<el-input-number class="item_width_4" v-model="dataForm.totalFloorNum" :min="0" :max="9999" label="层数"></el-input-number>
-				</el-form-item>
-				<el-form-item label="总户数" style="display: block" prop="totalHouseNum" label-width="150px">
-					<el-input-number class="item_width_4" v-model="dataForm.totalHouseNum" :min="0" :max="9999" label="总户数"></el-input-number>
-				</el-form-item>
-				<el-form-item label="人口数" style="display: block" prop="realPerson" label-width="150px">
-					<el-input-number class="item_width_4" v-model="dataForm.realPerson" :min="0" :max="9999" label="人口数"></el-input-number>
-				</el-form-item>
-				<el-form-item label="楼长/单元长姓名" prop="buildingLeaderName" label-width="150px" style="display: block">
-					<el-input class="item_width_1" placeholder="请输入楼长/单元长姓名" v-model="dataForm.buildingLeaderName"></el-input>
-				</el-form-item>
+                <el-form-item label="单元数"
+                              style="display: block"
+                              prop="totalUnitNum"
+                              label-width="150px">
+                    <el-input-number class="item_width_4"
+                                     v-model="dataForm.totalUnitNum"
+                                     :min="1"
+                                     :max="9999"
+                                     label="单元数"></el-input-number>
+                </el-form-item>
+                <el-form-item label="层数"
+                              style="display: block"
+                              prop="totalFloorNum"
+                              label-width="150px">
+                    <el-input-number class="item_width_4"
+                                     v-model="dataForm.totalFloorNum"
+                                     :min="0"
+                                     :max="9999"
+                                     label="层数"></el-input-number>
+                </el-form-item>
+                <el-form-item label="总户数"
+                              style="display: block"
+                              prop="totalHouseNum"
+                              label-width="150px">
+                    <el-input-number class="item_width_4"
+                                     v-model="dataForm.totalHouseNum"
+                                     :min="0"
+                                     :max="9999"
+                                     label="总户数"></el-input-number>
+                </el-form-item>
+                <el-form-item label="人口数"
+                              style="display: block"
+                              prop="realPerson"
+                              label-width="150px">
+                    <el-input-number class="item_width_4"
+                                     v-model="dataForm.realPerson"
+                                     :min="0"
+                                     :max="9999"
+                                     label="人口数"></el-input-number>
+                </el-form-item>
+                <el-form-item label="楼长/单元长姓名"
+                              prop="buildingLeaderName"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              placeholder="请输入楼长/单元长姓名"
+                              v-model="dataForm.buildingLeaderName"></el-input>
+                </el-form-item>
 
-				<el-form-item label="楼长/单元长电话" prop="buildingLeaderMobile" label-width="150px" style="display: block">
-					<el-input class="item_width_1" type="number" placeholder="请输入楼长/单元长电话" v-model="dataForm.buildingLeaderMobile"></el-input>
-				</el-form-item>
-				<el-form-item label="身份证号" prop="buildingLeaderIdCard" label-width="150px">
-					<el-input v-model="dataForm.buildingLeaderIdCard" class="item_width_2" size="small" clearable placeholder="请输入"></el-input>
-				</el-form-item>
-				<!-- <el-form-item label="类型" prop="buildingLeaderType" label-width="150px">
+                <el-form-item label="楼长/单元长电话"
+                              prop="buildingLeaderMobile"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              type="number"
+                              placeholder="请输入楼长/单元长电话"
+                              v-model="dataForm.buildingLeaderMobile"></el-input>
+                </el-form-item>
+                <el-form-item label="身份证号"
+                              prop="buildingLeaderIdCard"
+                              label-width="150px">
+                    <el-input v-model="dataForm.buildingLeaderIdCard"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              placeholder="请输入"></el-input>
+                </el-form-item>
+                <!-- <el-form-item label="类型" prop="buildingLeaderType" label-width="150px">
 					<el-select class="item_width_2" v-model="dataForm.buildingLeaderType" placeholder="请选择" filterable multiple clearable>
 						<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="longitude" label-width="150px" style="display: block">
-					<div style="width: 500px">
-						<el-select
-							v-model="searchValue"
-							filterable
-							style="width: 500px"
-							remote
-							:reserve-keyword="true"
-							placeholder="请输入关键词"
-							:remote-method="remoteMethod"
-							:loading="loading"
-						>
-							<el-option
-								v-for="(item, index) in searchOptions"
-								@click.native="handleClickKey(index)"
-								:key="item.value"
-								:label="item.label"
-								:value="item.value"
-							></el-option>
-						</el-select>
-						<div id="app_build" class="div_map"></div>
-					</div>
-				</el-form-item>
-				<el-form-item label="楼栋地址" prop="coordinatePosition" label-width="150px" style="display: block">
-					<!-- <span>{{ dataForm.coordinatePosition }}</span> -->
-					<el-input class="item_width_1" placeholder="请选择楼栋地址" v-model="dataForm.coordinatePosition" />
-				</el-form-item>
-			</el-form>
-		</div>
-		<div class="div_btn">
-			<el-button size="small" @click="handleCancle">取 消</el-button>
-			<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
-		</div>
-	</div>
+                <el-form-item label="地图位置"
+                              prop="longitude"
+                              label-width="150px"
+                              style="display: block">
+                    <div style="width: 500px">
+                        <el-select v-model="searchValue"
+                                   filterable
+                                   style="width: 500px"
+                                   remote
+                                   :reserve-keyword="true"
+                                   placeholder="请输入关键词"
+                                   :remote-method="remoteMethod"
+                                   :loading="loading">
+                            <el-option v-for="(item, index) in searchOptions"
+                                       @click.native="handleClickKey(index)"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value"></el-option>
+                        </el-select>
+                        <div id="app_build"
+                             class="div_map"></div>
+                    </div>
+                </el-form-item>
+                <el-form-item label="楼栋地址"
+                              prop="coordinatePosition"
+                              label-width="150px"
+                              style="display: block">
+                    <!-- <span>{{ dataForm.coordinatePosition }}</span> -->
+                    <el-input class="item_width_1"
+                              placeholder="请选择楼栋地址"
+                              v-model="dataForm.coordinatePosition" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="div_btn">
+            <el-button size="small"
+                       @click="handleCancle">取 消</el-button>
+            <el-button size="small"
+                       v-if="formType != 'detail'"
+                       type="primary"
+                       :disabled="btnDisable"
+                       @click="handleComfirm">确 定</el-button>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -102,342 +182,342 @@ var markers;
 var infoWindowList;
 let loading; // 加载动画
 export default {
-	data() {
-		const checkPhone = (rule, value, callback) => {
-			if (value == '' || !value) {
-				callback();
-			} else if (!/^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(1[|6|7|8][0-9]))\d{8}$/.test(value)) {
-				callback(new Error('请输入正确的手机号格式'));
-			} else {
-				callback();
-			}
-		};
-		// 验证身份证号
-		const checkCardId = (rule, value, callback) => {
-			if (value == '' || !value) {
-				callback();
-			} else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
-				callback(new Error('请输入正确的身份证号'));
-			} else {
-				callback();
-			}
-		};
-		return {
-			typeList: [
-				{
-					value: '0',
-					label: '楼长'
-				},
-				{
-					value: '1',
-					label: '单元长'
-				}
-			],
-			formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-			searchOptions: [],
-			searchValue: '',
-			resultList: [],
-			loading: false,
+    data() {
+        const checkPhone = (rule, value, callback) => {
+            if (value == '' || !value) {
+                callback();
+            } else if (!/^1[3-9]\d{9}$/.test(value)) {
+                callback(new Error('请输入正确的手机号格式'));
+            } else {
+                callback();
+            }
+        };
+        // 验证身份证号
+        const checkCardId = (rule, value, callback) => {
+            if (value == '' || !value) {
+                callback();
+            } else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+                callback(new Error('请输入正确的身份证号'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            typeList: [
+                {
+                    value: '0',
+                    label: '楼长'
+                },
+                {
+                    value: '1',
+                    label: '单元长'
+                }
+            ],
+            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            loading: false,
 
-			btnDisable: false,
-			buildingId: '', //楼栋ID
-			buildType: '1',
-			dataForm: {
-				agencyId: '', // 所属组织ID
-				agencyName: '',
-				gridId: '', //所属网格ID
-				neighborHoodId: '', //所属小区id
-				buildingName: '', //房屋名称
-				// sort: 0,//排序
-				totalUnitNum: 1, //单元数
-				totalFloorNum: 0, //层数
-				totalHouseNum: 0, //总户数
-				realPerson: 0,
-				buildingLeaderName: '', //楼长姓名
-				buildingLeaderMobile: '', //楼长电话
-				buildingLeaderIdCard: '', //
+            btnDisable: false,
+            buildingId: '', //楼栋ID
+            buildType: '1',
+            dataForm: {
+                agencyId: '', // 所属组织ID
+                agencyName: '',
+                gridId: '', //所属网格ID
+                neighborHoodId: '', //所属小区id
+                buildingName: '', //房屋名称
+                // sort: 0,//排序
+                totalUnitNum: 1, //单元数
+                totalFloorNum: 0, //层数
+                totalHouseNum: 0, //总户数
+                realPerson: 0,
+                buildingLeaderName: '', //楼长姓名
+                buildingLeaderMobile: '', //楼长电话
+                buildingLeaderIdCard: '', //
 
-				// buildingLeaderType: [], //房屋类型
-				coordinatePosition: '',
-				sysCoding: '',
-				coding: '',
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '' //纬度
-			},
+                // buildingLeaderType: [], //房屋类型
+                coordinatePosition: '',
+                sysCoding: '',
+                coding: '',
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '' //纬度
+            },
 
-			keyWords: '',
-			agencyObj: {},
-			dataRule: {
-				buildingName: [
-					{ required: true, message: '楼栋名称不能为空', trigger: 'blur' },
-					{
-						min: 1,
-						max: 10,
-						message: '小区名称长度在 1 到 10个字符',
-						trigger: 'blur'
-					}
-				],
-				// type: [{ required: true, message: '楼栋类型不能为空', trigger: 'blur' }],
-				totalUnitNum: [{ required: true, message: '单元数不能为空', trigger: 'blur' }],
-				coding: [{ required: true, message: '楼栋编码不能为空', trigger: 'blur' }],
-				buildingLeaderMobile: [
-					{
-						validator: checkPhone,
-						trigger: 'blur'
-					}
-				],
-				buildingLeaderIdCard: [
-					{
-						validator: checkCardId,
-						trigger: 'blur'
-					}
-				]
+            keyWords: '',
+            agencyObj: {},
+            dataRule: {
+                buildingName: [
+                    { required: true, message: '楼栋名称不能为空', trigger: 'blur' },
+                    {
+                        min: 1,
+                        max: 10,
+                        message: '小区名称长度在 1 到 10个字符',
+                        trigger: 'blur'
+                    }
+                ],
+                // type: [{ required: true, message: '楼栋类型不能为空', trigger: 'blur' }],
+                totalUnitNum: [{ required: true, message: '单元数不能为空', trigger: 'blur' }],
+                coding: [{ required: true, message: '楼栋编码不能为空', trigger: 'blur' }],
+                buildingLeaderMobile: [
+                    {
+                        validator: checkPhone,
+                        trigger: 'blur'
+                    }
+                ],
+                buildingLeaderIdCard: [
+                    {
+                        validator: checkCardId,
+                        trigger: 'blur'
+                    }
+                ]
 
-				// totalFloorNum: [
-				//   { required: true, message: '层数不能为空', trigger: 'blur' }
-				// ],
-				// totalHouseNum: [
-				//   { required: true, message: '户数不能为空', trigger: 'blur' }
-				// ],
-				// longitude: [
-				//   { required: true, message: '坐标不能为空', trigger: 'blur' }
-				// ],
-			}
-		};
-	},
-	components: {},
-	mounted() {},
+                // totalFloorNum: [
+                //   { required: true, message: '层数不能为空', trigger: 'blur' }
+                // ],
+                // totalHouseNum: [
+                //   { required: true, message: '户数不能为空', trigger: 'blur' }
+                // ],
+                // longitude: [
+                //   { required: true, message: '坐标不能为空', trigger: 'blur' }
+                // ],
+            }
+        };
+    },
+    components: {},
+    mounted() { },
 
-	methods: {
-		async initForm(type, row, agencyObj) {
-			this.$refs.ref_form.resetFields();
-			let { latitude, longitude } = this.$store.state.user;
-			this.agencyObj = agencyObj;
-			this.dataForm.agencyId = agencyObj.agencyId;
-			this.dataForm.gridId = agencyObj.gridId;
-			this.dataForm.neighborHoodId = agencyObj.id;
+    methods: {
+        async initForm(type, row, agencyObj) {
+            this.$refs.ref_form.resetFields();
+            let { latitude, longitude } = this.$store.state.user;
+            this.agencyObj = agencyObj;
+            this.dataForm.agencyId = agencyObj.agencyId;
+            this.dataForm.gridId = agencyObj.gridId;
+            this.dataForm.neighborHoodId = agencyObj.id;
 
-			this.formType = type;
-			if (row) {
-				this.dataForm = JSON.parse(JSON.stringify(row));
-				this.buildingId = this.dataForm.buildingId;
-				// this.buildType = this.dataForm.buildingTypeKey
-				this.buildType = this.dataForm.type;
-			} else {
-				this.dataForm.latitude = latitude;
-				this.dataForm.longitude = longitude;
-			}
-			console.log('this.dataForm', this.dataForm);
-			// if (this.dataForm.buildingLeaderType && this.dataForm.buildingLeaderType.indexOf(',') > -1) {
-			// 	this.dataForm.buildingLeaderType = this.dataForm.buildingLeaderType.split(',');
-			// } else {
-			// 	this.dataForm.buildingLeaderType = [];
-			// }
+            this.formType = type;
+            if (row) {
+                this.dataForm = JSON.parse(JSON.stringify(row));
+                this.buildingId = this.dataForm.buildingId;
+                // this.buildType = this.dataForm.buildingTypeKey
+                this.buildType = this.dataForm.type;
+            } else {
+                this.dataForm.latitude = latitude;
+                this.dataForm.longitude = longitude;
+            }
+            console.log('this.dataForm', this.dataForm);
+            // if (this.dataForm.buildingLeaderType && this.dataForm.buildingLeaderType.indexOf(',') > -1) {
+            // 	this.dataForm.buildingLeaderType = this.dataForm.buildingLeaderType.split(',');
+            // } else {
+            // 	this.dataForm.buildingLeaderType = [];
+            // }
 
-			this.$nextTick(() => {
-				if (!map) {
-					this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-				} else {
-					map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
-					map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
-				}
-			});
-		},
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(this.dataForm.latitude, this.dataForm.longitude);
+                } else {
+                    map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
+                    map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
+                }
+            });
+        },
 
-		async handleComfirm() {
-			this.btnDisable = true;
-			setTimeout(() => {
-				this.btnDisable = false;
-			}, 10000);
-			this.dataForm.type = this.buildType;
-			this.$refs['ref_form'].validate((valid, messageObj) => {
-				if (!valid) {
-					this.btnDisable = false;
-					app.util.validateRule(messageObj);
-				} else {
-					this.addBuild();
-				}
-			});
-		},
-		async handleCode() {
-			const { data, code, msg } = await requestPost('/gov/org/houseInformation/getBuildingCoding/' + this.dataForm.neighborHoodId);
-			console.log('data----', data);
-			console.log('code----', code);
-			console.log('msg----', msg);
-			if (msg == 'success' && code == 0) {
-				this.dataForm.coding = data.coding;
-				this.dataForm.sysCoding = data.sysCoding;
-			}
-		},
-		async addBuild() {
-			if (this.dataForm.buildingLeaderMobile) {
-				const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-				if (this.dataForm.buildingLeaderMobile && regPhone.test(this.dataForm.buildingLeaderMobile) === false) {
-					this.btnDisable = false;
-					this.$message({
-						type: 'warning',
-						message: '请输入正确的楼主手机'
-					});
-					return false;
-				}
-			}
+        async handleComfirm() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.dataForm.type = this.buildType;
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    this.btnDisable = false;
+                    app.util.validateRule(messageObj);
+                } else {
+                    this.addBuild();
+                }
+            });
+        },
+        async handleCode() {
+            const { data, code, msg } = await requestPost('/gov/org/houseInformation/getBuildingCoding/' + this.dataForm.neighborHoodId);
+            console.log('data----', data);
+            console.log('code----', code);
+            console.log('msg----', msg);
+            if (msg == 'success' && code == 0) {
+                this.dataForm.coding = data.coding;
+                this.dataForm.sysCoding = data.sysCoding;
+            }
+        },
+        async addBuild() {
+            if (this.dataForm.buildingLeaderMobile) {
+                const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+                if (this.dataForm.buildingLeaderMobile && regPhone.test(this.dataForm.buildingLeaderMobile) === false) {
+                    this.btnDisable = false;
+                    this.$message({
+                        type: 'warning',
+                        message: '请输入正确的楼主手机'
+                    });
+                    return false;
+                }
+            }
 
-			let url = '';
-			if (this.formType === 'add') {
-				url = '/gov/org/building/buildingadd';
-			} else {
-				url = '/gov/org/building/buildingupdate';
+            let url = '';
+            if (this.formType === 'add') {
+                url = '/gov/org/building/buildingadd';
+            } else {
+                url = '/gov/org/building/buildingupdate';
 
-				this.dataForm.buildingId = this.buildingId;
-			}
-			// if (this.dataForm.buildingLeaderType) {
-			// 	this.dataForm.buildingLeaderType = this.dataForm.buildingLeaderType.toString();
-			// } else {
-			// 	this.dataForm.buildingLeaderType = '';
-			// }
-			const { data, code, msg } = await requestPost(url, this.dataForm);
+                this.dataForm.buildingId = this.buildingId;
+            }
+            // if (this.dataForm.buildingLeaderType) {
+            // 	this.dataForm.buildingLeaderType = this.dataForm.buildingLeaderType.toString();
+            // } else {
+            // 	this.dataForm.buildingLeaderType = '';
+            // }
+            const { data, code, msg } = await requestPost(url, this.dataForm);
 
-			if (code === 0) {
-				this.$message({
-					type: 'success',
-					message: '操作成功'
-				});
-				this.resetData();
-				this.btnDisable = false;
-				this.$emit('dialogOk');
-			} else {
-				this.btnDisable = false;
-				this.$message.error(msg);
-			}
-		},
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                });
+                this.resetData();
+                this.btnDisable = false;
+                this.$emit('dialogOk');
+            } else {
+                this.btnDisable = false;
+                this.$message.error(msg);
+            }
+        },
 
-		handleCancle() {
-			this.resetData();
-			this.$emit('dialogCancle');
-		},
-		// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-		initMap(latitude, longitude) {
-			map = new daiMap(
-				document.getElementById('app_build'),
-				{ latitude, longitude },
-				{
-					zoom: 16.2, // 设置地图缩放级别
-					pitch: 43.5, // 设置俯仰角
-					rotation: 45 // 设置地图旋转角度
-				}
-			);
+        handleCancle() {
+            this.resetData();
+            this.$emit('dialogCancle');
+        },
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            map = new daiMap(
+                document.getElementById('app_build'),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45 // 设置地图旋转角度
+                }
+            );
 
-			// 监听地图平移结束
-			map.on('dragend', e => {
-				this.handleMoveCenter(e);
-			});
+            // 监听地图平移结束
+            map.on('dragend', e => {
+                this.handleMoveCenter(e);
+            });
 
-			map.setCenter(latitude, longitude);
-			map.setMarker(latitude, longitude);
-		},
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+        },
 
-		async handleMoveCenter() {
-			//修改地图中心点
-			const { lat, lng } = map.getCenter();
-			this.dataForm.latitude = lat;
-			this.dataForm.longitude = lng;
-			map.setMarker(lat, lng);
+        async handleMoveCenter() {
+            //修改地图中心点
+            const { lat, lng } = map.getCenter();
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+            map.setMarker(lat, lng);
 
-			let { msg, data } = await map.getAddress(lat, lng);
-			if (msg == 'success') {
-				this.dataForm.coordinatePosition = data.address;
-				this.searchValue = data.address;
-				this.searchOptions = [];
-			}
-		},
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == 'success') {
+                this.dataForm.coordinatePosition = data.address;
+                this.searchValue = data.address;
+                this.searchOptions = [];
+            }
+        },
 
-		async remoteMethod(query) {
-			if (query !== '') {
-				this.loading = true;
+        async remoteMethod(query) {
+            if (query !== '') {
+                this.loading = true;
 
-				const { msg, data } = await map.searchNearby(query);
-				this.loading = false;
-				this.resultList = [];
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = [];
 
-				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-					if (data.resultList && data.resultList.length > 0) {
-						this.resultList = data.resultList;
-						this.searchOptions = this.resultList.map(item => {
-							return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
-						});
-					}
-				} else {
-					this.searchOptions = [
-						{
-							value: '0',
-							label: '未检索到结果'
-						}
-					];
-				}
-			} else {
-				this.searchOptions = [];
-			}
-		},
+                if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList;
+                        this.searchOptions = this.resultList.map(item => {
+                            return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ];
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
 
-		handleClickKey(index) {
-			let selPosition = this.resultList[index];
-			let lonlat = selPosition.lonlat.split(' ');
-			map.setCenter(lonlat[1], lonlat[0]);
-			map.setMarker(lonlat[1], lonlat[0]);
-			this.dataForm.latitude = lonlat[1];
-			this.dataForm.longitude = lonlat[0];
-			this.dataForm.coordinatePosition = selPosition.address + selPosition.name;
-		},
+        handleClickKey(index) {
+            let selPosition = this.resultList[index];
+            let lonlat = selPosition.lonlat.split(' ');
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.dataForm.latitude = lonlat[1];
+            this.dataForm.longitude = lonlat[0];
+            this.dataForm.coordinatePosition = selPosition.address + selPosition.name;
+        },
 
-		resetData() {
-			this.searchValue = '';
-			this.searchOptions = [];
-			this.resultList = [];
-			this.buildingId = ''; //楼栋ID
-			this.buildType = '1';
-			this.dataForm = {
-				agencyId: '', // 所属组织ID
-				agencyName: '',
-				gridId: '', //所属网格ID
-				neighborHoodId: '', //所属小区id
-				buildingName: '', //房屋名称
-				// sort: 0,//排序
-				totalUnitNum: 1, //单元数
-				totalFloorNum: 0, //层数
-				totalHouseNum: 0, //总户数
-				realPerson: 0,
-				buildingLeaderName: '', //楼长姓名
-				buildingLeaderMobile: '', //楼长电话
-				type: '', //房屋类型
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '', //纬度
-				coding: '',
-				sysCoding: '',
-				coordinatePosition: ''
-			};
-		},
-		// 开启加载动画
-		startLoading() {
-			loading = Loading.service({
-				lock: true, // 是否锁定
-				text: '正在加载……', // 加载中需要显示的文字
-				background: 'rgba(0,0,0,.7)' // 背景颜色
-			});
-		},
-		// 结束加载动画
-		endLoading() {
-			// clearTimeout(timer);
-			if (loading) {
-				loading.close();
-			}
-		}
-	},
-	computed: {},
-	props: {}
+        resetData() {
+            this.searchValue = '';
+            this.searchOptions = [];
+            this.resultList = [];
+            this.buildingId = ''; //楼栋ID
+            this.buildType = '1';
+            this.dataForm = {
+                agencyId: '', // 所属组织ID
+                agencyName: '',
+                gridId: '', //所属网格ID
+                neighborHoodId: '', //所属小区id
+                buildingName: '', //房屋名称
+                // sort: 0,//排序
+                totalUnitNum: 1, //单元数
+                totalFloorNum: 0, //层数
+                totalHouseNum: 0, //总户数
+                realPerson: 0,
+                buildingLeaderName: '', //楼长姓名
+                buildingLeaderMobile: '', //楼长电话
+                type: '', //房屋类型
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '', //纬度
+                coding: '',
+                sysCoding: '',
+                coordinatePosition: ''
+            };
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        }
+    },
+    computed: {},
+    props: {}
 };
 </script>
 <style lang="scss" scoped>
-@import '@/assets/scss/modules/visual/communityManageForm.scss';
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
diff --git a/src/views/modules/base/communityYantai/communityForm.vue b/src/views/modules/base/communityYantai/communityForm.vue
index 01a3ab66a..1d511e9aa 100644
--- a/src/views/modules/base/communityYantai/communityForm.vue
+++ b/src/views/modules/base/communityYantai/communityForm.vue
@@ -1,17 +1,32 @@
 <template>
-	<div>
-		<div class="dialog-h-content scroll-h">
-			<div v-show="!propertyFormShow">
-				<el-form ref="ref_form" :inline="true" :model="dataForm" :rules="dataRule" class="form">
-					<el-form-item label="所属组织" label-width="150px" style="display: block">
-						<span>{{ dataForm.agencyName }}</span>
-					</el-form-item>
-					<el-form-item label="所属网格" prop="gridId" label-width="150px" style="display: block">
-						<el-select class="item_width_1" v-model="dataForm.gridId" placeholder="请选择" clearable>
-							<el-option v-for="item in gridList" :key="item.gridId" :label="item.gridName" :value="item.gridId"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- /**
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <div v-show="!propertyFormShow">
+                <el-form ref="ref_form"
+                         :inline="true"
+                         :model="dataForm"
+                         :rules="dataRule"
+                         class="form">
+                    <el-form-item label="所属组织"
+                                  label-width="150px"
+                                  style="display: block">
+                        <span>{{ dataForm.agencyName }}</span>
+                    </el-form-item>
+                    <el-form-item label="所属网格"
+                                  prop="gridId"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-select class="item_width_1"
+                                   v-model="dataForm.gridId"
+                                   placeholder="请选择"
+                                   clearable>
+                            <el-option v-for="item in gridList"
+                                       :key="item.gridId"
+                                       :label="item.gridName"
+                                       :value="item.gridId"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- /**
      * 烟台需求：自然村/小区
      */
     private String viliageType;
@@ -27,102 +42,207 @@
      * 烟台需求：建筑年代
      */
     private String buildYear; -->
-					<!--小区/自然村类型 面积 开放类型 建筑年代 tianqian -->
-					<el-form-item label="小区/自然村名称" prop="neighborHoodName" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入小区/自然村名称" v-model="dataForm.neighborHoodName"></el-input>
-					</el-form-item>
-					<el-form-item label="小区/自然村类型" prop="viliageType" label-width="150px" style="display: block">
-						<el-select v-model="dataForm.viliageType" clearable placeholder="小区/自然村类型">
-							<el-option v-for="item in viliageTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="小区编码" prop="coding" label-width="150px" style="display: block">
-						<el-input class="item_width_2" maxlength="50" placeholder="请输入楼栋编码" v-model="dataForm.coding"></el-input>
-						<el-button style="margin-left: 10px" type="primary" size="small" @click="handleCode">生成</el-button>
-					</el-form-item>
-					<div v-if="dataForm.qrcodeUrl" style="display: flex;flex-direction: column;">
-						<img style="margin-left: 70px;width: 200px;" :src="dataForm.qrcodeUrl" />
-						<a style="margin-left: 80px" :href="dataForm.qrcodeUrl" target="_blank">下载</a>
-					</div>
-					<!-- 面积 开放类型 建筑年代 tianqian -->
-					<el-form-item label="面积" prop="area" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入面积" v-model="dataForm.area"></el-input>
-					</el-form-item>
-					<el-form-item label="开放类型" prop="openType" label-width="150px" style="display: block">
-						<el-select v-model="dataForm.openType" clearable placeholder="开放类型">
-							<el-option v-for="item in openTypeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="建筑年代" prop="buildYear" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入建筑年代" v-model="dataForm.buildYear"></el-input>
-					</el-form-item>
-					<el-form-item label="关联物业" prop="propertyId" label-width="150px" style="display: block">
-						<el-select class="item_width_2" v-model="dataForm.propertyId" placeholder="请选择" filterable clearable>
-							<el-option v-for="item in propertyList" :key="item.propertyId" :label="item.propertyName" :value="item.propertyId"></el-option>
-						</el-select>
-						<el-button style="margin-left: 10px" type="primary" size="small" @click="handleAddProperty">添加物业</el-button>
-					</el-form-item>
-					<el-form-item label="实有楼栋" style="display: block" prop="realBuilding" label-width="150px">
-						<el-input-number class="item_width_4" v-model="dataForm.realBuilding" :min="0" :max="9999" label="总户数"></el-input-number>
-					</el-form-item>
-					<el-form-item label="地图位置" prop="longitude" label-width="150px" style="display: block">
-						<div style="width: 500px">
-							<el-select
-								v-model="searchValue"
-								filterable
-								style="width: 500px"
-								remote
-								:reserve-keyword="true"
-								placeholder="请输入关键词"
-								:remote-method="remoteMethod"
-								:loading="loading"
-							>
-								<el-option
-									v-for="(item, index) in searchOptions"
-									@click.native="handleClickKey(index)"
-									:key="item.value"
-									:label="item.label"
-									:value="item.value"
-								></el-option>
-							</el-select>
-							<div id="app_community" class="div_map"></div>
-						</div>
-					</el-form-item>
-					<el-form-item label="详细地址" prop="address" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="50" show-word-limit placeholder="请输入详细地址" v-model="dataForm.address"></el-input>
-					</el-form-item>
-					<el-form-item label="备注" prop="remark" label-width="150px" style="display: block">
-						<el-input
-							class="item_width_1"
-							type="textarea"
-							maxlength="500"
-							show-word-limit
-							:rows="3"
-							placeholder="请输入备注，不超过500字"
-							v-model="dataForm.remark"
-						></el-input>
-					</el-form-item>
-				</el-form>
-			</div>
-			<div v-show="propertyFormShow">
-				<el-form :inline="false" :model="propertyForm" :rules="propertyRule" class="form">
-					<el-form-item label="物业名称" prop="name" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="10" placeholder="请输入小区名称" v-model="propertyForm.name"></el-input>
-					</el-form-item>
-					<el-form-item label="物业联系人" prop="contactName" label-width="150px" style="display: block">
-						<el-input v-model="propertyForm.contactName" class="item_width_2" size="small" clearable placeholder="请输入"></el-input>
-					</el-form-item>
-					<el-form-item label="联系电话" prop="contactMobile" label-width="150px" style="display: block">
-						<el-input v-model="propertyForm.contactMobile" class="item_width_2" size="small" clearable placeholder="请输入"></el-input>
-					</el-form-item>
-				</el-form>
-			</div>
-		</div>
-		<div class="div_btn">
-			<el-button size="small" @click="handleCancle">取 消</el-button>
-			<el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
-		</div>
-	</div>
+                    <!--小区/自然村类型 面积 开放类型 建筑年代 tianqian -->
+                    <el-form-item label="小区/自然村名称"
+                                  prop="neighborHoodName"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  maxlength="50"
+                                  show-word-limit
+                                  placeholder="请输入小区/自然村名称"
+                                  v-model="dataForm.neighborHoodName"></el-input>
+                    </el-form-item>
+                    <el-form-item label="小区/自然村类型"
+                                  prop="viliageType"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-select v-model="dataForm.viliageType"
+                                   clearable
+                                   placeholder="小区/自然村类型">
+                            <el-option v-for="item in viliageTypeList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="小区编码"
+                                  prop="coding"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_2"
+                                  maxlength="50"
+                                  placeholder="请输入楼栋编码"
+                                  v-model="dataForm.coding"></el-input>
+                        <el-button style="margin-left: 10px"
+                                   type="primary"
+                                   size="small"
+                                   @click="handleCode">生成</el-button>
+                    </el-form-item>
+                    <div v-if="dataForm.qrcodeUrl"
+                         style="display: flex;flex-direction: column;">
+                        <img style="margin-left: 70px;width: 200px;"
+                             :src="dataForm.qrcodeUrl" />
+                        <a style="margin-left: 80px"
+                           :href="dataForm.qrcodeUrl"
+                           target="_blank">下载</a>
+                    </div>
+                    <!-- 面积 开放类型 建筑年代 tianqian -->
+                    <el-form-item label="面积"
+                                  prop="area"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  maxlength="50"
+                                  show-word-limit
+                                  placeholder="请输入面积"
+                                  v-model="dataForm.area"></el-input>
+                    </el-form-item>
+                    <el-form-item label="开放类型"
+                                  prop="openType"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-select v-model="dataForm.openType"
+                                   clearable
+                                   placeholder="开放类型">
+                            <el-option v-for="item in openTypeList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="建筑年代"
+                                  prop="buildYear"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  maxlength="50"
+                                  show-word-limit
+                                  placeholder="请输入建筑年代"
+                                  v-model="dataForm.buildYear"></el-input>
+                    </el-form-item>
+                    <el-form-item label="关联物业"
+                                  prop="propertyId"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-select class="item_width_2"
+                                   v-model="dataForm.propertyId"
+                                   placeholder="请选择"
+                                   filterable
+                                   clearable>
+                            <el-option v-for="item in propertyList"
+                                       :key="item.propertyId"
+                                       :label="item.propertyName"
+                                       :value="item.propertyId"></el-option>
+                        </el-select>
+                        <el-button style="margin-left: 10px"
+                                   type="primary"
+                                   size="small"
+                                   @click="handleAddProperty">添加物业</el-button>
+                    </el-form-item>
+                    <el-form-item label="实有楼栋"
+                                  style="display: block"
+                                  prop="realBuilding"
+                                  label-width="150px">
+                        <el-input-number class="item_width_4"
+                                         v-model="dataForm.realBuilding"
+                                         :min="0"
+                                         :max="9999"
+                                         label="总户数"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="地图位置"
+                                  prop="longitude"
+                                  label-width="150px"
+                                  style="display: block">
+                        <div style="width: 500px">
+                            <el-select v-model="searchValue"
+                                       filterable
+                                       style="width: 500px"
+                                       remote
+                                       :reserve-keyword="true"
+                                       placeholder="请输入关键词"
+                                       :remote-method="remoteMethod"
+                                       :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions"
+                                           @click.native="handleClickKey(index)"
+                                           :key="item.value"
+                                           :label="item.label"
+                                           :value="item.value"></el-option>
+                            </el-select>
+                            <div id="app_community"
+                                 class="div_map"></div>
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="详细地址"
+                                  prop="address"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  maxlength="50"
+                                  show-word-limit
+                                  placeholder="请输入详细地址"
+                                  v-model="dataForm.address"></el-input>
+                    </el-form-item>
+                    <el-form-item label="备注"
+                                  prop="remark"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  type="textarea"
+                                  maxlength="500"
+                                  show-word-limit
+                                  :rows="3"
+                                  placeholder="请输入备注，不超过500字"
+                                  v-model="dataForm.remark"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div v-show="propertyFormShow">
+                <el-form :inline="false"
+                         :model="propertyForm"
+                         :rules="propertyRule"
+                         class="form">
+                    <el-form-item label="物业名称"
+                                  prop="name"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  maxlength="10"
+                                  placeholder="请输入小区名称"
+                                  v-model="propertyForm.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="物业联系人"
+                                  prop="contactName"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input v-model="propertyForm.contactName"
+                                  class="item_width_2"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入"></el-input>
+                    </el-form-item>
+                    <el-form-item label="联系电话"
+                                  prop="contactMobile"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input v-model="propertyForm.contactMobile"
+                                  class="item_width_2"
+                                  size="small"
+                                  clearable
+                                  placeholder="请输入"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+        <div class="div_btn">
+            <el-button size="small"
+                       @click="handleCancle">取 消</el-button>
+            <el-button size="small"
+                       type="primary"
+                       :disabled="btnDisable"
+                       @click="handleComfirm">确 定</el-button>
+        </div>
+    </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
@@ -135,422 +255,422 @@ var markers;
 var infoWindowList;
 let loading; // 加载动画
 export default {
-	data() {
-		var checkPhone = (rule, value, callback) => {
-			if(value=='') {
-				callback();
-			}
-			else if (!/^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(1[|6|7|8][0-9]))\d{8}$/.test(value)) {
-				callback(new Error('请输入正确的手机号格式'));
-			} else {
-				callback();
-			}
-		};
-		return {
-			formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-			searchOptions: [],
-			searchValue: '',
-			resultList: [],
-			loading: false,
-			gridList: [],
-			propertyList: [],
-			btnDisable: false,
-			neighborHoodId: '', //小区ID
-			dataForm: {
-				neighborHoodName: '', // 小区名称【不超过50字】
-				agencyId: '', // 所属组织ID
-				agencyName: '',
-				gridId: '', //所属网格ID
-				propertyId: '', //关联物业
-				address: '', //详细地址
-				remark: '', //备注【最大500字】
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '', //纬度
-				realBuilding: 0,
-				coding: '',
-				sysCoding: '',
-				viliageType: '',
-				area: '',
-				openType: '',
-				buildYear: ''
-			},
-			propertyFormShow: false,
-			propertyForm: {
-				name: '',
-				contactMobile: '',
-				contactName: ''
-			},
-			propertyRule: {
-				name: [{ required: true, message: '物业名字不能为空', trigger: 'blur' }],
-				contactMobile: [{ validator: checkPhone, trigger: 'blur' }]
-			},
-			keyWords: '',
-			agencyObj: {},
-			viliageTypeList: [],
-			openTypeList: []
-		};
-	},
-	components: {},
-	mounted() {},
-	methods: {
-		async initForm(type, row, agencyObj) {
-			this.$refs.ref_form.resetFields();
-			this.agencyObj = agencyObj;
-			let { latitude, longitude } = this.$store.state.user;
-			this.formType = type;
-			if (row) {
-				this.dataForm = JSON.parse(JSON.stringify(row));
-				this.dataForm.neighborHoodId = this.dataForm.id;
-				this.neighborHoodId = this.dataForm.neighborHoodId;
-			} else {
-				this.dataForm.latitude = latitude;
-				this.dataForm.longitude = longitude;
-			}
-			if (!map) {
-				this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-			} else {
-				map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
-				map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
-			}
-			await this.loadAgency();
-			await this.loadGrid();
-			await this.loadProperty();
-			await this.getViliageTypeList();
-			await this.getOpenTypeList();
-		},
-		// 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-		initMap(latitude, longitude) {
-			map = new daiMap(
-				document.getElementById('app_community'),
-				{
-					latitude,
-					longitude
-				},
-				{
-					zoom: 16.2, // 设置地图缩放级别
-					pitch: 43.5, // 设置俯仰角
-					rotation: 45 // 设置地图旋转角度
-				}
-			);
-			// 监听地图平移结束
-			map.on('dragend', e => {
-				this.handleMoveCenter(e);
-			});
-			map.setCenter(latitude, longitude);
-			map.setMarker(latitude, longitude);
-		},
-		async handleMoveCenter() {
-			//修改地图中心点
-			const { lat, lng } = map.getCenter();
-			this.dataForm.latitude = lat;
-			this.dataForm.longitude = lng;
-			map.setMarker(lat, lng);
-			let { msg, data } = await map.getAddress(lat, lng);
-			if (msg == 'success') {
-				this.dataForm.address = data.address;
-				this.searchValue = data.address;
-				this.searchOptions = [];
-			}
-		},
-		async remoteMethod(query) {
-			if (query !== '') {
-				this.loading = true;
-				const { msg, data } = await map.searchNearby(query);
-				this.loading = false;
-				this.resultList = [];
-				if (msg == 'success' && data.resultList && data.resultList.length > 0) {
-					if (data.resultList && data.resultList.length > 0) {
-						this.resultList = data.resultList;
-						this.searchOptions = this.resultList.map(item => {
-							return {
-								value: `${item.hotPointID}`,
-								label: `${item.address + item.name}`
-							};
-						});
-					}
-				} else {
-					this.searchOptions = [
-						{
-							value: '0',
-							label: '未检索到结果'
-						}
-					];
-				}
-			} else {
-				this.searchOptions = [];
-			}
-		},
-		handleClickKey(index) {
-			let selPosition = this.resultList[index];
-			let lonlat = selPosition.lonlat.split(' ');
-			map.setCenter(lonlat[1], lonlat[0]);
-			map.setMarker(lonlat[1], lonlat[0]);
-			this.dataForm.latitude = lonlat[1];
-			this.dataForm.longitude = lonlat[0];
-			this.dataForm.address = selPosition.address + selPosition.name;
-		},
-		async handleCode() {
-			if (!this.dataForm.gridId) return this.$message.error('请选择网格');
-			const { data, code, msg } = await requestPost('/gov/org/houseInformation/getNeighborHoodCoding/' + this.dataForm.gridId);
-			if (msg == 'success' && code == 0) {
-				this.dataForm.coding = data.coding;
-				this.dataForm.sysCoding = data.sysCoding;
-			}
-		},
-		//加载组织
-		async loadAgency() {
-			const url = '/epmetuser/customerstaff/staffbasicinfo';
-			let params = {};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.dataForm.agencyId = data.agencyId;
-				this.dataForm.agencyName = data.agencyName;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		//加载网格
-		async loadGrid() {
-			const url = '/gov/org/grid/allgridsnopermission ';
-			// const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
-			let params = {
-				agencyId: this.dataForm.agencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.gridList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getViliageTypeList() {
-			const url = '/sys/dict/data/dictlist';
-			let params = {
-				dictType: 'neighbor_hood_type'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.viliageTypeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getOpenTypeList() {
-			const url = '/sys/dict/data/dictlist';
-			let params = {
-				dictType: 'open_type'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.openTypeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		//加载物业
-		async loadProperty() {
-			const url = '/gov/org/propertymanagement/list';
-			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
-			let params = {};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.propertyList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		handleAddProperty() {
-			this.propertyForm.name = '';
-			this.propertyForm.contactName = '';
-			this.propertyForm.contactMobile = '';
+    data() {
+        var checkPhone = (rule, value, callback) => {
+            if (value == '') {
+                callback();
+            }
+            else if (!/^1[3-9]\d{9}$/.test(value)) {
+                callback(new Error('请输入正确的手机号格式'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            loading: false,
+            gridList: [],
+            propertyList: [],
+            btnDisable: false,
+            neighborHoodId: '', //小区ID
+            dataForm: {
+                neighborHoodName: '', // 小区名称【不超过50字】
+                agencyId: '', // 所属组织ID
+                agencyName: '',
+                gridId: '', //所属网格ID
+                propertyId: '', //关联物业
+                address: '', //详细地址
+                remark: '', //备注【最大500字】
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '', //纬度
+                realBuilding: 0,
+                coding: '',
+                sysCoding: '',
+                viliageType: '',
+                area: '',
+                openType: '',
+                buildYear: ''
+            },
+            propertyFormShow: false,
+            propertyForm: {
+                name: '',
+                contactMobile: '',
+                contactName: ''
+            },
+            propertyRule: {
+                name: [{ required: true, message: '物业名字不能为空', trigger: 'blur' }],
+                contactMobile: [{ validator: checkPhone, trigger: 'blur' }]
+            },
+            keyWords: '',
+            agencyObj: {},
+            viliageTypeList: [],
+            openTypeList: []
+        };
+    },
+    components: {},
+    mounted() { },
+    methods: {
+        async initForm(type, row, agencyObj) {
+            this.$refs.ref_form.resetFields();
+            this.agencyObj = agencyObj;
+            let { latitude, longitude } = this.$store.state.user;
+            this.formType = type;
+            if (row) {
+                this.dataForm = JSON.parse(JSON.stringify(row));
+                this.dataForm.neighborHoodId = this.dataForm.id;
+                this.neighborHoodId = this.dataForm.neighborHoodId;
+            } else {
+                this.dataForm.latitude = latitude;
+                this.dataForm.longitude = longitude;
+            }
+            if (!map) {
+                this.initMap(this.dataForm.latitude, this.dataForm.longitude);
+            } else {
+                map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
+                map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
+            }
+            await this.loadAgency();
+            await this.loadGrid();
+            await this.loadProperty();
+            await this.getViliageTypeList();
+            await this.getOpenTypeList();
+        },
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            map = new daiMap(
+                document.getElementById('app_community'),
+                {
+                    latitude,
+                    longitude
+                },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45 // 设置地图旋转角度
+                }
+            );
+            // 监听地图平移结束
+            map.on('dragend', e => {
+                this.handleMoveCenter(e);
+            });
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+        },
+        async handleMoveCenter() {
+            //修改地图中心点
+            const { lat, lng } = map.getCenter();
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+            map.setMarker(lat, lng);
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == 'success') {
+                this.dataForm.address = data.address;
+                this.searchValue = data.address;
+                this.searchOptions = [];
+            }
+        },
+        async remoteMethod(query) {
+            if (query !== '') {
+                this.loading = true;
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = [];
+                if (msg == 'success' && data.resultList && data.resultList.length > 0) {
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList;
+                        this.searchOptions = this.resultList.map(item => {
+                            return {
+                                value: `${item.hotPointID}`,
+                                label: `${item.address + item.name}`
+                            };
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ];
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
+        handleClickKey(index) {
+            let selPosition = this.resultList[index];
+            let lonlat = selPosition.lonlat.split(' ');
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.dataForm.latitude = lonlat[1];
+            this.dataForm.longitude = lonlat[0];
+            this.dataForm.address = selPosition.address + selPosition.name;
+        },
+        async handleCode() {
+            if (!this.dataForm.gridId) return this.$message.error('请选择网格');
+            const { data, code, msg } = await requestPost('/gov/org/houseInformation/getNeighborHoodCoding/' + this.dataForm.gridId);
+            if (msg == 'success' && code == 0) {
+                this.dataForm.coding = data.coding;
+                this.dataForm.sysCoding = data.sysCoding;
+            }
+        },
+        //加载组织
+        async loadAgency() {
+            const url = '/epmetuser/customerstaff/staffbasicinfo';
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.dataForm.agencyId = data.agencyId;
+                this.dataForm.agencyName = data.agencyName;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        //加载网格
+        async loadGrid() {
+            const url = '/gov/org/grid/allgridsnopermission ';
+            // const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
+            let params = {
+                agencyId: this.dataForm.agencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getViliageTypeList() {
+            const url = '/sys/dict/data/dictlist';
+            let params = {
+                dictType: 'neighbor_hood_type'
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.viliageTypeList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async getOpenTypeList() {
+            const url = '/sys/dict/data/dictlist';
+            let params = {
+                dictType: 'open_type'
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.openTypeList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        //加载物业
+        async loadProperty() {
+            const url = '/gov/org/propertymanagement/list';
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/list"
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.propertyList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleAddProperty() {
+            this.propertyForm.name = '';
+            this.propertyForm.contactName = '';
+            this.propertyForm.contactMobile = '';
 
-			this.propertyFormShow = true;
-		},
-		async handleComfirm() {
-			if (this.propertyFormShow) {
-				this.addProperty();
-			} else {
-				this.btnDisable = true;
-				setTimeout(() => {
-					this.btnDisable = false;
-				}, 10000);
-				this.$refs['ref_form'].validate((valid, messageObj) => {
-					if (!valid) {
-						app.util.validateRule(messageObj);
-						this.btnDisable = false;
-					} else {
-						this.addCommunity();
-					}
-				});
-			}
-		},
-		async addCommunity() {
-			let url = '';
-			if (this.formType === 'add') {
-				url = '/gov/org/neighborhood/neighborhoodadd';
-				// url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
-			} else {
-				url = '/gov/org/neighborhood/neighborhoodupdate';
-				this.dataForm.neighborHoodId = this.neighborHoodId;
-			}
-			console.log('this.dataForm', this.dataForm);
-			const { data, code, msg } = await requestPost(url, this.dataForm);
-			if (code === 0) {
-				this.$message({
-					type: 'success',
-					message: '操作成功'
-				});
-				this.resetData();
-				this.$emit('dialogOk');
-				this.btnDisable = false;
-			} else {
-				this.btnDisable = false;
-				this.$message.error(msg);
-			}
-		},
-		async addProperty() {
-			if (!this.propertyForm.name || this.propertyForm.name === '') {
-				this.$message({
-					type: 'error',
-					message: '物业名称不能为空'
-				});
-				return false;
-			}
-			const url = '/gov/org/propertymanagement/add';
-			// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
-			let params = {
-				name: this.propertyForm.name,
-				contactName: this.propertyForm.contactName,
-				contactMobile: this.propertyForm.contactMobile
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message({
-					type: 'success',
-					message: '操作成功'
-				});
-				this.propertyForm.name = '';
+            this.propertyFormShow = true;
+        },
+        async handleComfirm() {
+            if (this.propertyFormShow) {
+                this.addProperty();
+            } else {
+                this.btnDisable = true;
+                setTimeout(() => {
+                    this.btnDisable = false;
+                }, 10000);
+                this.$refs['ref_form'].validate((valid, messageObj) => {
+                    if (!valid) {
+                        app.util.validateRule(messageObj);
+                        this.btnDisable = false;
+                    } else {
+                        this.addCommunity();
+                    }
+                });
+            }
+        },
+        async addCommunity() {
+            let url = '';
+            if (this.formType === 'add') {
+                url = '/gov/org/neighborhood/neighborhoodadd';
+                // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+            } else {
+                url = '/gov/org/neighborhood/neighborhoodupdate';
+                this.dataForm.neighborHoodId = this.neighborHoodId;
+            }
+            console.log('this.dataForm', this.dataForm);
+            const { data, code, msg } = await requestPost(url, this.dataForm);
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                });
+                this.resetData();
+                this.$emit('dialogOk');
+                this.btnDisable = false;
+            } else {
+                this.btnDisable = false;
+                this.$message.error(msg);
+            }
+        },
+        async addProperty() {
+            if (!this.propertyForm.name || this.propertyForm.name === '') {
+                this.$message({
+                    type: 'error',
+                    message: '物业名称不能为空'
+                });
+                return false;
+            }
+            const url = '/gov/org/propertymanagement/add';
+            // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/propertymanagement/add"
+            let params = {
+                name: this.propertyForm.name,
+                contactName: this.propertyForm.contactName,
+                contactMobile: this.propertyForm.contactMobile
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                });
+                this.propertyForm.name = '';
 
-				this.propertyForm.contactName = '';
-				this.propertyForm.contactMobile = '';
-				this.propertyFormShow = false;
-				this.loadProperty();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		handleCancle() {
-			if (this.propertyFormShow) {
-				this.propertyForm.name = '';
-				this.propertyForm.contactName = '';
-				this.propertyForm.contactMobile = '';
-				this.propertyFormShow = false;
-			} else {
-				this.resetData();
-				this.$emit('dialogCancle');
-			}
-		},
-		resetData() {
-			this.searchValue = '';
-			this.searchOptions = [];
-			this.resultList = [];
-			this.neighborHoodId = ''; //小区ID
-			this.dataForm = {
-				neighborHoodName: '', // 小区名称【不超过50字】
-				agencyId: '', // 所属组织ID
-				agencyName: '',
-				gridId: '', //所属网格ID
-				propertyId: '', //关联物业
-				address: '', //详细地址
-				remark: '', //备注【最大500字】
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '', //纬度
-				realBuilding: 0,
-				coding: '',
-				sysCoding: '',
-				viliageType: '',
-				area: '',
-				openType: '',
-				buildYear: ''
-			};
-			this.propertyFormShow = false;
-		},
-		// 开启加载动画
-		startLoading() {
-			loading = Loading.service({
-				lock: true, // 是否锁定
-				text: '正在加载……', // 加载中需要显示的文字
-				background: 'rgba(0,0,0,.7)' // 背景颜色
-			});
-		},
-		// 结束加载动画
-		endLoading() {
-			// clearTimeout(timer);
-			if (loading) {
-				loading.close();
-			}
-		}
-	},
-	computed: {
-		dataRule() {
-			return {
-				neighborHoodName: [
-					{
-						required: true,
-						message: '小区名称不能为空',
-						trigger: 'blur'
-					},
-					{
-						min: 1,
-						max: 50,
-						message: '小区名称长度在 1 到 50个字符',
-						trigger: 'blur'
-					}
-				],
-				agencyId: [
-					{
-						required: true,
-						message: '所属组织不能为空',
-						trigger: 'blur'
-					}
-				],
-				gridId: [
-					{
-						required: true,
-						message: '所属网格不能为空',
-						trigger: 'blur'
-					}
-				],
-				coding: [
-					{
-						required: true,
-						message: '小区编码不能为空',
-						trigger: 'blur'
-					}
-				],
-				address: [
-					{
-						required: true,
-						message: '详细地址不能为空',
-						trigger: 'blur'
-					}
-				],
-				longitude: [
-					{
-						required: true,
-						message: '坐标不能为空',
-						trigger: 'blur'
-					}
-				]
-			};
-		},
-		
-	},
-	props: {}
+                this.propertyForm.contactName = '';
+                this.propertyForm.contactMobile = '';
+                this.propertyFormShow = false;
+                this.loadProperty();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handleCancle() {
+            if (this.propertyFormShow) {
+                this.propertyForm.name = '';
+                this.propertyForm.contactName = '';
+                this.propertyForm.contactMobile = '';
+                this.propertyFormShow = false;
+            } else {
+                this.resetData();
+                this.$emit('dialogCancle');
+            }
+        },
+        resetData() {
+            this.searchValue = '';
+            this.searchOptions = [];
+            this.resultList = [];
+            this.neighborHoodId = ''; //小区ID
+            this.dataForm = {
+                neighborHoodName: '', // 小区名称【不超过50字】
+                agencyId: '', // 所属组织ID
+                agencyName: '',
+                gridId: '', //所属网格ID
+                propertyId: '', //关联物业
+                address: '', //详细地址
+                remark: '', //备注【最大500字】
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '', //纬度
+                realBuilding: 0,
+                coding: '',
+                sysCoding: '',
+                viliageType: '',
+                area: '',
+                openType: '',
+                buildYear: ''
+            };
+            this.propertyFormShow = false;
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                neighborHoodName: [
+                    {
+                        required: true,
+                        message: '小区名称不能为空',
+                        trigger: 'blur'
+                    },
+                    {
+                        min: 1,
+                        max: 50,
+                        message: '小区名称长度在 1 到 50个字符',
+                        trigger: 'blur'
+                    }
+                ],
+                agencyId: [
+                    {
+                        required: true,
+                        message: '所属组织不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                gridId: [
+                    {
+                        required: true,
+                        message: '所属网格不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                coding: [
+                    {
+                        required: true,
+                        message: '小区编码不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                address: [
+                    {
+                        required: true,
+                        message: '详细地址不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                longitude: [
+                    {
+                        required: true,
+                        message: '坐标不能为空',
+                        trigger: 'blur'
+                    }
+                ]
+            };
+        },
+
+    },
+    props: {}
 };
 </script>
 <style lang="scss" scoped>
-@import '@/assets/scss/modules/visual/communityManageForm.scss';
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
diff --git a/src/views/modules/base/communityYantai/roomForm.vue b/src/views/modules/base/communityYantai/roomForm.vue
index e5e1d8753..a08181a65 100644
--- a/src/views/modules/base/communityYantai/roomForm.vue
+++ b/src/views/modules/base/communityYantai/roomForm.vue
@@ -1,42 +1,84 @@
 <template>
-	<div>
-		<div class="dialog-h-content scroll-h">
-			<el-form ref="ref_form" :inline="false" :model="dataForm" :rules="dataRule"
-				:disabled="formType === 'detail'" class="form">
-				<el-form-item label="所属楼栋" label-width="150px" style="display: block">
-					<span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
-				</el-form-item>
-				<el-form-item label="所在楼层" label-width="150px" style="display: block">
-					<el-input class="item_width_1" placeholder="请输入所在楼层" v-model="dataForm.floor">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="单元号" prop="buildingUnitId" label-width="150px" style="display: block">
-					<el-select class="item_width_1" v-model="dataForm.buildingUnitId" placeholder="请选择" clearable>
-						<el-option v-for="item in unitList" :key="item.id" :label="item.unitName" :value="item.id">
-						</el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="门牌号" prop="doorName" label-width="150px" style="display: block">
-					<el-input class="item_width_1" placeholder="请输入门牌号" v-model="dataForm.doorName">
-					</el-input>
-				</el-form-item>
-				<el-form-item v-if="formType != 'detail'" label="房屋编码" prop="coding" label-width="150px"
-					style="display: block">
-					<el-input class="item_width_2" maxlength="50" placeholder="请输入楼栋编码" v-model="dataForm.coding">
-					</el-input>
-					<el-button style="margin-left: 10px" type="primary" size="small" @click="handleCode">生成</el-button>
-				</el-form-item>
-				<div v-if="formType === 'detail'">
-					<el-form-item label="房屋编码" prop="houseCode" label-width="150px" style="display: block">
-						<el-input class="item_width_1" maxlength="30" v-model="dataForm.houseCode">
-						</el-input>
-					</el-form-item>
-					<div v-if="dataForm.houseQrcodeUrl" style="display: flex;flex-direction: column;">
-						<img style="margin-left: 70px;width: 200px;" :src="dataForm.houseQrcodeUrl">
-						<a style="margin-left: 80px" :href="dataForm.houseQrcodeUrl" target="_blank">下载</a>
-					</div>
-				</div>
-				<!-- <el-form-item label="居住人数"
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form"
+                     :inline="false"
+                     :model="dataForm"
+                     :rules="dataRule"
+                     :disabled="formType === 'detail'"
+                     class="form">
+                <el-form-item label="所属楼栋"
+                              label-width="150px"
+                              style="display: block">
+                    <span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
+                </el-form-item>
+                <el-form-item label="所在楼层"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              placeholder="请输入所在楼层"
+                              v-model="dataForm.floor">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="单元号"
+                              prop="buildingUnitId"
+                              label-width="150px"
+                              style="display: block">
+                    <el-select class="item_width_1"
+                               v-model="dataForm.buildingUnitId"
+                               placeholder="请选择"
+                               clearable>
+                        <el-option v-for="item in unitList"
+                                   :key="item.id"
+                                   :label="item.unitName"
+                                   :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="门牌号"
+                              prop="doorName"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              placeholder="请输入门牌号"
+                              v-model="dataForm.doorName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item v-if="formType != 'detail'"
+                              label="房屋编码"
+                              prop="coding"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_2"
+                              maxlength="50"
+                              placeholder="请输入楼栋编码"
+                              v-model="dataForm.coding">
+                    </el-input>
+                    <el-button style="margin-left: 10px"
+                               type="primary"
+                               size="small"
+                               @click="handleCode">生成</el-button>
+                </el-form-item>
+                <div v-if="formType === 'detail'">
+                    <el-form-item label="房屋编码"
+                                  prop="houseCode"
+                                  label-width="150px"
+                                  style="display: block">
+                        <el-input class="item_width_1"
+                                  maxlength="30"
+                                  v-model="dataForm.houseCode">
+                        </el-input>
+                    </el-form-item>
+                    <div v-if="dataForm.houseQrcodeUrl"
+                         style="display: flex;flex-direction: column;">
+                        <img style="margin-left: 70px;width: 200px;"
+                             :src="dataForm.houseQrcodeUrl">
+                        <a style="margin-left: 80px"
+                           :href="dataForm.houseQrcodeUrl"
+                           target="_blank">下载</a>
+                    </div>
+                </div>
+                <!-- <el-form-item label="居住人数"
                       style="display: block"
                       prop="realPerson"
                       label-width="150px">
@@ -46,365 +88,408 @@
                            :max="9999"
                            label="居住人数"></el-input-number>
         </el-form-item> -->
-				<el-form-item label="房屋类型" prop="houseType" label-width="150px" style="display: block">
-					<el-radio-group v-model="houseType">
-						<el-radio :label="'1'">楼房</el-radio>
-						<el-radio :label="'2'">平房</el-radio>
-						<el-radio :label="'3'">别墅</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="面积(平方米)" label-width="150px" style="display: block">
-					<el-input class="item_width_1" placeholder="请输入面积(平方米)" v-model="dataForm.area">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="房屋用途" prop="purpose" label-width="150px" style="display: block">
-					<el-radio-group v-model="purpose">
-						<el-radio :label="'1'">住宅</el-radio>
-						<el-radio :label="'2'">商业</el-radio>
-						<el-radio :label="'3'">办公</el-radio>
-						<el-radio :label="'4'">工业</el-radio>
-						<el-radio :label="'5'">仓储</el-radio>
-						<el-radio :label="'6'">商住混用</el-radio>
-						<el-radio :label="'7'">其他</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="房屋状态" prop="rentFlag" label-width="150px" style="display: block">
-					<el-radio-group v-model="rentFlag">
-						<el-radio :label="1">出租</el-radio>
-						<el-radio :label="2">闲置</el-radio>
-						<el-radio :label="0">自住</el-radio>
-						<el-radio :label="3">未出售</el-radio>
-					</el-radio-group>
-				</el-form-item>
-				<el-form-item label="房主姓名" prop="ownerName" label-width="150px" style="display: block">
-					<el-input class="item_width_1" maxlength="30" placeholder="请输入房主姓名" v-model="dataForm.ownerName">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="联系方式" prop="ownerPhone" label-width="150px" style="display: block">
-					<el-input class="item_width_1" type='number' placeholder="请输入联系方式" v-model="dataForm.ownerPhone">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="房主身份证" prop="ownerIdCard" label-width="150px" style="display: block">
-					<el-input class="item_width_1" placeholder="请输入房主身份证" v-model="dataForm.ownerIdCard">
-					</el-input>
-				</el-form-item>
-				<el-form-item label="备注" prop="remark" label-width="150px" style="display: block">
-					<el-input v-model="dataForm.remark" type="textarea" :autosize="{ minRows: 6, maxRows: 20 }"
-						maxlength="500" class="item_width_1" style="" clearable show-word-limit
-						placeholder="请输入备注"></el-input>
-					
-				</el-form-item>
-			</el-form>
-		</div>
-		<div class="div_btn">
-			<el-button size="small" @click="handleCancle">取 消</el-button>
-			<el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
-				@click="handleComfirm">确 定</el-button>
-		</div>
-	</div>
+                <el-form-item label="房屋类型"
+                              prop="houseType"
+                              label-width="150px"
+                              style="display: block">
+                    <el-radio-group v-model="houseType">
+                        <el-radio :label="'1'">楼房</el-radio>
+                        <el-radio :label="'2'">平房</el-radio>
+                        <el-radio :label="'3'">别墅</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="面积(平方米)"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              placeholder="请输入面积(平方米)"
+                              v-model="dataForm.area">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="房屋用途"
+                              prop="purpose"
+                              label-width="150px"
+                              style="display: block">
+                    <el-radio-group v-model="purpose">
+                        <el-radio :label="'1'">住宅</el-radio>
+                        <el-radio :label="'2'">商业</el-radio>
+                        <el-radio :label="'3'">办公</el-radio>
+                        <el-radio :label="'4'">工业</el-radio>
+                        <el-radio :label="'5'">仓储</el-radio>
+                        <el-radio :label="'6'">商住混用</el-radio>
+                        <el-radio :label="'7'">其他</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="房屋状态"
+                              prop="rentFlag"
+                              label-width="150px"
+                              style="display: block">
+                    <el-radio-group v-model="rentFlag">
+                        <el-radio :label="1">出租</el-radio>
+                        <el-radio :label="2">闲置</el-radio>
+                        <el-radio :label="0">自住</el-radio>
+                        <el-radio :label="3">未出售</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="房主姓名"
+                              prop="ownerName"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              maxlength="30"
+                              placeholder="请输入房主姓名"
+                              v-model="dataForm.ownerName">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="联系方式"
+                              prop="ownerPhone"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              type='number'
+                              placeholder="请输入联系方式"
+                              v-model="dataForm.ownerPhone">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="房主身份证"
+                              prop="ownerIdCard"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input class="item_width_1"
+                              placeholder="请输入房主身份证"
+                              v-model="dataForm.ownerIdCard">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="备注"
+                              prop="remark"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input v-model="dataForm.remark"
+                              type="textarea"
+                              :autosize="{ minRows: 6, maxRows: 20 }"
+                              maxlength="500"
+                              class="item_width_1"
+                              style=""
+                              clearable
+                              show-word-limit
+                              placeholder="请输入备注"></el-input>
+
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="div_btn">
+            <el-button size="small"
+                       @click="handleCancle">取 消</el-button>
+            <el-button size="small"
+                       v-if="formType != 'detail'"
+                       type="primary"
+                       :disabled="btnDisable"
+                       @click="handleComfirm">确 定</el-button>
+        </div>
+    </div>
 </template>
 <script>
-	import {
-		mapGetters
-	} from 'vuex'
-	import {
-		Loading
-	} from 'element-ui' // 引入Loading服务
-	import {
-		requestPost,
-		requestGet
-	} from '@/js/dai/request'
-	let loading // 加载动画
-	export default {
-		data() {
-			// if (value === '') {
-			// 	callback(new Error('请输入身份证号'));
-			// } else
-			const checkPhone = (rule, value, callback) => {
-				if (value === '') {
-					callback();
-				} else if (!/^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(1[|6|7|8][0-9]))\d{8}$/.test(value)) {
-					callback(new Error('请输入正确的手机号格式'));
-				} else {
-					callback();
-				}
-			};
-			// 验证身份证号
-			const checkCardId = (rule, value, callback) => {
-				if (value === '') {
-					callback();
-				} else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
-					callback(new Error('请输入正确的身份证号'));
-				} else {
-					callback();
-				}
-			};
-			return {
-				formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-				btnDisable: false,
-				unitList: [],
-				houseId: '', //房屋ID
-				houseType: '1',
-				purpose: '1',
-				rentFlag: 0,
-				dataForm: {
-					neighborHoodId: '', // 所属小区ID
-					buildingId: '', //所属楼栋ID
-					buildingUnitId: '', //所属单元ID
-					doorName: '', //门牌号
-					houseType: '', //房屋类型【楼房，平房，别墅】
-					purpose: '', //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-					rentFlag: 0, //房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-					ownerPhone: '', //联系方式
-					ownerName: '', //房主名字
-					ownerIdCard: '', //房主身份证
-					remark: '',
-					// realPerson: 0,
-					coding: '',
-					sysCoding: '',
-					area: "",
-					floor: ""
-				},
-				keyWords: '',
-				agencyObj: {},
-				dataRule: {
-					buildingUnitId: [{
-						required: true,
-						message: '所属单元不能为空',
-						trigger: 'blur'
-					}, ],
-					doorName: [{
-						required: true,
-						message: '门牌号不能为空',
-						trigger: 'blur'
-					}],
-					coding: [{
-						required: true,
-						message: '房屋编码不能为空',
-						trigger: 'blur'
-					}],
-					houseType: [{
-						required: true,
-						message: '房屋类型不能为空',
-						trigger: 'blur'
-					}],
-					purpose: [{
-						required: true,
-						message: '房屋用途不能为空',
-						trigger: 'blur'
-					}],
-					rentFlag: [{
-						required: true,
-						message: '是否出租不能为空',
-						trigger: 'blur'
-					}],
-					ownerPhone: [{
-						
-						validator: checkPhone,
-						trigger: 'blur'
-					}],
-					ownerName: [{
-						required: false
-					}],
-					ownerIdCard: [{
-						
-						validator: checkCardId,
-						trigger: 'blur'
-					}],
-					remark: [{
-						required: false
-					}],
-				},
-			}
-		},
-		components: {},
-		mounted() {},
-		methods: {
-			async initForm(type, row, agencyObj) {
-				this.$refs.ref_form.resetFields();
-				this.agencyObj = agencyObj
-				this.formType = type
-				console.log('agencyObj-----', agencyObj)
-				if (row) {
-					this.houseId = row.houseId
-					await this.loadHouseInfo()
-					// this.dataForm = JSON.parse(JSON.stringify(row))
-					// this.houseId = this.dataForm.houseId
-					// this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-					// this.dataForm = { ...  this.dataForm }
-					// this.houseType = this.dataForm.houseTypeKey
-					// this.purpose = this.dataForm.purposeKey
-					// this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-				} else {
-					this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-					this.dataForm.buildingId = this.agencyObj.id
-				}
-				await this.loadUnitList()
-			},
-			async loadHouseInfo() {
-				const url = "/gov/org/ichouse/" + this.houseId
-				const {
-					data,
-					code,
-					msg
-				} = await requestGet(url)
-				if (code === 0) {
-					// debugger
-					this.dataForm = {
-						...data
-					}
-					this.houseType = this.dataForm.houseType
-					this.purpose = this.dataForm.purpose
-					this.rentFlag = parseInt(this.dataForm.rentFlag)
-				} else {
-					this.$message.error(msg)
-				}
-			},
-			//加载单元
-			async loadUnitList() {
-				const url = '/gov/org/building/buildingunitlist'
-				let params = {
-					buildingId: this.dataForm.buildingId
-				}
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, params)
-				if (code === 0) {
-					this.unitList = data
-				} else {
-					this.$message.error(msg)
-				}
-			},
-			async handleCode() {
-				if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost("/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
-				if (msg == "success" && code == 0) {
-					this.dataForm.coding = data.coding
-					this.dataForm.sysCoding = data.sysCoding
-				}
-			},
-			async handleComfirm() {
-				this.btnDisable = true
-				setTimeout(() => {
-					this.btnDisable = false
-				}, 10000)
-				this.dataForm.houseType = this.houseType
-				this.dataForm.purpose = this.purpose
-				this.dataForm.rentFlag = this.rentFlag
-				this.$refs['ref_form'].validate((valid, messageObj) => {
-					if (!valid) {
-						this.btnDisable = false
-						app.util.validateRule(messageObj)
-					} else {
-						this.addRoom()
-					}
-				})
-			},
-			async addRoom() {
-				const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-				if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
-					this.btnDisable = false
-					this.$message({
-						type: 'warning',
-						message: '请输入正确的身份证号码'
-					})
-					return false;
-				}
-				const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-				if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
-					this.btnDisable = false
-					this.$message({
-						type: 'warning',
-						message: '请输入正确的手机号码'
-					})
-					return false;
-				}
-				let url = ''
-				if (this.formType === 'add') {
-					url = '/gov/org/house/houseadd'
-				} else {
-					url = '/gov/org/house/houseupdate'
-					this.dataForm.houseId = this.houseId
-				}
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, this.dataForm)
-				this.btnDisable = false
-				if (code === 0) {
-					this.$message({
-						type: 'success',
-						message: '操作成功'
-					})
-					this.resetData()
-					this.$emit('dialogOk')
-				} else {
-					this.$message.error(msg)
-				}
-			},
-			handleCancle() {
-				this.resetData()
-				this.$emit('dialogCancle')
-			},
-			resetData() {
-				this.houseId = '' //房屋ID
-				this.houseType = '1'
-				this.purpose = '1'
-				this.rentFlag = 0
-				this.dataForm = {
-					neighborHoodId: '', // 所属小区ID
-					buildingId: '', //所属楼栋ID
-					buildingUnitId: '', //所属单元ID
-					doorName: '', //门牌号
-					houseType: '1', //房屋类型【楼房，平房，别墅】
-					purpose: '1', //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-					rentFlag: 0, //是否出租【是：1，否：0】
-					ownerPhone: '', //联系方式
-					ownerName: '', //房主名字
-					ownerIdCard: '', //房主身份证
-					remark: '', // 备注
-					coding: '',
-					sysCoding: ''
-				}
-			},
-			// 开启加载动画
-			startLoading() {
-				loading = Loading.service({
-					lock: true, // 是否锁定
-					text: '正在加载……', // 加载中需要显示的文字
-					background: 'rgba(0,0,0,.7)' // 背景颜色
-				})
-			},
-			// 结束加载动画
-			endLoading() {
-				// clearTimeout(timer);
-				if (loading) {
-					loading.close()
-				}
-			}
-		},
-		computed: {},
-		props: {
-			view_real_data: { //显示【显示脱敏信息】按钮
-				type: Boolean,
-				default: false,
-			}
-		}
-	}
+import {
+    mapGetters
+} from 'vuex'
+import {
+    Loading
+} from 'element-ui' // 引入Loading服务
+import {
+    requestPost,
+    requestGet
+} from '@/js/dai/request'
+let loading // 加载动画
+export default {
+    data() {
+        // if (value === '') {
+        // 	callback(new Error('请输入身份证号'));
+        // } else
+        const checkPhone = (rule, value, callback) => {
+            if (value === '') {
+                callback();
+            } else if (!/^1[3-9]\d{9}$/.test(value)) {
+                callback(new Error('请输入正确的手机号格式'));
+            } else {
+                callback();
+            }
+        };
+        // 验证身份证号
+        const checkCardId = (rule, value, callback) => {
+            if (value === '') {
+                callback();
+            } else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+                callback(new Error('请输入正确的身份证号'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+            btnDisable: false,
+            unitList: [],
+            houseId: '', //房屋ID
+            houseType: '1',
+            purpose: '1',
+            rentFlag: 0,
+            dataForm: {
+                neighborHoodId: '', // 所属小区ID
+                buildingId: '', //所属楼栋ID
+                buildingUnitId: '', //所属单元ID
+                doorName: '', //门牌号
+                houseType: '', //房屋类型【楼房，平房，别墅】
+                purpose: '', //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+                rentFlag: 0, //房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+                ownerPhone: '', //联系方式
+                ownerName: '', //房主名字
+                ownerIdCard: '', //房主身份证
+                remark: '',
+                // realPerson: 0,
+                coding: '',
+                sysCoding: '',
+                area: "",
+                floor: ""
+            },
+            keyWords: '',
+            agencyObj: {},
+            dataRule: {
+                buildingUnitId: [{
+                    required: true,
+                    message: '所属单元不能为空',
+                    trigger: 'blur'
+                },],
+                doorName: [{
+                    required: true,
+                    message: '门牌号不能为空',
+                    trigger: 'blur'
+                }],
+                coding: [{
+                    required: true,
+                    message: '房屋编码不能为空',
+                    trigger: 'blur'
+                }],
+                houseType: [{
+                    required: true,
+                    message: '房屋类型不能为空',
+                    trigger: 'blur'
+                }],
+                purpose: [{
+                    required: true,
+                    message: '房屋用途不能为空',
+                    trigger: 'blur'
+                }],
+                rentFlag: [{
+                    required: true,
+                    message: '是否出租不能为空',
+                    trigger: 'blur'
+                }],
+                ownerPhone: [{
+
+                    validator: checkPhone,
+                    trigger: 'blur'
+                }],
+                ownerName: [{
+                    required: false
+                }],
+                ownerIdCard: [{
+
+                    validator: checkCardId,
+                    trigger: 'blur'
+                }],
+                remark: [{
+                    required: false
+                }],
+            },
+        }
+    },
+    components: {},
+    mounted() { },
+    methods: {
+        async initForm(type, row, agencyObj) {
+            this.$refs.ref_form.resetFields();
+            this.agencyObj = agencyObj
+            this.formType = type
+            console.log('agencyObj-----', agencyObj)
+            if (row) {
+                this.houseId = row.houseId
+                await this.loadHouseInfo()
+                // this.dataForm = JSON.parse(JSON.stringify(row))
+                // this.houseId = this.dataForm.houseId
+                // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+                // this.dataForm = { ...  this.dataForm }
+                // this.houseType = this.dataForm.houseTypeKey
+                // this.purpose = this.dataForm.purposeKey
+                // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+            } else {
+                this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+                this.dataForm.buildingId = this.agencyObj.id
+            }
+            await this.loadUnitList()
+        },
+        async loadHouseInfo() {
+            const url = "/gov/org/ichouse/" + this.houseId
+            const {
+                data,
+                code,
+                msg
+            } = await requestGet(url)
+            if (code === 0) {
+                // debugger
+                this.dataForm = {
+                    ...data
+                }
+                this.houseType = this.dataForm.houseType
+                this.purpose = this.dataForm.purpose
+                this.rentFlag = parseInt(this.dataForm.rentFlag)
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        //加载单元
+        async loadUnitList() {
+            const url = '/gov/org/building/buildingunitlist'
+            let params = {
+                buildingId: this.dataForm.buildingId
+            }
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, params)
+            if (code === 0) {
+                this.unitList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async handleCode() {
+            if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost("/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
+            if (msg == "success" && code == 0) {
+                this.dataForm.coding = data.coding
+                this.dataForm.sysCoding = data.sysCoding
+            }
+        },
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            this.dataForm.houseType = this.houseType
+            this.dataForm.purpose = this.purpose
+            this.dataForm.rentFlag = this.rentFlag
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    this.btnDisable = false
+                    app.util.validateRule(messageObj)
+                } else {
+                    this.addRoom()
+                }
+            })
+        },
+        async addRoom() {
+            const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+            if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+                this.btnDisable = false
+                this.$message({
+                    type: 'warning',
+                    message: '请输入正确的身份证号码'
+                })
+                return false;
+            }
+            const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+            if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+                this.btnDisable = false
+                this.$message({
+                    type: 'warning',
+                    message: '请输入正确的手机号码'
+                })
+                return false;
+            }
+            let url = ''
+            if (this.formType === 'add') {
+                url = '/gov/org/house/houseadd'
+            } else {
+                url = '/gov/org/house/houseupdate'
+                this.dataForm.houseId = this.houseId
+            }
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, this.dataForm)
+            this.btnDisable = false
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                })
+                this.resetData()
+                this.$emit('dialogOk')
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        handleCancle() {
+            this.resetData()
+            this.$emit('dialogCancle')
+        },
+        resetData() {
+            this.houseId = '' //房屋ID
+            this.houseType = '1'
+            this.purpose = '1'
+            this.rentFlag = 0
+            this.dataForm = {
+                neighborHoodId: '', // 所属小区ID
+                buildingId: '', //所属楼栋ID
+                buildingUnitId: '', //所属单元ID
+                doorName: '', //门牌号
+                houseType: '1', //房屋类型【楼房，平房，别墅】
+                purpose: '1', //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+                rentFlag: 0, //是否出租【是：1，否：0】
+                ownerPhone: '', //联系方式
+                ownerName: '', //房主名字
+                ownerIdCard: '', //房主身份证
+                remark: '', // 备注
+                coding: '',
+                sysCoding: ''
+            }
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {},
+    props: {
+        view_real_data: { //显示【显示脱敏信息】按钮
+            type: Boolean,
+            default: false,
+        }
+    }
+}
 </script>
 <style lang="scss" scoped>
-	@import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 
-	.div_tuomin {
-		position: absolute;
-		top: 0;
-		right: 40px;
-	}
+.div_tuomin {
+    position: absolute;
+    top: 0;
+    right: 40px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index af09b64a9..5c06ee47e 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -1,2368 +1,2850 @@
 <template>
-	<div class="app-container">
-		<el-row>
-			<el-col :span="24" style="margin-left: 10px; margin-top: 10px; margin-bottom: 20px">
-				<el-breadcrumb separator-class="el-icon-arrow-right">
-					<el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr" :key="breadcrumb.id">
-						<el-link v-if="breadcrumb.id === currentBreadcrumbKey" type="primary" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-						<el-link v-else type="info" @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
-						<el-link
-							v-if="index === breadcrumbArr.length - 1"
-							type="primary"
-							@click.native="modifyOrgInfo"
-							style="
+    <div class="app-container">
+        <el-row>
+            <el-col :span="24"
+                    style="margin-left: 10px; margin-top: 10px; margin-bottom: 20px">
+                <el-breadcrumb separator-class="el-icon-arrow-right">
+                    <el-breadcrumb-item v-for="(breadcrumb, index) in breadcrumbArr"
+                                        :key="breadcrumb.id">
+                        <el-link v-if="breadcrumb.id === currentBreadcrumbKey"
+                                 type="primary"
+                                 @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-else
+                                 type="info"
+                                 @click.native="refreshThisPage(index)">{{ breadcrumb.name }}</el-link>
+                        <el-link v-if="index === breadcrumbArr.length - 1"
+                                 type="primary"
+                                 @click.native="modifyOrgInfo"
+                                 style="
 								margin-left: 10px;
 								margin-top: 0px;
 								color: #3e8ef7;
 								cursor: pointer;
 							"
-							icon="el-icon-edit"
-						>
-							修改
-						</el-link>
-					</el-breadcrumb-item>
-				</el-breadcrumb>
-			</el-col>
-		</el-row>
-		<!-- 组织列表 -->
-		<el-table v-show="agencyTableFlag" height="250" :data="agencyTableListData" style="width: 100%">
-			<el-table-column prop="agencyName" label="下级组织"></el-table-column>
-			<el-table-column prop="contacts" label="联系人"></el-table-column>
-			<el-table-column prop="mobile" label="联系人电话"></el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot="header">
-					<el-button size="mini" type="primary" icon="el-icon-plus" @click="addAgency()">新增</el-button>
-				</template>
-				<template slot-scope="scope">
-					<el-button size="mini" type="warning" icon="el-icon-arrow-right" @click="entryAgency(scope.row.agencyId)">进入</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 下级机关单位/基层科室列表 -->
-		<el-table v-show="departmentTableFlag" height="250" :data="departmentTableListData" style="width: 100%">
-			<el-table-column prop="departmentName" label="下级机关单位/基层科室"></el-table-column>
-			<el-table-column prop="departmentTypeShow" label="部门类型"></el-table-column>
-			<el-table-column prop="contacts" label="联系人"></el-table-column>
-			<el-table-column prop="mobile" label="联系人电话"></el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot="header" slot-scope="scope">
-					<div style="display: flex;">
-						<el-upload
-							:headers="$getElUploadHeaders()"
-							ref="upload"
-							class="upload-btn"
-							:multiple="false"
-							:show-file-list="false"
-							:before-upload="
+                                 icon="el-icon-edit">
+                            修改
+                        </el-link>
+                    </el-breadcrumb-item>
+                </el-breadcrumb>
+            </el-col>
+        </el-row>
+        <!-- 组织列表 -->
+        <el-table v-show="agencyTableFlag"
+                  height="250"
+                  :data="agencyTableListData"
+                  style="width: 100%">
+            <el-table-column prop="agencyName"
+                             label="下级组织"></el-table-column>
+            <el-table-column prop="contacts"
+                             label="联系人"></el-table-column>
+            <el-table-column prop="mobile"
+                             label="联系人电话"></el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             class-name="small-padding fixed-width">
+                <template slot="header">
+                    <el-button size="mini"
+                               type="primary"
+                               icon="el-icon-plus"
+                               @click="addAgency()">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini"
+                               type="warning"
+                               icon="el-icon-arrow-right"
+                               @click="entryAgency(scope.row.agencyId)">进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 下级机关单位/基层科室列表 -->
+        <el-table v-show="departmentTableFlag"
+                  height="250"
+                  :data="departmentTableListData"
+                  style="width: 100%">
+            <el-table-column prop="departmentName"
+                             label="下级机关单位/基层科室"></el-table-column>
+            <el-table-column prop="departmentTypeShow"
+                             label="部门类型"></el-table-column>
+            <el-table-column prop="contacts"
+                             label="联系人"></el-table-column>
+            <el-table-column prop="mobile"
+                             label="联系人电话"></el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             class-name="small-padding fixed-width">
+                <template slot="header"
+                          slot-scope="scope">
+                    <div style="display: flex;">
+                        <el-upload :headers="$getElUploadHeaders()"
+                                   ref="upload"
+                                   class="upload-btn"
+                                   :multiple="false"
+                                   :show-file-list="false"
+                                   :before-upload="
 								file => {
 									beforeUpload(file);
 								}
 							"
-							action=""
-							accept=".xls,.xlsx"
-							:http-request="
+                                   action=""
+                                   accept=".xls,.xlsx"
+                                   :http-request="
 								() => {
 									uploadFile('department');
 								}
-							"
-						>
-							<el-button type="primary" style="margin-right:10px" class="btn" size="small">导入</el-button>
-						</el-upload>
-						<el-button size="small" style="margin-right:10px" type="primary" class="btn" @click="handleExportModule('department')">下载模板</el-button>
+							">
+                            <el-button type="primary"
+                                       style="margin-right:10px"
+                                       class="btn"
+                                       size="small">导入</el-button>
+                        </el-upload>
+                        <el-button size="small"
+                                   style="margin-right:10px"
+                                   type="primary"
+                                   class="btn"
+                                   @click="handleExportModule('department')">下载模板</el-button>
 
-						<el-button size="small" type="primary" icon="el-icon-plus" class="btn" @click="addCommunity(scope.row)">新增</el-button>
-					</div>
-				</template>
-				<template slot-scope="scope">
-					<el-button size="small" type="warning" icon="el-icon-arrow-right" @click="entryDepartment(scope.row)">进入</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 网格列表 -->
-		<el-table v-if="currentAgencyLevel == 'community'" v-show="gridTableFlag" height="250" :data="gridTableListData" style="width: 100%">
-			<el-table-column prop="gridName" label="直属网格"></el-table-column>
-			<el-table-column prop="gridTypeName" label="网格类型"></el-table-column>
-			<el-table-column prop="contacts" label="联系人"></el-table-column>
-			<el-table-column prop="mobile" label="联系人电话"></el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot="header" slot-scope="scope">
-					<el-button size="mini" type="primary" icon="el-icon-plus" @click="addGrid(scope.row)">新增</el-button>
-				</template>
-				<template slot-scope="scope">
-					<el-button size="mini" type="warning" icon="el-icon-arrow-right" @click="entryGrid(scope.row.gridId)">进入</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 本级工作人员 -->
-		<el-table v-show="currentAgencyStaffTableFlag" :data="cleanAgencyStaffTableListData" style="width: 100%" height="350">
-			<el-table-column prop="name" label="本级工作人员名字" width="260">
-				<template slot-scope="scope">
-					<span>{{ scope.row.name }}</span>
-					<el-tag v-if="scope.row.enableFlag === 'disabled'" type="danger" style="margin-left: 10px" size="mini" disable-transitions>{{ '已禁用' }}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column prop="roles" label="本级工作人员职责" width="260">
-				<template slot-scope="scope">
-					<el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot="header" slot-scope="scope">
-					<div style="display: flex;">
-						<el-input
-							placeholder="请输入姓名或手机号"
-							v-model="searchStaffKeyword"
-							style="width: 400px; margin-right: 10px"
-							@input="handleSearchStaff"
-							class="input-with-select"
-						>
-							<el-button @click.stop="handleSearchStaff" slot="append" icon="el-icon-search"></el-button>
-						</el-input>
+                        <el-button size="small"
+                                   type="primary"
+                                   icon="el-icon-plus"
+                                   class="btn"
+                                   @click="addCommunity(scope.row)">新增</el-button>
+                    </div>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="small"
+                               type="warning"
+                               icon="el-icon-arrow-right"
+                               @click="entryDepartment(scope.row)">进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 网格列表 -->
+        <el-table v-if="currentAgencyLevel == 'community'"
+                  v-show="gridTableFlag"
+                  height="250"
+                  :data="gridTableListData"
+                  style="width: 100%">
+            <el-table-column prop="gridName"
+                             label="直属网格"></el-table-column>
+            <el-table-column prop="gridTypeName"
+                             label="网格类型"></el-table-column>
+            <el-table-column prop="contacts"
+                             label="联系人"></el-table-column>
+            <el-table-column prop="mobile"
+                             label="联系人电话"></el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             class-name="small-padding fixed-width">
+                <template slot="header"
+                          slot-scope="scope">
+                    <el-button size="mini"
+                               type="primary"
+                               icon="el-icon-plus"
+                               @click="addGrid(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini"
+                               type="warning"
+                               icon="el-icon-arrow-right"
+                               @click="entryGrid(scope.row.gridId)">进入</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 本级工作人员 -->
+        <el-table v-show="currentAgencyStaffTableFlag"
+                  :data="cleanAgencyStaffTableListData"
+                  style="width: 100%"
+                  height="350">
+            <el-table-column prop="name"
+                             label="本级工作人员名字"
+                             width="260">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.name }}</span>
+                    <el-tag v-if="scope.row.enableFlag === 'disabled'"
+                            type="danger"
+                            style="margin-left: 10px"
+                            size="mini"
+                            disable-transitions>{{ '已禁用' }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column prop="roles"
+                             label="本级工作人员职责"
+                             width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary"
+                            size="mini"
+                            v-for="(role, index) in scope.row.roles"
+                            :key="index"
+                            disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             class-name="small-padding fixed-width">
+                <template slot="header"
+                          slot-scope="scope">
+                    <div style="display: flex;">
+                        <el-input placeholder="请输入姓名或手机号"
+                                  v-model="searchStaffKeyword"
+                                  style="width: 400px; margin-right: 10px"
+                                  @input="handleSearchStaff"
+                                  class="input-with-select">
+                            <el-button @click.stop="handleSearchStaff"
+                                       slot="append"
+                                       icon="el-icon-search"></el-button>
+                        </el-input>
 
-						<el-upload
-							:headers="$getElUploadHeaders()"
-							ref="upload"
-							class="upload-btn"
-							:multiple="false"
-							:show-file-list="false"
-							:before-upload="
+                        <el-upload :headers="$getElUploadHeaders()"
+                                   ref="upload"
+                                   class="upload-btn"
+                                   :multiple="false"
+                                   :show-file-list="false"
+                                   :before-upload="
 								file => {
 									beforeUpload(file);
 								}
 							"
-							action=""
-							accept=".xls,.xlsx"
-							:http-request="
+                                   action=""
+                                   accept=".xls,.xlsx"
+                                   :http-request="
 								() => {
 									uploadFile('staff');
 								}
-							"
-						>
-							<el-button type="primary" style="margin-right:10px" size="small" class="btn">导入</el-button>
-						</el-upload>
-						<el-button type="primary" class="btn" size="small" @click="handleExportModule('staff')">下载模板</el-button>
-						<el-button type="primary" class="btn" size="small" icon="el-icon-plus" @click="addPeo(scope.row)">新增</el-button>
-					</div>
-				</template>
-				<template slot-scope="scope">
-					<el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuPeo(scope.row)">修改</el-button>
-					<el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
-					<el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
-					<el-button v-if="scope.row.enableFlag === 'enable'" size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用/删除</el-button>
-					<el-button v-if="scope.row.enableFlag === 'disabled'" size="mini" type="danger" icon="el-icon-circle-close" @click="enablestaff(scope.row)">解禁</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 下级机关单位/基层科室工作人员 -->
-		<el-table height="350" v-show="departmentStaffTableFlag" :data="cleanDepartmentStaffTableListData" style="width: 100%">
-			<el-table-column prop="name" label="下级机关单位/基层科室工作人员" width="260"></el-table-column>
-			<el-table-column prop="roles" label="下级机关单位/基层科室工作人员职责" width="260">
-				<template slot-scope="scope">
-					<el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot="header" slot-scope="scope">
-					<el-input
-						placeholder="请输入姓名或手机号"
-						v-model="searchDeptStaffKeyword"
-						style="width: 400px; margin-right: 10px"
-						@input="handleSearchDeptStaff"
-						class="input-with-select"
-					>
-						<el-button @click.stop="handleSearchDeptStaff" slot="append" icon="el-icon-search"></el-button>
-					</el-input>
-					<el-button v-if="selDeptType === 'duty'" size="mini" type="primary" icon="el-icon-plus" @click="addCommunityPeo(scope.row)">新增</el-button>
-				</template>
-				<template slot-scope="scope">
-					<el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuCommunityPeo(scope.row)">修改</el-button>
-					<el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
-					<el-button v-if="selDeptType === 'duty'" size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
-					<el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用/删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 网格工作人员 -->
-		<el-table v-show="gridStaffTableFlag" :data="cleanGridStaffTableListData" style="width: 100%" height="350">
-			<el-table-column prop="name" label="网格工作人员名字" width="260"></el-table-column>
-			<el-table-column prop="roles" label="网格工作人员职责" width="260">
-				<template slot-scope="scope">
-					<el-tag type="primary" size="mini" v-for="(role, index) in scope.row.roles" :key="index" disable-transitions>{{ role }}</el-tag>
-				</template>
-			</el-table-column>
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-				<template slot="header" slot-scope="scope">
-					<el-input
-						placeholder="请输入姓名或手机号"
-						v-model="searchGridStaffKeyword"
-						style="width: 400px; margin-right: 10px"
-						@input="handleSearchGridStaff"
-						class="input-with-select"
-					>
-						<el-button @click.stop="handleSearchGridStaff" slot="append" icon="el-icon-search"></el-button>
-					</el-input>
-					<el-button size="mini" type="primary" icon="el-icon-plus" @click="addGridPeo(scope.row)">新增</el-button>
-				</template>
-				<template slot-scope="scope">
-					<el-button size="mini" type="warning" icon="el-icon-edit" @click="xiuGridPeo(scope.row)">修改</el-button>
-					<el-button size="mini" type="success" icon="el-icon-view" @click="lookAngency(scope.row)">查看</el-button>
-					<el-button size="mini" type="info" icon="el-icon-rank" @click="transfer(scope.row)">调动</el-button>
-					<el-button size="mini" type="danger" icon="el-icon-circle-close" @click="DisablePeo(scope.row)">禁用/删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<!-- 新增下级机关单位/基层科室 -->
-		<el-dialog title="新增部门" :visible.sync="dialogVisible" width="850" :before-close="handleClose">
-			<el-form label-width="120px" :rules="rules">
-				<el-form-item label="部门名称" prop="addDepartmentName"><el-input v-model="insertForm.departmentName" placeholder="请输入部门名称"></el-input></el-form-item>
-				<el-form-item label="组织编码" prop="code"><el-input v-model="insertForm.code" placeholder="请输入组织编码"></el-input></el-form-item>
-				<el-form-item label="联系人" prop="contacts"><el-input v-model="insertForm.contacts" placeholder="请输入联系人姓名"></el-input></el-form-item>
-				<el-form-item label="联系电话" prop="mobile"><el-input v-model="insertForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="cancel">取 消</el-button>
-				<el-button type="primary" @click="submit">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 新增网格 -->
-		<div v-if="dialogVisibleGrid">
-			<el-dialog title="新增网格" :visible.sync="dialogVisibleGrid" width="850" :before-close="handleClose">
-				<el-form label-width="120px" :rules="rules">
-					<el-form-item label="网格名称" prop="gridName"><el-input v-model="GridForm.gridName" placeholder="请输入部门名称"></el-input></el-form-item>
-					<el-form-item label="网格编码" prop="GridCode"><el-input v-model="GridForm.code" placeholder="请输入网格编码"></el-input></el-form-item>
-					<!-- 网格类型，下拉框 -->
-					<el-form-item label="网格类型" prop="typeTag">
-						<el-select v-model="GridForm.gridType" clearable placeholder="网格类型">
-							<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="GridContacts"><el-input v-model="GridForm.contacts" placeholder="请输入联系人姓名"></el-input></el-form-item>
-					<el-form-item label="联系电话" prop="GridMobile"><el-input v-model="GridForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-					<!-- 组织位置 -->
-					<el-form-item label="坐标"><div id="con"></div></el-form-item>
-				</el-form>
-				<div slot="footer">
-					<el-button @click="cancelGrid">取 消</el-button>
-					<el-button type="primary" @click="submitGrid">确 定</el-button>
-				</div>
-			</el-dialog>
-		</div>
-		<!-- 新增人员 -->
-		<div v-if="dialogVisiblePeo">
-			<el-dialog title="新增人员" :visible.sync="dialogVisiblePeo" width="850" :before-close="handleClose">
-				<el-form :model="peoForm" label-width="150px" ref="addPeoForm" :rules="rulesPeo">
-					<el-form-item label="姓名" prop="name"><el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input></el-form-item>
-					<el-form-item label="手机号" prop="mobile"><el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input></el-form-item>
-					<!-- 性别下拉框 -->
-					<el-form-item label="身份证号" prop="idCard"><el-input v-model="peoForm.idCard" placeholder="请输入身份证号"></el-input></el-form-item>
-					<el-form-item label="村居委员职务" prop="viliagePosition">
-						<el-input v-model="peoForm.viliagePosition" placeholder="请输入村居委员职务"></el-input>
-					</el-form-item>
-					<el-form-item label="党组织职务" prop="partyPosition"><el-input v-model="peoForm.partyPosition" placeholder="请输入党组织职务"></el-input></el-form-item>
-					<el-form-item label="居住地址" prop="address"><el-input v-model="peoForm.address" placeholder="请输入居住地址"></el-input></el-form-item>
-					<el-form-item label="文化程度" prop="culture">
-						<el-select v-model="peoForm.culture" clearable placeholder="文化程度">
-							<el-option v-for="item in cultureList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- *身份证号 tianqian
+							">
+                            <el-button type="primary"
+                                       style="margin-right:10px"
+                                       size="small"
+                                       class="btn">导入</el-button>
+                        </el-upload>
+                        <el-button type="primary"
+                                   class="btn"
+                                   size="small"
+                                   @click="handleExportModule('staff')">下载模板</el-button>
+                        <el-button type="primary"
+                                   class="btn"
+                                   size="small"
+                                   icon="el-icon-plus"
+                                   @click="addPeo(scope.row)">新增</el-button>
+                    </div>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini"
+                               type="warning"
+                               icon="el-icon-edit"
+                               @click="xiuPeo(scope.row)">修改</el-button>
+                    <el-button size="mini"
+                               type="success"
+                               icon="el-icon-view"
+                               @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini"
+                               type="info"
+                               icon="el-icon-rank"
+                               @click="transfer(scope.row)">调动</el-button>
+                    <el-button v-if="scope.row.enableFlag === 'enable'"
+                               size="mini"
+                               type="danger"
+                               icon="el-icon-circle-close"
+                               @click="DisablePeo(scope.row)">禁用/删除</el-button>
+                    <el-button v-if="scope.row.enableFlag === 'disabled'"
+                               size="mini"
+                               type="danger"
+                               icon="el-icon-circle-close"
+                               @click="enablestaff(scope.row)">解禁</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 下级机关单位/基层科室工作人员 -->
+        <el-table height="350"
+                  v-show="departmentStaffTableFlag"
+                  :data="cleanDepartmentStaffTableListData"
+                  style="width: 100%">
+            <el-table-column prop="name"
+                             label="下级机关单位/基层科室工作人员"
+                             width="260"></el-table-column>
+            <el-table-column prop="roles"
+                             label="下级机关单位/基层科室工作人员职责"
+                             width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary"
+                            size="mini"
+                            v-for="(role, index) in scope.row.roles"
+                            :key="index"
+                            disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             class-name="small-padding fixed-width">
+                <template slot="header"
+                          slot-scope="scope">
+                    <el-input placeholder="请输入姓名或手机号"
+                              v-model="searchDeptStaffKeyword"
+                              style="width: 400px; margin-right: 10px"
+                              @input="handleSearchDeptStaff"
+                              class="input-with-select">
+                        <el-button @click.stop="handleSearchDeptStaff"
+                                   slot="append"
+                                   icon="el-icon-search"></el-button>
+                    </el-input>
+                    <el-button v-if="selDeptType === 'duty'"
+                               size="mini"
+                               type="primary"
+                               icon="el-icon-plus"
+                               @click="addCommunityPeo(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini"
+                               type="warning"
+                               icon="el-icon-edit"
+                               @click="xiuCommunityPeo(scope.row)">修改</el-button>
+                    <el-button size="mini"
+                               type="success"
+                               icon="el-icon-view"
+                               @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button v-if="selDeptType === 'duty'"
+                               size="mini"
+                               type="info"
+                               icon="el-icon-rank"
+                               @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini"
+                               type="danger"
+                               icon="el-icon-circle-close"
+                               @click="DisablePeo(scope.row)">禁用/删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 网格工作人员 -->
+        <el-table v-show="gridStaffTableFlag"
+                  :data="cleanGridStaffTableListData"
+                  style="width: 100%"
+                  height="350">
+            <el-table-column prop="name"
+                             label="网格工作人员名字"
+                             width="260"></el-table-column>
+            <el-table-column prop="roles"
+                             label="网格工作人员职责"
+                             width="260">
+                <template slot-scope="scope">
+                    <el-tag type="primary"
+                            size="mini"
+                            v-for="(role, index) in scope.row.roles"
+                            :key="index"
+                            disable-transitions>{{ role }}</el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作"
+                             align="center"
+                             class-name="small-padding fixed-width">
+                <template slot="header"
+                          slot-scope="scope">
+                    <el-input placeholder="请输入姓名或手机号"
+                              v-model="searchGridStaffKeyword"
+                              style="width: 400px; margin-right: 10px"
+                              @input="handleSearchGridStaff"
+                              class="input-with-select">
+                        <el-button @click.stop="handleSearchGridStaff"
+                                   slot="append"
+                                   icon="el-icon-search"></el-button>
+                    </el-input>
+                    <el-button size="mini"
+                               type="primary"
+                               icon="el-icon-plus"
+                               @click="addGridPeo(scope.row)">新增</el-button>
+                </template>
+                <template slot-scope="scope">
+                    <el-button size="mini"
+                               type="warning"
+                               icon="el-icon-edit"
+                               @click="xiuGridPeo(scope.row)">修改</el-button>
+                    <el-button size="mini"
+                               type="success"
+                               icon="el-icon-view"
+                               @click="lookAngency(scope.row)">查看</el-button>
+                    <el-button size="mini"
+                               type="info"
+                               icon="el-icon-rank"
+                               @click="transfer(scope.row)">调动</el-button>
+                    <el-button size="mini"
+                               type="danger"
+                               icon="el-icon-circle-close"
+                               @click="DisablePeo(scope.row)">禁用/删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 新增下级机关单位/基层科室 -->
+        <el-dialog title="新增部门"
+                   :visible.sync="dialogVisible"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form label-width="120px"
+                     :rules="rules">
+                <el-form-item label="部门名称"
+                              prop="addDepartmentName"><el-input v-model="insertForm.departmentName"
+                              placeholder="请输入部门名称"></el-input></el-form-item>
+                <el-form-item label="组织编码"
+                              prop="code"><el-input v-model="insertForm.code"
+                              placeholder="请输入组织编码"></el-input></el-form-item>
+                <el-form-item label="联系人"
+                              prop="contacts"><el-input v-model="insertForm.contacts"
+                              placeholder="请输入联系人姓名"></el-input></el-form-item>
+                <el-form-item label="联系电话"
+                              prop="mobile"><el-input v-model="insertForm.mobile"
+                              placeholder="请输入联系电话"></el-input></el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancel">取 消</el-button>
+                <el-button type="primary"
+                           @click="submit">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 新增网格 -->
+        <div v-if="dialogVisibleGrid">
+            <el-dialog title="新增网格"
+                       :visible.sync="dialogVisibleGrid"
+                       width="850"
+                       :before-close="handleClose">
+                <el-form label-width="120px"
+                         :rules="rules">
+                    <el-form-item label="网格名称"
+                                  prop="gridName"><el-input v-model="GridForm.gridName"
+                                  placeholder="请输入部门名称"></el-input></el-form-item>
+                    <el-form-item label="网格编码"
+                                  prop="GridCode"><el-input v-model="GridForm.code"
+                                  placeholder="请输入网格编码"></el-input></el-form-item>
+                    <!-- 网格类型，下拉框 -->
+                    <el-form-item label="网格类型"
+                                  prop="typeTag">
+                        <el-select v-model="GridForm.gridType"
+                                   clearable
+                                   placeholder="网格类型">
+                            <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="GridContacts"><el-input v-model="GridForm.contacts"
+                                  placeholder="请输入联系人姓名"></el-input></el-form-item>
+                    <el-form-item label="联系电话"
+                                  prop="GridMobile"><el-input v-model="GridForm.mobile"
+                                  placeholder="请输入联系电话"></el-input></el-form-item>
+                    <!-- 组织位置 -->
+                    <el-form-item label="坐标">
+                        <div id="con"></div>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="cancelGrid">取 消</el-button>
+                    <el-button type="primary"
+                               @click="submitGrid">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+        <!-- 新增人员 -->
+        <div v-if="dialogVisiblePeo">
+            <el-dialog title="新增人员"
+                       :visible.sync="dialogVisiblePeo"
+                       width="850"
+                       :before-close="handleClose">
+                <el-form :model="peoForm"
+                         label-width="150px"
+                         ref="addPeoForm"
+                         :rules="rulesPeo">
+                    <el-form-item label="姓名"
+                                  prop="name"><el-input v-model="peoForm.name"
+                                  placeholder="请输入姓名"></el-input></el-form-item>
+                    <el-form-item label="手机号"
+                                  prop="mobile"><el-input v-model="peoForm.mobile"
+                                  placeholder="请输入手机号"></el-input></el-form-item>
+                    <!-- 性别下拉框 -->
+                    <el-form-item label="身份证号"
+                                  prop="idCard"><el-input v-model="peoForm.idCard"
+                                  placeholder="请输入身份证号"></el-input></el-form-item>
+                    <el-form-item label="村居委员职务"
+                                  prop="viliagePosition">
+                        <el-input v-model="peoForm.viliagePosition"
+                                  placeholder="请输入村居委员职务"></el-input>
+                    </el-form-item>
+                    <el-form-item label="党组织职务"
+                                  prop="partyPosition"><el-input v-model="peoForm.partyPosition"
+                                  placeholder="请输入党组织职务"></el-input></el-form-item>
+                    <el-form-item label="居住地址"
+                                  prop="address"><el-input v-model="peoForm.address"
+                                  placeholder="请输入居住地址"></el-input></el-form-item>
+                    <el-form-item label="文化程度"
+                                  prop="culture">
+                        <el-select v-model="peoForm.culture"
+                                   clearable
+                                   placeholder="文化程度">
+                            <el-option v-for="item in cultureList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- *身份证号 tianqian
 					*村居委员职务
 					*党组织职务
 					*居住地址
 					*文化程度 -->
-					<!-- 专兼职下拉框 -->
-					<el-form-item label="性别" prop="gender">
-						<el-select v-model="peoForm.gender" clearable placeholder="性别">
-							<el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-					<el-form-item label="专兼职" prop="post">
-						<el-select v-model="peoForm.post" clearable placeholder="专兼职">
-							<el-option v-for="item in postList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- 职责下拉框 -->
-					<el-form-item label="职责" prop="roles">
-						<el-select v-model="peoForm.roles" multiple placeholder="请选择">
-							<el-option v-for="item in dutyList" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.disabled"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- tianqian -->
-					<el-form-item label="工作职责" prop="duty"><el-input v-model="peoForm.duty" placeholder="请输入工作职责"></el-input></el-form-item>
-					<el-form-item label="角色" prop="newRoles">
-						<el-select v-model="peoForm.newRoles" multiple placeholder="请选择">
-							<el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-						</el-select>
-					</el-form-item>
-					<!-- tianqian -->
-					<el-form-item label="备注" prop="remark">
-						<el-input
-							v-model="peoForm.remark"
-							type="textarea"
-							:autosize="{ minRows: 6, maxRows: 20 }"
-							maxlength="500"
-							style=""
-							clearable
-							show-word-limit
-							placeholder="请输入备注"
-						></el-input>
-					</el-form-item>
-				</el-form>
-				<div slot="footer">
-					<el-button @click="cancelPeo">取 消</el-button>
-					<el-button type="primary" @click="submitPeo">确 定</el-button>
-				</div>
-			</el-dialog>
-		</div>
-		<!-- 人员修改 -->
-		<el-dialog v-if="modifyPeo" title="人员修改" :visible.sync="modifyPeo" width="850" :before-close="handleClose">
-			<el-form :model="peoForm" label-width="120px" ref="editPeoForm" :rules="rulesPeo">
-				<el-form-item label="姓名" prop="name"><el-input v-model="peoForm.name" placeholder="请输入姓名"></el-input></el-form-item>
-				<el-form-item label="手机号" prop="mobile"><el-input v-model="peoForm.mobile" placeholder="请输入手机号"></el-input></el-form-item>
-				<el-form-item label="身份证号" prop="idCard"><el-input v-model="peoForm.idCard" placeholder="请输入身份证号"></el-input></el-form-item>
-				<el-form-item label="村居委员职务" prop="viliagePosition"><el-input v-model="peoForm.viliagePosition" placeholder="请输入村居委员职务"></el-input></el-form-item>
-				<el-form-item label="党组织职务" prop="partyPosition"><el-input v-model="peoForm.partyPosition" placeholder="请输入党组织职务"></el-input></el-form-item>
-				<el-form-item label="居住地址" prop="address"><el-input v-model="peoForm.address" placeholder="请输入居住地址"></el-input></el-form-item>
-				<el-form-item label="文化程度" prop="culture">
-					<el-select v-model="peoForm.culture" clearable placeholder="文化程度">
-						<el-option v-for="item in cultureList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="性别" prop="gender">
-					<el-select v-model="peoForm.gender" clearable placeholder="性别">
-						<el-option v-for="item in genderList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="专兼职" prop="post">
-					<el-select v-model="peoForm.post" clearable placeholder="专兼职">
-						<el-option v-for="item in postList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="职责" prop="roles">
-					<el-select v-model="peoForm.roles" multiple placeholder="请选择">
-						<el-option v-for="item in dutyList" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.disabled"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="工作职责" prop="duty"><el-input v-model="peoForm.duty" placeholder="请输入工作职责"></el-input></el-form-item>
-				<el-form-item label="角色" prop="newRoles">
-					<el-select v-model="peoForm.newRoles" multiple placeholder="请选择">
-						<el-option v-for="item in roleList" :disabled="item.name=='超级管理员'" :key="item.id" :label="item.name" :value="item.id"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="备注" prop="remark">
-					<el-input
-						v-model="peoForm.remark"
-						type="textarea"
-						:autosize="{ minRows: 6, maxRows: 20 }"
-						maxlength="500"
-						style=""
-						clearable
-						show-word-limit
-						placeholder="请输入备注"
-					></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="cancelXiugai">取 消</el-button>
-				<el-button type="primary" @click="updatePeo">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 禁用弹窗 -->
-		<el-dialog v-if="Disable" title="确认禁用" :visible.sync="Disable" width="850" :before-close="handleClose">
-			<span>禁用后该用户将无法登录系统，是否继续？</span>
-			<div slot="footer">
-				<el-button @click="cancelDisable">取 消</el-button>
-				<el-button type="primary" @click="submitDisable">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 人员查看 -->
-		<el-dialog v-if="details" title="人员详情" :visible.sync="details" width="850" :before-close="handleClosePeoView">
-			<el-form label-width="120px">
-				<el-form-item label="姓名"><el-input v-model="peoForm.name" placeholder="姓名" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="手机号"><el-input v-model="peoForm.mobile" placeholder="手机号" :disabled="true"></el-input></el-form-item>
+                    <!-- 专兼职下拉框 -->
+                    <el-form-item label="性别"
+                                  prop="gender">
+                        <el-select v-model="peoForm.gender"
+                                   clearable
+                                   placeholder="性别">
+                            <el-option v-for="item in genderList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="专兼职"
+                                  prop="post">
+                        <el-select v-model="peoForm.post"
+                                   clearable
+                                   placeholder="专兼职">
+                            <el-option v-for="item in postList"
+                                       :key="item.value"
+                                       :label="item.label"
+                                       :value="item.value"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 职责下拉框 -->
+                    <el-form-item label="职责"
+                                  prop="roles">
+                        <el-select v-model="peoForm.roles"
+                                   multiple
+                                   placeholder="请选择">
+                            <el-option v-for="item in dutyList"
+                                       :key="item.roleId"
+                                       :label="item.roleName"
+                                       :value="item.roleId"
+                                       :disabled="item.disabled"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- tianqian -->
+                    <el-form-item label="工作职责"
+                                  prop="duty"><el-input v-model="peoForm.duty"
+                                  placeholder="请输入工作职责"></el-input></el-form-item>
+                    <el-form-item label="角色"
+                                  prop="newRoles">
+                        <el-select v-model="peoForm.newRoles"
+                                   multiple
+                                   placeholder="请选择">
+                            <el-option v-for="item in roleList"
+                                       :key="item.id"
+                                       :label="item.name"
+                                       :value="item.id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- tianqian -->
+                    <el-form-item label="备注"
+                                  prop="remark">
+                        <el-input v-model="peoForm.remark"
+                                  type="textarea"
+                                  :autosize="{ minRows: 6, maxRows: 20 }"
+                                  maxlength="500"
+                                  style=""
+                                  clearable
+                                  show-word-limit
+                                  placeholder="请输入备注"></el-input>
+                    </el-form-item>
+                </el-form>
+                <div slot="footer">
+                    <el-button @click="cancelPeo">取 消</el-button>
+                    <el-button type="primary"
+                               @click="submitPeo">确 定</el-button>
+                </div>
+            </el-dialog>
+        </div>
+        <!-- 人员修改 -->
+        <el-dialog v-if="modifyPeo"
+                   title="人员修改"
+                   :visible.sync="modifyPeo"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form :model="peoForm"
+                     label-width="120px"
+                     ref="editPeoForm"
+                     :rules="rulesPeo">
+                <el-form-item label="姓名"
+                              prop="name"><el-input v-model="peoForm.name"
+                              placeholder="请输入姓名"></el-input></el-form-item>
+                <el-form-item label="手机号"
+                              prop="mobile"><el-input v-model="peoForm.mobile"
+                              placeholder="请输入手机号"></el-input></el-form-item>
+                <el-form-item label="身份证号"
+                              prop="idCard"><el-input v-model="peoForm.idCard"
+                              placeholder="请输入身份证号"></el-input></el-form-item>
+                <el-form-item label="村居委员职务"
+                              prop="viliagePosition"><el-input v-model="peoForm.viliagePosition"
+                              placeholder="请输入村居委员职务"></el-input></el-form-item>
+                <el-form-item label="党组织职务"
+                              prop="partyPosition"><el-input v-model="peoForm.partyPosition"
+                              placeholder="请输入党组织职务"></el-input></el-form-item>
+                <el-form-item label="居住地址"
+                              prop="address"><el-input v-model="peoForm.address"
+                              placeholder="请输入居住地址"></el-input></el-form-item>
+                <el-form-item label="文化程度"
+                              prop="culture">
+                    <el-select v-model="peoForm.culture"
+                               clearable
+                               placeholder="文化程度">
+                        <el-option v-for="item in cultureList"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="性别"
+                              prop="gender">
+                    <el-select v-model="peoForm.gender"
+                               clearable
+                               placeholder="性别">
+                        <el-option v-for="item in genderList"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="专兼职"
+                              prop="post">
+                    <el-select v-model="peoForm.post"
+                               clearable
+                               placeholder="专兼职">
+                        <el-option v-for="item in postList"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="职责"
+                              prop="roles">
+                    <el-select v-model="peoForm.roles"
+                               multiple
+                               placeholder="请选择">
+                        <el-option v-for="item in dutyList"
+                                   :key="item.roleId"
+                                   :label="item.roleName"
+                                   :value="item.roleId"
+                                   :disabled="item.disabled"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="工作职责"
+                              prop="duty"><el-input v-model="peoForm.duty"
+                              placeholder="请输入工作职责"></el-input></el-form-item>
+                <el-form-item label="角色"
+                              prop="newRoles">
+                    <el-select v-model="peoForm.newRoles"
+                               multiple
+                               placeholder="请选择">
+                        <el-option v-for="item in roleList"
+                                   :disabled="item.name=='超级管理员'"
+                                   :key="item.id"
+                                   :label="item.name"
+                                   :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="备注"
+                              prop="remark">
+                    <el-input v-model="peoForm.remark"
+                              type="textarea"
+                              :autosize="{ minRows: 6, maxRows: 20 }"
+                              maxlength="500"
+                              style=""
+                              clearable
+                              show-word-limit
+                              placeholder="请输入备注"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelXiugai">取 消</el-button>
+                <el-button type="primary"
+                           @click="updatePeo">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 禁用弹窗 -->
+        <el-dialog v-if="Disable"
+                   title="确认禁用"
+                   :visible.sync="Disable"
+                   width="850"
+                   :before-close="handleClose">
+            <span>禁用后该用户将无法登录系统，是否继续？</span>
+            <div slot="footer">
+                <el-button @click="cancelDisable">取 消</el-button>
+                <el-button type="primary"
+                           @click="submitDisable">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 人员查看 -->
+        <el-dialog v-if="details"
+                   title="人员详情"
+                   :visible.sync="details"
+                   width="850"
+                   :before-close="handleClosePeoView">
+            <el-form label-width="120px">
+                <el-form-item label="姓名"><el-input v-model="peoForm.name"
+                              placeholder="姓名"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="手机号"><el-input v-model="peoForm.mobile"
+                              placeholder="手机号"
+                              :disabled="true"></el-input></el-form-item>
 
-				<el-form-item label="身份证号"><el-input v-model="peoForm.idCard" placeholder="身份证号" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="村居委员职务"><el-input v-model="peoForm.viliagePosition" placeholder="村居委员职务" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="党组织职务"><el-input v-model="peoForm.partyPosition" placeholder="党组织职务" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="居住地址"><el-input v-model="peoForm.address" placeholder="居住地址" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="文化程度"><el-input v-model="peoForm.culture" placeholder="文化程度" :disabled="true"></el-input></el-form-item>
+                <el-form-item label="身份证号"><el-input v-model="peoForm.idCard"
+                              placeholder="身份证号"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="村居委员职务"><el-input v-model="peoForm.viliagePosition"
+                              placeholder="村居委员职务"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="党组织职务"><el-input v-model="peoForm.partyPosition"
+                              placeholder="党组织职务"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="居住地址"><el-input v-model="peoForm.address"
+                              placeholder="居住地址"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="文化程度"><el-input v-model="peoForm.culture"
+                              placeholder="文化程度"
+                              :disabled="true"></el-input></el-form-item>
 
-				<el-form-item label="组织/部门"><el-input v-model="peoForm.zuzhi" placeholder="组织/部门" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="激活时间"><el-input v-model="peoForm.activeTime" placeholder="激活时间" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="职位"><el-input v-model="peoForm.roles" placeholder="职位" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="工作职责"><el-input v-model="peoForm.duty" placeholder="工作职责" :disabled="true"></el-input></el-form-item>
+                <el-form-item label="组织/部门"><el-input v-model="peoForm.zuzhi"
+                              placeholder="组织/部门"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="激活时间"><el-input v-model="peoForm.activeTime"
+                              placeholder="激活时间"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="职位"><el-input v-model="peoForm.roles"
+                              placeholder="职位"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="工作职责"><el-input v-model="peoForm.duty"
+                              placeholder="工作职责"
+                              :disabled="true"></el-input></el-form-item>
 
-				<el-form-item label="是否禁用"><el-input v-model="peoForm.disableFlag" placeholder="是否禁用" :disabled="true"></el-input></el-form-item>
-				<el-form-item label="备注"><el-input v-model="peoForm.remark" placeholder="备注" :disabled="true"></el-input></el-form-item>
-			</el-form>
-			<div slot="footer"><el-button type="primary" style="margin-right: 170px" @click="cancelDetails">关 闭</el-button></div>
-		</el-dialog>
-		<!-- 人员调动 -->
-		<el-dialog v-if="transferPeo" title="人员调动" :visible.sync="transferPeo" width="850" :before-close="handleClose">
-			<el-form label-width="120px" :model="agencyForm">
-				<el-form-item label="姓名"><el-input v-model="transferForm.name" placeholder="姓名"></el-input></el-form-item>
-				<el-form-item label="调动至">
-					<el-cascader
-						clearable
-						:props="{ checkStrictly: true, multiple: false }"
-						v-model="selectValue"
-						:options="options"
-						style="width: 100%"
-						@change="handleChangeTransferCascader"
-					>
-						<template slot-scope="{ data }">
-							<span>{{ data.label }}</span>
-							<span v-if="data.type != 'agency'" style="color: #aaa; font-size: 12px">（{{ data.typeName }}）</span>
-						</template>
-					</el-cascader>
-				</el-form-item>
-				<el-form-item label="调动原因">
-					<el-input type="textarea" :rows="2" placeholder="请输入内容" maxlength="500" show-word-limit v-model="transferForm.remarks"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="cancelTransfer">取 消</el-button>
-				<el-button type="primary" @click="submitTransfer">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 新增组织 -->
-		<el-dialog v-if="createAgencyDialogFlag" title="新增组织" :visible.sync="createAgencyDialogFlag" width="1050" :before-close="handleClose">
-			<el-form label-width="160px" :model="agencyForm" :rules="dataRuleOrg">
-				<el-form-item label="组织名称" prop="agencyName"><el-input v-model="agencyForm.agencyName" placeholder="请输入组织名称"></el-input></el-form-item>
-				<!-- 组织区划 -->
-				<el-form-item label="组织区划" prop="areaCode">
-					<el-select v-model="agencyForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
-						<el-option v-for="item in zonings" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="组织编码"><el-input v-model="agencyForm.code" placeholder="请输入组织编码"></el-input></el-form-item>
-				<el-form-item label="村居/社区书记姓名" prop="secretaryName">
-					<el-input v-model="agencyForm.secretaryName" placeholder="请输入村居/社区书记姓名"></el-input>
-				</el-form-item>
-				<el-form-item label="村居/社区书记电话" prop="secretaryMobile">
-					<el-input v-model="agencyForm.secretaryMobile" placeholder="请输入村居/社区书记电话"></el-input>
-				</el-form-item>
-				<el-form-item label="值班电话" prop="dutyMobile"><el-input v-model="agencyForm.dutyMobile" placeholder="请输入值班电话"></el-input></el-form-item>
-				<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-					<el-input v-model="agencyForm.unifiedSocialCreditCode" placeholder="请输入统一社会信用代码"></el-input>
-				</el-form-item>
-				<el-form-item label="统一社会信用代码证书" prop="unifiedSocialCreditCodeCertificate">
-					<el-upload
-						:headers="$getElUploadHeaders()"
-						class="avatar-uploader"
-						:action="uploadUlr"
-						:show-file-list="false"
-						:data="{ customerId: customerId }"
-						:on-success="(response, file, fileList) => handleImgSuccess(index, response, file, fileList)"
-						:before-upload="beforeImgUpload"
-					>
-						<img v-if="agencyForm.unifiedSocialCreditCodeCertificate" :src="agencyForm.unifiedSocialCreditCodeCertificate" class="avatar" />
-						<i v-else class="el-icon-plus avatar-uploader-icon"></i>
-					</el-upload>
-				</el-form-item>
-				<el-form-item label="负责人"><el-input v-model="agencyForm.contacts" placeholder="请输入负责人名字"></el-input></el-form-item>
-				<el-form-item label="联系电话"><el-input v-model="agencyForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-				<el-form-item label="组织简介">
-					<el-input v-model="agencyForm.remark" type="textarea" rows="3" maxlength="500" show-word-limit placeholder="请输入组织简介"></el-input>
-				</el-form-item>
-				<!-- *详细地址 tianqian-->
-				<el-form-item label="详细地址" prop="fullAddress"><el-input v-model="agencyForm.fullAddress" placeholder="请输入详细地址"></el-input></el-form-item>
-				<el-form-item label="坐标"><div id="con"></div></el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="canceladdNewAgency">取 消</el-button>
-				<el-button type="primary" @click="submitaddNewAgency">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 修改市区级组织 -->
-		<el-dialog v-if="modifyCityOrgPop" title="修改组织" :visible.sync="modifyCityOrgPop" width="850" :before-close="handleClose">
-			<el-form label-width="150px" :model="OrgDetailsForm" :rules="dataRuleOrg">
-				<el-form-item label="组织名称" prop="agencyName"><el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input></el-form-item>
-				<el-form-item label="组织区划">
-					<el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
-						<el-option v-for="item in zonings" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="组织编码"><el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input></el-form-item>
-				<el-form-item label="村居/社区书记姓名" prop="secretaryName">
-					<el-input v-model="OrgDetailsForm.secretaryName" placeholder="请输入村居/社区书记姓名"></el-input>
-				</el-form-item>
-				<el-form-item label="村居/社区书记电话" prop="secretaryMobile">
-					<el-input v-model="OrgDetailsForm.secretaryMobile" placeholder="请输入村居/社区书记电话"></el-input>
-				</el-form-item>
-				<el-form-item label="值班电话" prop="dutyMobile"><el-input v-model="OrgDetailsForm.dutyMobile" placeholder="请输入值班电话"></el-input></el-form-item>
-				<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-					<el-input v-model="OrgDetailsForm.unifiedSocialCreditCode" placeholder="请输入统一社会信用代码"></el-input>
-				</el-form-item>
-				<el-form-item label="统一社会信用代码证书" prop="unifiedSocialCreditCodeCertificate">
-					<el-upload
-						:headers="$getElUploadHeaders()"
-						class="avatar-uploader"
-						:action="uploadUlr"
-						:show-file-list="false"
-						:data="{ customerId: customerId }"
-						:on-success="(response, file, fileList) => handleImgSuccess2(index, response, file, fileList)"
-						:before-upload="beforeImgUpload"
-					>
-						<img v-if="OrgDetailsForm.unifiedSocialCreditCodeCertificate" :src="OrgDetailsForm.unifiedSocialCreditCodeCertificate" class="avatar" />
-						<i v-else class="el-icon-plus avatar-uploader-icon"></i>
-					</el-upload>
-				</el-form-item>
-				<el-form-item label="负责人"><el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input></el-form-item>
-				<el-form-item label="联系电话"><el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-				<el-form-item label="组织简介">
-					<el-input v-model="OrgDetailsForm.remark" type="textarea" rows="3" maxlength="500" show-word-limit placeholder="请输入组织简介"></el-input>
-				</el-form-item>
-				<el-form-item label="详细地址" prop="fullAddress"><el-input v-model="OrgDetailsForm.fullAddress" placeholder="请输入详细地址"></el-input></el-form-item>
-				<el-form-item label="坐标"><div id="con"></div></el-form-item>
-			</el-form>
+                <el-form-item label="是否禁用"><el-input v-model="peoForm.disableFlag"
+                              placeholder="是否禁用"
+                              :disabled="true"></el-input></el-form-item>
+                <el-form-item label="备注"><el-input v-model="peoForm.remark"
+                              placeholder="备注"
+                              :disabled="true"></el-input></el-form-item>
+            </el-form>
+            <div slot="footer"><el-button type="primary"
+                           style="margin-right: 170px"
+                           @click="cancelDetails">关 闭</el-button></div>
+        </el-dialog>
+        <!-- 人员调动 -->
+        <el-dialog v-if="transferPeo"
+                   title="人员调动"
+                   :visible.sync="transferPeo"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form label-width="120px"
+                     :model="agencyForm">
+                <el-form-item label="姓名"><el-input v-model="transferForm.name"
+                              placeholder="姓名"></el-input></el-form-item>
+                <el-form-item label="调动至">
+                    <el-cascader clearable
+                                 :props="{ checkStrictly: true, multiple: false }"
+                                 v-model="selectValue"
+                                 :options="options"
+                                 style="width: 100%"
+                                 @change="handleChangeTransferCascader">
+                        <template slot-scope="{ data }">
+                            <span>{{ data.label }}</span>
+                            <span v-if="data.type != 'agency'"
+                                  style="color: #aaa; font-size: 12px">（{{ data.typeName }}）</span>
+                        </template>
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="调动原因">
+                    <el-input type="textarea"
+                              :rows="2"
+                              placeholder="请输入内容"
+                              maxlength="500"
+                              show-word-limit
+                              v-model="transferForm.remarks"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelTransfer">取 消</el-button>
+                <el-button type="primary"
+                           @click="submitTransfer">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 新增组织 -->
+        <el-dialog v-if="createAgencyDialogFlag"
+                   title="新增组织"
+                   :visible.sync="createAgencyDialogFlag"
+                   width="1050"
+                   :before-close="handleClose">
+            <el-form label-width="160px"
+                     :model="agencyForm"
+                     :rules="dataRuleOrg">
+                <el-form-item label="组织名称"
+                              prop="agencyName"><el-input v-model="agencyForm.agencyName"
+                              placeholder="请输入组织名称"></el-input></el-form-item>
+                <!-- 组织区划 -->
+                <el-form-item label="组织区划"
+                              prop="areaCode">
+                    <el-select v-model="agencyForm.areaCode"
+                               placeholder="请选择组织区划"
+                               @change="handelZoing">
+                        <el-option v-for="item in zonings"
+                                   :key="item.areaCode"
+                                   :label="item.areaName"
+                                   :value="item.areaCode"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="组织编码"><el-input v-model="agencyForm.code"
+                              placeholder="请输入组织编码"></el-input></el-form-item>
+                <el-form-item label="村居/社区书记姓名"
+                              prop="secretaryName">
+                    <el-input v-model="agencyForm.secretaryName"
+                              placeholder="请输入村居/社区书记姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="村居/社区书记电话"
+                              prop="secretaryMobile">
+                    <el-input v-model="agencyForm.secretaryMobile"
+                              placeholder="请输入村居/社区书记电话"></el-input>
+                </el-form-item>
+                <el-form-item label="值班电话"
+                              prop="dutyMobile"><el-input v-model="agencyForm.dutyMobile"
+                              placeholder="请输入值班电话"></el-input></el-form-item>
+                <el-form-item label="统一社会信用代码"
+                              prop="unifiedSocialCreditCode">
+                    <el-input v-model="agencyForm.unifiedSocialCreditCode"
+                              placeholder="请输入统一社会信用代码"></el-input>
+                </el-form-item>
+                <el-form-item label="统一社会信用代码证书"
+                              prop="unifiedSocialCreditCodeCertificate">
+                    <el-upload :headers="$getElUploadHeaders()"
+                               class="avatar-uploader"
+                               :action="uploadUlr"
+                               :show-file-list="false"
+                               :data="{ customerId: customerId }"
+                               :on-success="(response, file, fileList) => handleImgSuccess(index, response, file, fileList)"
+                               :before-upload="beforeImgUpload">
+                        <img v-if="agencyForm.unifiedSocialCreditCodeCertificate"
+                             :src="agencyForm.unifiedSocialCreditCodeCertificate"
+                             class="avatar" />
+                        <i v-else
+                           class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="负责人"><el-input v-model="agencyForm.contacts"
+                              placeholder="请输入负责人名字"></el-input></el-form-item>
+                <el-form-item label="联系电话"><el-input v-model="agencyForm.mobile"
+                              placeholder="请输入联系电话"></el-input></el-form-item>
+                <el-form-item label="组织简介">
+                    <el-input v-model="agencyForm.remark"
+                              type="textarea"
+                              rows="3"
+                              maxlength="500"
+                              show-word-limit
+                              placeholder="请输入组织简介"></el-input>
+                </el-form-item>
+                <!-- *详细地址 tianqian-->
+                <el-form-item label="详细地址"
+                              prop="fullAddress"><el-input v-model="agencyForm.fullAddress"
+                              placeholder="请输入详细地址"></el-input></el-form-item>
+                <el-form-item label="坐标">
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="canceladdNewAgency">取 消</el-button>
+                <el-button type="primary"
+                           @click="submitaddNewAgency">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 修改市区级组织 -->
+        <el-dialog v-if="modifyCityOrgPop"
+                   title="修改组织"
+                   :visible.sync="modifyCityOrgPop"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form label-width="150px"
+                     :model="OrgDetailsForm"
+                     :rules="dataRuleOrg">
+                <el-form-item label="组织名称"
+                              prop="agencyName"><el-input v-model="OrgDetailsForm.agencyName"
+                              placeholder="请输入组织名称"></el-input></el-form-item>
+                <el-form-item label="组织区划">
+                    <el-select v-model="OrgDetailsForm.areaCode"
+                               placeholder="请选择组织区划"
+                               @change="handelZoing">
+                        <el-option v-for="item in zonings"
+                                   :key="item.areaCode"
+                                   :label="item.areaName"
+                                   :value="item.areaCode"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="组织编码"><el-input v-model="OrgDetailsForm.code"
+                              placeholder="请输入组织编码"></el-input></el-form-item>
+                <el-form-item label="村居/社区书记姓名"
+                              prop="secretaryName">
+                    <el-input v-model="OrgDetailsForm.secretaryName"
+                              placeholder="请输入村居/社区书记姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="村居/社区书记电话"
+                              prop="secretaryMobile">
+                    <el-input v-model="OrgDetailsForm.secretaryMobile"
+                              placeholder="请输入村居/社区书记电话"></el-input>
+                </el-form-item>
+                <el-form-item label="值班电话"
+                              prop="dutyMobile"><el-input v-model="OrgDetailsForm.dutyMobile"
+                              placeholder="请输入值班电话"></el-input></el-form-item>
+                <el-form-item label="统一社会信用代码"
+                              prop="unifiedSocialCreditCode">
+                    <el-input v-model="OrgDetailsForm.unifiedSocialCreditCode"
+                              placeholder="请输入统一社会信用代码"></el-input>
+                </el-form-item>
+                <el-form-item label="统一社会信用代码证书"
+                              prop="unifiedSocialCreditCodeCertificate">
+                    <el-upload :headers="$getElUploadHeaders()"
+                               class="avatar-uploader"
+                               :action="uploadUlr"
+                               :show-file-list="false"
+                               :data="{ customerId: customerId }"
+                               :on-success="(response, file, fileList) => handleImgSuccess2(index, response, file, fileList)"
+                               :before-upload="beforeImgUpload">
+                        <img v-if="OrgDetailsForm.unifiedSocialCreditCodeCertificate"
+                             :src="OrgDetailsForm.unifiedSocialCreditCodeCertificate"
+                             class="avatar" />
+                        <i v-else
+                           class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="负责人"><el-input v-model="OrgDetailsForm.contacts"
+                              placeholder="请输入负责人名字"></el-input></el-form-item>
+                <el-form-item label="联系电话"><el-input v-model="OrgDetailsForm.mobile"
+                              placeholder="请输入联系电话"></el-input></el-form-item>
+                <el-form-item label="组织简介">
+                    <el-input v-model="OrgDetailsForm.remark"
+                              type="textarea"
+                              rows="3"
+                              maxlength="500"
+                              show-word-limit
+                              placeholder="请输入组织简介"></el-input>
+                </el-form-item>
+                <el-form-item label="详细地址"
+                              prop="fullAddress"><el-input v-model="OrgDetailsForm.fullAddress"
+                              placeholder="请输入详细地址"></el-input></el-form-item>
+                <el-form-item label="坐标">
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
 
-			<div slot="footer">
-				<el-button @click="cancelModifyCityOrgPop">取 消</el-button>
-				<el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 修改街道/社区级组织 -->
-		<el-dialog v-if="streetOrCommunity" title="修改组织" :visible.sync="streetOrCommunity" width="850" :before-close="handleClose">
-			<el-form label-width="150px" :model="OrgDetailsForm" :rules="dataRuleOrg">
-				<el-form-item label="组织名称"><el-input v-model="OrgDetailsForm.agencyName" placeholder="请输入组织名称"></el-input></el-form-item>
-				<!-- 组织区划 -->
-				<el-form-item label="组织区划">
-					<el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
-						<el-option v-for="item in zonings" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="组织编码"><el-input v-model="OrgDetailsForm.code" placeholder="请输入组织编码"></el-input></el-form-item>
-				<el-form-item label="村居/社区书记姓名" prop="secretaryName">
-					<el-input v-model="OrgDetailsForm.secretaryName" placeholder="请输入村居/社区书记姓名"></el-input>
-				</el-form-item>
-				<el-form-item label="村居/社区书记电话" prop="secretaryMobile">
-					<el-input v-model="OrgDetailsForm.secretaryMobile" placeholder="请输入村居/社区书记电话"></el-input>
-				</el-form-item>
-				<el-form-item label="值班电话" prop="dutyMobile"><el-input v-model="OrgDetailsForm.dutyMobile" placeholder="请输入值班电话"></el-input></el-form-item>
-				<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode">
-					<el-input v-model="OrgDetailsForm.unifiedSocialCreditCode" placeholder="请输入统一社会信用代码"></el-input>
-				</el-form-item>
-				<el-form-item label="统一社会信用代码证书" prop="unifiedSocialCreditCodeCertificate">
-					<el-upload
-						:headers="$getElUploadHeaders()"
-						class="avatar-uploader"
-						:action="uploadUlr"
-						:show-file-list="false"
-						:data="{ customerId: customerId }"
-						:on-success="(response, file, fileList) => handleImgSuccess2(index, response, file, fileList)"
-						:before-upload="beforeImgUpload"
-					>
-						<img v-if="OrgDetailsForm.unifiedSocialCreditCodeCertificate" :src="OrgDetailsForm.unifiedSocialCreditCodeCertificate" class="avatar" />
-						<i v-else class="el-icon-plus avatar-uploader-icon"></i>
-					</el-upload>
-				</el-form-item>
-				<el-form-item label="负责人"><el-input v-model="OrgDetailsForm.contacts" placeholder="请输入负责人名字"></el-input></el-form-item>
-				<el-form-item label="联系电话"><el-input v-model="OrgDetailsForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-				<el-form-item label="组织简介">
-					<el-input v-model="OrgDetailsForm.remark" type="textarea" rows="3" maxlength="500" show-word-limit placeholder="请输入组织简介"></el-input>
-				</el-form-item>
-				<el-form-item label="详细地址" prop="fullAddress"><el-input v-model="OrgDetailsForm.fullAddress" placeholder="请输入详细地址"></el-input></el-form-item>
-				<el-form-item label="坐标"><div id="con"></div></el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="cancelstreetOrCommunity">取 消</el-button>
-				<el-button type="primary" @click="sunmitModifyCityOrgPop">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 修改下级机关单位 -->
-		<el-dialog v-if="OrgUnitPop" title="修改部门" :visible.sync="OrgUnitPop" width="850" :before-close="handleClose">
-			<el-form label-width="120px">
-				<el-form-item label="部门名称"><el-input v-model="OrgUnitDetailsForm.departmentName" placeholder="请输入组织名称"></el-input></el-form-item>
-				<el-form-item label="组织编码"><el-input v-model="OrgUnitDetailsForm.code" placeholder="请输入组织编码"></el-input></el-form-item>
-				<el-form-item label="负责人"><el-input v-model="OrgUnitDetailsForm.contacts" placeholder="请输入负责人名字"></el-input></el-form-item>
-				<el-form-item label="联系电话1"><el-input v-model="OrgUnitDetailsForm.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="cancelOrgUnitPop">取 消</el-button>
-				<el-button type="primary" @click="sunmitOrgUnitForm">确 定</el-button>
-			</div>
-		</el-dialog>
-		<!-- 修改网格 -->
-		<el-dialog v-if="modifyGridPop" title="修改网格" :visible.sync="modifyGridPop" width="850" :before-close="handleClose">
-			<el-form label-width="120px">
-				<el-form-item label="网格名称"><el-input v-model="modifyGridFrom.gridName" placeholder="请输入组织名称"></el-input></el-form-item>
-				<el-form-item label="组织编码"><el-input v-model="modifyGridFrom.code" placeholder="请输入组织编码"></el-input></el-form-item>
-				<!-- 网格类型下拉框 -->
-				<el-form-item label="网格类型" prop="typeTag">
-					<el-select v-model="modifyGridFrom.gridType" clearable placeholder="网格类型">
-						<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="排序"><el-input-number v-model="modifyGridFrom.gridSort" :min="1" label="排序"></el-input-number></el-form-item>
-				<el-form-item label="负责人"><el-input v-model="modifyGridFrom.contacts" placeholder="请输入负责人名字"></el-input></el-form-item>
-				<el-form-item label="联系电话"><el-input v-model="modifyGridFrom.mobile" placeholder="请输入联系电话"></el-input></el-form-item>
-				<!-- 组织位置,地图 -->
-				<el-form-item label="坐标"><div id="con"></div></el-form-item>
-			</el-form>
-			<div slot="footer">
-				<el-button @click="cancelModifyGridPop">取 消</el-button>
-				<el-button type="primary" @click="submitModifyGrid">确 定</el-button>
-			</div>
-		</el-dialog>
-	</div>
+            <div slot="footer">
+                <el-button @click="cancelModifyCityOrgPop">取 消</el-button>
+                <el-button type="primary"
+                           @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 修改街道/社区级组织 -->
+        <el-dialog v-if="streetOrCommunity"
+                   title="修改组织"
+                   :visible.sync="streetOrCommunity"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form label-width="150px"
+                     :model="OrgDetailsForm"
+                     :rules="dataRuleOrg">
+                <el-form-item label="组织名称"><el-input v-model="OrgDetailsForm.agencyName"
+                              placeholder="请输入组织名称"></el-input></el-form-item>
+                <!-- 组织区划 -->
+                <el-form-item label="组织区划">
+                    <el-select v-model="OrgDetailsForm.areaCode"
+                               placeholder="请选择组织区划"
+                               @change="handelStreeOrCommunityZoing">
+                        <el-option v-for="item in zonings"
+                                   :key="item.areaCode"
+                                   :label="item.areaName"
+                                   :value="item.areaCode"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="组织编码"><el-input v-model="OrgDetailsForm.code"
+                              placeholder="请输入组织编码"></el-input></el-form-item>
+                <el-form-item label="村居/社区书记姓名"
+                              prop="secretaryName">
+                    <el-input v-model="OrgDetailsForm.secretaryName"
+                              placeholder="请输入村居/社区书记姓名"></el-input>
+                </el-form-item>
+                <el-form-item label="村居/社区书记电话"
+                              prop="secretaryMobile">
+                    <el-input v-model="OrgDetailsForm.secretaryMobile"
+                              placeholder="请输入村居/社区书记电话"></el-input>
+                </el-form-item>
+                <el-form-item label="值班电话"
+                              prop="dutyMobile"><el-input v-model="OrgDetailsForm.dutyMobile"
+                              placeholder="请输入值班电话"></el-input></el-form-item>
+                <el-form-item label="统一社会信用代码"
+                              prop="unifiedSocialCreditCode">
+                    <el-input v-model="OrgDetailsForm.unifiedSocialCreditCode"
+                              placeholder="请输入统一社会信用代码"></el-input>
+                </el-form-item>
+                <el-form-item label="统一社会信用代码证书"
+                              prop="unifiedSocialCreditCodeCertificate">
+                    <el-upload :headers="$getElUploadHeaders()"
+                               class="avatar-uploader"
+                               :action="uploadUlr"
+                               :show-file-list="false"
+                               :data="{ customerId: customerId }"
+                               :on-success="(response, file, fileList) => handleImgSuccess2(index, response, file, fileList)"
+                               :before-upload="beforeImgUpload">
+                        <img v-if="OrgDetailsForm.unifiedSocialCreditCodeCertificate"
+                             :src="OrgDetailsForm.unifiedSocialCreditCodeCertificate"
+                             class="avatar" />
+                        <i v-else
+                           class="el-icon-plus avatar-uploader-icon"></i>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="负责人"><el-input v-model="OrgDetailsForm.contacts"
+                              placeholder="请输入负责人名字"></el-input></el-form-item>
+                <el-form-item label="联系电话"><el-input v-model="OrgDetailsForm.mobile"
+                              placeholder="请输入联系电话"></el-input></el-form-item>
+                <el-form-item label="组织简介">
+                    <el-input v-model="OrgDetailsForm.remark"
+                              type="textarea"
+                              rows="3"
+                              maxlength="500"
+                              show-word-limit
+                              placeholder="请输入组织简介"></el-input>
+                </el-form-item>
+                <el-form-item label="详细地址"
+                              prop="fullAddress"><el-input v-model="OrgDetailsForm.fullAddress"
+                              placeholder="请输入详细地址"></el-input></el-form-item>
+                <el-form-item label="坐标">
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelstreetOrCommunity">取 消</el-button>
+                <el-button type="primary"
+                           @click="sunmitModifyCityOrgPop">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 修改下级机关单位 -->
+        <el-dialog v-if="OrgUnitPop"
+                   title="修改部门"
+                   :visible.sync="OrgUnitPop"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form label-width="120px">
+                <el-form-item label="部门名称"><el-input v-model="OrgUnitDetailsForm.departmentName"
+                              placeholder="请输入组织名称"></el-input></el-form-item>
+                <el-form-item label="组织编码"><el-input v-model="OrgUnitDetailsForm.code"
+                              placeholder="请输入组织编码"></el-input></el-form-item>
+                <el-form-item label="负责人"><el-input v-model="OrgUnitDetailsForm.contacts"
+                              placeholder="请输入负责人名字"></el-input></el-form-item>
+                <el-form-item label="联系电话1"><el-input v-model="OrgUnitDetailsForm.mobile"
+                              placeholder="请输入联系电话"></el-input></el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelOrgUnitPop">取 消</el-button>
+                <el-button type="primary"
+                           @click="sunmitOrgUnitForm">确 定</el-button>
+            </div>
+        </el-dialog>
+        <!-- 修改网格 -->
+        <el-dialog v-if="modifyGridPop"
+                   title="修改网格"
+                   :visible.sync="modifyGridPop"
+                   width="850"
+                   :before-close="handleClose">
+            <el-form label-width="120px">
+                <el-form-item label="网格名称"><el-input v-model="modifyGridFrom.gridName"
+                              placeholder="请输入组织名称"></el-input></el-form-item>
+                <el-form-item label="组织编码"><el-input v-model="modifyGridFrom.code"
+                              placeholder="请输入组织编码"></el-input></el-form-item>
+                <!-- 网格类型下拉框 -->
+                <el-form-item label="网格类型"
+                              prop="typeTag">
+                    <el-select v-model="modifyGridFrom.gridType"
+                               clearable
+                               placeholder="网格类型">
+                        <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="排序"><el-input-number v-model="modifyGridFrom.gridSort"
+                                     :min="1"
+                                     label="排序"></el-input-number></el-form-item>
+                <el-form-item label="负责人"><el-input v-model="modifyGridFrom.contacts"
+                              placeholder="请输入负责人名字"></el-input></el-form-item>
+                <el-form-item label="联系电话"><el-input v-model="modifyGridFrom.mobile"
+                              placeholder="请输入联系电话"></el-input></el-form-item>
+                <!-- 组织位置,地图 -->
+                <el-form-item label="坐标">
+                    <div id="con"></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer">
+                <el-button @click="cancelModifyGridPop">取 消</el-button>
+                <el-button type="primary"
+                           @click="submitModifyGrid">确 定</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 <script>
 import { requestPost, requestGet } from '@/js/dai/request';
 import daiMap from '@/utils/dai-map';
 export default {
-	data() {
-		// 验证手机号
-		const checkPhone = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入手机号'));
-			} else if (!/^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(1[|6|7|8][0-9]))\d{8}$/.test(value)) {
-				callback(new Error('请输入正确的手机号格式'));
-			} else {
-				callback();
-			}
-		};
-		// 验证身份证号
-		const checkCardId = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入身份证号'));
-			} else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
-				callback(new Error('请输入正确的身份证号'));
-			} else {
-				callback();
-			}
-		};
-		// 验证统一社会信用代码
-		const checkCreditCode = (rule, value, callback) => {
-			if (value === '') {
-				callback(new Error('请输入统一社会信用代码'));
-				// /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/
-			} else if (!/^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g.test(value)) {
-				callback(new Error('请输入正确的统一社会信用代码'));
-			} else {
-				callback();
-			}
-		};
-		return {
-			importLoading: false,
-			uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-			customerId: '',
-			// 新增组织弹窗
-			createAgencyDialogFlag: false,
-			// 修改市区级组织弹窗
-			modifyCityOrgPop: false,
-			// 修改街道/社区级组织弹窗
-			streetOrCommunity: false,
-			// 修改下级机关单位弹窗
-			OrgUnitPop: false,
-			// 修改网格弹窗
-			modifyGridPop: false,
-			// 组织列表展示标识
-			agencyTableFlag: true,
-			// 组织工作人员列表展示标识
-			currentAgencyStaffTableFlag: true,
-			// 组织列表数据
-			agencyTableListData: [],
-			// 组织工作人员列表数据
-			agencyStaffTableListData: [],
-			// 部门列表（机关、科室列表）列表展示标识
-			departmentTableFlag: true,
-			// 部门人员列表展示标识
-			departmentStaffTableFlag: false,
-			// 部门列表数据
-			departmentTableListData: [],
-			// 部门工作人员列表数据
-			departmentStaffTableListData: [],
-			// 网格列表展示标识
-			gridTableFlag: true,
-			// 网格人员列表展示标识
-			gridStaffTableFlag: false,
-			// 网格列表数据
-			gridTableListData: [],
-			// 网格工作人员列表数据
-			gridStaffTableListData: [],
-			// 用户所属组织ID
-			userAgencyId: localStorage.getItem('agencyId'),
-			// 修改时操作的用户staffId
-			userStaffId: '',
-			// 当前被操作的组织的ID
-			currentAgencyId: localStorage.getItem('agencyId'),
-			// 当前被操作的部门的ID
-			currentDepartmentId: '14f572e724eecf7668b655505d789cab',
-			// 当前被操作的网格的ID
-			currentGridOrgId: '63d5ff92ea981b1c58e4914ac894c610',
-			// 当前被操作的组织的级别
-			currentAgencyLevel: localStorage.getItem('level'),
-			currentAreaCode: '',
-			currentAreaCodeSwitch: '',
-			parentAreaCode: '',
-			parentAgencyId: localStorage.getItem('agencyId'),
-			parentAgencyLevel: localStorage.getItem('level'),
-			// 经纬度坐标
-			lat: '',
-			lng: '',
-			latitude: '',
-			longitude: '',
-			Navigation: '',
-			// 查询参数
-			queryParams: {
-				deptName: undefined,
-				status: undefined
-			},
-			// 状态列表
-			dictList: [],
-			// 重新渲染表格状态
-			refreshTable: true,
-			// 是否展开，默认全部展开
-			isExpandAll: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 遮罩层
-			loading: true,
-			// 表格树数据
-			deptList: [],
-			// 弹窗开关
-			dialogVisible: false,
-			dialogVisibleGrid: false,
-			dialogVisiblePeo: false,
-			Disable: false,
-			details: false,
-			transferPeo: false,
-			// 社区添加表单项
-			insertForm: {
-				departmentName: '',
-				code: '',
-				contacts: '',
-				mobile: '',
-				agencyId: '',
-				departmentDuty: '123'
-			},
-			// 网格添加表单项
-			GridForm: {
-				gridName: '',
-				code: '',
-				contacts: '',
-				mobile: '',
-				agencyId: '',
-				manageDistrict: '',
-				gridType: '',
-				location: '', //坐标位置
-				longitude: '', //经度
-				latitude: '', //纬度
-				centerAddress: ''
-			},
-			// 新增组织
-			agencyForm: {
-				parentAgencyId: '',
-				agencyName: '',
-				level: '',
-				areaCodeSwitch: '',
-				areaCode: '',
-				areaName: '',
-				contacts: '',
-				mobile: '',
-				remark: '',
-				code: '',
-				secretaryName: '',
-				secretaryMobile: '',
-				dutyMobile: '',
-				unifiedSocialCreditCode: '',
-				unifiedSocialCreditCodeCertificate: '',
-				fullAddress: ''
-			},
-			// 树
-			tree: [],
-			// 新增人员表单项
-			peoForm: {
-				name: '',
-				mobile: '',
-				gender: '',
-				post: '',
-				roles: [],
-				orgType: '',
-				activeTime: '',
-				zuzhi: '',
-				disableFlag: '',
-				newRoles: [],
-				idCard: '',
-				viliagePosition: '',
-				partyPosition: '',
-				address: '',
-				culture: '',
-				duty: '',
-				remark: ''
-			},
-			// 人员调动
-			transferForm: {
-				name: '',
-				remarks: '',
-				transferTo: '',
-				staffId: '',
-				orgId: '',
-				orgType: ''
-			},
-			// 人员禁用
-			DisableForm: {
-				staffId: '',
-				agencyId: '',
-				customerId: ''
-			},
-			// 组织详细信息
-			OrgDetailsForm: {
-				level: '',
-				agencyName: '',
-				code: '',
-				contacts: '',
-				mobile: '',
-				centerAddress: '',
-				areaCode: '',
-				agencyId: '',
-				areaName: '',
-				remark: '',
-				secretaryName: '',
-				secretaryMobile: '',
-				dutyMobile: '',
-				unifiedSocialCreditCode: '',
-				unifiedSocialCreditCodeCertificate: '',
-				fullAddress: ''
-			},
-			// 下级机关单位
-			OrgUnitDetailsForm: {
-				code: '',
-				contacts: '',
-				departmentId: '',
-				departmentName: '',
-				mobile: ''
-			},
-			// 网格修改表单
-			modifyGridFrom: {
-				gridName: '',
-				code: '',
-				gridTypeName: '',
-				contacts: '',
-				mobile: '',
-				latitude: '',
-				longitude: '',
-				agencyId: '',
-				gridType: '',
-				manageDistrict: '',
-				griId: '',
-				// 排序
-				gridSort: 0
-			},
-			judgeOrgInfoLevel: [],
-			keyWords: '',
-			typeList: [],
-			// 性别字典
-			genderList: [
-				{
-					value: 1,
-					label: '男'
-				},
-				{
-					value: 2,
-					label: '女'
-				},
-				{
-					value: 0,
-					label: '未知'
-				}
-			],
-			cultureList: [
-				{
-					value: 1,
-					label: '男'
-				},
-				{
-					value: 2,
-					label: '女'
-				},
-				{
-					value: 0,
-					label: '未知'
-				}
-			],
-			// 专兼职字典
-			postList: [
-				{
-					value: 'fulltime',
-					label: '专职'
-				},
-				{
-					value: 'parttime',
-					label: '兼职'
-				}
-			],
-			// 职责字典
-			dutyList: [],
-			// 修改操作是否展示
-			modifyPeo: false,
-			roleList: [],
-			// 级联数据
-			options: [],
-			selectValue: [],
-			// 顶部 面包屑
-			breadcrumbArr: [],
-			// 面包屑 当前所属机构ID
-			currentBreadcrumbKey: '',
-			// 组织区划数据
-			zonings: [],
-			// 校验
-			rules: {
-				departmentName: [
-					{
-						required: true,
-						message: '社区名称不能为空',
-						trigger: 'blur'
-					}
-				],
-				gridName: [
-					{
-						required: true,
-						message: '网格名称不能为空',
-						trigger: 'blur'
-					}
-				],
-				addDepartmentName: [
-					{
-						required: true,
-						message: '部门名称不能为空',
-						trigger: 'blur'
-					}
-				]
-			},
-			rulesPeo: {
-				name: [
-					{
-						required: true,
-						message: '姓名不能为空',
-						trigger: 'blur'
-					}
-				],
-				mobile: [
-					{
-						required: true,
-						validator: checkPhone,
-						trigger: 'blur'
-					}
-				],
-				gender: [
-					{
-						required: true,
-						message: '性别不能为空',
-						trigger: 'blur'
-					}
-				],
-				idCard: [
-					{
-						required: true,
-						validator: checkCardId,
-						trigger: 'blur'
-					}
-				],
-				// viliagePosition: [{
-				// 	required: true,
-				// 	message: '村居委员职务不能为空',
-				// 	trigger: 'blur'
-				// }],
-				// partyPosition: [{
-				// 	required: true,
-				// 	message: '党组织职务不能为空',
-				// 	trigger: 'blur'
-				// }],
-				address: [
-					{
-						required: true,
-						message: '居住地址不能为空',
-						trigger: 'blur'
-					}
-				],
-				culture: [
-					{
-						required: true,
-						message: '文化程度不能为空',
-						trigger: 'blur'
-					}
-				],
-				post: [
-					{
-						required: true,
-						message: '专兼职不能为空',
-						trigger: 'blur'
-					}
-				],
-				roles: [
-					{
-						required: true,
-						message: '职责不能为空',
-						trigger: 'blur'
-					}
-				],
-				duty: [
-					{
-						required: true,
-						message: '职责不能为空',
-						trigger: 'blur'
-					}
-				],
-				newRoles: [
-					{
-						required: true,
-						message: '角色不能为空',
-						trigger: 'blur'
-					}
-				]
-			},
-			dataRuleOrg: {
-				// checkPhone
-				// checkCardId
-				// checkCreditCode
-				agencyName: [
-					{
-						required: true,
-						message: '组织名称不能为空',
-						trigger: 'blur'
-					}
-				],
-				areaCode: [
-					{
-						required: true,
-						message: '组织区划不能为空',
-						trigger: 'blur'
-					}
-				],
-				secretaryName: [
-					{
-						required: true,
-						message: '村居/社区书记姓名不能为空',
-						trigger: 'blur'
-					}
-				],
-				secretaryMobile: [
-					{
-						required: true,
-						validator: checkPhone,
-						trigger: 'blur'
-					}
-				],
-				dutyMobile: [
-					{
-						required: true,
-						message: '值班电话不能为空',
-						trigger: 'blur'
-					}
-				],
-				unifiedSocialCreditCode: [
-					{
-						required: true,
-						validator: checkCreditCode,
-						trigger: 'blur'
-					}
-				],
-				unifiedSocialCreditCodeCertificate: [
-					{
-						required: true,
-						message: '统一社会信用代码证书不能为空',
-						trigger: 'blur'
-					}
-				],
-				fullAddress: [
-					{
-						required: true,
-						message: '详细地址不能为空',
-						trigger: 'blur'
-					}
-				]
-			},
-			selDeptType: '',
-			searchStaffKeyword: '',
-			searchGridStaffKeyword: '',
-			searchDeptStaffKeyword: ''
-		};
-	},
-	watch: {
-		dialogVisibleGrid(val) {
-			if (val) {
-				setTimeout(() => {
-					this.createMap();
-				}, 1000);
-			}
-		},
-		createAgencyDialogFlag(val) {
-			if (val) {
-				setTimeout(() => {
-					this.createMap();
-				}, 1000);
-			}
-		},
-		modifyCityOrgPop(val) {
-			if (val) {
-				setTimeout(() => {
-					this.createMap();
-				}, 1000);
-			}
-		},
-		streetOrCommunity(val) {
-			if (val) {
-				setTimeout(() => {
-					this.createMap();
-				}, 1000);
-			}
-		},
-		modifyGridPop(val) {
-			if (val) {
-				setTimeout(() => {
-					this.createMap('modifyGridFrom');
-				}, 1000);
-			}
-		}
-	},
-	computed: {
-		cleanAgencyStaffTableListData() {
-			return this.agencyStaffTableListData.filter(item => !item.hidden);
-		},
-		cleanGridStaffTableListData() {
-			return this.gridStaffTableListData.filter(item => !item.hidden);
-		},
-		cleanDepartmentStaffTableListData() {
-			return this.departmentStaffTableListData.filter(item => !item.hidden);
-		}
-	},
-	mounted() {
-		this.getAgencyList();
-		this.getDepartmentList();
-		this.getGridList();
-		this.getAgencyStaffListData();
-		this.getDutyList();
-		this.getRoleList();
-		this.getCultureList();
-		// this.getNavigation()
-		// 更新顶部面包屑
-		this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency');
-		// this.initMap()
-	},
-	methods: {
-		handleImgSuccess(index, res, file) {
-			if (res.code === 0 && res.msg === 'success') {
-				console.log('res.data.url', res.data.url);
-				this.agencyForm.unifiedSocialCreditCodeCertificate = res.data.url;
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-		handleImgSuccess2(index, res, file) {
-			if (res.code === 0 && res.msg === 'success') {
-				console.log('res.data.url', res.data.url);
-				this.OrgDetailsForm.unifiedSocialCreditCodeCertificate = res.data.url;
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-		beforeImgUpload(file) {
-			const isLt1M = file.size / 1024 / 1024 < 1;
-			if (!isLt1M) {
-				this.$message.error('上传图片大小不能超过 1MB!');
-			}
-			return isLt1M;
-		},
-		// async handleExport () {
-		//   let title = "部门导出";
-		//   const url = "/epmetuser/icVaccinePrarmeter/vaccine-export";
-		//   app.ajax.exportFilePost(
-		//     url,
-		//     this.dataForm,
-		//     (data, rspMsg) => {
-		//       console.log(data)
-		//       this.download(data, title + ".xlsx");
-		//     },
-		//     (rspMsg, data) => {
-		//       this.$message.error(rspMsg);
-		//     }
-		//   );
-		// },
-		beforeUpload(file) {
-			this.files = file;
-			const isText = file.type === 'application/vnd.ms-excel';
-			const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-			if (!isText && !isTextComputer) {
-				this.$message.error('请选择正确格式的文件');
-				this.files = null;
-				this.fileName = '';
-				return false;
-			} else {
-				this.fileName = file.name;
-				return true;
-			}
-		},
-		async uploadFile(type) {
-			if (this.fileName == '') {
-				this.$message.warning('请选择要上传的文件！');
-				return false;
-			}
-			this.$message({
-				showClose: true,
-				message: '导入中，请到系统管理-导入记录中查看进度',
-				duration: 0
-			});
+    data() {
+        // 验证手机号
+        const checkPhone = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入手机号'));
+            } else if (!/^1[3-9]\d{9}$/.test(value)) {
+                callback(new Error('请输入正确的手机号格式'));
+            } else {
+                callback();
+            }
+        };
+        // 验证身份证号
+        const checkCardId = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入身份证号'));
+            } else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+                callback(new Error('请输入正确的身份证号'));
+            } else {
+                callback();
+            }
+        };
+        // 验证统一社会信用代码
+        const checkCreditCode = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入统一社会信用代码'));
+                // /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/
+            } else if (!/^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g.test(value)) {
+                callback(new Error('请输入正确的统一社会信用代码'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            importLoading: false,
+            uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: '',
+            // 新增组织弹窗
+            createAgencyDialogFlag: false,
+            // 修改市区级组织弹窗
+            modifyCityOrgPop: false,
+            // 修改街道/社区级组织弹窗
+            streetOrCommunity: false,
+            // 修改下级机关单位弹窗
+            OrgUnitPop: false,
+            // 修改网格弹窗
+            modifyGridPop: false,
+            // 组织列表展示标识
+            agencyTableFlag: true,
+            // 组织工作人员列表展示标识
+            currentAgencyStaffTableFlag: true,
+            // 组织列表数据
+            agencyTableListData: [],
+            // 组织工作人员列表数据
+            agencyStaffTableListData: [],
+            // 部门列表（机关、科室列表）列表展示标识
+            departmentTableFlag: true,
+            // 部门人员列表展示标识
+            departmentStaffTableFlag: false,
+            // 部门列表数据
+            departmentTableListData: [],
+            // 部门工作人员列表数据
+            departmentStaffTableListData: [],
+            // 网格列表展示标识
+            gridTableFlag: true,
+            // 网格人员列表展示标识
+            gridStaffTableFlag: false,
+            // 网格列表数据
+            gridTableListData: [],
+            // 网格工作人员列表数据
+            gridStaffTableListData: [],
+            // 用户所属组织ID
+            userAgencyId: localStorage.getItem('agencyId'),
+            // 修改时操作的用户staffId
+            userStaffId: '',
+            // 当前被操作的组织的ID
+            currentAgencyId: localStorage.getItem('agencyId'),
+            // 当前被操作的部门的ID
+            currentDepartmentId: '14f572e724eecf7668b655505d789cab',
+            // 当前被操作的网格的ID
+            currentGridOrgId: '63d5ff92ea981b1c58e4914ac894c610',
+            // 当前被操作的组织的级别
+            currentAgencyLevel: localStorage.getItem('level'),
+            currentAreaCode: '',
+            currentAreaCodeSwitch: '',
+            parentAreaCode: '',
+            parentAgencyId: localStorage.getItem('agencyId'),
+            parentAgencyLevel: localStorage.getItem('level'),
+            // 经纬度坐标
+            lat: '',
+            lng: '',
+            latitude: '',
+            longitude: '',
+            Navigation: '',
+            // 查询参数
+            queryParams: {
+                deptName: undefined,
+                status: undefined
+            },
+            // 状态列表
+            dictList: [],
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 是否展开，默认全部展开
+            isExpandAll: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 遮罩层
+            loading: true,
+            // 表格树数据
+            deptList: [],
+            // 弹窗开关
+            dialogVisible: false,
+            dialogVisibleGrid: false,
+            dialogVisiblePeo: false,
+            Disable: false,
+            details: false,
+            transferPeo: false,
+            // 社区添加表单项
+            insertForm: {
+                departmentName: '',
+                code: '',
+                contacts: '',
+                mobile: '',
+                agencyId: '',
+                departmentDuty: '123'
+            },
+            // 网格添加表单项
+            GridForm: {
+                gridName: '',
+                code: '',
+                contacts: '',
+                mobile: '',
+                agencyId: '',
+                manageDistrict: '',
+                gridType: '',
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '', //纬度
+                centerAddress: ''
+            },
+            // 新增组织
+            agencyForm: {
+                parentAgencyId: '',
+                agencyName: '',
+                level: '',
+                areaCodeSwitch: '',
+                areaCode: '',
+                areaName: '',
+                contacts: '',
+                mobile: '',
+                remark: '',
+                code: '',
+                secretaryName: '',
+                secretaryMobile: '',
+                dutyMobile: '',
+                unifiedSocialCreditCode: '',
+                unifiedSocialCreditCodeCertificate: '',
+                fullAddress: ''
+            },
+            // 树
+            tree: [],
+            // 新增人员表单项
+            peoForm: {
+                name: '',
+                mobile: '',
+                gender: '',
+                post: '',
+                roles: [],
+                orgType: '',
+                activeTime: '',
+                zuzhi: '',
+                disableFlag: '',
+                newRoles: [],
+                idCard: '',
+                viliagePosition: '',
+                partyPosition: '',
+                address: '',
+                culture: '',
+                duty: '',
+                remark: ''
+            },
+            // 人员调动
+            transferForm: {
+                name: '',
+                remarks: '',
+                transferTo: '',
+                staffId: '',
+                orgId: '',
+                orgType: ''
+            },
+            // 人员禁用
+            DisableForm: {
+                staffId: '',
+                agencyId: '',
+                customerId: ''
+            },
+            // 组织详细信息
+            OrgDetailsForm: {
+                level: '',
+                agencyName: '',
+                code: '',
+                contacts: '',
+                mobile: '',
+                centerAddress: '',
+                areaCode: '',
+                agencyId: '',
+                areaName: '',
+                remark: '',
+                secretaryName: '',
+                secretaryMobile: '',
+                dutyMobile: '',
+                unifiedSocialCreditCode: '',
+                unifiedSocialCreditCodeCertificate: '',
+                fullAddress: ''
+            },
+            // 下级机关单位
+            OrgUnitDetailsForm: {
+                code: '',
+                contacts: '',
+                departmentId: '',
+                departmentName: '',
+                mobile: ''
+            },
+            // 网格修改表单
+            modifyGridFrom: {
+                gridName: '',
+                code: '',
+                gridTypeName: '',
+                contacts: '',
+                mobile: '',
+                latitude: '',
+                longitude: '',
+                agencyId: '',
+                gridType: '',
+                manageDistrict: '',
+                griId: '',
+                // 排序
+                gridSort: 0
+            },
+            judgeOrgInfoLevel: [],
+            keyWords: '',
+            typeList: [],
+            // 性别字典
+            genderList: [
+                {
+                    value: 1,
+                    label: '男'
+                },
+                {
+                    value: 2,
+                    label: '女'
+                },
+                {
+                    value: 0,
+                    label: '未知'
+                }
+            ],
+            cultureList: [
+                {
+                    value: 1,
+                    label: '男'
+                },
+                {
+                    value: 2,
+                    label: '女'
+                },
+                {
+                    value: 0,
+                    label: '未知'
+                }
+            ],
+            // 专兼职字典
+            postList: [
+                {
+                    value: 'fulltime',
+                    label: '专职'
+                },
+                {
+                    value: 'parttime',
+                    label: '兼职'
+                }
+            ],
+            // 职责字典
+            dutyList: [],
+            // 修改操作是否展示
+            modifyPeo: false,
+            roleList: [],
+            // 级联数据
+            options: [],
+            selectValue: [],
+            // 顶部 面包屑
+            breadcrumbArr: [],
+            // 面包屑 当前所属机构ID
+            currentBreadcrumbKey: '',
+            // 组织区划数据
+            zonings: [],
+            // 校验
+            rules: {
+                departmentName: [
+                    {
+                        required: true,
+                        message: '社区名称不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                gridName: [
+                    {
+                        required: true,
+                        message: '网格名称不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                addDepartmentName: [
+                    {
+                        required: true,
+                        message: '部门名称不能为空',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            rulesPeo: {
+                name: [
+                    {
+                        required: true,
+                        message: '姓名不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                mobile: [
+                    {
+                        required: true,
+                        validator: checkPhone,
+                        trigger: 'blur'
+                    }
+                ],
+                gender: [
+                    {
+                        required: true,
+                        message: '性别不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                idCard: [
+                    {
+                        required: true,
+                        validator: checkCardId,
+                        trigger: 'blur'
+                    }
+                ],
+                // viliagePosition: [{
+                // 	required: true,
+                // 	message: '村居委员职务不能为空',
+                // 	trigger: 'blur'
+                // }],
+                // partyPosition: [{
+                // 	required: true,
+                // 	message: '党组织职务不能为空',
+                // 	trigger: 'blur'
+                // }],
+                address: [
+                    {
+                        required: true,
+                        message: '居住地址不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                culture: [
+                    {
+                        required: true,
+                        message: '文化程度不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                post: [
+                    {
+                        required: true,
+                        message: '专兼职不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                roles: [
+                    {
+                        required: true,
+                        message: '职责不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                duty: [
+                    {
+                        required: true,
+                        message: '职责不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                newRoles: [
+                    {
+                        required: true,
+                        message: '角色不能为空',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            dataRuleOrg: {
+                // checkPhone
+                // checkCardId
+                // checkCreditCode
+                agencyName: [
+                    {
+                        required: true,
+                        message: '组织名称不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                areaCode: [
+                    {
+                        required: true,
+                        message: '组织区划不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                secretaryName: [
+                    {
+                        required: true,
+                        message: '村居/社区书记姓名不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                secretaryMobile: [
+                    {
+                        required: true,
+                        validator: checkPhone,
+                        trigger: 'blur'
+                    }
+                ],
+                dutyMobile: [
+                    {
+                        required: true,
+                        message: '值班电话不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                unifiedSocialCreditCode: [
+                    {
+                        required: true,
+                        validator: checkCreditCode,
+                        trigger: 'blur'
+                    }
+                ],
+                unifiedSocialCreditCodeCertificate: [
+                    {
+                        required: true,
+                        message: '统一社会信用代码证书不能为空',
+                        trigger: 'blur'
+                    }
+                ],
+                fullAddress: [
+                    {
+                        required: true,
+                        message: '详细地址不能为空',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            selDeptType: '',
+            searchStaffKeyword: '',
+            searchGridStaffKeyword: '',
+            searchDeptStaffKeyword: ''
+        };
+    },
+    watch: {
+        dialogVisibleGrid(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.createMap();
+                }, 1000);
+            }
+        },
+        createAgencyDialogFlag(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.createMap();
+                }, 1000);
+            }
+        },
+        modifyCityOrgPop(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.createMap();
+                }, 1000);
+            }
+        },
+        streetOrCommunity(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.createMap();
+                }, 1000);
+            }
+        },
+        modifyGridPop(val) {
+            if (val) {
+                setTimeout(() => {
+                    this.createMap('modifyGridFrom');
+                }, 1000);
+            }
+        }
+    },
+    computed: {
+        cleanAgencyStaffTableListData() {
+            return this.agencyStaffTableListData.filter(item => !item.hidden);
+        },
+        cleanGridStaffTableListData() {
+            return this.gridStaffTableListData.filter(item => !item.hidden);
+        },
+        cleanDepartmentStaffTableListData() {
+            return this.departmentStaffTableListData.filter(item => !item.hidden);
+        }
+    },
+    mounted() {
+        this.getAgencyList();
+        this.getDepartmentList();
+        this.getGridList();
+        this.getAgencyStaffListData();
+        this.getDutyList();
+        this.getRoleList();
+        this.getCultureList();
+        // this.getNavigation()
+        // 更新顶部面包屑
+        this.assembleBreadcrumbArr(localStorage.getItem('agencyId'), 'agency');
+        // this.initMap()
+    },
+    methods: {
+        handleImgSuccess(index, res, file) {
+            if (res.code === 0 && res.msg === 'success') {
+                console.log('res.data.url', res.data.url);
+                this.agencyForm.unifiedSocialCreditCodeCertificate = res.data.url;
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        handleImgSuccess2(index, res, file) {
+            if (res.code === 0 && res.msg === 'success') {
+                console.log('res.data.url', res.data.url);
+                this.OrgDetailsForm.unifiedSocialCreditCodeCertificate = res.data.url;
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 1;
+            if (!isLt1M) {
+                this.$message.error('上传图片大小不能超过 1MB!');
+            }
+            return isLt1M;
+        },
+        // async handleExport () {
+        //   let title = "部门导出";
+        //   const url = "/epmetuser/icVaccinePrarmeter/vaccine-export";
+        //   app.ajax.exportFilePost(
+        //     url,
+        //     this.dataForm,
+        //     (data, rspMsg) => {
+        //       console.log(data)
+        //       this.download(data, title + ".xlsx");
+        //     },
+        //     (rspMsg, data) => {
+        //       this.$message.error(rspMsg);
+        //     }
+        //   );
+        // },
+        beforeUpload(file) {
+            this.files = file;
+            const isText = file.type === 'application/vnd.ms-excel';
+            const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+            if (!isText && !isTextComputer) {
+                this.$message.error('请选择正确格式的文件');
+                this.files = null;
+                this.fileName = '';
+                return false;
+            } else {
+                this.fileName = file.name;
+                return true;
+            }
+        },
+        async uploadFile(type) {
+            if (this.fileName == '') {
+                this.$message.warning('请选择要上传的文件！');
+                return false;
+            }
+            this.$message({
+                showClose: true,
+                message: '导入中，请到系统管理-导入记录中查看进度',
+                duration: 0
+            });
+
+            this.$refs['upload'].clearFiles();
+            let url = '';
+            let fileFormData = new FormData();
+            fileFormData.append('file', this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+            fileFormData.append('agencyId', this.currentAgencyId);
 
-			this.$refs['upload'].clearFiles();
-			let url = '';
-			let fileFormData = new FormData();
-			fileFormData.append('file', this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-			fileFormData.append('agencyId', this.currentAgencyId);
+            if (type == 'department') {
+                url = '/gov/org/department/yantai/import';
+            } else if (type == 'staff') {
+                url = '/gov/org/staff/staffimport';
 
-			if (type == 'department') {
-				url = '/gov/org/department/yantai/import';
-			} else if (type == 'staff') {
-				url = '/gov/org/staff/staffimport';
-				
-				fileFormData.append('orgType', 'agency');
-				fileFormData.append('orgId', this.currentAgencyId);
-			}
-			window.app.ajax.post2(
-				url,
-				fileFormData,
-				(data, rspMsg) => {
-					if (data.code === 0 && data.msg == 'success') {
-						// this.getDepartmentList();
-						// this.$message.success('导入成功')
-					} else {
-						// this.$message({
-						//   showClose: true,
-						//   message: rspMsg,
-						//   duration: 0,
-						//   type: "error"
-						// })
-						// this.$message.error(rspMsg)
-					}
-					// this.loadTable();
-				},
-				(rspMsg, data) => {},
-				{
-					headers: {
-						'Content-Type': 'multipart/form-data'
-					}
-				}
-			);
-			this.getDepartmentList();
-		},
-		download(data, fileName) {
-			if (!data) {
-				return;
-			}
-			var csvData = new Blob([data]);
-			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-				window.navigator.msSaveOrOpenBlob(csvData, fileName);
-			} else {
-				var a = document.createElement('a');
-				document.body.appendChild(a);
-				a.style = 'display: none';
-				var url = window.URL.createObjectURL(csvData);
-				a.href = url;
-				a.download = fileName;
-				a.click();
-				a.remove();
-				window.URL.revokeObjectURL(url);
-			}
-		},
-		handleExportModule(type) {
-			let title = '';
-			let url = '';
-			if (type == 'department') {
-				title = '部门导入模板';
-				url = '/gov/org/department/yantai/download-tem';
-			} else if (type == 'staff') {
-				title = '工作人员模板';
-				url = '/gov/org/staff/import/download-template';
-			}
-			let params = {};
-			app.ajax.exportFilePost(
-				url,
-				params,
-				(data, rspMsg) => {
-					this.download(data, title + '.xlsx');
-				},
-				(rspMsg, data) => {
-					this.$message.error(rspMsg);
-				}
-			);
-		},
-		handleSearchStaff() {
-			const { searchStaffKeyword, agencyStaffTableListData } = this;
-			this.agencyStaffTableListData = agencyStaffTableListData.map(item => {
-				return {
-					...item,
-					hidden: !(item.name.indexOf(searchStaffKeyword) != -1 || item.mobile.indexOf(searchStaffKeyword) != -1)
-				};
-			});
-		},
-		handleSearchGridStaff() {
-			const { searchGridStaffKeyword, gridStaffTableListData } = this;
-			this.gridStaffTableListData = gridStaffTableListData.map(item => {
-				return {
-					...item,
-					hidden: !(item.name.indexOf(searchGridStaffKeyword) != -1 || item.mobile.indexOf(searchGridStaffKeyword) != -1)
-				};
-			});
-		},
-		handleSearchDeptStaff() {
-			const { searchDeptStaffKeyword, departmentStaffTableListData } = this;
-			this.departmentStaffTableListData = departmentStaffTableListData.map(item => {
-				return {
-					...item,
-					hidden: !(item.name.indexOf(searchDeptStaffKeyword) != -1 || item.mobile.indexOf(searchDeptStaffKeyword) != -1)
-				};
-			});
-		},
-		// 点击后获取id
-		handleChangeTransferCascader(e) {
-			console.log('*********************');
+                fileFormData.append('orgType', 'agency');
+                fileFormData.append('orgId', this.currentAgencyId);
+            }
+            window.app.ajax.post2(
+                url,
+                fileFormData,
+                (data, rspMsg) => {
+                    if (data.code === 0 && data.msg == 'success') {
+                        // this.getDepartmentList();
+                        // this.$message.success('导入成功')
+                    } else {
+                        // this.$message({
+                        //   showClose: true,
+                        //   message: rspMsg,
+                        //   duration: 0,
+                        //   type: "error"
+                        // })
+                        // this.$message.error(rspMsg)
+                    }
+                    // this.loadTable();
+                },
+                (rspMsg, data) => { },
+                {
+                    headers: {
+                        'Content-Type': 'multipart/form-data'
+                    }
+                }
+            );
+            this.getDepartmentList();
+        },
+        download(data, fileName) {
+            if (!data) {
+                return;
+            }
+            var csvData = new Blob([data]);
+            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                window.navigator.msSaveOrOpenBlob(csvData, fileName);
+            } else {
+                var a = document.createElement('a');
+                document.body.appendChild(a);
+                a.style = 'display: none';
+                var url = window.URL.createObjectURL(csvData);
+                a.href = url;
+                a.download = fileName;
+                a.click();
+                a.remove();
+                window.URL.revokeObjectURL(url);
+            }
+        },
+        handleExportModule(type) {
+            let title = '';
+            let url = '';
+            if (type == 'department') {
+                title = '部门导入模板';
+                url = '/gov/org/department/yantai/download-tem';
+            } else if (type == 'staff') {
+                title = '工作人员模板';
+                url = '/gov/org/staff/import/download-template';
+            }
+            let params = {};
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    this.download(data, title + '.xlsx');
+                },
+                (rspMsg, data) => {
+                    this.$message.error(rspMsg);
+                }
+            );
+        },
+        handleSearchStaff() {
+            const { searchStaffKeyword, agencyStaffTableListData } = this;
+            this.agencyStaffTableListData = agencyStaffTableListData.map(item => {
+                return {
+                    ...item,
+                    hidden: !(item.name.indexOf(searchStaffKeyword) != -1 || item.mobile.indexOf(searchStaffKeyword) != -1)
+                };
+            });
+        },
+        handleSearchGridStaff() {
+            const { searchGridStaffKeyword, gridStaffTableListData } = this;
+            this.gridStaffTableListData = gridStaffTableListData.map(item => {
+                return {
+                    ...item,
+                    hidden: !(item.name.indexOf(searchGridStaffKeyword) != -1 || item.mobile.indexOf(searchGridStaffKeyword) != -1)
+                };
+            });
+        },
+        handleSearchDeptStaff() {
+            const { searchDeptStaffKeyword, departmentStaffTableListData } = this;
+            this.departmentStaffTableListData = departmentStaffTableListData.map(item => {
+                return {
+                    ...item,
+                    hidden: !(item.name.indexOf(searchDeptStaffKeyword) != -1 || item.mobile.indexOf(searchDeptStaffKeyword) != -1)
+                };
+            });
+        },
+        // 点击后获取id
+        handleChangeTransferCascader(e) {
+            console.log('*********************');
 
-			function findItem(valueArr, coll) {
-				console.log('--------------------');
-				console.log(valueArr);
-				let copyArr = [...valueArr];
-				let firstValue = copyArr.shift();
-				let item = coll.find(a => a.value == firstValue);
-				console.log(item);
-				if (copyArr.length > 0) {
-					return findItem(copyArr, item.children);
-				} else {
-					return item;
-				}
-			}
-			let item = findItem(e, this.options);
-			this.transferForm.orgId = item.value;
-			this.transferForm.orgType = item.type;
-		},
-		async getCultureList() {
-			const url = '/sys/dict/data/dictlist';
-			let params = {
-				dictType: 'education'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.cultureList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		/** 查询系统工作人员角色（职责） */
-		async getDutyList() {
-			const url = '/gov/org/staff/rolelist';
-			let params = {
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.dutyList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		/** 查询系统工作人员角色（职责） */
-		async getRoleList() {
-			this.tableLoading = true;
-			const url = '/gov/access/govrole/list';
-			let params = {};
-			const { data, code, msg } = await requestGet(url, params);
-			if (code === 0) {
-				this.roleList = data;
-			} else {
-				this.$message.error(msg);
-			}
-			this.tableLoading = false;
-		},
-		/** 查询组织列表 */
-		async getAgencyList() {
-			const url = '/gov/org/agency/agencylist';
-			let params = {
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.agencyTableListData = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		/** 查询社区列表 */
-		async getDepartmentList() {
-			const url = '/gov/org/department/departmentlist';
-			let params = {
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.departmentTableListData = data;
-				this.departmentTableListData.forEach(element => {
-					if (element.deptType === 'duty') {
-						element.departmentTypeShow = '职能部门';
-					} else if (element.deptType === 'party_unit') {
-						element.departmentTypeShow = '联建单位';
-					} else if (element.deptType === 'community_org') {
-						element.departmentTypeShow = '社会自组织';
-					} else {
-						element.departmentTypeShow = '';
-					}
-				});
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		/** 查询网格列表 */
-		async getGridList() {
-			const url = '/gov/org/grid/allgrids';
-			let params = {
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.gridTableListData = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 查询网格人员列表
-		async getGridStaffListData() {
-			const url = '/data/aggregator/org/stafflist';
-			let params = {
-				orgId: this.currentGridOrgId,
-				orgType: 'grid',
-				pageNo: 1,
-				pageSize: 10000
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.gridStaffTableListData = data.staffList || [];
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 查询组织工作人员
-		async getAgencyStaffListData() {
-			const url = '/data/aggregator/org/stafflist';
-			let params = {
-				orgId: this.currentAgencyId,
-				orgType: 'agency',
-				pageNo: 1,
-				pageSize: 10000
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.agencyStaffTableListData = data.staffList || [];
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 查询部门人员
-		async getDepartmentStaffListData() {
-			const url = '/data/aggregator/org/stafflist';
-			let params = {
-				orgId: this.currentDepartmentId,
-				orgType: 'dept',
-				pageNo: 1,
-				pageSize: 10000
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.departmentStaffTableListData = data.staffList || [];
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 添加组织
-		async submit() {
-			const url = '/gov/org/department/adddepartment';
-			let params = {
-				agencyId: this.insertForm.agencyId,
-				departmentName: this.insertForm.departmentName,
-				departmentDuty: this.insertForm.departmentDuty,
-				contacts: this.insertForm.contacts,
-				mobile: this.insertForm.mobile,
-				code: this.insertForm.code
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('添加成功');
-				this.dialogVisible = false;
-				this.insertForm = [];
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 添加网格
-		async submitGrid() {
-			const url = '/gov/org/grid/addgrid';
-			let params = {
-				agencyId: this.GridForm.agencyId,
-				gridName: this.GridForm.gridName,
-				contacts: this.GridForm.contacts,
-				mobile: this.GridForm.mobile,
-				code: this.GridForm.code,
-				manageDistrict: this.GridForm.manageDistrict,
-				gridType: this.GridForm.gridType,
-				latitude: this.lat,
-				longitude: this.lng
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('添加成功');
-				this.dialogVisibleGrid = false;
-				this.GridForm = [];
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async submitPeo() {
-			this.$refs['addPeoForm'].validate((valid, err) => {
-				if (valid) {
-					this.submitPeoDo();
-				} else {
-					app.util.validateRule(err);
-					return console.log('error submit!!', valid, err);
-				}
-			});
-		},
-		// 添加人员
-		async submitPeoDo() {
-			const url = '/gov/org/staff/addstaffv2';
-			const {
-				peoForm: { orgType }
-			} = this;
-			let params = {
-				orgType: this.peoForm.orgType,
-				name: this.peoForm.name,
-				mobile: this.peoForm.mobile,
-				gender: this.peoForm.gender,
-				workType: this.peoForm.post,
-				duty: this.peoForm.duty,
-				roles: this.peoForm.roles,
-				newRoles: this.peoForm.newRoles,
-				idCard: this.peoForm.idCard,
-				viliagePosition: this.peoForm.viliagePosition,
-				partyPosition: this.peoForm.partyPosition,
-				address: this.peoForm.address,
-				culture: this.peoForm.culture,
-				duty: this.peoForm.duty,
-				remark: this.peoForm.remark,
-				orgId: orgType == 'agency' ? this.currentAgencyId : orgType == 'dept' ? this.currentDepartmentId : this.currentGridOrgId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('添加成功');
-				this.dialogVisiblePeo = false;
-				this.peoForm = [];
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-				this.insertFormRest();
-				if (orgType == 'dept') {
-					this.getDepartmentStaffListData();
-				} else if (orgType == 'grid') {
-					this.getGridStaffListData();
-				} else {
-					this.getAgencyStaffListData();
-				}
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async updatePeo() {
-			this.$refs['editPeoForm'].validate((valid, err) => {
-				if (valid) {
-					this.updatePeoDo();
-				} else {
-					app.util.validateRule(err);
-					return console.log('error updatePeo!!', valid, err);
-				}
-			});
-		},
-		// 人员修改
-		async updatePeoDo() {
-			const url = '/gov/org/staff/editstaff';
-			let params = {
-				staffId: this.userStaffId,
-				name: this.peoForm.name,
-				mobile: this.peoForm.mobile,
-				// gender: this.peoForm.gender === '男' ? 1 : 0,
-				gender: this.peoForm.gender,
-				workType: this.peoForm.post,
-				roles: this.peoForm.roles,
-				newRoles: this.peoForm.newRoles,
-				agencyId: this.currentAgencyId,
-				idCard: this.peoForm.idCard,
-				viliagePosition: this.peoForm.viliagePosition,
-				partyPosition: this.peoForm.partyPosition,
-				address: this.peoForm.address,
-				culture: this.peoForm.culture,
-				duty: this.peoForm.duty,
-				remark: this.peoForm.remark
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('修改成功');
-				this.modifyPeo = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-				this.getDepartmentStaffListData();
-				this.getGridStaffListData();
-				this.insertFormRest();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 字典
-		async getDictionaries() {
-			const url = '/sys/dict/data/dictlist';
-			let params = {
-				dictType: 'grid_type'
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.typeList = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.queryParams.deptName = undefined;
-			this.queryParams.status = undefined;
-			this.handleQuery();
-		},
-		/** 新增按钮操作 */
-		handleAdd(row) {
-			this.dialogVisible = true;
-		},
-		// 社区弹框关闭函数
-		handleClose(done) {
-			this.$confirm('确认关闭？')
-				.then(_ => {
-					this.insertFormRest();
-					done();
-				})
-				.catch(_ => {});
-		},
-		// 人员查看叉号关闭
-		handleClosePeoView(done) {
-			this.insertFormRest();
-			done();
-		},
-		// 社区新增弹框重置函数
-		insertFormRest() {
-			this.insertForm.name = '';
-			this.insertForm.contacts = '';
-			this.insertForm.code = '';
-			this.insertForm.mobile = '';
-			this.insertForm.departmentName = '';
-			this.peoForm = {
-				name: '',
-				mobile: '',
-				gender: '',
-				post: '',
-				duty: [],
-				orgType: '',
-				activeTime: '',
-				zuzhi: '',
-				disableFlag: '',
-				newRoles: [],
-				idCard: '',
-				viliagePosition: '',
-				partyPosition: '',
-				address: '',
-				culture: '',
-				duty: '',
-				remark: ''
-			};
-		},
-		// 网格新增弹框重置函数
-		GridFormRest() {
-			(this.GridForm.gridName = ''),
-				(this.GridForm.code = ''),
-				(this.GridForm.centerAddress = ''),
-				(this.GridForm.contacts = ''),
-				(this.GridForm.mobile = ''),
-				(this.GridForm.agencyId = ''),
-				(this.GridForm.manageDistrict = ''),
-				(this.GridForm.gridType = ''),
-				(this.GridForm.location = ''),
-				(this.GridForm.longitude = ''),
-				(this.GridForm.latitude = '');
-		},
-		/** 人员清空 */
-		peoFormRest() {
-			(this.peoForm.name = ''), (this.peoForm.mobile = ''), (this.peoForm.gender = ''), (this.peoForm.post = ''), (this.peoForm.duty = '');
-			this.peoForm.newRoles = [];
-		},
-		// 人员调动
-		transferRest() {
-			(this.transferForm.name = ''), (this.transferForm.remarks = ''), (this.transferForm.transferTo = '');
-			(this.transferForm.staffId = ''), (this.transferForm.orgId = ''), (this.transferForm.orgType = '');
-			this.selectValue = '';
-			this.options[0] = [];
-		},
-		// 新增组织
-		addNewAgencyRest() {
-			(this.agencyForm.parentAgencyId = ''),
-				(this.agencyForm.agencyName = ''),
-				(this.agencyForm.level = ''),
-				(this.agencyForm.areaCodeSwitch = ''),
-				(this.agencyForm.areaCode = ''),
-				(this.agencyForm.areaName = ''),
-				(this.agencyForm.contacts = ''),
-				(this.agencyForm.mobile = ''),
-				(this.agencyForm.code = ''),
-				(this.agencyForm.remark = ''),
-				(this.agencyForm.secretaryName = ''),
-				(this.agencyForm.secretaryMobile = ''),
-				(this.agencyForm.dutyMobile = ''),
-				(this.agencyForm.unifiedSocialCreditCode = ''),
-				(this.agencyForm.unifiedSocialCreditCodeCertificate = ''),
-				(this.agencyForm.fullAddress = ''),
-				(this.latitude = ''),
-				(this.longitude = '');
-		},
-		// 修改市级组织
-		cancelModifyCityOrgPopRest() {
-			(this.OrgDetailsForm.level = ''),
-				(this.OrgDetailsForm.agencyName = ''),
-				(this.OrgDetailsForm.code = ''),
-				(this.OrgDetailsForm.contacts = ''),
-				(this.OrgDetailsForm.mobile = ''),
-				(this.OrgDetailsForm.centerAddress = ''),
-				(this.OrgDetailsForm.areaCode = '');
-			(this.OrgDetailsForm.secretaryName = ''),
-				(this.OrgDetailsForm.secretaryMobile = ''),
-				(this.OrgDetailsForm.dutyMobile = ''),
-				(this.OrgDetailsForm.unifiedSocialCreditCode = ''),
-				(this.OrgDetailsForm.unifiedSocialCreditCodeCertificate = ''),
-				(this.OrgDetailsForm.fullAddress = ''),
-				(this.OrgDetailsForm.agencyId = '');
-			(this.latitude = ''), (this.longitude = '');
-		},
-		// 修改下级机关单位
-		OrgUnitDetailsRest() {
-			(this.OrgUnitDetailsForm.code = ''),
-				(this.OrgUnitDetailsForm.contacts = ''),
-				(this.OrgUnitDetailsForm.departmentId = ''),
-				(this.OrgUnitDetailsForm.departmentName = ''),
-				(this.OrgUnitDetailsForm.mobile = '');
-		},
-		// 修改网格清空
-		ModifyGridPopRest() {
-			(this.modifyGridFrom.gridName = ''),
-				(this.modifyGridFrom.code = ''),
-				(this.modifyGridFrom.gridTypeName = ''),
-				(this.modifyGridFrom.contacts = ''),
-				(this.modifyGridFrom.mobile = ''),
-				(this.latitude = ''),
-				(this.longitude = ''),
-				(this.modifyGridFrom.agencyId = ''),
-				(this.modifyGridFrom.gridType = ''),
-				(this.modifyGridFrom.manageDistrict = ''),
-				(this.modifyGridFrom.griId = '');
-		},
-		// 社区新增弹框取消按钮
-		cancel() {
-			this.dialogVisible = false;
-			this.insertFormRest();
-		},
-		// 网格新增弹框取消按钮
-		cancelGrid() {
-			this.dialogVisibleGrid = false;
-			this.GridFormRest();
-		},
-		/** 取消按钮 */
-		cancelPeo() {
-			this.dialogVisiblePeo = false;
-			this.peoFormRest();
-		},
-		// 修改取消
-		cancelXiugai() {
-			this.modifyPeo = false;
-			this.peoFormRest();
-		},
-		// 查看弹窗
-		cancelDetails() {
-			this.details = false;
-		},
-		/** 人员调动取消按钮 */
-		cancelTransfer() {
-			this.transferRest();
-			this.transferPeo = false;
-		},
-		// 新增组织取消按钮
-		canceladdNewAgency() {
-			this.addNewAgencyRest();
-			this.createAgencyDialogFlag = false;
-		},
-		// 修改市级组织取消按钮
-		cancelModifyCityOrgPop() {
-			this.cancelModifyCityOrgPopRest();
-			this.modifyCityOrgPop = false;
-		},
-		// 修改街道/社区级取消按钮
-		cancelstreetOrCommunity() {
-			this.cancelModifyCityOrgPopRest();
-			this.streetOrCommunity = false;
-		},
-		// 取消修改下级机关单位按钮
-		cancelOrgUnitPop() {
-			this.OrgUnitPop = false;
-			this.OrgUnitDetailsRest();
-		},
-		// 取消修改网格按钮
-		cancelModifyGridPop() {
-			this.modifyGridPop = false;
-			this.ModifyGridPopRest();
-		},
-		// 进入网格，查询网格所属人员
-		entryGrid(gridId) {
-			console.log(gridId);
-			this.gridStaffTableListData = [];
-			this.departmentStaffTableListData = [];
-			this.agencyStaffTableListData = [];
-			this.currentGridOrgId = gridId;
-			this.gridStaffTableFlag = true;
-			this.departmentStaffTableFlag = false;
-			this.currentAgencyStaffTableFlag = false;
-			this.agencyTableFlag = false;
-			this.departmentTableFlag = false;
-			this.gridTableFlag = false;
-			this.getGridStaffListData();
-			this.assembleBreadcrumbArr(gridId, 'grid');
-		},
-		// 进入部门，查询部门所属人员
-		entryDepartment(row) {
-			console.log(row);
-			this.gridStaffTableListData = [];
-			this.departmentStaffTableListData = [];
-			this.agencyStaffTableListData = [];
-			this.currentDepartmentId = row.departmentId;
-			this.departmentStaffTableFlag = true;
-			this.currentAgencyStaffTableFlag = false;
-			this.gridStaffTableFlag = false;
-			this.gridTableFlag = false;
-			this.agencyTableFlag = false;
-			this.departmentTableFlag = false;
-			this.selDeptType = row.deptType;
-			this.getDepartmentStaffListData();
-			this.assembleBreadcrumbArr(row.departmentId, 'department');
-		},
-		// 进入组织，重新渲染
-		entryAgency(agencyId) {
-			this.currentAgencyId = agencyId;
-			this.agencyTableListData = [];
-			this.departmentTableListData = [];
-			this.gridTableListData = [];
-			this.gridStaffTableListData = [];
-			this.agencyStaffTableListData = [];
-			this.departmentStaffTableListData = [];
-			this.getDepartmentList();
-			this.getGridList();
-			this.getAgencyStaffListData();
-			this.getAgencyList();
-			this.assembleBreadcrumbArr(agencyId, 'agency');
-		},
-		// 新增组织
-		addCommunity(row) {
-			this.insertForm.agencyId = this.currentAgencyId;
-			this.dialogVisible = true;
-		},
-		// 新增网格
-		addGrid(row) {
-			this.GridForm.agencyId = this.currentAgencyId;
-			this.getDictionaries();
-			this.dialogVisibleGrid = true;
-		},
-		// 新增人员
-		addPeo(row) {
-			this.dialogVisiblePeo = true;
-			this.peoForm = {};
-			this.peoForm.orgType = 'agency';
-		},
-		// 新增社区人员
-		addCommunityPeo() {
-			this.dialogVisiblePeo = true;
-			this.peoForm = {};
-			this.peoForm.orgType = 'dept';
-		},
-		// 新增网格人员
-		addGridPeo() {
-			this.dialogVisiblePeo = true;
-			this.peoForm = {};
-			this.peoForm.orgType = 'grid';
-		},
-		// 修改网格人员
-		async xiuGridPeo(row) {
-			this.modifyPeo = true;
-			this.peoForm.orgType = 'grid';
-			this.userStaffId = row.staffId;
-			const url = '/gov/org/staff/editstaffinit';
-			let params = {
-				staffId: row.staffId,
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.peoForm.name = data.name;
-				this.peoForm.mobile = data.mobile;
-				// this.peoForm.gender = data.gender === 1 ? '男' : '女'
-				this.peoForm.gender = data.gender;
-				this.peoForm.post = data.workType;
-				this.peoForm.idCard = data.idCard;
-				this.peoForm.viliagePosition = data.viliagePosition;
-				this.peoForm.partyPosition = data.partyPosition;
-				this.peoForm.address = data.address;
-				this.peoForm.culture = data.culture;
-				this.peoForm.duty = data.duty;
-				this.peoForm.remark = data.remark;
-				// 已有的权限（职责）
-				let existedDutyArr = [];
-				data.roleList.forEach(function(sysDuty) {
-					if (sysDuty.selected === true) {
-						existedDutyArr.push(sysDuty.roleId);
-					}
-				});
-				this.peoForm.roles = existedDutyArr;
-				// 已有的权限（角色）
-				let existedRoleArr = [];
-				data.newRoleList.forEach(function(sysRole) {
-					if (sysRole.selected === true) {
-						existedRoleArr.push(sysRole.roleId);
-					}
-				});
-				this.peoForm.newRoles = existedRoleArr;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 修改人员
-		async xiuPeo(row) {
-			this.modifyPeo = true;
-			this.peoForm.orgType = 'agency';
-			this.userStaffId = row.staffId;
-			const url = '/gov/org/staff/editstaffinit';
-			let params = {
-				staffId: row.staffId,
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.peoForm.name = data.name;
-				this.peoForm.mobile = data.mobile;
-				this.peoForm.post = data.workType;
-				// this.peoForm.gender = data.gender === 1 ? '男' : '女'
-				this.peoForm.gender = data.gender;
-				this.peoForm.idCard = data.idCard;
-				this.peoForm.viliagePosition = data.viliagePosition;
-				this.peoForm.partyPosition = data.partyPosition;
-				this.peoForm.address = data.address;
-				this.peoForm.culture = data.culture;
-				this.peoForm.duty = data.duty;
-				this.peoForm.remark = data.remark;
-				// 已有的权限（职责）
-				let existedDutyArr = [];
-				data.roleList.forEach(function(sysDuty) {
-					if (sysDuty.selected === true) {
-						existedDutyArr.push(sysDuty.roleId);
-					}
-				});
-				this.peoForm.roles = existedDutyArr;
-				// 已有的权限（角色）
-				let existedRoleArr = [];
-				data.newRoleList.forEach(function(sysRole) {
-					if (sysRole.selected === true) {
-						existedRoleArr.push(sysRole.roleId);
-					}
-				});
-				this.peoForm.newRoles = existedRoleArr;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 修改社区人员
-		async xiuCommunityPeo(row) {
-			this.modifyPeo = true;
-			this.peoForm.orgType = 'dept';
-			this.userStaffId = row.staffId;
-			const url = '/gov/org/staff/editstaffinit';
-			let params = {
-				staffId: row.staffId,
-				agencyId: this.currentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.peoForm.name = data.name;
-				this.peoForm.mobile = data.mobile;
-				// this.peoForm.gender = data.gender === 1 ? '男' : '女'
-				this.peoForm.gender = data.gender;
-				this.peoForm.post = data.workType;
-				this.peoForm.idCard = data.idCard;
-				this.peoForm.viliagePosition = data.viliagePosition;
-				this.peoForm.partyPosition = data.partyPosition;
-				this.peoForm.address = data.address;
-				this.peoForm.culture = data.culture;
-				this.peoForm.duty = data.duty;
-				this.peoForm.remark = data.remark;
-				// 已有的权限（职责）
-				let existedDutyArr = [];
-				data.roleList.forEach(function(sysDuty) {
-					if (sysDuty.selected === true) {
-						existedDutyArr.push(sysDuty.roleId);
-					}
-				});
-				this.peoForm.roles = existedDutyArr;
-				// 已有的权限（角色）
-				let existedRoleArr = [];
-				data.newRoleList.forEach(function(sysRole) {
-					if (sysRole.selected === true) {
-						existedRoleArr.push(sysRole.roleId);
-					}
-				});
-				this.peoForm.newRoles = existedRoleArr;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 取消禁用按钮
-		cancelDisable() {
-			this.Disable = false;
-		},
-		// 人员禁用
-		DisablePeo(row) {
-			this.DisableForm.staffId = row.staffId;
-			this.Disable = true;
-		},
-		enablestaff(row) {
-			this.$confirm('确认解禁该员工?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			})
-				.then(() => {
-					this.submitEnable(row);
-				})
-				.catch(err => {
-					if (err == 'cancel') {
-						// this.$message({
-						//   type: "info",
-						//   message: "已取消删除"
-						// });
-					}
-				});
-		},
-		// 确定解禁
-		async submitEnable(row) {
-			const url = '/epmetuser/customerstaff/enablestaff';
-			let params = {
-				staffId: row.staffId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('解禁成功');
-				this.Disable = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 确定禁用
-		async submitDisable() {
-			const url = '/epmetuser/customerstaff/disabledstaff';
-			let params = {
-				staffId: this.DisableForm.staffId,
-				agencyId: this.DisableForm.agencyId,
-				customerId: this.DisableForm.customerId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('禁用成功');
-				this.Disable = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 查看按钮
-		async lookAngency(row) {
-			const url = '/data/aggregator/org/staffdetailv2';
-			let params = {
-				staffId: row.staffId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.peoForm.name = data.name;
-				this.peoForm.mobile = data.mobile.substr(0, 3) + '****' + data.mobile.substr(7);
-				this.peoForm.activeTime = data.activeTime;
-				this.peoForm.roles = data.roles;
-				this.peoForm.zuzhi = data.orgName;
-				this.peoForm.idCard = data.idCard;
-				this.peoForm.viliagePosition = data.viliagePosition;
-				this.peoForm.partyPosition = data.partyPosition;
-				this.peoForm.address = data.address;
-				this.peoForm.culture = data.culture;
-				this.peoForm.duty = data.duty;
-				this.peoForm.remark = data.remark;
-				if (data.enableFlag === 'enable') {
-					this.peoForm.disableFlag = '已启用';
-				} else {
-					this.peoForm.disableFlag = '已禁用';
-				}
-			}
-			this.details = true;
-		},
-		// 人员调动
-		async transfer(row) {
-			this.transferForm.name = row.name;
-			this.transferForm.staffId = row.staffId;
-			this.transferPeo = true;
-			const url = '/gov/org/customeragency/orgtree';
-			let params = {};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				function computeOption(opt) {
-					return {
-						label: opt.agencyName,
-						value: opt.agencyId,
-						type: 'agency',
-						children: [
-							...(opt.departmentList || []).map(item => ({
-								label: item.deptName,
-								value: item.deptId,
-								type: 'dept',
-								typeName: '部门'
-							})),
-							...(opt.gridList || []).map(item => ({
-								label: item.gridName,
-								value: item.gridId,
-								type: 'grid',
-								typeName: '网格'
-							})),
-							...(opt.subAgencyList || []).map(item => computeOption(item))
-						]
-					};
-				}
-				if (data) {
-					this.options = [computeOption(data)];
-					console.log('树树树树树树树树树树', this.options[0]);
-				}
-			} else {
-				this.$message.error('树查询失败', msg);
-			}
-		},
-		// 人员调动确定
-		async submitTransfer() {
-			const url = '/gov/org/staff/stafftransferv2';
-			let params = {
-				staffId: this.transferForm.staffId,
-				orgId: this.transferForm.orgId,
-				orgType: this.transferForm.orgType,
-				remarks: this.transferForm.remarks
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('调动成功');
-				this.transferRest();
-				this.transferPeo = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-				this.getDepartmentStaffListData();
-				this.getAgencyStaffListData();
-				this.getGridStaffListData();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 获取导航
-		// async getNavigation(){
-		//     const url = "/gov/org/customeragency/orgtree"
-		//     let params = {
-		//     }
-		//     const { data, code, msg } = await requestPost(url,params)
-		//     if(code === 0){
-		//         this.Navigation = data.agencyName
-		//     }
-		// 组装顶部面包屑数组
-		async assembleBreadcrumbArr(id, orgType) {
-			this.currentBreadcrumbKey = id;
-			if (orgType === 'agency') {
-				const url = '/gov/org/agency/agencydetail';
-				let params = {
-					agencyId: id
-				};
-				const { data, code, msg } = await requestPost(url, params);
-				if (code === 0) {
-					// 社区级为最低级组织，不展示下级组织列表
-					this.currentAgencyLevel = data.level;
-					this.currentAreaCode = data.areaCode;
-					this.currentAreaCodeSwitch = data.areaCodeSwitch;
-					if (data.parentList && data.parentList.length > 0) {
-						this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode;
-						this.parentAgencyId = data.parentList[data.parentList.length - 1].id;
-						this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level;
-					}
-					if (data.level === 'community') {
-						this.agencyTableFlag = false;
-					} else {
-						this.agencyTableFlag = true;
-					}
-					if (this.breadcrumbArr.length === 0) {
-						this.breadcrumbArr = [
-							{
-								id: data.agencyId,
-								name: data.agencyName,
-								type: orgType
-							}
-						];
-					} else {
-						let hasBreadcrumbArr = false;
-						this.breadcrumbArr.forEach(function(bc) {
-							if (bc.id === id) {
-								hasBreadcrumbArr = true;
-							}
-						});
-						if (hasBreadcrumbArr === false) {
-							let breadcrumb = {
-								id: data.agencyId,
-								name: data.agencyName,
-								type: orgType
-							};
-							this.breadcrumbArr.push(breadcrumb);
-						}
-					}
-				} else {
-					this.$message.error(msg);
-				}
-			} else if (orgType === 'department') {
-				const url = '/gov/org/department/departmentdetail';
-				let params = {
-					departmentId: id
-				};
-				const { data, code, msg } = await requestPost(url, params);
-				if (code === 0) {
-					if (this.breadcrumbArr.length === 0) {
-						this.breadcrumbArr = [
-							{
-								id: data.departmentId,
-								name: data.departmentName,
-								type: orgType
-							}
-						];
-					} else {
-						let hasBreadcrumbArr = false;
-						this.breadcrumbArr.forEach(function(bc) {
-							if (bc.id === id) {
-								hasBreadcrumbArr = true;
-							}
-						});
-						if (hasBreadcrumbArr === false) {
-							let breadcrumb = {
-								id: data.departmentId,
-								name: data.departmentName,
-								type: orgType
-							};
-							this.breadcrumbArr.push(breadcrumb);
-						}
-					}
-				} else {
-					this.$message.error(msg);
-				}
-			} else if (orgType === 'grid') {
-				const url = '/gov/org/grid/griddetail';
-				let params = {
-					gridId: id
-				};
-				const { data, code, msg } = await requestPost(url, params);
-				if (code === 0) {
-					if (this.breadcrumbArr.length === 0) {
-						this.breadcrumbArr = [
-							{
-								id: data.grid,
-								name: data.gridName,
-								type: orgType
-							}
-						];
-					} else {
-						let hasBreadcrumbArr = false;
-						this.breadcrumbArr.forEach(function(bc) {
-							if (bc.id === id) {
-								hasBreadcrumbArr = true;
-							}
-						});
-						if (hasBreadcrumbArr === false) {
-							let breadcrumb = {
-								id: data.grid,
-								name: data.gridName,
-								type: orgType
-							};
-							this.breadcrumbArr.push(breadcrumb);
-						}
-					}
-				} else {
-					this.$message.error(msg);
-				}
-			}
-		},
-		async refreshThisPage(index) {
-			// 点击最后一级不触发响应
-			if (index === this.breadcrumbArr.length - 1) {
-				return;
-			}
-			const selectOrg = this.breadcrumbArr[index];
-			this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1);
-			const orgId = selectOrg.id;
-			const orgType = selectOrg.type;
-			if (orgType === 'agency') {
-				this.agencyTableListData = [];
-				this.agencyStaffTableListData = [];
-				this.departmentTableListData = [];
-				this.departmentStaffTableListData = [];
-				this.gridTableListData = [];
-				this.gridStaffTableListData = [];
-				this.userAgencyId = orgId;
-				this.currentAgencyId = orgId;
-				this.agencyTableFlag = true;
-				this.currentAgencyStaffTableFlag = true;
-				this.departmentTableFlag = true;
-				this.departmentStaffTableFlag = false;
-				this.gridTableFlag = true;
-				this.gridStaffTableFlag = false;
-				this.assembleBreadcrumbArr(orgId, 'agency');
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-			}
-			// 当点击最后一级不触发响应
-			// 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
-			// 若需要点击最后一级触发刷新，可释放以下代码
-			/* else if (orgType === 'department') {
+            function findItem(valueArr, coll) {
+                console.log('--------------------');
+                console.log(valueArr);
+                let copyArr = [...valueArr];
+                let firstValue = copyArr.shift();
+                let item = coll.find(a => a.value == firstValue);
+                console.log(item);
+                if (copyArr.length > 0) {
+                    return findItem(copyArr, item.children);
+                } else {
+                    return item;
+                }
+            }
+            let item = findItem(e, this.options);
+            this.transferForm.orgId = item.value;
+            this.transferForm.orgType = item.type;
+        },
+        async getCultureList() {
+            const url = '/sys/dict/data/dictlist';
+            let params = {
+                dictType: 'education'
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.cultureList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        /** 查询系统工作人员角色（职责） */
+        async getDutyList() {
+            const url = '/gov/org/staff/rolelist';
+            let params = {
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.dutyList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        /** 查询系统工作人员角色（职责） */
+        async getRoleList() {
+            this.tableLoading = true;
+            const url = '/gov/access/govrole/list';
+            let params = {};
+            const { data, code, msg } = await requestGet(url, params);
+            if (code === 0) {
+                this.roleList = data;
+            } else {
+                this.$message.error(msg);
+            }
+            this.tableLoading = false;
+        },
+        /** 查询组织列表 */
+        async getAgencyList() {
+            const url = '/gov/org/agency/agencylist';
+            let params = {
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.agencyTableListData = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        /** 查询社区列表 */
+        async getDepartmentList() {
+            const url = '/gov/org/department/departmentlist';
+            let params = {
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.departmentTableListData = data;
+                this.departmentTableListData.forEach(element => {
+                    if (element.deptType === 'duty') {
+                        element.departmentTypeShow = '职能部门';
+                    } else if (element.deptType === 'party_unit') {
+                        element.departmentTypeShow = '联建单位';
+                    } else if (element.deptType === 'community_org') {
+                        element.departmentTypeShow = '社会自组织';
+                    } else {
+                        element.departmentTypeShow = '';
+                    }
+                });
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        /** 查询网格列表 */
+        async getGridList() {
+            const url = '/gov/org/grid/allgrids';
+            let params = {
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridTableListData = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 查询网格人员列表
+        async getGridStaffListData() {
+            const url = '/data/aggregator/org/stafflist';
+            let params = {
+                orgId: this.currentGridOrgId,
+                orgType: 'grid',
+                pageNo: 1,
+                pageSize: 10000
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.gridStaffTableListData = data.staffList || [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 查询组织工作人员
+        async getAgencyStaffListData() {
+            const url = '/data/aggregator/org/stafflist';
+            let params = {
+                orgId: this.currentAgencyId,
+                orgType: 'agency',
+                pageNo: 1,
+                pageSize: 10000
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.agencyStaffTableListData = data.staffList || [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 查询部门人员
+        async getDepartmentStaffListData() {
+            const url = '/data/aggregator/org/stafflist';
+            let params = {
+                orgId: this.currentDepartmentId,
+                orgType: 'dept',
+                pageNo: 1,
+                pageSize: 10000
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.departmentStaffTableListData = data.staffList || [];
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 添加组织
+        async submit() {
+            const url = '/gov/org/department/adddepartment';
+            let params = {
+                agencyId: this.insertForm.agencyId,
+                departmentName: this.insertForm.departmentName,
+                departmentDuty: this.insertForm.departmentDuty,
+                contacts: this.insertForm.contacts,
+                mobile: this.insertForm.mobile,
+                code: this.insertForm.code
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('添加成功');
+                this.dialogVisible = false;
+                this.insertForm = [];
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 添加网格
+        async submitGrid() {
+            const url = '/gov/org/grid/addgrid';
+            let params = {
+                agencyId: this.GridForm.agencyId,
+                gridName: this.GridForm.gridName,
+                contacts: this.GridForm.contacts,
+                mobile: this.GridForm.mobile,
+                code: this.GridForm.code,
+                manageDistrict: this.GridForm.manageDistrict,
+                gridType: this.GridForm.gridType,
+                latitude: this.lat,
+                longitude: this.lng
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('添加成功');
+                this.dialogVisibleGrid = false;
+                this.GridForm = [];
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async submitPeo() {
+            this.$refs['addPeoForm'].validate((valid, err) => {
+                if (valid) {
+                    this.submitPeoDo();
+                } else {
+                    app.util.validateRule(err);
+                    return console.log('error submit!!', valid, err);
+                }
+            });
+        },
+        // 添加人员
+        async submitPeoDo() {
+            const url = '/gov/org/staff/addstaffv2';
+            const {
+                peoForm: { orgType }
+            } = this;
+            let params = {
+                orgType: this.peoForm.orgType,
+                name: this.peoForm.name,
+                mobile: this.peoForm.mobile,
+                gender: this.peoForm.gender,
+                workType: this.peoForm.post,
+                duty: this.peoForm.duty,
+                roles: this.peoForm.roles,
+                newRoles: this.peoForm.newRoles,
+                idCard: this.peoForm.idCard,
+                viliagePosition: this.peoForm.viliagePosition,
+                partyPosition: this.peoForm.partyPosition,
+                address: this.peoForm.address,
+                culture: this.peoForm.culture,
+                duty: this.peoForm.duty,
+                remark: this.peoForm.remark,
+                orgId: orgType == 'agency' ? this.currentAgencyId : orgType == 'dept' ? this.currentDepartmentId : this.currentGridOrgId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('添加成功');
+                this.dialogVisiblePeo = false;
+                this.peoForm = [];
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+                this.insertFormRest();
+                if (orgType == 'dept') {
+                    this.getDepartmentStaffListData();
+                } else if (orgType == 'grid') {
+                    this.getGridStaffListData();
+                } else {
+                    this.getAgencyStaffListData();
+                }
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async updatePeo() {
+            this.$refs['editPeoForm'].validate((valid, err) => {
+                if (valid) {
+                    this.updatePeoDo();
+                } else {
+                    app.util.validateRule(err);
+                    return console.log('error updatePeo!!', valid, err);
+                }
+            });
+        },
+        // 人员修改
+        async updatePeoDo() {
+            const url = '/gov/org/staff/editstaff';
+            let params = {
+                staffId: this.userStaffId,
+                name: this.peoForm.name,
+                mobile: this.peoForm.mobile,
+                // gender: this.peoForm.gender === '男' ? 1 : 0,
+                gender: this.peoForm.gender,
+                workType: this.peoForm.post,
+                roles: this.peoForm.roles,
+                newRoles: this.peoForm.newRoles,
+                agencyId: this.currentAgencyId,
+                idCard: this.peoForm.idCard,
+                viliagePosition: this.peoForm.viliagePosition,
+                partyPosition: this.peoForm.partyPosition,
+                address: this.peoForm.address,
+                culture: this.peoForm.culture,
+                duty: this.peoForm.duty,
+                remark: this.peoForm.remark
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('修改成功');
+                this.modifyPeo = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+                this.getDepartmentStaffListData();
+                this.getGridStaffListData();
+                this.insertFormRest();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 字典
+        async getDictionaries() {
+            const url = '/sys/dict/data/dictlist';
+            let params = {
+                dictType: 'grid_type'
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.typeList = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.queryParams.deptName = undefined;
+            this.queryParams.status = undefined;
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd(row) {
+            this.dialogVisible = true;
+        },
+        // 社区弹框关闭函数
+        handleClose(done) {
+            this.$confirm('确认关闭？')
+                .then(_ => {
+                    this.insertFormRest();
+                    done();
+                })
+                .catch(_ => { });
+        },
+        // 人员查看叉号关闭
+        handleClosePeoView(done) {
+            this.insertFormRest();
+            done();
+        },
+        // 社区新增弹框重置函数
+        insertFormRest() {
+            this.insertForm.name = '';
+            this.insertForm.contacts = '';
+            this.insertForm.code = '';
+            this.insertForm.mobile = '';
+            this.insertForm.departmentName = '';
+            this.peoForm = {
+                name: '',
+                mobile: '',
+                gender: '',
+                post: '',
+                duty: [],
+                orgType: '',
+                activeTime: '',
+                zuzhi: '',
+                disableFlag: '',
+                newRoles: [],
+                idCard: '',
+                viliagePosition: '',
+                partyPosition: '',
+                address: '',
+                culture: '',
+                duty: '',
+                remark: ''
+            };
+        },
+        // 网格新增弹框重置函数
+        GridFormRest() {
+            (this.GridForm.gridName = ''),
+                (this.GridForm.code = ''),
+                (this.GridForm.centerAddress = ''),
+                (this.GridForm.contacts = ''),
+                (this.GridForm.mobile = ''),
+                (this.GridForm.agencyId = ''),
+                (this.GridForm.manageDistrict = ''),
+                (this.GridForm.gridType = ''),
+                (this.GridForm.location = ''),
+                (this.GridForm.longitude = ''),
+                (this.GridForm.latitude = '');
+        },
+        /** 人员清空 */
+        peoFormRest() {
+            (this.peoForm.name = ''), (this.peoForm.mobile = ''), (this.peoForm.gender = ''), (this.peoForm.post = ''), (this.peoForm.duty = '');
+            this.peoForm.newRoles = [];
+        },
+        // 人员调动
+        transferRest() {
+            (this.transferForm.name = ''), (this.transferForm.remarks = ''), (this.transferForm.transferTo = '');
+            (this.transferForm.staffId = ''), (this.transferForm.orgId = ''), (this.transferForm.orgType = '');
+            this.selectValue = '';
+            this.options[0] = [];
+        },
+        // 新增组织
+        addNewAgencyRest() {
+            (this.agencyForm.parentAgencyId = ''),
+                (this.agencyForm.agencyName = ''),
+                (this.agencyForm.level = ''),
+                (this.agencyForm.areaCodeSwitch = ''),
+                (this.agencyForm.areaCode = ''),
+                (this.agencyForm.areaName = ''),
+                (this.agencyForm.contacts = ''),
+                (this.agencyForm.mobile = ''),
+                (this.agencyForm.code = ''),
+                (this.agencyForm.remark = ''),
+                (this.agencyForm.secretaryName = ''),
+                (this.agencyForm.secretaryMobile = ''),
+                (this.agencyForm.dutyMobile = ''),
+                (this.agencyForm.unifiedSocialCreditCode = ''),
+                (this.agencyForm.unifiedSocialCreditCodeCertificate = ''),
+                (this.agencyForm.fullAddress = ''),
+                (this.latitude = ''),
+                (this.longitude = '');
+        },
+        // 修改市级组织
+        cancelModifyCityOrgPopRest() {
+            (this.OrgDetailsForm.level = ''),
+                (this.OrgDetailsForm.agencyName = ''),
+                (this.OrgDetailsForm.code = ''),
+                (this.OrgDetailsForm.contacts = ''),
+                (this.OrgDetailsForm.mobile = ''),
+                (this.OrgDetailsForm.centerAddress = ''),
+                (this.OrgDetailsForm.areaCode = '');
+            (this.OrgDetailsForm.secretaryName = ''),
+                (this.OrgDetailsForm.secretaryMobile = ''),
+                (this.OrgDetailsForm.dutyMobile = ''),
+                (this.OrgDetailsForm.unifiedSocialCreditCode = ''),
+                (this.OrgDetailsForm.unifiedSocialCreditCodeCertificate = ''),
+                (this.OrgDetailsForm.fullAddress = ''),
+                (this.OrgDetailsForm.agencyId = '');
+            (this.latitude = ''), (this.longitude = '');
+        },
+        // 修改下级机关单位
+        OrgUnitDetailsRest() {
+            (this.OrgUnitDetailsForm.code = ''),
+                (this.OrgUnitDetailsForm.contacts = ''),
+                (this.OrgUnitDetailsForm.departmentId = ''),
+                (this.OrgUnitDetailsForm.departmentName = ''),
+                (this.OrgUnitDetailsForm.mobile = '');
+        },
+        // 修改网格清空
+        ModifyGridPopRest() {
+            (this.modifyGridFrom.gridName = ''),
+                (this.modifyGridFrom.code = ''),
+                (this.modifyGridFrom.gridTypeName = ''),
+                (this.modifyGridFrom.contacts = ''),
+                (this.modifyGridFrom.mobile = ''),
+                (this.latitude = ''),
+                (this.longitude = ''),
+                (this.modifyGridFrom.agencyId = ''),
+                (this.modifyGridFrom.gridType = ''),
+                (this.modifyGridFrom.manageDistrict = ''),
+                (this.modifyGridFrom.griId = '');
+        },
+        // 社区新增弹框取消按钮
+        cancel() {
+            this.dialogVisible = false;
+            this.insertFormRest();
+        },
+        // 网格新增弹框取消按钮
+        cancelGrid() {
+            this.dialogVisibleGrid = false;
+            this.GridFormRest();
+        },
+        /** 取消按钮 */
+        cancelPeo() {
+            this.dialogVisiblePeo = false;
+            this.peoFormRest();
+        },
+        // 修改取消
+        cancelXiugai() {
+            this.modifyPeo = false;
+            this.peoFormRest();
+        },
+        // 查看弹窗
+        cancelDetails() {
+            this.details = false;
+        },
+        /** 人员调动取消按钮 */
+        cancelTransfer() {
+            this.transferRest();
+            this.transferPeo = false;
+        },
+        // 新增组织取消按钮
+        canceladdNewAgency() {
+            this.addNewAgencyRest();
+            this.createAgencyDialogFlag = false;
+        },
+        // 修改市级组织取消按钮
+        cancelModifyCityOrgPop() {
+            this.cancelModifyCityOrgPopRest();
+            this.modifyCityOrgPop = false;
+        },
+        // 修改街道/社区级取消按钮
+        cancelstreetOrCommunity() {
+            this.cancelModifyCityOrgPopRest();
+            this.streetOrCommunity = false;
+        },
+        // 取消修改下级机关单位按钮
+        cancelOrgUnitPop() {
+            this.OrgUnitPop = false;
+            this.OrgUnitDetailsRest();
+        },
+        // 取消修改网格按钮
+        cancelModifyGridPop() {
+            this.modifyGridPop = false;
+            this.ModifyGridPopRest();
+        },
+        // 进入网格，查询网格所属人员
+        entryGrid(gridId) {
+            console.log(gridId);
+            this.gridStaffTableListData = [];
+            this.departmentStaffTableListData = [];
+            this.agencyStaffTableListData = [];
+            this.currentGridOrgId = gridId;
+            this.gridStaffTableFlag = true;
+            this.departmentStaffTableFlag = false;
+            this.currentAgencyStaffTableFlag = false;
+            this.agencyTableFlag = false;
+            this.departmentTableFlag = false;
+            this.gridTableFlag = false;
+            this.getGridStaffListData();
+            this.assembleBreadcrumbArr(gridId, 'grid');
+        },
+        // 进入部门，查询部门所属人员
+        entryDepartment(row) {
+            console.log(row);
+            this.gridStaffTableListData = [];
+            this.departmentStaffTableListData = [];
+            this.agencyStaffTableListData = [];
+            this.currentDepartmentId = row.departmentId;
+            this.departmentStaffTableFlag = true;
+            this.currentAgencyStaffTableFlag = false;
+            this.gridStaffTableFlag = false;
+            this.gridTableFlag = false;
+            this.agencyTableFlag = false;
+            this.departmentTableFlag = false;
+            this.selDeptType = row.deptType;
+            this.getDepartmentStaffListData();
+            this.assembleBreadcrumbArr(row.departmentId, 'department');
+        },
+        // 进入组织，重新渲染
+        entryAgency(agencyId) {
+            this.currentAgencyId = agencyId;
+            this.agencyTableListData = [];
+            this.departmentTableListData = [];
+            this.gridTableListData = [];
+            this.gridStaffTableListData = [];
+            this.agencyStaffTableListData = [];
+            this.departmentStaffTableListData = [];
+            this.getDepartmentList();
+            this.getGridList();
+            this.getAgencyStaffListData();
+            this.getAgencyList();
+            this.assembleBreadcrumbArr(agencyId, 'agency');
+        },
+        // 新增组织
+        addCommunity(row) {
+            this.insertForm.agencyId = this.currentAgencyId;
+            this.dialogVisible = true;
+        },
+        // 新增网格
+        addGrid(row) {
+            this.GridForm.agencyId = this.currentAgencyId;
+            this.getDictionaries();
+            this.dialogVisibleGrid = true;
+        },
+        // 新增人员
+        addPeo(row) {
+            this.dialogVisiblePeo = true;
+            this.peoForm = {};
+            this.peoForm.orgType = 'agency';
+        },
+        // 新增社区人员
+        addCommunityPeo() {
+            this.dialogVisiblePeo = true;
+            this.peoForm = {};
+            this.peoForm.orgType = 'dept';
+        },
+        // 新增网格人员
+        addGridPeo() {
+            this.dialogVisiblePeo = true;
+            this.peoForm = {};
+            this.peoForm.orgType = 'grid';
+        },
+        // 修改网格人员
+        async xiuGridPeo(row) {
+            this.modifyPeo = true;
+            this.peoForm.orgType = 'grid';
+            this.userStaffId = row.staffId;
+            const url = '/gov/org/staff/editstaffinit';
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.peoForm.name = data.name;
+                this.peoForm.mobile = data.mobile;
+                // this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.gender = data.gender;
+                this.peoForm.post = data.workType;
+                this.peoForm.idCard = data.idCard;
+                this.peoForm.viliagePosition = data.viliagePosition;
+                this.peoForm.partyPosition = data.partyPosition;
+                this.peoForm.address = data.address;
+                this.peoForm.culture = data.culture;
+                this.peoForm.duty = data.duty;
+                this.peoForm.remark = data.remark;
+                // 已有的权限（职责）
+                let existedDutyArr = [];
+                data.roleList.forEach(function (sysDuty) {
+                    if (sysDuty.selected === true) {
+                        existedDutyArr.push(sysDuty.roleId);
+                    }
+                });
+                this.peoForm.roles = existedDutyArr;
+                // 已有的权限（角色）
+                let existedRoleArr = [];
+                data.newRoleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId);
+                    }
+                });
+                this.peoForm.newRoles = existedRoleArr;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改人员
+        async xiuPeo(row) {
+            this.modifyPeo = true;
+            this.peoForm.orgType = 'agency';
+            this.userStaffId = row.staffId;
+            const url = '/gov/org/staff/editstaffinit';
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.peoForm.name = data.name;
+                this.peoForm.mobile = data.mobile;
+                this.peoForm.post = data.workType;
+                // this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.gender = data.gender;
+                this.peoForm.idCard = data.idCard;
+                this.peoForm.viliagePosition = data.viliagePosition;
+                this.peoForm.partyPosition = data.partyPosition;
+                this.peoForm.address = data.address;
+                this.peoForm.culture = data.culture;
+                this.peoForm.duty = data.duty;
+                this.peoForm.remark = data.remark;
+                // 已有的权限（职责）
+                let existedDutyArr = [];
+                data.roleList.forEach(function (sysDuty) {
+                    if (sysDuty.selected === true) {
+                        existedDutyArr.push(sysDuty.roleId);
+                    }
+                });
+                this.peoForm.roles = existedDutyArr;
+                // 已有的权限（角色）
+                let existedRoleArr = [];
+                data.newRoleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId);
+                    }
+                });
+                this.peoForm.newRoles = existedRoleArr;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改社区人员
+        async xiuCommunityPeo(row) {
+            this.modifyPeo = true;
+            this.peoForm.orgType = 'dept';
+            this.userStaffId = row.staffId;
+            const url = '/gov/org/staff/editstaffinit';
+            let params = {
+                staffId: row.staffId,
+                agencyId: this.currentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.peoForm.name = data.name;
+                this.peoForm.mobile = data.mobile;
+                // this.peoForm.gender = data.gender === 1 ? '男' : '女'
+                this.peoForm.gender = data.gender;
+                this.peoForm.post = data.workType;
+                this.peoForm.idCard = data.idCard;
+                this.peoForm.viliagePosition = data.viliagePosition;
+                this.peoForm.partyPosition = data.partyPosition;
+                this.peoForm.address = data.address;
+                this.peoForm.culture = data.culture;
+                this.peoForm.duty = data.duty;
+                this.peoForm.remark = data.remark;
+                // 已有的权限（职责）
+                let existedDutyArr = [];
+                data.roleList.forEach(function (sysDuty) {
+                    if (sysDuty.selected === true) {
+                        existedDutyArr.push(sysDuty.roleId);
+                    }
+                });
+                this.peoForm.roles = existedDutyArr;
+                // 已有的权限（角色）
+                let existedRoleArr = [];
+                data.newRoleList.forEach(function (sysRole) {
+                    if (sysRole.selected === true) {
+                        existedRoleArr.push(sysRole.roleId);
+                    }
+                });
+                this.peoForm.newRoles = existedRoleArr;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 取消禁用按钮
+        cancelDisable() {
+            this.Disable = false;
+        },
+        // 人员禁用
+        DisablePeo(row) {
+            this.DisableForm.staffId = row.staffId;
+            this.Disable = true;
+        },
+        enablestaff(row) {
+            this.$confirm('确认解禁该员工?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    this.submitEnable(row);
+                })
+                .catch(err => {
+                    if (err == 'cancel') {
+                        // this.$message({
+                        //   type: "info",
+                        //   message: "已取消删除"
+                        // });
+                    }
+                });
+        },
+        // 确定解禁
+        async submitEnable(row) {
+            const url = '/epmetuser/customerstaff/enablestaff';
+            let params = {
+                staffId: row.staffId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('解禁成功');
+                this.Disable = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 确定禁用
+        async submitDisable() {
+            const url = '/epmetuser/customerstaff/disabledstaff';
+            let params = {
+                staffId: this.DisableForm.staffId,
+                agencyId: this.DisableForm.agencyId,
+                customerId: this.DisableForm.customerId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('禁用成功');
+                this.Disable = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 查看按钮
+        async lookAngency(row) {
+            const url = '/data/aggregator/org/staffdetailv2';
+            let params = {
+                staffId: row.staffId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.peoForm.name = data.name;
+                this.peoForm.mobile = data.mobile.substr(0, 3) + '****' + data.mobile.substr(7);
+                this.peoForm.activeTime = data.activeTime;
+                this.peoForm.roles = data.roles;
+                this.peoForm.zuzhi = data.orgName;
+                this.peoForm.idCard = data.idCard;
+                this.peoForm.viliagePosition = data.viliagePosition;
+                this.peoForm.partyPosition = data.partyPosition;
+                this.peoForm.address = data.address;
+                this.peoForm.culture = data.culture;
+                this.peoForm.duty = data.duty;
+                this.peoForm.remark = data.remark;
+                if (data.enableFlag === 'enable') {
+                    this.peoForm.disableFlag = '已启用';
+                } else {
+                    this.peoForm.disableFlag = '已禁用';
+                }
+            }
+            this.details = true;
+        },
+        // 人员调动
+        async transfer(row) {
+            this.transferForm.name = row.name;
+            this.transferForm.staffId = row.staffId;
+            this.transferPeo = true;
+            const url = '/gov/org/customeragency/orgtree';
+            let params = {};
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                function computeOption(opt) {
+                    return {
+                        label: opt.agencyName,
+                        value: opt.agencyId,
+                        type: 'agency',
+                        children: [
+                            ...(opt.departmentList || []).map(item => ({
+                                label: item.deptName,
+                                value: item.deptId,
+                                type: 'dept',
+                                typeName: '部门'
+                            })),
+                            ...(opt.gridList || []).map(item => ({
+                                label: item.gridName,
+                                value: item.gridId,
+                                type: 'grid',
+                                typeName: '网格'
+                            })),
+                            ...(opt.subAgencyList || []).map(item => computeOption(item))
+                        ]
+                    };
+                }
+                if (data) {
+                    this.options = [computeOption(data)];
+                    console.log('树树树树树树树树树树', this.options[0]);
+                }
+            } else {
+                this.$message.error('树查询失败', msg);
+            }
+        },
+        // 人员调动确定
+        async submitTransfer() {
+            const url = '/gov/org/staff/stafftransferv2';
+            let params = {
+                staffId: this.transferForm.staffId,
+                orgId: this.transferForm.orgId,
+                orgType: this.transferForm.orgType,
+                remarks: this.transferForm.remarks
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('调动成功');
+                this.transferRest();
+                this.transferPeo = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+                this.getDepartmentStaffListData();
+                this.getAgencyStaffListData();
+                this.getGridStaffListData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 获取导航
+        // async getNavigation(){
+        //     const url = "/gov/org/customeragency/orgtree"
+        //     let params = {
+        //     }
+        //     const { data, code, msg } = await requestPost(url,params)
+        //     if(code === 0){
+        //         this.Navigation = data.agencyName
+        //     }
+        // 组装顶部面包屑数组
+        async assembleBreadcrumbArr(id, orgType) {
+            this.currentBreadcrumbKey = id;
+            if (orgType === 'agency') {
+                const url = '/gov/org/agency/agencydetail';
+                let params = {
+                    agencyId: id
+                };
+                const { data, code, msg } = await requestPost(url, params);
+                if (code === 0) {
+                    // 社区级为最低级组织，不展示下级组织列表
+                    this.currentAgencyLevel = data.level;
+                    this.currentAreaCode = data.areaCode;
+                    this.currentAreaCodeSwitch = data.areaCodeSwitch;
+                    if (data.parentList && data.parentList.length > 0) {
+                        this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode;
+                        this.parentAgencyId = data.parentList[data.parentList.length - 1].id;
+                        this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level;
+                    }
+                    if (data.level === 'community') {
+                        this.agencyTableFlag = false;
+                    } else {
+                        this.agencyTableFlag = true;
+                    }
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [
+                            {
+                                id: data.agencyId,
+                                name: data.agencyName,
+                                type: orgType
+                            }
+                        ];
+                    } else {
+                        let hasBreadcrumbArr = false;
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true;
+                            }
+                        });
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {
+                                id: data.agencyId,
+                                name: data.agencyName,
+                                type: orgType
+                            };
+                            this.breadcrumbArr.push(breadcrumb);
+                        }
+                    }
+                } else {
+                    this.$message.error(msg);
+                }
+            } else if (orgType === 'department') {
+                const url = '/gov/org/department/departmentdetail';
+                let params = {
+                    departmentId: id
+                };
+                const { data, code, msg } = await requestPost(url, params);
+                if (code === 0) {
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [
+                            {
+                                id: data.departmentId,
+                                name: data.departmentName,
+                                type: orgType
+                            }
+                        ];
+                    } else {
+                        let hasBreadcrumbArr = false;
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true;
+                            }
+                        });
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {
+                                id: data.departmentId,
+                                name: data.departmentName,
+                                type: orgType
+                            };
+                            this.breadcrumbArr.push(breadcrumb);
+                        }
+                    }
+                } else {
+                    this.$message.error(msg);
+                }
+            } else if (orgType === 'grid') {
+                const url = '/gov/org/grid/griddetail';
+                let params = {
+                    gridId: id
+                };
+                const { data, code, msg } = await requestPost(url, params);
+                if (code === 0) {
+                    if (this.breadcrumbArr.length === 0) {
+                        this.breadcrumbArr = [
+                            {
+                                id: data.grid,
+                                name: data.gridName,
+                                type: orgType
+                            }
+                        ];
+                    } else {
+                        let hasBreadcrumbArr = false;
+                        this.breadcrumbArr.forEach(function (bc) {
+                            if (bc.id === id) {
+                                hasBreadcrumbArr = true;
+                            }
+                        });
+                        if (hasBreadcrumbArr === false) {
+                            let breadcrumb = {
+                                id: data.grid,
+                                name: data.gridName,
+                                type: orgType
+                            };
+                            this.breadcrumbArr.push(breadcrumb);
+                        }
+                    }
+                } else {
+                    this.$message.error(msg);
+                }
+            }
+        },
+        async refreshThisPage(index) {
+            // 点击最后一级不触发响应
+            if (index === this.breadcrumbArr.length - 1) {
+                return;
+            }
+            const selectOrg = this.breadcrumbArr[index];
+            this.breadcrumbArr = this.breadcrumbArr.slice(0, index + 1);
+            const orgId = selectOrg.id;
+            const orgType = selectOrg.type;
+            if (orgType === 'agency') {
+                this.agencyTableListData = [];
+                this.agencyStaffTableListData = [];
+                this.departmentTableListData = [];
+                this.departmentStaffTableListData = [];
+                this.gridTableListData = [];
+                this.gridStaffTableListData = [];
+                this.userAgencyId = orgId;
+                this.currentAgencyId = orgId;
+                this.agencyTableFlag = true;
+                this.currentAgencyStaffTableFlag = true;
+                this.departmentTableFlag = true;
+                this.departmentStaffTableFlag = false;
+                this.gridTableFlag = true;
+                this.gridStaffTableFlag = false;
+                this.assembleBreadcrumbArr(orgId, 'agency');
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+            }
+            // 当点击最后一级不触发响应
+            // 其父级及以上，只可能属于组织，而非部门或网格，注释以下代码即可
+            // 若需要点击最后一级触发刷新，可释放以下代码
+            /* else if (orgType === 'department') {
           this.agencyStaffTableListData = []
           this.departmentStaffTableListData = []
           this.gridStaffTableListData = []
@@ -2394,363 +2876,363 @@ export default {
           this.getGridStaffListData()
           this.assembleBreadcrumbArr(orgId, 'grid')
       } */
-		},
-		// 获取组织区划信息
-		async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
-			const url = '/data/aggregator/org/nextlevelareacodelist';
-			let params = {
-				areaCode: areaCode,
-				level: parentAgencyLevel,
-				parentAgencyId: parentAgencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.zonings = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		handelZoing(val) {
-			this.zonings.forEach(item => {
-				if (item.areaCode == val) {
-					this.agencyForm.level = item.level;
-					this.agencyForm.areaName = item.areaName;
-					this.agencyForm.areaCode = item.areaCode;
-				}
-			});
-		},
-		handelStreeOrCommunityZoing(val) {
-			this.zonings.forEach(item => {
-				if (item.areaCode == val) {
-					this.OrgDetailsForm.level = item.level;
-					this.OrgDetailsForm.areaName = item.areaName;
-					this.OrgDetailsForm.areaCode = item.areaCode;
-				}
-			});
-		},
-		addAgency() {
-			this.createAgencyDialogFlag = true;
-			this.addNewAgencyRest();
-			this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel);
-		},
-		// 新增组织确定按钮
-		async submitaddNewAgency() {
-			const url = '/gov/org/agency/addagency-v2';
-			let params = {
-				parentAgencyId: this.currentAgencyId,
-				agencyName: this.agencyForm.agencyName,
-				level: this.agencyForm.level,
-				areaCodeSwitch: this.currentAreaCodeSwitch,
-				areaCode: this.agencyForm.areaCode,
-				areaName: this.agencyForm.areaName,
-				contacts: this.agencyForm.contacts,
-				mobile: this.agencyForm.mobile,
-				code: this.agencyForm.code,
-				remark: this.agencyForm.remark,
-				latitude: this.latitude,
-				longitude: this.longitude,
-				secretaryName: this.agencyForm.secretaryName,
-				secretaryMobile: this.agencyForm.secretaryMobile,
-				dutyMobile: this.agencyForm.dutyMobile,
-				unifiedSocialCreditCode: this.agencyForm.unifiedSocialCreditCode,
-				unifiedSocialCreditCodeCertificate: this.agencyForm.unifiedSocialCreditCodeCertificate,
-				fullAddress: this.agencyForm.fullAddress
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('添加成功');
-				this.createAgencyDialogFlag = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.getAgencyStaffListData();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 修改面包屑
-		modifyOrgInfo() {
-			this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length - 1];
-			if (this.judgeOrgInfoLevel.type === 'agency') {
-				this.getOrgDetailsById();
-				setTimeout(() => {
-					if (this.OrgDetailsForm.level === 'district') {
-						/** 修改市区级弹窗 */
-						this.modifyCityOrgPop = true;
-					} else {
-						/** 街道级和社区级弹窗 */
-						this.getZoning(this.parentAreaCode, this.parentAgencyId, this.parentAgencyLevel);
-						this.streetOrCommunity = true;
-					}
-				}, 1000);
-			} else if (this.judgeOrgInfoLevel.type === 'department') {
-				/** 下级机关单位修改 */
-				this.OrgUnitPop = true;
-				this.getOrgUnitDetailsById();
-			} else {
-				/** 网格修改 */
-				this.getDictionaries();
-				this.modifyGridPop = true;
-				this.getGridDetailsById();
-			}
-		},
-		// 根据id获取组织机构详细信息
-		async getOrgDetailsById() {
-			const url = '/gov/org/agency/agencydetail';
-			let params = {
-				agencyId: this.judgeOrgInfoLevel.id
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.currentAgencyLevel = data.level;
-				this.currentAreaCode = data.areaCode;
-				if (data.parentList && data.parentList.length > 0) {
-					this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode;
-					this.parentAgencyId = data.parentList[data.parentList.length - 1].id;
-					this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level;
-				}
-				this.OrgDetailsForm.level = data.level;
-				this.OrgDetailsForm.agencyName = data.agencyName;
-				this.OrgDetailsForm.code = data.code;
-				this.OrgDetailsForm.contacts = data.contacts;
-				this.OrgDetailsForm.centerAddress = data.centerAddress;
-				this.OrgDetailsForm.areaCode = data.areaCode;
-				this.OrgDetailsForm.mobile = data.mobile;
-				this.OrgDetailsForm.remark = data.remark;
-				this.latitude = data.latitude;
-				this.longitude = data.longitude;
-				this.OrgDetailsForm.agencyId = data.agencyId;
-				this.OrgDetailsForm.secretaryName = data.secretaryName;
-				this.OrgDetailsForm.secretaryMobile = data.secretaryMobile;
-				this.OrgDetailsForm.dutyMobile = data.dutyMobile;
-				this.OrgDetailsForm.unifiedSocialCreditCode = data.unifiedSocialCreditCode;
-				this.OrgDetailsForm.unifiedSocialCreditCodeCertificate = data.unifiedSocialCreditCodeCertificate;
-				this.OrgDetailsForm.fullAddress = data.fullAddress;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 根据id获取下级机关单位详情
-		async getOrgUnitDetailsById() {
-			const url = '/gov/org/department/departmentdetail';
-			let params = {
-				departmentId: this.judgeOrgInfoLevel.id
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.OrgUnitDetailsForm.code = data.code;
-				this.OrgUnitDetailsForm.contacts = data.contacts;
-				this.OrgUnitDetailsForm.departmentId = data.departmentId;
-				this.OrgUnitDetailsForm.departmentName = data.departmentName;
-				this.OrgUnitDetailsForm.mobile = data.mobile;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 根据id获取网格详情
-		async getGridDetailsById() {
-			const url = '/gov/org/grid/griddetail';
-			let params = {
-				gridId: this.judgeOrgInfoLevel.id
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.modifyGridFrom.gridName = data.gridName;
-				this.modifyGridFrom.code = data.code;
-				this.modifyGridFrom.gridTypeName = data.gridTypeName;
-				this.modifyGridFrom.contacts = data.contacts;
-				this.modifyGridFrom.mobile = data.mobile;
-				this.modifyGridFrom.agencyId = data.agencyId;
-				this.modifyGridFrom.gridType = data.gridType;
-				this.modifyGridFrom.manageDistrict = data.manageDistrict;
-				this.modifyGridFrom.griId = data.grid;
-				this.modifyGridFrom.gridSort = data.gridSort;
-				this.modifyGridFrom.latitude = data.latitude;
-				this.modifyGridFrom.longitude = data.longitude;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 市级/街道/社区级组织修改确定按钮
-		async sunmitModifyCityOrgPop() {
-			const url = '/gov/org/agency/editagency';
-			let params = {
-				agencyId: this.OrgDetailsForm.agencyId,
-				agencyName: this.OrgDetailsForm.agencyName,
-				contacts: this.OrgDetailsForm.contacts,
-				mobile: this.OrgDetailsForm.mobile,
-				code: this.OrgDetailsForm.code,
-				latitude: this.latitude,
-				longitude: this.longitude,
-				remark: this.OrgDetailsForm.remark,
-				secretaryName: this.OrgDetailsForm.secretaryName,
-				secretaryMobile: this.OrgDetailsForm.secretaryMobile,
-				dutyMobile: this.OrgDetailsForm.dutyMobile,
-				unifiedSocialCreditCode: this.OrgDetailsForm.unifiedSocialCreditCode,
-				unifiedSocialCreditCodeCertificate: this.OrgDetailsForm.unifiedSocialCreditCodeCertificate,
-				fullAddress: this.OrgDetailsForm.fullAddress
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('修改成功');
-				this.modifyCityOrgPop = false;
-				this.streetOrCommunity = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.agencyPeo();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 修改下级机关单位确定按钮
-		async sunmitOrgUnitForm() {
-			const url = '/gov/org/department/editdepartment';
-			let params = {
-				code: this.OrgUnitDetailsForm.code,
-				contacts: this.OrgUnitDetailsForm.contacts,
-				departmentId: this.OrgUnitDetailsForm.departmentId,
-				departmentName: this.OrgUnitDetailsForm.departmentName,
-				mobile: this.OrgUnitDetailsForm.mobile
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('修改成功');
-				this.OrgUnitPop = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.agencyPeo();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		// 修改网格确定按钮
-		async submitModifyGrid() {
-			const url = '/gov/org/grid/editgrid';
-			let params = {
-				gridId: this.modifyGridFrom.griId,
-				gridName: this.modifyGridFrom.gridName,
-				manageDistrict: this.modifyGridFrom.manageDistrict,
-				contacts: this.modifyGridFrom.contacts,
-				mobile: this.modifyGridFrom.mobile,
-				code: this.modifyGridFrom.code,
-				gridType: this.modifyGridFrom.gridType,
-				sort: this.modifyGridFrom.gridSort,
-				latitude: this.modifyGridFrom.latitude,
-				longitude: this.modifyGridFrom.longitude
-			};
-			const { data, code, msg } = await requestPost(url, params);
-			if (code === 0) {
-				this.$message.success('修改成功');
-				this.modifyGridPop = false;
-				this.getAgencyList();
-				this.getDepartmentList();
-				this.getGridList();
-				this.agencyPeo();
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		/** 地图初始化 */
-		createMap(type) {
-			let { latitude, longitude } = this[type] || this;
-			if (latitude === null || latitude === '' || longitude === null || longitude === '') {
-				let { latitude: latitude2, longitude: longitude2 } = this.$store.state.user;
-				if (!latitude2 || latitude2 == '' || latitude2 == '0') {
-					latitude = 39.9088810666821;
-					longitude = 116.39743841556731;
-				} else {
-					latitude = latitude2;
-					longitude = longitude2;
-				}
-			}
-			var map = new daiMap(
-				document.getElementById('con'),
-				{
-					latitude,
-					longitude
-				},
-				{
-					zoom: 16.2, // 设置地图缩放级别
-					pitch: 43.5, // 设置俯仰角
-					rotation: 45 // 设置地图旋转角度
-				}
-			);
-			// 监听地图平移结束
-			map.on('dragend', e => {
-				//修改地图中心点
-				const { lat, lng } = map.getCenter();
-				map.setMarker(lat, lng);
-				if (type) {
-					this[type].latitude = lat;
-					this[type].longitude = lng;
-				} else {
-					this.latitude = lat;
-					this.longitude = lng;
-				}
-			});
-			map.setMarker(latitude, longitude);
-		}
-	}
+        },
+        // 获取组织区划信息
+        async getZoning(areaCode, parentAgencyId, parentAgencyLevel) {
+            const url = '/data/aggregator/org/nextlevelareacodelist';
+            let params = {
+                areaCode: areaCode,
+                level: parentAgencyLevel,
+                parentAgencyId: parentAgencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.zonings = data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        handelZoing(val) {
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.agencyForm.level = item.level;
+                    this.agencyForm.areaName = item.areaName;
+                    this.agencyForm.areaCode = item.areaCode;
+                }
+            });
+        },
+        handelStreeOrCommunityZoing(val) {
+            this.zonings.forEach(item => {
+                if (item.areaCode == val) {
+                    this.OrgDetailsForm.level = item.level;
+                    this.OrgDetailsForm.areaName = item.areaName;
+                    this.OrgDetailsForm.areaCode = item.areaCode;
+                }
+            });
+        },
+        addAgency() {
+            this.createAgencyDialogFlag = true;
+            this.addNewAgencyRest();
+            this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel);
+        },
+        // 新增组织确定按钮
+        async submitaddNewAgency() {
+            const url = '/gov/org/agency/addagency-v2';
+            let params = {
+                parentAgencyId: this.currentAgencyId,
+                agencyName: this.agencyForm.agencyName,
+                level: this.agencyForm.level,
+                areaCodeSwitch: this.currentAreaCodeSwitch,
+                areaCode: this.agencyForm.areaCode,
+                areaName: this.agencyForm.areaName,
+                contacts: this.agencyForm.contacts,
+                mobile: this.agencyForm.mobile,
+                code: this.agencyForm.code,
+                remark: this.agencyForm.remark,
+                latitude: this.latitude,
+                longitude: this.longitude,
+                secretaryName: this.agencyForm.secretaryName,
+                secretaryMobile: this.agencyForm.secretaryMobile,
+                dutyMobile: this.agencyForm.dutyMobile,
+                unifiedSocialCreditCode: this.agencyForm.unifiedSocialCreditCode,
+                unifiedSocialCreditCodeCertificate: this.agencyForm.unifiedSocialCreditCodeCertificate,
+                fullAddress: this.agencyForm.fullAddress
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('添加成功');
+                this.createAgencyDialogFlag = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.getAgencyStaffListData();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改面包屑
+        modifyOrgInfo() {
+            this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length - 1];
+            if (this.judgeOrgInfoLevel.type === 'agency') {
+                this.getOrgDetailsById();
+                setTimeout(() => {
+                    if (this.OrgDetailsForm.level === 'district') {
+                        /** 修改市区级弹窗 */
+                        this.modifyCityOrgPop = true;
+                    } else {
+                        /** 街道级和社区级弹窗 */
+                        this.getZoning(this.parentAreaCode, this.parentAgencyId, this.parentAgencyLevel);
+                        this.streetOrCommunity = true;
+                    }
+                }, 1000);
+            } else if (this.judgeOrgInfoLevel.type === 'department') {
+                /** 下级机关单位修改 */
+                this.OrgUnitPop = true;
+                this.getOrgUnitDetailsById();
+            } else {
+                /** 网格修改 */
+                this.getDictionaries();
+                this.modifyGridPop = true;
+                this.getGridDetailsById();
+            }
+        },
+        // 根据id获取组织机构详细信息
+        async getOrgDetailsById() {
+            const url = '/gov/org/agency/agencydetail';
+            let params = {
+                agencyId: this.judgeOrgInfoLevel.id
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.currentAgencyLevel = data.level;
+                this.currentAreaCode = data.areaCode;
+                if (data.parentList && data.parentList.length > 0) {
+                    this.parentAreaCode = data.parentList[data.parentList.length - 1].areaCode;
+                    this.parentAgencyId = data.parentList[data.parentList.length - 1].id;
+                    this.parentAgencyLevel = data.parentList[data.parentList.length - 1].level;
+                }
+                this.OrgDetailsForm.level = data.level;
+                this.OrgDetailsForm.agencyName = data.agencyName;
+                this.OrgDetailsForm.code = data.code;
+                this.OrgDetailsForm.contacts = data.contacts;
+                this.OrgDetailsForm.centerAddress = data.centerAddress;
+                this.OrgDetailsForm.areaCode = data.areaCode;
+                this.OrgDetailsForm.mobile = data.mobile;
+                this.OrgDetailsForm.remark = data.remark;
+                this.latitude = data.latitude;
+                this.longitude = data.longitude;
+                this.OrgDetailsForm.agencyId = data.agencyId;
+                this.OrgDetailsForm.secretaryName = data.secretaryName;
+                this.OrgDetailsForm.secretaryMobile = data.secretaryMobile;
+                this.OrgDetailsForm.dutyMobile = data.dutyMobile;
+                this.OrgDetailsForm.unifiedSocialCreditCode = data.unifiedSocialCreditCode;
+                this.OrgDetailsForm.unifiedSocialCreditCodeCertificate = data.unifiedSocialCreditCodeCertificate;
+                this.OrgDetailsForm.fullAddress = data.fullAddress;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 根据id获取下级机关单位详情
+        async getOrgUnitDetailsById() {
+            const url = '/gov/org/department/departmentdetail';
+            let params = {
+                departmentId: this.judgeOrgInfoLevel.id
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.OrgUnitDetailsForm.code = data.code;
+                this.OrgUnitDetailsForm.contacts = data.contacts;
+                this.OrgUnitDetailsForm.departmentId = data.departmentId;
+                this.OrgUnitDetailsForm.departmentName = data.departmentName;
+                this.OrgUnitDetailsForm.mobile = data.mobile;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 根据id获取网格详情
+        async getGridDetailsById() {
+            const url = '/gov/org/grid/griddetail';
+            let params = {
+                gridId: this.judgeOrgInfoLevel.id
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.modifyGridFrom.gridName = data.gridName;
+                this.modifyGridFrom.code = data.code;
+                this.modifyGridFrom.gridTypeName = data.gridTypeName;
+                this.modifyGridFrom.contacts = data.contacts;
+                this.modifyGridFrom.mobile = data.mobile;
+                this.modifyGridFrom.agencyId = data.agencyId;
+                this.modifyGridFrom.gridType = data.gridType;
+                this.modifyGridFrom.manageDistrict = data.manageDistrict;
+                this.modifyGridFrom.griId = data.grid;
+                this.modifyGridFrom.gridSort = data.gridSort;
+                this.modifyGridFrom.latitude = data.latitude;
+                this.modifyGridFrom.longitude = data.longitude;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 市级/街道/社区级组织修改确定按钮
+        async sunmitModifyCityOrgPop() {
+            const url = '/gov/org/agency/editagency';
+            let params = {
+                agencyId: this.OrgDetailsForm.agencyId,
+                agencyName: this.OrgDetailsForm.agencyName,
+                contacts: this.OrgDetailsForm.contacts,
+                mobile: this.OrgDetailsForm.mobile,
+                code: this.OrgDetailsForm.code,
+                latitude: this.latitude,
+                longitude: this.longitude,
+                remark: this.OrgDetailsForm.remark,
+                secretaryName: this.OrgDetailsForm.secretaryName,
+                secretaryMobile: this.OrgDetailsForm.secretaryMobile,
+                dutyMobile: this.OrgDetailsForm.dutyMobile,
+                unifiedSocialCreditCode: this.OrgDetailsForm.unifiedSocialCreditCode,
+                unifiedSocialCreditCodeCertificate: this.OrgDetailsForm.unifiedSocialCreditCodeCertificate,
+                fullAddress: this.OrgDetailsForm.fullAddress
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('修改成功');
+                this.modifyCityOrgPop = false;
+                this.streetOrCommunity = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.agencyPeo();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改下级机关单位确定按钮
+        async sunmitOrgUnitForm() {
+            const url = '/gov/org/department/editdepartment';
+            let params = {
+                code: this.OrgUnitDetailsForm.code,
+                contacts: this.OrgUnitDetailsForm.contacts,
+                departmentId: this.OrgUnitDetailsForm.departmentId,
+                departmentName: this.OrgUnitDetailsForm.departmentName,
+                mobile: this.OrgUnitDetailsForm.mobile
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('修改成功');
+                this.OrgUnitPop = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.agencyPeo();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 修改网格确定按钮
+        async submitModifyGrid() {
+            const url = '/gov/org/grid/editgrid';
+            let params = {
+                gridId: this.modifyGridFrom.griId,
+                gridName: this.modifyGridFrom.gridName,
+                manageDistrict: this.modifyGridFrom.manageDistrict,
+                contacts: this.modifyGridFrom.contacts,
+                mobile: this.modifyGridFrom.mobile,
+                code: this.modifyGridFrom.code,
+                gridType: this.modifyGridFrom.gridType,
+                sort: this.modifyGridFrom.gridSort,
+                latitude: this.modifyGridFrom.latitude,
+                longitude: this.modifyGridFrom.longitude
+            };
+            const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message.success('修改成功');
+                this.modifyGridPop = false;
+                this.getAgencyList();
+                this.getDepartmentList();
+                this.getGridList();
+                this.agencyPeo();
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        /** 地图初始化 */
+        createMap(type) {
+            let { latitude, longitude } = this[type] || this;
+            if (latitude === null || latitude === '' || longitude === null || longitude === '') {
+                let { latitude: latitude2, longitude: longitude2 } = this.$store.state.user;
+                if (!latitude2 || latitude2 == '' || latitude2 == '0') {
+                    latitude = 39.9088810666821;
+                    longitude = 116.39743841556731;
+                } else {
+                    latitude = latitude2;
+                    longitude = longitude2;
+                }
+            }
+            var map = new daiMap(
+                document.getElementById('con'),
+                {
+                    latitude,
+                    longitude
+                },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45 // 设置地图旋转角度
+                }
+            );
+            // 监听地图平移结束
+            map.on('dragend', e => {
+                //修改地图中心点
+                const { lat, lng } = map.getCenter();
+                map.setMarker(lat, lng);
+                if (type) {
+                    this[type].latitude = lat;
+                    this[type].longitude = lng;
+                } else {
+                    this.latitude = lat;
+                    this.longitude = lng;
+                }
+            });
+            map.setMarker(latitude, longitude);
+        }
+    }
 };
 </script>
 <style scoped>
 .el-select {
-	width: 100%;
+    width: 100%;
 }
 #container {
-	width: 100%;
-	height: 100%;
+    width: 100%;
+    height: 100%;
 }
 
 #info {
-	left: 20px;
-	top: 20px;
-	font-size: 14px;
-	background: #fff;
-	width: 270px;
-	padding: 10px;
-	border-radius: 3px;
+    left: 20px;
+    top: 20px;
+    font-size: 14px;
+    background: #fff;
+    width: 270px;
+    padding: 10px;
+    border-radius: 3px;
 }
 
 #con {
-	width: 100%;
-	height: 100%;
+    width: 100%;
+    height: 100%;
 }
 
 .el-tag + .el-tag {
-	margin-left: 10px;
+    margin-left: 10px;
 }
 
 .avatar-uploader .el-upload {
-	border: 1px dashed #d9d9d9;
-	border-radius: 6px;
-	cursor: pointer;
-	position: relative;
-	overflow: hidden;
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
 }
 
 .avatar-uploader .el-upload:hover {
-	border-color: #409eff;
+    border-color: #409eff;
 }
 
 .avatar-uploader-icon {
-	font-size: 28px;
-	color: #8c939d;
-	width: 178px;
-	height: 178px;
-	line-height: 178px;
-	text-align: center;
-	background-color: #f9f9f9;
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+    background-color: #f9f9f9;
 }
 
 .avatar {
-	width: 178px;
-	height: 178px;
-	display: block;
+    width: 178px;
+    height: 178px;
+    display: block;
 }
 .btn {
-	line-height: 16px;
+    line-height: 16px;
 }
 </style>
diff --git a/src/views/modules/communityService/estateManagement/cpts/edit.vue b/src/views/modules/communityService/estateManagement/cpts/edit.vue
index f7bcdc8bb..c14eafdfd 100644
--- a/src/views/modules/communityService/estateManagement/cpts/edit.vue
+++ b/src/views/modules/communityService/estateManagement/cpts/edit.vue
@@ -1,42 +1,85 @@
 <template>
-	<div>
-		<div class="dialog-h-content scroll-h">
-			<!-- 姓名 联系电话 证件号 类型 所属组织   楼栋 单元 tianqian -->
-			<!-- 物业公司 这个不一定  物业联系人  tianqian  联系电话 -->
-			<el-form ref="ref_form" :inline="true" :model="fmData" :rules="dataRule" :disabled="formType === 'watch'" class="form">
-				<el-form-item label="物业名称" prop="name" label-width="150px" style="display: block">
-					<el-input v-model="fmData.name" class="item_width_2" size="small" clearable placeholder="请输入"></el-input>
-				</el-form-item>
-				<el-form-item label="物业联系人" prop="contactName" label-width="150px" style="display: block">
-					<el-input v-model="fmData.contactName" class="item_width_2" size="small" clearable placeholder="请输入"></el-input>
-				</el-form-item>
-				<el-form-item label="联系电话" prop="contactMobile" label-width="150px" style="display: block">
-					<el-input v-model="fmData.contactMobile" class="item_width_2" size="small" clearable placeholder="请输入"></el-input>
-				</el-form-item>
-				<el-form-item label="所属组织" prop="agencyId" label-width="150px" style="display: block">
-					<el-cascader
-						ref="myCascader"
-						filterable
-						v-model="fmData.agencyId"
-						:options="orgOptions"
-						:props="orgOptionProps"
-						:show-all-levels="false"
-						@change="handleChangeAgency"
-					/>
-				</el-form-item>
-				<el-form-item label="管理小区" prop="neighborHoodIdList" label-width="150px" style="display: block">
-					<el-select multiple v-model="fmData.neighborHoodIdList" filterable placeholder="请选择" clearable @change="jj">
-						<el-option v-for="item in neighborhoodList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-form>
-		</div>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <!-- 姓名 联系电话 证件号 类型 所属组织   楼栋 单元 tianqian -->
+            <!-- 物业公司 这个不一定  物业联系人  tianqian  联系电话 -->
+            <el-form ref="ref_form"
+                     :inline="true"
+                     :model="fmData"
+                     :rules="dataRule"
+                     :disabled="formType === 'watch'"
+                     class="form">
+                <el-form-item label="物业名称"
+                              prop="name"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input v-model="fmData.name"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              placeholder="请输入"></el-input>
+                </el-form-item>
+                <el-form-item label="物业联系人"
+                              prop="contactName"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input v-model="fmData.contactName"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              placeholder="请输入"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话"
+                              prop="contactMobile"
+                              label-width="150px"
+                              style="display: block">
+                    <el-input v-model="fmData.contactMobile"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              placeholder="请输入"></el-input>
+                </el-form-item>
+                <el-form-item label="所属组织"
+                              prop="agencyId"
+                              label-width="150px"
+                              style="display: block">
+                    <el-cascader ref="myCascader"
+                                 filterable
+                                 v-model="fmData.agencyId"
+                                 :options="orgOptions"
+                                 :props="orgOptionProps"
+                                 :show-all-levels="false"
+                                 @change="handleChangeAgency" />
+                </el-form-item>
+                <el-form-item label="管理小区"
+                              prop="neighborHoodIdList"
+                              label-width="150px"
+                              style="display: block">
+                    <el-select multiple
+                               v-model="fmData.neighborHoodIdList"
+                               filterable
+                               placeholder="请选择"
+                               clearable
+                               @change="jj">
+                        <el-option v-for="item in neighborhoodList"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
 
-		<div class="div_btn resi-btns">
-			<el-button size="small" @click="handleCancle">取 消</el-button>
-			<el-button v-if="formType != 'watch'" type="primary" size="small" :disabled="btnDisable" @click="handleComfirm">确 定</el-button>
-		</div>
-	</div>
+        <div class="div_btn resi-btns">
+            <el-button size="small"
+                       @click="handleCancle">取 消</el-button>
+            <el-button v-if="formType != 'watch'"
+                       type="primary"
+                       size="small"
+                       :disabled="btnDisable"
+                       @click="handleComfirm">确 定</el-button>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -45,252 +88,252 @@ import { requestPost } from '@/js/dai/request';
 import formVltHelper from 'dai-js/tools/formVltHelper';
 
 export default {
-	props: {
-		formId: {
-			type: String,
-			default: ''
-		},
-		formType: {
-			type: String,
-			default: 'info'
-		},
-		villageList: {
-			type: Object,
-			default: {}
-		}
-	},
+    props: {
+        formId: {
+            type: String,
+            default: ''
+        },
+        formType: {
+            type: String,
+            default: 'info'
+        },
+        villageList: {
+            type: Object,
+            default: {}
+        }
+    },
 
-	data() {
-		var checkPhone = (rule, value, callback) => {
-			if(value=='') {
-				callback();
-			}
-			else if (!/^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(1[|6|7|8][0-9]))\d{8}$/.test(value)) {
-				callback(new Error('请输入正确的手机号格式'));
-			} else {
-				callback();
-			}
-		};
-		return {
-			uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-			customerId: localStorage.getItem('customerId'),
+    data() {
+        var checkPhone = (rule, value, callback) => {
+            if (value == '') {
+                callback();
+            }
+            else if (!/^1[3-9]\d{9}$/.test(value)) {
+                callback(new Error('请输入正确的手机号格式'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
 
-			btnDisable: false,
+            btnDisable: false,
 
-			fmData: {
-				name: '',
-				contactName: '',
-				contactMobile: ''
-			},
-			dataRule: {
-				name: [{ required: true, message: '物业名字不能为空', trigger: 'blur' }],
-				contactMobile: [{ validator: checkPhone, trigger: 'blur' }]
-			},
-			orgOptions: [],
-			orgOptionProps: {
-				// multiple: false,
-				// value: 'agencyId',
-				// label: 'agencyName',
-				// children: 'subAgencyList',
-				// checkStrictly: true
-				multiple: false,
-				checkStrictly: true,
-				emitPath: false,
-				children: 'subAgencyList',
-				label: 'agencyName',
-				value: 'agencyId'
-			},
-			neighborhoodList: [],
-			levelOptions: [
-				{
-					value: '0',
-					label: '市级'
-				},
-				{
-					value: '1',
-					label: '区级'
-				},
-				{
-					value: '2',
-					label: '街道级'
-				}
-			],
-			categoryOptions: []
-		};
-	},
-	components: {},
-	// computed: {
-	// 	dataRule() {
-	// 		return ;
-	// 	}
-	// },
-	watch: {},
+            fmData: {
+                name: '',
+                contactName: '',
+                contactMobile: ''
+            },
+            dataRule: {
+                name: [{ required: true, message: '物业名字不能为空', trigger: 'blur' }],
+                contactMobile: [{ validator: checkPhone, trigger: 'blur' }]
+            },
+            orgOptions: [],
+            orgOptionProps: {
+                // multiple: false,
+                // value: 'agencyId',
+                // label: 'agencyName',
+                // children: 'subAgencyList',
+                // checkStrictly: true
+                multiple: false,
+                checkStrictly: true,
+                emitPath: false,
+                children: 'subAgencyList',
+                label: 'agencyName',
+                value: 'agencyId'
+            },
+            neighborhoodList: [],
+            levelOptions: [
+                {
+                    value: '0',
+                    label: '市级'
+                },
+                {
+                    value: '1',
+                    label: '区级'
+                },
+                {
+                    value: '2',
+                    label: '街道级'
+                }
+            ],
+            categoryOptions: []
+        };
+    },
+    components: {},
+    // computed: {
+    // 	dataRule() {
+    // 		return ;
+    // 	}
+    // },
+    watch: {},
 
-	async mounted() {
-		console.log('ddd', this.formId);
-		this.initForm();
-	},
+    async mounted() {
+        console.log('ddd', this.formId);
+        this.initForm();
+    },
 
-	methods: {
-		jj(){
-			this.$forceUpdate()
-		},
-		async initForm() {
-			if (this.formType != 'add') {
-				this.getInfo();
-			}
-			this.getOrgTreeList();
-			
-		},
-		getOrgTreeList() {
-			const { user } = this.$store.state;
-			this.$http
-				.post('gov/org/customeragency/staffinagencylist', {})
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						console.log('获取组织树成功', res.data);
-						let { agencyList, subAgencyList } = res.data;
-						const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
-						this.orgOptions = this.deepTree(_arr);
-					}
-				})
-				.catch(() => {
-					return this.$message.error('网络错误');
-				});
-		},
-		deepTree(arr) {
-			if (Array.isArray(arr)) {
-				return arr.map(item => {
-					return {
-						...item,
-						subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
-					};
-				});
-			}
-		},
-		handleChangeAgency(val) {
-			let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
+    methods: {
+        jj() {
+            this.$forceUpdate()
+        },
+        async initForm() {
+            if (this.formType != 'add') {
+                this.getInfo();
+            }
+            this.getOrgTreeList();
 
-			this.getNeighborhood();
-		},
-		async getNeighborhood() {
-			let url = '/gov/org/icneighborhood/neighborhood-options-yantai';
-			let params = {
-				agencyId: this.fmData.agencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
+        },
+        getOrgTreeList() {
+            const { user } = this.$store.state;
+            this.$http
+                .post('gov/org/customeragency/staffinagencylist', {})
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        console.log('获取组织树成功', res.data);
+                        let { agencyList, subAgencyList } = res.data;
+                        const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
+                        this.orgOptions = this.deepTree(_arr);
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误');
+                });
+        },
+        deepTree(arr) {
+            if (Array.isArray(arr)) {
+                return arr.map(item => {
+                    return {
+                        ...item,
+                        subAgencyList: (item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList)) || null
+                    };
+                });
+            }
+        },
+        handleChangeAgency(val) {
+            let obj = this.$refs['myCascader'].getCheckedNodes()[0].data;
 
-			if (code === 0) {
-				console.log(data);
-				this.neighborhoodList = data;
-			} else {
-			}
-		},
+            this.getNeighborhood();
+        },
+        async getNeighborhood() {
+            let url = '/gov/org/icneighborhood/neighborhood-options-yantai';
+            let params = {
+                agencyId: this.fmData.agencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
 
-		async getInfo() {
-			let url = '/gov/org/propertymanagement/detail/' + this.formId;
-			let params = {
-				agencyId: this.fmData.agencyId
-			};
-			const { data, code, msg } = await requestPost(url, params);
+            if (code === 0) {
+                console.log(data);
+                this.neighborhoodList = data;
+            } else {
+            }
+        },
 
-			if (code === 0) {
-				this.fmData = data;
+        async getInfo() {
+            let url = '/gov/org/propertymanagement/detail/' + this.formId;
+            let params = {
+                agencyId: this.fmData.agencyId
+            };
+            const { data, code, msg } = await requestPost(url, params);
 
-				this.neighborhoodList = this.fmData.neighborHoodList.map(item => {
-					return {
-						value: item.id,
-						label: item.neighborHoodName
-					};
-				});
-				this.fmData.neighborHoodIdList = this.fmData.neighborHoodList.map(item => {
-					return item.id
-				});
-				console.log(this.fmData.neighborHoodList,this.neighborhoodList)
-			} else {
-			}
-		},
+            if (code === 0) {
+                this.fmData = data;
 
-		async handleComfirm() {
-			this.btnDisable = true;
-			setTimeout(() => {
-				this.btnDisable = false;
-			}, 10000);
-			this.$refs['ref_form'].validate((valid, messageObj) => {
-				if (!valid) {
-					app.util.validateRule(messageObj);
-					this.btnDisable = false;
-				} else {
-					this.submit();
-				}
-			});
-		},
+                this.neighborhoodList = this.fmData.neighborHoodList.map(item => {
+                    return {
+                        value: item.id,
+                        label: item.neighborHoodName
+                    };
+                });
+                this.fmData.neighborHoodIdList = this.fmData.neighborHoodList.map(item => {
+                    return item.id
+                });
+                console.log(this.fmData.neighborHoodList, this.neighborhoodList)
+            } else {
+            }
+        },
 
-		async submit() {
-			let url = '';
-			let params = { ...this.fmData };
-			if (this.formType === 'add') {
-				url = '/gov/org/propertymanagement/add';
-			} else {
-				url = '/gov/org/propertymanagement/update';
-				this.$set(params, 'id', this.villageList.id);
-			}
-			const { data, code, msg } = await requestPost(url, params);
+        async handleComfirm() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    this.submit();
+                }
+            });
+        },
 
-			if (code === 0) {
-				this.$message({
-					type: 'success',
-					message: '操作成功'
-				});
-				this.$emit('afterEdit');
-				this.btnDisable = false;
-			} else {
-				this.btnDisable = false;
-				this.$message.error(msg);
-			}
-		},
+        async submit() {
+            let url = '';
+            let params = { ...this.fmData };
+            if (this.formType === 'add') {
+                url = '/gov/org/propertymanagement/add';
+            } else {
+                url = '/gov/org/propertymanagement/update';
+                this.$set(params, 'id', this.villageList.id);
+            }
+            const { data, code, msg } = await requestPost(url, params);
 
-		handleCancle() {
-			this.$emit('close');
-		}
-	}
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                });
+                this.$emit('afterEdit');
+                this.btnDisable = false;
+            } else {
+                this.btnDisable = false;
+                this.$message.error(msg);
+            }
+        },
+
+        handleCancle() {
+            this.$emit('close');
+        }
+    }
 };
 </script>
 
 <style lang="scss" scoped>
 .item_width_1 {
-	width: 500px;
+    width: 500px;
 }
 .item_width_2 {
-	width: 400px;
+    width: 400px;
 }
 .item_width_3 {
-	margin-left: 10px;
-	width: 200px;
+    margin-left: 10px;
+    width: 200px;
 }
 .item_width_4 {
-	width: 200px;
+    width: 200px;
 }
 
 .div_map {
-	margin-top: 10px;
+    margin-top: 10px;
 }
 
 .div_btn {
-	// display: flex;
-	// justify-content: flex-end;
+    // display: flex;
+    // justify-content: flex-end;
 }
 .el-tabs {
-	margin: 0 20px;
+    margin: 0 20px;
 }
 .el-upload__tip {
-	color: rgb(155, 155, 155);
-	margin: 0;
+    color: rgb(155, 155, 155);
+    margin: 0;
 }
 .form {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 
 .attachement-list {
diff --git a/src/views/modules/housemaster/cpts/edit.vue b/src/views/modules/housemaster/cpts/edit.vue
index af873ae85..21666b2b2 100644
--- a/src/views/modules/housemaster/cpts/edit.vue
+++ b/src/views/modules/housemaster/cpts/edit.vue
@@ -1,539 +1,624 @@
 <template>
-	<div>
-		<div class="dialog-h-content scroll-h">
-			<el-form ref="ref_form" :inline="true" :model="fmData" :rules="dataRule" :disabled="formType === 'watch'"
-				class="form" label-width="150px">
-				<el-form-item label="姓名" prop="name" style="display: block">
-					<el-input v-model="fmData.name" class="item_width_2" size="small" clearable
-						placeholder="请输入"></el-input>
-				</el-form-item>
-				<el-form-item label="联系电话" prop="phone">
-					<el-input v-model="fmData.phone" class="item_width_2" size="small" clearable
-						placeholder="请输入"></el-input>
-				</el-form-item>
-				<el-form-item label="身份证号" prop="idCard">
-					<el-input v-model="fmData.idCard" class="item_width_2" size="small" clearable
-						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
-						@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 :disabled="disabled"
-						@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||disabled" 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||disabled" filterable clearable @change="
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form"
+                     :inline="true"
+                     :model="fmData"
+                     :rules="dataRule"
+                     :disabled="formType === 'watch'"
+                     class="form"
+                     label-width="150px">
+                <el-form-item label="姓名"
+                              prop="name"
+                              style="display: block">
+                    <el-input v-model="fmData.name"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              placeholder="请输入"></el-input>
+                </el-form-item>
+                <el-form-item label="联系电话"
+                              prop="phone">
+                    <el-input v-model="fmData.phone"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              placeholder="请输入"></el-input>
+                </el-form-item>
+                <el-form-item label="身份证号"
+                              prop="idCard">
+                    <el-input v-model="fmData.idCard"
+                              class="item_width_2"
+                              size="small"
+                              clearable
+                              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
+                               @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
+                               :disabled="disabled"
+                               @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||disabled"
+                               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||disabled"
+                               filterable
+                               clearable
+                               @change="
 							getgridList(1);
 							getviliageList(1);
 						">
-						<el-option v-for="item in communityList" :key="item.id" :label="item.organizationName"
-							:value="item.id"></el-option>
-					</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||disabled" 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||disabled" 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||disabled" 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||disabled" clearable>
-						<el-option v-for="item in unitList" :key="item.value" :label="item.label"
-							:value="item.value"></el-option>
-					</el-select>
-				</el-form-item>
-			</el-form>
-		</div>
-		<div class="div_btn resi-btns">
-			<el-button size="small" @click="handleCancle">取 消</el-button>
-			<el-button v-if="formType != 'watch'" type="primary" size="small" :disabled="btnDisable"
-				@click="handleComfirm">确 定</el-button>
-		</div>
-	</div>
+                        <el-option v-for="item in communityList"
+                                   :key="item.id"
+                                   :label="item.organizationName"
+                                   :value="item.id"></el-option>
+                    </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||disabled"
+                               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||disabled"
+                               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||disabled"
+                               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||disabled"
+                               clearable>
+                        <el-option v-for="item in unitList"
+                                   :key="item.value"
+                                   :label="item.label"
+                                   :value="item.value"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="div_btn resi-btns">
+            <el-button size="small"
+                       @click="handleCancle">取 消</el-button>
+            <el-button v-if="formType != 'watch'"
+                       type="primary"
+                       size="small"
+                       :disabled="btnDisable"
+                       @click="handleComfirm">确 定</el-button>
+        </div>
+    </div>
 </template>
 <script>
-	import {
-		mapGetters
-	} from 'vuex';
-	import {
-		requestPost
-	} from '@/js/dai/request';
-	import formVltHelper from 'dai-js/tools/formVltHelper';
-	export default {
-		props: {
-			formId: {
-				type: String,
-				default: ''
-			},
-			formType: {
-				type: String,
-				default: 'info'
-			},
-			villageList: {
-				type: Object,
-				default: {}
-			},
-			disabled:{
-				type:Boolean,
-				default:false,
-			}
-		},
-		data() {
-			const checkPhone = (rule, value, callback) => {
-				if (value === '') {
-					callback(new Error('请输入手机号'));
-				} else if (!/^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(1[|6|7|8][0-9]))\d{8}$/.test(value)) {
-					callback(new Error('请输入正确的手机号格式'));
-				} else {
-					callback();
-				}
-			};
-			const checkCardId = (rule, value, callback) => {
-				if (value === '') {
-					callback(new Error('请输入身份证号'));
-				} else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
-					callback(new Error('请输入正确的身份证号'));
-				} else {
-					callback();
-				}
-			};
-			return {
-				uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-				customerId: localStorage.getItem('customerId'),
-				btnDisable: false,
-				fmData: {
-					name: '',
-					phone: '',
-					idCard: '',
-					type: '',
-					districtId: '',
-					streetId: '',
-					communityId: '',
-					gridId: '',
-					viliageId: '',
-					buildingId: '',
-					unitId: '',
-				},
-				typeList: [{
-					value: '0',
-					label: '楼长'
-				}, {
-					value: '1',
-					label: '单元长'
-				}],
-				levelOptions: [{
-					value: '0',
-					label: '市级'
-				}, {
-					value: '1',
-					label: '区级'
-				}, {
-					value: '2',
-					label: '街道级'
-				}],
-				categoryOptions: [],
-				districtList: [],
-				streetList: [],
-				communityList: [],
-				gridList: [],
-				viliageList: [],
-				buildingList: [],
-				unitList: [],
-				dataRule: {
-					name: [{
-						required: true,
-						message: '姓名不能为空',
-						trigger: 'blur'
-					}],
-					phone: [{
-						required: true,
-						validator: checkPhone,
-						trigger: 'blur'
-					}],
-					idCard: [{
-						required: true,
-						validator: checkCardId,
-						trigger: 'blur'
-					}],
-					type: [{
-						required: true,
-						message: '类型不能为空',
-						trigger: 'blur'
-					}],
-					districtId: [{
-						required: true,
-						message: '所属区市不能为空',
-						trigger: 'blur'
-					}],
-					streetId: [{
-						required: true,
-						message: '所属镇街不能为空',
-						trigger: 'blur'
-					}],
-					communityId: [{
-						required: true,
-						message: '所属社区/村居不能为空',
-						trigger: 'blur'
-					}],
-					gridId: [{
-						required: true,
-						message: '所属网格不能为空',
-						trigger: 'blur'
-					}],
-					viliageId: [{
-						required: true,
-						message: '所属小区不能为空',
-						trigger: 'blur'
-					}],
-					buildingId: [{
-						required: true,
-						message: '楼栋不能为空',
-						trigger: 'blur'
-					}],
-					unitId: [],
-				}
-			};
-		},
-		components: {},
-		computed: {},
-		watch: {},
-		async mounted() {
-			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') {
-					this.getInfo();
-				}
-			},
-			async getdistrictList(type) {
-				// 区市
-				const url = '/gov/org/customeragency/districtList';
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url);
-				if (code === 0) {
-					this.districtList = data;
-					if (type == 1) {
-						this.streetList = [];
-						this.communityList = [];
-						this.gridList = [];
-						this.viliageList = [];
-						this.buildingList = [];
-						this.unitList = [];
-						this.fmData.districtId = '';
-						this.fmData.streetId = '';
-						this.fmData.communityId = '';
-						this.fmData.gridId = '';
-						this.fmData.viliageId = '';
-						this.fmData.buildingId = '';
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getstreetList(type) {
-				// 镇街
-				const url = `/gov/org/customeragency/streetList/${this.fmData.districtId}`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url);
-				if (code === 0) {
-					this.streetList = data;
-					if (type == 1) {
-						this.communityList = [];
-						this.gridList = [];
-						this.viliageList = [];
-						this.buildingList = [];
-						this.unitList = [];
-						this.fmData.streetId = '';
-						this.fmData.communityId = '';
-						this.fmData.gridId = '';
-						this.fmData.viliageId = '';
-						this.fmData.buildingId = '';
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getcommunityList(type) {
-				// 社区/民居
-				const url = `/gov/org/customeragency/communityList/${this.fmData.streetId}`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url);
-				if (code === 0) {
-					this.communityList = data;
-					if (type == 1) {
-						this.gridList = [];
-						this.viliageList = [];
-						this.buildingList = [];
-						this.unitList = [];
-						this.fmData.communityId = '';
-						this.fmData.gridId = '';
-						this.fmData.viliageId = '';
-						this.fmData.buildingId = '';
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getgridList(type) {
-				// 网格
-				const url = `/gov/org/customergrid/gridoption`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, {
-					agencyId: this.fmData.communityId,
-					purpose: 'query'
-				});
-				if (code === 0) {
-					this.gridList = data;
-					if (type == 1) {
-						this.viliageList = [];
-						this.buildingList = [];
-						this.unitList = [];
-						this.fmData.gridId = '';
-						this.fmData.viliageId = '';
-						this.fmData.buildingId = '';
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getviliageList(type) {
-				//小区
-				const url = `/gov/org/icneighborhood/neighborhood-options`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, {
-					agencyId: this.fmData.communityId,
-					gridId: this.fmData.gridId
-				});
-				if (code === 0) {
-					this.viliageList = data;
-					if (type == 1) {
-						this.buildingList = [];
-						this.unitList = [];
-						this.fmData.viliageId = '';
-						this.fmData.buildingId = '';
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getbuildingList(type) {
-				const url = `/gov/org/icbuilding/buildingoption`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, {
-					neighborHoodId: this.fmData.viliageId
-				});
-				if (code === 0) {
-					this.buildingList = data;
-					if (type == 1) {
-						this.unitList = [];
-						this.fmData.buildingId = '';
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getunitList(type) {
-				const url = `/gov/org/icbuildingunit/unitoption`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, {
-					buildingId: this.fmData.buildingId
-				});
-				if (code === 0) {
-					this.unitList = data;
-					if (type == 1) {
-						this.fmData.unitId = '';
-					}
-				} else {
-					this.$message.error(msg);
-				}
-				this.$forceUpdate();
-			},
-			async getInfo() {
-				const url = `/gov/org/communityBuildingManager/detail/${this.formId}`;
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url);
-				if (code === 0) {
-					this.$nextTick(() => {
-						this.fmData = data;
-						this.getstreetList(2);
-						this.getcommunityList(2);
-						this.getgridList(2);
-						this.getviliageList(2);
-						this.getbuildingList(2);
-						this.getunitList(2);
-					})
-				} else {
-					this.$message.error(msg);
-				}
-			},
-			async handleComfirm() {
-				this.btnDisable = true;
-				setTimeout(() => {
-					this.btnDisable = false;
-				}, 10000);
-				this.$refs['ref_form'].validate((valid, messageObj) => {
-					if (!valid) {
-						app.util.validateRule(messageObj);
-						this.btnDisable = false;
-					} else {
-						this.submit();
-					}
-				});
-			},
-			async submit() {
-				let url = '';
-				let params = {
-					...this.fmData
-				};
-				if (this.formType === 'add') {
-					url = '/gov/org/communityBuildingManager/save';
-				} else {
-					url = '/gov/org/communityBuildingManager/update';
-					this.$set(params, 'id', this.villageList.id);
-				}
-				const {
-					data,
-					code,
-					msg
-				} = await requestPost(url, params);
-				if (code === 0) {
-					this.$message({
-						type: 'success',
-						message: '操作成功'
-					});
-					this.$emit('afterEdit');
-					this.btnDisable = false;
-				} else {
-					this.btnDisable = false;
-					this.$message.error(msg);
-				}
-			},
-			handleCancle() {
-				this.$emit('close');
-			}
-		}
-	};
+import {
+    mapGetters
+} from 'vuex';
+import {
+    requestPost
+} from '@/js/dai/request';
+import formVltHelper from 'dai-js/tools/formVltHelper';
+export default {
+    props: {
+        formId: {
+            type: String,
+            default: ''
+        },
+        formType: {
+            type: String,
+            default: 'info'
+        },
+        villageList: {
+            type: Object,
+            default: {}
+        },
+        disabled: {
+            type: Boolean,
+            default: false,
+        }
+    },
+    data() {
+        const checkPhone = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入手机号'));
+            } else if (!/^1[3-9]\d{9}$/.test(value)) {
+                callback(new Error('请输入正确的手机号格式'));
+            } else {
+                callback();
+            }
+        };
+        const checkCardId = (rule, value, callback) => {
+            if (value === '') {
+                callback(new Error('请输入身份证号'));
+            } else if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+                callback(new Error('请输入正确的身份证号'));
+            } else {
+                callback();
+            }
+        };
+        return {
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+            btnDisable: false,
+            fmData: {
+                name: '',
+                phone: '',
+                idCard: '',
+                type: '',
+                districtId: '',
+                streetId: '',
+                communityId: '',
+                gridId: '',
+                viliageId: '',
+                buildingId: '',
+                unitId: '',
+            },
+            typeList: [{
+                value: '0',
+                label: '楼长'
+            }, {
+                value: '1',
+                label: '单元长'
+            }],
+            levelOptions: [{
+                value: '0',
+                label: '市级'
+            }, {
+                value: '1',
+                label: '区级'
+            }, {
+                value: '2',
+                label: '街道级'
+            }],
+            categoryOptions: [],
+            districtList: [],
+            streetList: [],
+            communityList: [],
+            gridList: [],
+            viliageList: [],
+            buildingList: [],
+            unitList: [],
+            dataRule: {
+                name: [{
+                    required: true,
+                    message: '姓名不能为空',
+                    trigger: 'blur'
+                }],
+                phone: [{
+                    required: true,
+                    validator: checkPhone,
+                    trigger: 'blur'
+                }],
+                idCard: [{
+                    required: true,
+                    validator: checkCardId,
+                    trigger: 'blur'
+                }],
+                type: [{
+                    required: true,
+                    message: '类型不能为空',
+                    trigger: 'blur'
+                }],
+                districtId: [{
+                    required: true,
+                    message: '所属区市不能为空',
+                    trigger: 'blur'
+                }],
+                streetId: [{
+                    required: true,
+                    message: '所属镇街不能为空',
+                    trigger: 'blur'
+                }],
+                communityId: [{
+                    required: true,
+                    message: '所属社区/村居不能为空',
+                    trigger: 'blur'
+                }],
+                gridId: [{
+                    required: true,
+                    message: '所属网格不能为空',
+                    trigger: 'blur'
+                }],
+                viliageId: [{
+                    required: true,
+                    message: '所属小区不能为空',
+                    trigger: 'blur'
+                }],
+                buildingId: [{
+                    required: true,
+                    message: '楼栋不能为空',
+                    trigger: 'blur'
+                }],
+                unitId: [],
+            }
+        };
+    },
+    components: {},
+    computed: {},
+    watch: {},
+    async mounted() {
+        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') {
+                this.getInfo();
+            }
+        },
+        async getdistrictList(type) {
+            // 区市
+            const url = '/gov/org/customeragency/districtList';
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url);
+            if (code === 0) {
+                this.districtList = data;
+                if (type == 1) {
+                    this.streetList = [];
+                    this.communityList = [];
+                    this.gridList = [];
+                    this.viliageList = [];
+                    this.buildingList = [];
+                    this.unitList = [];
+                    this.fmData.districtId = '';
+                    this.fmData.streetId = '';
+                    this.fmData.communityId = '';
+                    this.fmData.gridId = '';
+                    this.fmData.viliageId = '';
+                    this.fmData.buildingId = '';
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getstreetList(type) {
+            // 镇街
+            const url = `/gov/org/customeragency/streetList/${this.fmData.districtId}`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url);
+            if (code === 0) {
+                this.streetList = data;
+                if (type == 1) {
+                    this.communityList = [];
+                    this.gridList = [];
+                    this.viliageList = [];
+                    this.buildingList = [];
+                    this.unitList = [];
+                    this.fmData.streetId = '';
+                    this.fmData.communityId = '';
+                    this.fmData.gridId = '';
+                    this.fmData.viliageId = '';
+                    this.fmData.buildingId = '';
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getcommunityList(type) {
+            // 社区/民居
+            const url = `/gov/org/customeragency/communityList/${this.fmData.streetId}`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url);
+            if (code === 0) {
+                this.communityList = data;
+                if (type == 1) {
+                    this.gridList = [];
+                    this.viliageList = [];
+                    this.buildingList = [];
+                    this.unitList = [];
+                    this.fmData.communityId = '';
+                    this.fmData.gridId = '';
+                    this.fmData.viliageId = '';
+                    this.fmData.buildingId = '';
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getgridList(type) {
+            // 网格
+            const url = `/gov/org/customergrid/gridoption`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, {
+                agencyId: this.fmData.communityId,
+                purpose: 'query'
+            });
+            if (code === 0) {
+                this.gridList = data;
+                if (type == 1) {
+                    this.viliageList = [];
+                    this.buildingList = [];
+                    this.unitList = [];
+                    this.fmData.gridId = '';
+                    this.fmData.viliageId = '';
+                    this.fmData.buildingId = '';
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getviliageList(type) {
+            //小区
+            const url = `/gov/org/icneighborhood/neighborhood-options`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, {
+                agencyId: this.fmData.communityId,
+                gridId: this.fmData.gridId
+            });
+            if (code === 0) {
+                this.viliageList = data;
+                if (type == 1) {
+                    this.buildingList = [];
+                    this.unitList = [];
+                    this.fmData.viliageId = '';
+                    this.fmData.buildingId = '';
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getbuildingList(type) {
+            const url = `/gov/org/icbuilding/buildingoption`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, {
+                neighborHoodId: this.fmData.viliageId
+            });
+            if (code === 0) {
+                this.buildingList = data;
+                if (type == 1) {
+                    this.unitList = [];
+                    this.fmData.buildingId = '';
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getunitList(type) {
+            const url = `/gov/org/icbuildingunit/unitoption`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, {
+                buildingId: this.fmData.buildingId
+            });
+            if (code === 0) {
+                this.unitList = data;
+                if (type == 1) {
+                    this.fmData.unitId = '';
+                }
+            } else {
+                this.$message.error(msg);
+            }
+            this.$forceUpdate();
+        },
+        async getInfo() {
+            const url = `/gov/org/communityBuildingManager/detail/${this.formId}`;
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url);
+            if (code === 0) {
+                this.$nextTick(() => {
+                    this.fmData = data;
+                    this.getstreetList(2);
+                    this.getcommunityList(2);
+                    this.getgridList(2);
+                    this.getviliageList(2);
+                    this.getbuildingList(2);
+                    this.getunitList(2);
+                })
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        async handleComfirm() {
+            this.btnDisable = true;
+            setTimeout(() => {
+                this.btnDisable = false;
+            }, 10000);
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj);
+                    this.btnDisable = false;
+                } else {
+                    this.submit();
+                }
+            });
+        },
+        async submit() {
+            let url = '';
+            let params = {
+                ...this.fmData
+            };
+            if (this.formType === 'add') {
+                url = '/gov/org/communityBuildingManager/save';
+            } else {
+                url = '/gov/org/communityBuildingManager/update';
+                this.$set(params, 'id', this.villageList.id);
+            }
+            const {
+                data,
+                code,
+                msg
+            } = await requestPost(url, params);
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                });
+                this.$emit('afterEdit');
+                this.btnDisable = false;
+            } else {
+                this.btnDisable = false;
+                this.$message.error(msg);
+            }
+        },
+        handleCancle() {
+            this.$emit('close');
+        }
+    }
+};
 </script>
 <style lang="scss" scoped>
-	.item_width_1 {
-		width: 500px;
-	}
+.item_width_1 {
+    width: 500px;
+}
 
-	.item_width_2 {
-		width: 400px;
-	}
+.item_width_2 {
+    width: 400px;
+}
 
-	.item_width_3 {
-		margin-left: 10px;
-		width: 200px;
-	}
+.item_width_3 {
+    margin-left: 10px;
+    width: 200px;
+}
 
-	.item_width_4 {
-		width: 200px;
-	}
+.item_width_4 {
+    width: 200px;
+}
 
-	.div_map {
-		margin-top: 10px;
-	}
+.div_map {
+    margin-top: 10px;
+}
 
-	.div_btn {
-		// display: flex;
-		// justify-content: flex-end;
-	}
+.div_btn {
+    // display: flex;
+    // justify-content: flex-end;
+}
 
-	.el-tabs {
-		margin: 0 20px;
-	}
+.el-tabs {
+    margin: 0 20px;
+}
 
-	.el-upload__tip {
-		color: rgb(155, 155, 155);
-		margin: 0;
-	}
+.el-upload__tip {
+    color: rgb(155, 155, 155);
+    margin: 0;
+}
 
-	.form {
-		margin-top: 30px;
-	}
+.form {
+    margin-top: 30px;
+}
 
-	.attachement-list {}
+.attachement-list {
+}
 </style>
\ No newline at end of file