diff --git a/.env.development b/.env.development
index be04f184b..85c23d412 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
 NODE_ENV=development
 
-VUE_APP_API_SERVER =  http://192.168.1.140/api
+# VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-yantai.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
-# VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
+VUE_APP_API_SERVER =   https://epmet-cloud.elinkservice.cn/api
 # VUE_APP_API_SERVER =   https://epdc-shibei.elinkservice.cn/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
diff --git a/src/views/main-sidebar-sub-menu.vue b/src/views/main-sidebar-sub-menu.vue
index 132f6dcf8..a3a1bb1e3 100644
--- a/src/views/main-sidebar-sub-menu.vue
+++ b/src/views/main-sidebar-sub-menu.vue
@@ -31,6 +31,7 @@
 
 <script>
 import SubMenu from "./main-sidebar-sub-menu";
+import jointUrl from "dai-js/tools/jointUrl";
 export default {
   name: "sub-menu",
   props: {
@@ -50,7 +51,13 @@ export default {
       )[0];
       if (route) {
         console.log(route);
-        if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
+        if (route.meta.iframeURL.endsWith("【跳转新页面免登】")) {
+          window.open(
+            jointUrl(route.meta.iframeURL.slice(0, -9), {
+              token: localStorage.getItem("token"),
+            })
+          );
+        } else if (route.meta.iframeURL.endsWith("【跳转新页面】")) {
           window.open(route.meta.iframeURL.slice(0, -7));
         } else {
           this.$router.push({ name: route.name });
diff --git a/src/views/modules/base/communityYantai/buildDetail.vue b/src/views/modules/base/communityYantai/buildDetail.vue
new file mode 100644
index 000000000..5fcec1356
--- /dev/null
+++ b/src/views/modules/base/communityYantai/buildDetail.vue
@@ -0,0 +1,271 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">所属小区：</span>
+            <span>{{ agencyObj.agencyName }}—{{ agencyObj.gridName }}—{{ agencyObj.label }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">楼栋名称：</span>
+            <span>{{ dataForm.buildingName?dataForm.buildingName:'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">楼栋编码：</span>
+            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">楼栋类型：</span>
+            <span>{{ dataForm.typeName?dataForm.typeName:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">单元数：</span>
+            <span>{{dataForm.totalUnitNum?dataForm.totalUnitNum:0 }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">层数：</span>
+            <span>{{dataForm.totalFloorNum?dataForm.totalFloorNum:0 }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">总户数：</span>
+            <span>{{dataForm.totalHouseNum?dataForm.totalHouseNum:0 }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">人口数：</span>
+            <span>{{dataForm.realPerson?dataForm.realPerson:0 }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">楼长姓名：</span>
+            <span>{{ dataForm.buildingLeaderName?dataForm.buildingLeaderName:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">楼长电话：</span>
+            <span>{{ dataForm.buildingLeaderMobile?dataForm.buildingLeaderMobile:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">详细地址：</span>
+            <span>{{ dataForm.coordinatePosition?dataForm.coordinatePosition:'--' }}</span>
+          </div>
+
+          <div v-show="dataForm.coordinatePosition"
+               class="info-prop">
+            <span class="info-title-2">地图位置：</span>
+            <div class="div_map">
+
+              <div id="app_detail_build"></div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import daiMap from "@/utils/dai-map";
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      btnDisable: false,
+      initLoading: false,
+
+      dataForm: {
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        neighborHoodId: '',//所属小区id
+        buildingName: '',//房屋名称
+        // sort: 0,//排序
+        totalUnitNum: 1,//单元数	
+        totalFloorNum: 0,//层数	
+        totalHouseNum: 0,//总户数	
+        realPerson: 0,
+        buildingLeaderName: '',//楼长姓名
+        buildingLeaderMobile: '',//楼长电话
+        type: '',//房屋类型
+        coordinatePosition: '',
+        sysCoding: '',
+        coding: '',
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '' //纬度
+      },
+
+      agencyObj: {},
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+    diaDestroy () {
+      if (map) {
+        // map.destroy()
+      }
+    },
+    async initForm (row, agencyObj) {
+
+      this.dataForm = JSON.parse(JSON.stringify(row))
+      this.agencyObj = agencyObj
+
+      this.initLoading = true
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+      if (this.dataForm.latitude && this.dataForm.longitude) {
+        latitude = this.dataForm.latitude
+        longitude = this.dataForm.longitude
+      }
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+      if (this.dataForm.coordinatePosition) {
+        this.$nextTick(() => {
+          if (!map) {
+            this.initMap(latitude, longitude)
+          } else {
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+          }
+
+        })
+      }
+    },
+
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap (latitude, longitude) {
+
+      map = new daiMap(
+        document.getElementById("app_detail_build"),
+        { 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);
+
+    },
+
+    resetData () {
+
+      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: {
+    dataRule () {
+      return {
+        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' }
+        ]
+        // totalFloorNum: [
+        //   { required: true, message: '层数不能为空', trigger: 'blur' }
+        // ],
+        // totalHouseNum: [
+        //   { required: true, message: '户数不能为空', trigger: 'blur' }
+        // ],
+        // longitude: [
+        //   { required: true, message: '坐标不能为空', trigger: 'blur' }
+        // ],
+      }
+    },
+
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/communityYantai/buildForm.vue b/src/views/modules/base/communityYantai/buildForm.vue
new file mode 100644
index 000000000..271d1b91a
--- /dev/null
+++ b/src/views/modules/base/communityYantai/buildForm.vue
@@ -0,0 +1,492 @@
+<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>
+
+        <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">
+          <el-input-number class="item_width_1"
+                           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="楼长电话"
+                      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="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>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import daiMap from "@/utils/dai-map";
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      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: '',//楼长电话
+        type: '',//房屋类型
+        coordinatePosition: '',
+        sysCoding: '',
+        coding: '',
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '' //纬度
+      },
+
+      keyWords: '',
+      agencyObj: {},
+
+    }
+  },
+  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
+
+      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
+      }
+      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;
+        }
+      }
+
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/org/building/buildingadd'
+      } else {
+        url = '/gov/org/building/buildingupdate'
+
+        this.dataForm.buildingId = this.buildingId
+      }
+
+      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)
+      }
+
+    },
+
+    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.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.coordinatePosition = 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.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: {
+    dataRule () {
+      return {
+        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' }
+        ]
+        // totalFloorNum: [
+        //   { required: true, message: '层数不能为空', trigger: 'blur' }
+        // ],
+        // totalHouseNum: [
+        //   { required: true, message: '户数不能为空', trigger: 'blur' }
+        // ],
+        // longitude: [
+        //   { required: true, message: '坐标不能为空', trigger: 'blur' }
+        // ],
+      }
+    },
+
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/communityYantai/buildTable.vue b/src/views/modules/base/communityYantai/buildTable.vue
new file mode 100644
index 000000000..b28c2bd9a
--- /dev/null
+++ b/src/views/modules/base/communityYantai/buildTable.vue
@@ -0,0 +1,886 @@
+<template>
+  <div>
+
+    <div class="div_btn">
+
+      <el-button style="float:left"
+                 class="diy-button--add"
+                 size="small"
+                 @click="handleAdd">新增楼栋</el-button>
+      <div class="btn_upload"
+           v-if="showImportBtn">
+        <el-button style=";margin-left:10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('building')">下载楼栋模板</el-button>
+
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
+                   ref="upload_building"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'building')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'building')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入楼栋数据</el-button>
+        </el-upload>
+        <el-button style=";margin-left:10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载房屋模板</el-button>
+
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
+                   ref="upload_room"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'room')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'room')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入房屋数据</el-button>
+        </el-upload>
+      </div>
+      <el-button style="float:left;margin-left:10px"
+                 class="diy-button--reset"
+                 size="small"
+                 @click="handleExport">导出</el-button>
+      <el-button style="float:left;margin-left:10px"
+                 class="diy-button--more"
+                 size="small"
+                 @click="deleteBatch">批量删除</el-button>
+      <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 :disabled="yihuyidangDisabled"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+      <el-button size="small"
+                 v-if="displayedBaobiaoBtn"
+                 class="diy-button--add"
+                 @click="reportForm">智能填报</el-button>
+    </div>
+
+    <div class="div_table_item">
+      <el-table ref="ref_table"
+                :data="tableData"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                border
+                @sort-change="handleSortOrderChange"
+                :height="tableHeight"
+                v-loading="tableLoading"
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55">
+        </el-table-column>
+        <el-table-column fixed="left"
+                         width="55"
+                         type="index"
+                         label="序号"
+                         :index="indexMethod">
+        </el-table-column>
+
+        <el-table-column prop="buildingName"
+                         fixed="left"
+                         label="楼栋名称"
+                         min-width="180">
+          <template slot-scope="scope">
+            <a class="name-a"
+               @click="handleToNextLevel(scope.row)">
+              {{ scope.row.buildingName }}
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column prop="neighborHoodName"
+                         label="所属小区"
+                         min-width="160">
+        </el-table-column>
+        <el-table-column prop="buildingType"
+                         label="楼栋类型"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="buildingLeaderName"
+                         label="楼长姓名"
+                         min-width="90">
+        </el-table-column>
+        <el-table-column prop="buildingLeaderMobile"
+                         label="楼长电话"
+                         min-width="110">
+        </el-table-column>
+        <el-table-column prop="totalUnitNum"
+                         label="单元数">
+        </el-table-column>
+        <el-table-column prop="totalFloorNum"
+                         label="层数">
+        </el-table-column>
+        <el-table-column prop="realTotalHouseNum"
+                         label="实际录入总数">
+        </el-table-column>
+        <el-table-column prop="totalHouseNum"
+                         label="总户数">
+        </el-table-column>
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="140"
+                         label="排序">
+          <template slot-scope="scope">
+            <div @click="handleEditSort(scope.row)">
+              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
+              <el-input-number v-else
+                               @change="handleChangeSort(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :precision="2"
+                               size="small"
+                               :min="0"
+                               :max="9999"
+                               label="描述文字"></el-input-number>
+            </div>
+
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               top="5vh"
+               width="900px"
+               class="dialog-h"
+               @closed="diaClose">
+      <build-form ref="ref_form"
+                  @dialogCancle="addFormCancle"
+                  @dialogOk="addFormOk"></build-form>
+    </el-dialog>
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'楼栋详情'"
+               top="5vh"
+               width="900px"
+               class="dialog-h"
+               @closed="detailFormCancle">
+      <build-detail ref="ref_form_detail"
+                    @diaDetailClose="detailFormCancle"></build-detail>
+    </el-dialog>
+
+    <baobiao ref="baobiao" />
+  </div>
+</template>
+
+<script>
+
+import BuildForm from './buildForm'
+import BuildDetail from './buildDetail'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import baobiao from "@/views/modules/cpts/baobiao";
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      importBuildingLoading: false,
+      importRoomLoading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      sortType: 'asc',//asc：正，desc：倒
+      tableLoading: true,
+      tableData: [],
+
+      agencyObj: {},//树所选的小区对象
+
+      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
+      selection: [],
+
+
+      //form相关
+      formShow: false,
+      formTitle: '新增楼栋',
+      detailShow: false,
+
+      yihuyidangDisabled: false,
+
+      displayedBaobiaoBtn: false,
+    }
+  },
+  components: {
+    baobiao,
+    BuildForm,
+    BuildDetail
+  },
+  async mounted () {
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ['house_info'], categoryKey: 'house_info',
+      }
+    });
+  },
+  computed: {
+    tableHeight () {
+
+      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  methods: {
+    reportForm () {
+      let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyObj.level,
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+      };
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys: ['house_info'], categoryKey: 'house_info', paramMap
+        }
+      })
+    },
+
+    indexMethod (index) {
+      return index + 1;
+    },
+    handleSortOrderChange (value) {
+      console.log(value.column, value.prop, value.order)
+      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+      this.loadTable()
+
+    },
+    // handleChangeSort(row){
+
+    // },
+
+    handleEditSort (row) {
+      if (!row.isChange) {
+        row.isChange = true
+      }
+
+    },
+
+
+    async handleChangeSort (row, index) {
+      // row.isChange = false
+      console.log(row.sort)
+      let params = {
+        id: row.buildingId,
+        sort: row.sort,
+        type: 'building',
+      }
+
+      let url = '/gov/org/house/update-sort'
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        // this.$message({
+        //   type: 'success',
+        //   message: '操作成功'
+        // })
+
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+
+    },
+
+    checkSelect (row, index) {
+      let isChecked = false;
+      if (row.showBtn) { // 判断里面是否存在某个参数
+        isChecked = true
+      } else {
+        isChecked = false
+      }
+      return isChecked
+    },
+
+    async loadTable (fromTree, treeObj) {
+      this.tableLoading = true
+      if (fromTree) {
+        this.sortType = 'asc'
+
+        this.agencyObj = treeObj
+
+      }
+
+
+      console.log(this.agencyObj)
+      const url = "/gov/org/building/buildinglist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        sortType: this.sortType,
+        neighborHoodId: this.agencyObj.id
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.validTableDataNum = 0
+        this.total = data.total
+        data.list.forEach(item => {
+          item.sort = parseInt(item.sort) || 0;
+          item.sort = item.sort.toFixed(2)
+          item.isChange = false
+          if (item.agencyId === this.staffAgencyId) {
+            item.showBtn = true
+            this.validTableDataNum++
+          } else {
+            item.showBtn = false
+          }
+
+        });
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    async handleDetail (row) {
+
+
+      this.detailShow = true
+
+      const _data = await this.detail(row)
+      this.$nextTick(() => {
+        this.$refs.ref_form_detail.initForm(_data, this.agencyObj)
+      })
+    },
+
+    detailFormCancle () {
+      this.$refs.ref_form_detail.diaDestroy()
+      this.detailShow = false
+    },
+
+    handleAdd () {
+      this.formTitle = '新增楼栋'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyObj)
+      })
+    },
+
+    async handleEdit (row) {
+      this.formTitle = '修改楼栋'
+      this.formShow = true
+      const _data = await this.detail(row)
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
+      })
+    },
+
+    handleToNextLevel (row) {
+      this.$emit('toNextLevel', row, 'building')
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+      this.$emit('refreshTree')
+    },
+
+
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的楼栋?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteCommunityBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的楼栋')
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
+
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+    },
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteBuild(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+
+        });
+
+
+    },
+
+    async deleteCommunityBatch () {
+      let ids = []
+      this.selection.forEach(element => {
+
+        ids.push(element.buildingId)
+      });
+
+      const url = "/gov/org/house/delete"
+
+      let params = {
+        type: 'building',
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else if (code > 8000) {
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async deleteBuild (row) {
+      const url = "/gov/org/building/buildingdel"
+
+      let params = {
+        buildingId: row.buildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async detail (row) {
+      const url = "/gov/org/houseInformation/getBuildingDetail/" + row.buildingId
+
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        return data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—楼栋列表'
+
+      const url = "/gov/org/building/exportbuildinginfo"
+      let params = {
+
+        neighborHoodId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      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 === 'building') {
+        title = '楼栋导入模板'
+        url = '/gov/org/building/exporttemplate'
+
+      } else if (type === 'room') {
+        title = '房屋导入模板'
+        url = '/gov/org/house/exporttemplate'
+      }
+
+
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    //导出一户一档
+    handleExportYihuyidang () {
+      this.yihuyidangDisabled = true
+      let title = this.agencyObj.label
+      title = title + '-一户一档'
+      let url = "/gov/org/house/exportHouseUser"
+
+
+      let params = {
+        agencyId: '',
+        gridId: '',
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+        neighborHoodId: this.agencyObj.id
+
+      }
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+          this.yihuyidangDisabled = false
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+          this.yihuyidangDisabled = false
+        }
+      );
+    },
+
+
+    // 上传文件之前的钩子
+    beforeUpload (file, type) {
+      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
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile (type) {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+
+      //清空上传列表
+      let url = ''
+      let params = {}
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      // params.file = fileFormData
+      // params.orgId = this.agencyObj.id
+      // params.orgType = this.agencyObj.level
+
+      if (type === 'building') {
+        this.$refs['upload_building'].clearFiles()
+        // url = 'http://192.168.51.26:8080/api/gov/org/building/buildingimport'
+        url = '/gov/org/building/buildingimport'
+        this.importBuildingLoading = true
+
+      } else if (type === 'room') {
+        this.$refs['upload_room'].clearFiles()
+        // url = 'http://192.168.51.26:8080/api/gov/org/house/houseimport'
+        url = '/gov/org/house/houseimport'
+        this.importRoomLoading = true
+      }
+
+      window.app.ajax.post2(url, fileFormData,
+        (data, rspMsg) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          if (type === 'building') {
+            this.importBuildingLoading = false
+
+          } else if (type === 'room') {
+            this.importRoomLoading = false
+          }
+        },
+        (rspMsg, data) => {
+          if (type === 'building') {
+            this.importBuildingLoading = false
+
+          } else if (type === 'room') {
+            this.importRoomLoading = false
+          }
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+    },
+
+    showMessage (msg) {
+      this.$alert(msg, '操作结果', {
+        confirmButtonText: '关闭',
+        callback: action => {
+          this.$emit('refreshTree')
+          this.loadTable()
+        }
+      });
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  watch: {
+
+  },
+  props: {
+    staffAgencyId: {
+      type: String,
+      default: '',
+    },
+    showImportBtn: {
+      type: Boolean,
+      default: false,
+    },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
+    purpose: {
+      type: String,
+      default: '',
+    },
+    remark: {
+      type: String,
+      default: '',
+    },
+    updateStartDate: {
+      type: String,
+      default: '',
+    },
+    updateEndDate: {
+      type: String,
+      default: '',
+    },
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManage.scss";
+
+.item_width_4 {
+  width: 120px;
+}
+
+/deep/.el-input-number--medium .el-input-number__decrease,
+/deep/.el-input-number--medium .el-input-number__increase {
+  width: 26px;
+}
+/deep/.el-input-number--medium .el-input__inner {
+  padding-left: 0px;
+  padding-right: 0px;
+}
+</style>
diff --git a/src/views/modules/base/communityYantai/community.vue b/src/views/modules/base/communityYantai/community.vue
new file mode 100644
index 000000000..aa8a2889b
--- /dev/null
+++ b/src/views/modules/base/communityYantai/community.vue
@@ -0,0 +1,728 @@
+<template>
+  <div class="div_main">
+
+    <div :style="{height:rowHeight}"
+         class="div_tree">
+      <!-- <el-input placeholder="输入关键字进行过滤"
+                v-model="filterText">
+      </el-input> -->
+      <el-scrollbar :style="{height:treeHeight}"
+                    class="scrollar">
+        <el-tree ref="ref_tree"
+                 v-loading="treeLoading"
+                 class="filter_tree"
+                 :data="treeData"
+                 :props="defaultProps"
+                 :highlight-current="true"
+                 node-key="id"
+                 :default-expanded-keys="openNodes"
+                 :expand-on-click-node="false"
+                 :filter-node-method="filterNode"
+                 @node-click="handleNodeClick"
+                 lazy
+                 :load="lazyLoadTree">
+
+          <span slot-scope="{ node, data }"
+                class="custom-tree-node">
+            <span :id="data.id">{{ data.showName }}</span>
+          </span>
+        </el-tree>
+      </el-scrollbar>
+
+    </div>
+
+    <div :style="{height:rowHeight}"
+         class=div_left>
+
+      <div class="div_search marginl-20">
+        <el-form :inline="true"
+                 ref="ref_searchform"
+                 :label-width="'80px'">
+          <div>
+
+            <el-form-item label="所属组织"
+                          prop="ownerName">
+              <el-cascader class="customer_cascader"
+                           ref="myCascader"
+                           size="small"
+                           v-model="agencyIdArray"
+                           :options="orgOptions"
+                           :props="orgOptionProps"
+                           :show-all-levels="false"
+                           @change="handleChangeAgency"></el-cascader>
+            </el-form-item>
+            <el-form-item label="房主姓名"
+                          prop="ownerName">
+              <el-input v-model="ownerName"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入内容">
+
+              </el-input>
+            </el-form-item>
+            <el-form-item label="联系方式"
+                          prop="ownerPhone">
+              <el-input v-model="ownerPhone"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入手机">
+              </el-input>
+
+            </el-form-item>
+
+            <el-form-item label="房屋状态"
+                          prop="rentFlag">
+              <el-select class="item_width_2"
+                         v-model="rentFlag"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in rentList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="房屋用途"
+                          prop="purpose">
+              <el-select v-model="purpose"
+                         class="item_width_2"
+                         placeholder="请选择"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in purposeArr"
+                           :key="item.dictValue"
+                           :label="item.dictName"
+                           :value="item.dictValue">
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+
+            <el-form-item label="备注"
+                          prop="remark">
+              <el-input v-model="remark"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入备注">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="更新时间"
+                          prop="updateStartDate">
+              <el-date-picker v-model="updateStartDate"
+                              :picker-options="startPickerOptions"
+                              class="item_width_2"
+                              size="small"
+                              type="date"
+                              value-format="yyyyMMdd"
+                              value="yyyy-MM-dd"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="updateEndDate"
+                              :picker-options="endPickerOptions"
+                              class="item_width_2 data-tag"
+                              size="small"
+                              type="date"
+                              value-format="yyyyMMdd"
+                              value="yyyy-MM-dd"
+                              placeholder="结束时间">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </div>
+        </el-form>
+      </div>
+      <div class=div_left_table>
+        <build-table v-if="selTreeObj.level==='neighborHood'&&!showRoomTable"
+                     ref="ref_neighTable"
+                     :staffAgencyId="staffAgencyId"
+                     :showImportBtn="showImportBtn"
+                     :ownerName="ownerName"
+                     :ownerPhone="ownerPhone"
+                     :rentFlag="rentFlag"
+                     :purpose="purpose"
+                     :remark="remark"
+                     :updateStartDate="updateStartDate"
+                     :updateEndDate="updateEndDate"
+                     @toNextLevel="toNextLevel"
+                     @refreshTree="refreshTree"></build-table>
+
+        <room-table v-if="showRoomTable||selTreeObj.level==='building'"
+                    :staffAgencyId="staffAgencyId"
+                    :showImportBtn="showImportBtn"
+                    :ownerName="ownerName"
+                    :ownerPhone="ownerPhone"
+                    :rentFlag="rentFlag"
+                    :purpose="purpose"
+                    :remark="remark"
+                    :updateStartDate="updateStartDate"
+                    :updateEndDate="updateEndDate"
+                    :orgType="orgType"
+                    :orgId="orgId"
+                    ref="ref_buildingTable"
+                    @refreshTree="refreshTree"></room-table>
+
+        <community-table v-if="selTreeObj.level!=='building'&&selTreeObj.level!=='neighborHood'&&!showRoomTable"
+                         @toNextLevel="toNextLevel"
+                         :staffAgencyId="staffAgencyId"
+                         :ownerName="ownerName"
+                         :ownerPhone="ownerPhone"
+                         :rentFlag="rentFlag"
+                         :purpose="purpose"
+                         :remark="remark"
+                         :updateStartDate="updateStartDate"
+                         :updateEndDate="updateEndDate"
+                         ref="ref_communityTable"
+                         @refreshTree="refreshTree"></community-table>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import CDialog from '@c/CDialog'
+import communityTable from './communityTable'
+import buildTable from './buildTable'
+import roomTable from './roomTable'
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import nextTick from 'dai-js/tools/nextTick'
+
+let loading // 加载动画
+export default {
+  data () {
+    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      if (this.updateStartDate) {
+        let startTime = new Date(this.updateStartDate)
+        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+      } else {
+        return time.getTime() > nowData
+      }
+
+    }
+    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      return time.getTime() > nowData
+    }
+    return {
+      // filterText: '',
+      treeLoading: true,
+      treeData: [],
+      openNodes: [],
+      defaultProps: {
+        children: 'children',
+        label: 'showName',
+        isLeaf: 'isLeaf'
+      },
+      orgOptions: [],
+      orgOptionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      },
+      agencyIdArray: [],
+      orgType: '',
+      orgId: '',
+
+      selTreeObj: {},
+
+      centerPoint: [],
+      staffAgencyId: localStorage.getItem("agencyId"),
+      showImportBtn: false,
+
+      rentList: [
+        {
+          value: '1',
+          label: '出租'
+        },
+        {
+          value: '2',
+          label: '闲置'
+        },
+        {
+          value: '0',
+          label: '自住'
+        },
+        {
+          value: '3',
+          label: '未出售'
+        },
+      ],
+      ownerName: '',
+      ownerPhone: '',
+      rentFlag: '',
+      purpose: '',
+      remark: '',
+      updateStartDate: '',
+      updateEndDate: '',
+      showRoomTable: false,
+      selObj: {},
+      purposeArr: [
+        { dictValue: '1', dictName: '住宅' },
+        { dictValue: '2', dictName: '商业' },
+        { dictValue: '3', dictName: '办公' },
+        { dictValue: '4', dictName: '工业' },
+        { dictValue: '5', dictName: '仓储' },
+        { dictValue: '6', dictName: '商住混用' },
+        { dictValue: '7', dictName: '其他' }
+      ],
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+
+      selGridId: '',
+      selAgencyId: '',
+
+
+    }
+  },
+  components: {
+    CDialog
+  },
+  async mounted () {
+    this.treeLoading = true
+
+    await this.loadOrgData()
+    await this.loadTree()
+    await this.getOrgTreeList()
+
+    await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+    if (this.treeData.length > 0) {
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
+      });
+    }
+    this.treeLoading = false
+
+  },
+  computed: {
+    rowHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
+
+    },
+    treeHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  methods: {
+    async getOrgTreeList () {
+      let url = '/gov/org/customeragency/agencygridtree'
+      let params = {}
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.orgOptions = []
+        this.orgOptions.push(data)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+
+        this.orgType = obj.level === 'grid' ? 'grid' : 'agency'
+        this.orgId = obj.agencyId
+
+      } else {
+        this.orgType = ''
+        this.orgId = ''
+      }
+
+
+    },
+    async lazyLoadTree (node, resolve) {
+      console.log(node)
+      // debugger
+      if (node.level !== 0) {
+        const url = "/gov/org/building/next-tree-node"
+        let params = {
+          id: node.data.id,
+          level: node.data.level
+        }
+
+        const { data, code, msg } = await requestPost(url, params)
+
+        if (code === 0) {
+          data.forEach(element => {
+            if (element.level === 'building') {
+              element.isLeaf = true
+            }
+          });
+          console.log(data)
+          resolve(data)
+
+        } else {
+          this.$message.error(msg)
+        }
+      }
+
+    },
+
+
+    handleSearch () {
+      // if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
+      this.showRoomTable = true
+
+      this.$nextTick(() => {
+        this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
+      })
+      // } else {
+      //   this.$message.warning('请输入查询条件')
+      // }
+
+
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.ownerName = ''
+      this.ownerPhone = ''
+      this.rentFlag = ''
+      this.purpose = ''
+      this.remark = ''
+      this.updateStartDate = ''
+      this.updateEndDate = ''
+      this.orgType = ''
+      this.orgId = ''
+
+      this.pageSize = 10
+      this.pageNo = 1
+
+      this.agencyIdArray = []
+
+    },
+
+    async loadTree (isRefresh) {
+      const url = "/gov/org/building/treeinit"
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.openNodes = []
+        this.openNodes.push(data.id)
+
+        this.treeData = []
+        this.treeData.push(data)
+
+        if (!isRefresh && data) {
+
+          this.selTreeObj = data
+          if (!this.selTreeObj.latitude) {
+            this.selTreeObj.latitude = this.centerPoint[0]
+          }
+
+          if (!this.selTreeObj.longitude) {
+            this.selTreeObj.longitude = this.centerPoint[1]
+          }
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //加载组织数据
+    async loadOrgData () {
+      const url = "/gov/org/agency/maporg"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.centerPoint = []
+
+        this.centerPoint.push(data.latitude)
+        this.centerPoint.push(data.longitude)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async handleNodeClick (obj) {
+      this.ownerName = ''
+      this.ownerPhone = ''
+      this.rentFlag = ''
+      this.purpose = ''
+      this.remark = ''
+      this.updateStartDate = ''
+      this.updateEndDate = ''
+      this.showRoomTable = false
+
+      this.selObj = JSON.parse(JSON.stringify(obj))
+      this.getTreeObj(obj)
+      await nextTick(1000)
+
+      if (obj.level === 'building') {//点击楼栋
+
+        this.selAgencyId = ''
+        this.selGridId = ''
+
+        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+
+
+      } else if (obj.level === 'neighborHood') {//点击小区
+
+        this.selAgencyId = ''
+        this.selGridId = ''
+
+        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+
+      } else {
+        this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+
+        if (obj.level === 'grid') {
+          this.selAgencyId = ''
+          this.selGridId = this.selTreeObj.id
+        } else {
+          this.selAgencyId = this.selTreeObj.id
+          this.selGridId = ''
+        }
+
+      }
+
+
+    },
+
+    //添加小区结束
+    async refreshTree () {
+      this.treeLoading = true
+      await this.loadTree(this.selTreeObj.id)
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+      });
+      this.treeLoading = false
+    },
+
+    //进入下一级
+    async toNextLevel (row, level) {
+      console.log(row)
+      if (level === 'community') {
+        this.selTreeObj.id = row.neighborHoodId
+        this.selTreeObj.label = row.neighborHoodName
+        this.selTreeObj.latitude = row.latitude
+        this.selTreeObj.level = 'neighborHood'
+        this.selTreeObj.longitude = row.longitude
+
+      } else {
+        this.selTreeObj.id = row.buildingId
+        this.selTreeObj.label = row.buildingName
+        this.selTreeObj.latitude = row.latitude
+        this.selTreeObj.level = "building"
+        this.selTreeObj.longitude = row.longitude
+      }
+
+      console.log(this.selTreeObj)
+
+      this.ownerName = ''
+      this.ownerPhone = ''
+      this.rentFlag = ''
+      this.purpose = ''
+      this.remark = ''
+      this.updateStartDate = ''
+      this.updateEndDate = ''
+      this.showRoomTable = false
+
+      this.selObj = JSON.parse(JSON.stringify(this.selTreeObj))
+      // this.getTreeObj(obj)
+      await nextTick(1000)
+
+      if (this.selObj.level === 'building') {//点击楼栋
+        this.selAgencyId = ''
+        this.selGridId = ''
+
+        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+
+      } else if (this.selObj.level === 'neighborHood') {//点击小区
+        this.selAgencyId = ''
+        this.selGridId = ''
+
+        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+
+      }
+
+
+    },
+
+    //解析树数据
+    getTreeObj (obj) {
+      // 树接口：
+      // 组织：组织id、组织名称、type、经度、纬度
+      // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
+      // 楼：楼id、楼名称、type、所属小区id、所属小区名称
+      if (obj.level === 'building') {//点击楼栋
+        let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
+
+        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
+        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
+        obj.agencyId = agencyNode.data.id
+        obj.agencyName = agencyNode.data.label
+        obj.gridId = gridNode.data.id
+        obj.gridName = gridNode.data.label
+        obj.neighborHoodId = neighborHoodNode.data.id
+        obj.neighborHoodName = neighborHoodNode.data.label
+        if (obj.agencyId === this.staffAgencyId) {
+          this.showImportBtn = true
+        } else {
+          this.showImportBtn = false
+        }
+
+      } else if (obj.level === 'neighborHood') {//点击小区
+        let gridNode = this.$refs.ref_tree.getNode(obj.pid)
+        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
+        obj.gridId = gridNode.data.id
+        obj.gridName = gridNode.data.label
+        obj.agencyId = agencyNode.data.id
+        obj.agencyName = agencyNode.data.label
+        if (obj.agencyId === this.staffAgencyId) {
+          this.showImportBtn = true
+        } else {
+          this.showImportBtn = false
+        }
+
+      } else {
+
+      }
+
+      if (!obj.latitude) {
+        obj.latitude = this.centerPoint[0]
+      }
+
+      if (!obj.longitude) {
+        obj.longitude = this.centerPoint[1]
+      }
+      this.selTreeObj = obj
+      console.log('selTreeObj', this.selTreeObj)
+
+    },
+
+    filterNode (value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  watch: {
+    // filterText (val) {
+    //   this.$refs.ref_tree.filter(val);
+    // }
+  },
+  components: {
+    communityTable, buildTable, roomTable
+  }
+}
+</script>
+
+
+<style>
+/* .aui-content > .el-tabs > .el-tabs__content {
+    padding: 0px;
+  } */
+
+.el-tree-node:focus > .el-tree-node__content {
+  /* background-color: #ccc !important; */
+  color: #2195fe;
+}
+</style>
+<style lang="scss" scoped>
+.div_tree {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
+}
+</style>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
+
+<style lang="scss" scoped >
+.div_main {
+  display: flex;
+}
+.scrollar {
+  margin-top: 10px;
+}
+
+.div_tree {
+  flex: 0 0 280px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+  overflow-y: hidden;
+}
+.filter_tree {
+  overflow-x: auto;
+}
+
+// .div_table {
+//   margin-left: 15px;
+//   // flex: 1;
+//   width: calc(100% - 300px);
+//   background-color: #ffffff;
+//   border-radius: 5px;
+//   padding: 10px;
+// }
+.div_left {
+  // flex: 1;
+  width: calc(100% - 300px);
+}
+.div_left_table {
+  margin-top: 10px;
+  margin-left: 15px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
+</style>
+
+
diff --git a/src/views/modules/base/communityYantai/communityDetail.vue b/src/views/modules/base/communityYantai/communityDetail.vue
new file mode 100644
index 000000000..f08478197
--- /dev/null
+++ b/src/views/modules/base/communityYantai/communityDetail.vue
@@ -0,0 +1,263 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">所属组织：</span>
+            <span>{{ dataForm.agencyName }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">所属网格：</span>
+            <span>{{ dataForm.gridName?dataForm.gridName:'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">小区名称：</span>
+            <span>{{ dataForm.neighborHoodName}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">小区编码：</span>
+            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+          </div>
+
+          <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>
+
+          <div class="info-prop">
+            <span class="info-title-2">关联物业：</span>
+            <span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">实有楼栋：</span>
+            <span>{{dataForm.realBuilding?dataForm.realBuilding:0 }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">详细地址：</span>
+            <span>{{ dataForm.address }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">地图位置：</span>
+            <div class="div_map">
+
+              <div id="app_detail_community"></div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import daiMap from "@/utils/dai-map";
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      btnDisable: false,
+      initLoading: false,
+
+      dataForm: {
+        neighborHoodName: '', // 小区名称【不超过50字】
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        propertyId: '', //关联物业
+        address: '', //详细地址
+        remark: '', //备注【最大500字】
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
+      },
+
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+    handleCancle () {
+      this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+    diaDestroy () {
+      if (map) {
+        // map.destroy()
+      }
+    },
+
+    async initForm (row) {
+      this.dataForm = JSON.parse(JSON.stringify(row))
+
+      let propertyShowList = []
+      this.dataForm.propertyList.forEach(element => {
+        propertyShowList.push(element.name)
+      });
+
+      this.dataForm.propertyShow = propertyShowList.join(',')
+
+      this.initLoading = true
+      let { latitude, longitude } = this.$store.state.user;
+      console.log('lat' + latitude + ',lon' + longitude)
+      if (this.dataForm.latitude && this.dataForm.longitude) {
+        latitude = this.dataForm.latitude
+        longitude = this.dataForm.longitude
+      }
+      if (!latitude || latitude == "" || latitude == "0") {
+        latitude = 39.9088810666821;
+        longitude = 116.39743841556731;
+      }
+
+      this.$nextTick(() => {
+        if (!map) {
+          this.initMap(latitude, longitude)
+        } else {
+          map.setCenter(latitude, longitude);
+          map.setMarker(latitude, longitude);
+        }
+
+      })
+
+    },
+
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap (latitude, longitude) {
+
+      map = new daiMap(
+        document.getElementById("app_detail_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);
+
+    },
+
+
+
+    resetData () {
+
+      this.dataForm = {
+        neighborHoodName: '', // 小区名称【不超过50字】
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        propertyId: '', //关联物业
+        address: '', //详细地址
+        remark: '', //备注【最大500字】
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '', //纬度
+        realBuilding: 0,
+        coding: '',
+        sysCoding: ''
+      }
+
+    },
+    // 开启加载动画
+    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' }
+        ]
+      }
+    },
+    propertyRule () {
+      name: [
+        { required: true, message: '物业名称不能为空', trigger: 'blur' }
+        // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+      ]
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
+
diff --git a/src/views/modules/base/communityYantai/communityForm.vue b/src/views/modules/base/communityYantai/communityForm.vue
new file mode 100644
index 000000000..3b329ca7d
--- /dev/null
+++ b/src/views/modules/base/communityYantai/communityForm.vue
@@ -0,0 +1,576 @@
+<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>
+
+          <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="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>
+          <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>
+      </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'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import daiMap from "@/utils/dai-map";
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    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: ''
+      },
+
+      propertyFormShow: false,
+      propertyForm: {
+        name: ''
+      },
+
+      keyWords: '',
+      agencyObj: {}
+    }
+  },
+  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()
+    },
+    // 地图初始化函数，本例取名为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 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.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
+      }
+
+      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
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+
+
+        this.propertyForm.name = ''
+        this.propertyFormShow = false
+        this.loadProperty()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    handleCancle () {
+      if (this.propertyFormShow) {
+        this.propertyForm.name = ''
+        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: ''
+      }
+      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' }
+        ]
+      }
+    },
+    propertyRule () {
+      name: [
+        { required: true, message: '物业名称不能为空', trigger: 'blur' }
+        // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+      ]
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+
+
+
diff --git a/src/views/modules/base/communityYantai/communityTable.vue b/src/views/modules/base/communityYantai/communityTable.vue
new file mode 100644
index 000000000..b7e916e4c
--- /dev/null
+++ b/src/views/modules/base/communityYantai/communityTable.vue
@@ -0,0 +1,1050 @@
+<template>
+  <div>
+
+    <div class="div_btn">
+      <el-button v-if="showYhymInfo && customerId!=='1535072605621841922'"
+                 style=""
+                 class="diy-button--reset"
+                 size="small"
+                 :loading="yhymLoading"
+                 @click="handleYhymInfo">补全一房一码信息</el-button>
+      <el-button v-if="showYhymInfo && customerId!=='1535072605621841922'"
+                 style=""
+                 class="diy-button--export"
+                 size="small"
+                 :loading="xcxmLoading"
+                 @click="createBatchNeiQrUrl">补全小程序小区码</el-button>
+      <el-button style=""
+                 class="diy-button--add"
+                 size="small"
+                 @click="handleAdd">新增小区</el-button>
+
+      <div class="btn_upload"
+           v-if="showImportBtn">
+        <el-button style=""
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('community')">下载小区模板</el-button>
+
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload_community"
+                   style=""
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'community')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'community')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入小区数据</el-button>
+        </el-upload>
+
+        <el-button style=";margin-left:10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('building')">下载楼栋模板</el-button>
+
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
+                   ref="upload_building"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'building')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'building')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入楼栋数据</el-button>
+        </el-upload>
+        <el-button style=";margin-left:10px"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载房屋模板</el-button>
+
+        <el-upload :headers="$getElUploadHeaders()"
+                   style=""
+                   ref="upload_room"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="((file)=>{beforeUpload(file, 'room')})"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :http-request="(()=>{uploadFile( 'room')})">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入房屋数据</el-button>
+        </el-upload>
+
+      </div>
+      <el-button style="margin-left:10px"
+                 class="diy-button--reset"
+                 size="small"
+                 @click="handleExportOpen">导出</el-button>
+      <el-button v-if="agencyObj.level == 'community'"
+                 style="margin-left:10px"
+                 class="diy-button--qrcode"
+                 size="small"
+                 @click="handleDownQr(agencyObj, 'community')">社区二维码</el-button>
+      <el-button style="float:left;margin-left:10px"
+                 class="diy-button--more"
+                 size="small"
+                 @click="deleteBatch">批量删除</el-button>
+      <!-- <el-button style=";margin-left:10px"
+                 class="diy-button--export"
+                 size="small"
+                 :disabled="yihuyidangDisabled"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button> -->
+
+      <el-button size="small"
+                 v-if="displayedBaobiaoBtn"
+                 class="diy-button--add"
+                 @click="reportForm">智能填报</el-button>
+    </div>
+
+    <div class="div_table_item">
+      <el-table ref="ref_table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%"
+                :show-overflow-tooltip="true"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55">
+        </el-table-column>
+        <el-table-column prop="neighborHoodName"
+                         label="小区名称"
+                         min-width="100">
+          <template slot-scope="scope">
+            <a class="name-a"
+               @click="handleToNextLevel(scope.row)">
+              {{ scope.row.neighborHoodName }}
+            </a>
+          </template>
+        </el-table-column>
+        <el-table-column prop="agencyName"
+                         label="所属组织"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="gridName"
+                         label="所属网格"
+                         min-width="120">
+        </el-table-column>
+        <!-- <el-table-column prop="总单元数"
+                         label="所属网格"
+                         min-width="80">
+        </el-table-column>
+        <el-table-column prop="总户数"
+                         label="所属网格"
+                         min-width="80">
+        </el-table-column> -->
+        <el-table-column prop="address"
+                         label="详细地址"
+                         min-width="180">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+
+    </div>
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'小区详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="detailFormCancle">
+      <community-detail ref="ref_form_detail"
+                        @diaDetailClose="detailFormCancle"></community-detail>
+    </el-dialog>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <community-form ref="ref_form"
+                      @dialogCancle="addFormCancle"
+                      @dialogOk="addFormOk"></community-form>
+    </el-dialog>
+
+    <el-dialog title="导出"
+               :visible.sync="dialogVisible"
+               width="30%"
+               :before-close="handleClose">
+      <div>
+        <el-button class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出小区数据</el-button>
+        <el-button class="diy-button--export"
+                   size="small"
+                   :disabled="yihuyidangDisabled"
+                   @click="handleExportYihuyidang()">导出一户一档</el-button>
+        <el-button class="diy-button--qrcode"
+                   size="small"
+                   :disabled="yihuyimaDisabled"
+                   :loading="exportBtn"
+                   @click="handleExportYihuyima()">导出一房一码</el-button>
+      </div>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <!-- <el-button type="primary" @click="dialogVisible = false">确 定</el-button> -->
+      </span>
+    </el-dialog>
+
+    <baobiao ref="baobiao" />
+  </div>
+</template>
+
+<script>
+
+import CommunityForm from './communityForm'
+import CommunityDetail from './communityDetail'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import axios from 'axios'
+import baobiao from "@/views/modules/cpts/baobiao";
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      importBuildingLoading: false,
+      importRoomLoading: false,
+      importCommunityLoading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: true,
+
+      showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
+      roleList: [],//角色列表
+      showYhymInfo: false, // 是否显示补全一房一码信息按钮
+      yhymLoading: false,
+      xcxmLoading: false,
+
+      agencyObj: {},//树所选的组织对象
+
+      tableData: [],
+      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
+      selection: [],
+      showDeletBtn: false,
+
+
+      //form相关
+      formShow: false,
+      formTitle: '新增小区',
+
+      detailShow: false,
+
+
+      files: "",
+      fileName: "",
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
+      yihuyidangDisabled: false,
+      yihuyimaDisabled: false,
+      exportBtn: false,
+      dialogVisible: false, // 导出
+
+      displayedBaobiaoBtn: false,
+      customerId: '',//烟台的客户id :  1535072605621841922
+    }
+  },
+  components: {
+    baobiao,
+    CommunityForm,
+    CommunityDetail
+  },
+  async mounted () {
+    this.customerId = localStorage.getItem('customerId')
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ['house_info'], categoryKey: 'house_info',
+      }
+    });
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 425 + this.iframeHeight : this.clientHeight - 425
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  methods: {
+    reportForm () {
+      let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyObj.level,
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+      };
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys: ['house_info'], categoryKey: 'house_info', paramMap
+        }
+      })
+    },
+    async loadTable (fromTree, treeObj) {
+      console.log(111, this.staffAgencyId)
+      // 是否显示补全一房一码信息按钮
+      this.roleList = localStorage.getItem('roleList')
+      if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) {
+        this.showYhymInfo = true
+      } else {
+        this.showYhymInfo = false
+      }
+      this.tableLoading = true
+      if (fromTree) {
+        this.agencyObj = treeObj
+        if (this.agencyObj.level === 'community') {//只有社区和网格显示操作按钮
+          if (this.agencyObj.id === this.staffAgencyId) {//如果所选树的组织id和登录人员id相同，有权限
+            this.showImportBtn = true
+          } else {
+            this.showImportBtn = false
+          }
+        } else if (this.agencyObj.level === 'grid') {//网格下
+          if (this.agencyObj.pid === this.staffAgencyId) {//如果所选树的父级组织id和登录人员id相同，有权限
+            this.showImportBtn = true
+          } else {
+            this.showImportBtn = false
+          }
+        } else {
+          this.showImportBtn = false
+        }
+      }
+
+      const url = "/gov/org/neighborhood/neighborhoodlist"
+
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+
+        level: this.agencyObj.level,
+        id: this.agencyObj.id
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.validTableDataNum = 0
+        this.total = data.total
+        data.list.forEach(item => {
+          if (item.agencyId === this.staffAgencyId) {
+            item.showBtn = true
+            this.validTableDataNum++
+          } else {
+            item.showBtn = false
+          }
+
+        });
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    checkSelect (row, index) {
+      let isChecked = false;
+      if (row.showBtn) { // 判断里面是否存在某个参数
+        isChecked = true
+      } else {
+        isChecked = false
+      }
+      return isChecked
+    },
+
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    async handleDetail (row) {
+      // this.formTitle = '小区详情'
+      // this.formShow = true
+      // const _data = await this.detail(row)
+      // this.$nextTick(() => {
+      //   this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
+      // })
+
+      this.detailShow = true
+
+      const _data = await this.detail(row)
+
+      this.$nextTick(() => {
+        this.$refs.ref_form_detail.initForm(_data)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增小区'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyObj)
+      })
+    },
+    async detail (row) {
+      const url = "/gov/org/houseInformation/neighborhoodDetail/" + row.neighborHoodId
+
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        return data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    // 补全一房一码点击事件
+    async handleYhymInfo () {
+      this.yhymLoading = true
+      const url = "/gov/org/house/createBatchHouseCodeAndUrl"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.yhymLoading = false
+        this.$message({
+          type: "success",
+          message: "批量生成成功"
+        });
+      } else if (code > 8000) {
+        this.yhymLoading = false
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+      } else {
+        this.yhymLoading = false
+        this.$message.error(msg)
+      }
+    },
+    // 补全小程序一户一码
+    async createBatchNeiQrUrl () {
+      this.xcxmLoading = true
+      const url = "/gov/org/neighborhood/createBatchNeiQrUrl"
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.xcxmLoading = false
+        this.$message({
+          type: "success",
+          message: "批量生成成功"
+        });
+      } else if (code > 8000) {
+        this.xcxmLoading = false
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+      } else {
+        this.xcxmLoading = false
+        this.$message.error(msg)
+      }
+    },
+    async handleEdit (row) {
+      this.formTitle = '修改小区'
+      this.formShow = true
+      const _data = await this.detail(row)
+
+
+
+      this.$nextTick(() => {
+        console.log(_data)
+        if (_data.propertyList.length > 0) {
+          _data.propertyId = _data.propertyList[0].id
+        } else {
+          _data.propertyId = ''
+        }
+        this.$refs.ref_form.initForm('edit', _data, this.agencyObj)
+      })
+    },
+
+    handleToNextLevel (row) {
+      this.$emit('toNextLevel', row, 'community')
+    },
+
+    addFormCancle () {
+      this.formShow = false
+
+    },
+    detailFormCancle () {
+      this.$refs.ref_form_detail.diaDestroy()
+      this.detailShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
+      this.$emit('refreshTree')
+    },
+
+
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的小区?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteCommunityBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的小区')
+      }
+    },
+    selectAll (selection) {
+
+      this.selection = selection
+
+
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteCommunity(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+
+        });
+    },
+
+    async deleteCommunityBatch () {
+      let ids = []
+      console.log(this.selection)
+      this.selection.forEach(element => {
+
+        ids.push(element.neighborHoodId)
+      });
+
+      const url = "/gov/org/house/delete"
+
+      let params = {
+        type: 'neighborHood',
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else if (code > 8000) {
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0
+        })
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async deleteCommunity (row) {
+      const url = "/gov/org/neighborhood/neighborhooddel"
+
+      let params = {
+        neighborHoodId: row.neighborHoodId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+        this.$emit('refreshTree')
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async handleDownQr (row, type) {
+      let title = row.label + '二维码.png'
+      // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
+      const url = '/gov/org/agency/create-qrcode'
+      const _id = type == 'community' ? row.id : row.neighborHoodId
+      const params = {
+        id: _id,
+        type
+      }
+      await axios({
+        method: 'POST',
+        url: window.SITE_CONFIG['apiURL'] + url,
+        data: params,
+        responseType: 'blob'
+      }).then(res => {
+        console.log('res----1r', res)
+        if (res.data) {
+          // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          // console.log('filename', fileName)
+          this.download(res.data, title) //释放掉blob对象
+        } else this.$message.error('下载失败')
+        // this.download(res.data, '1.png')
+      })
+    },
+    // 导出按钮点击事件
+    handleExportOpen () {
+      this.dialogVisible = true
+    },
+    //导出表格 以前是导出 现在改成导出房屋数据
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—小区列表'
+
+      const url = "/gov/org/neighborhood/exportneighborhoodinfo"
+      let params = {
+
+        level: this.agencyObj.level,
+        id: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    handleClose (done) {
+      this.dialogVisible = false
+    },
+
+    // 下载文件
+    download (data, downFileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, downFileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      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 = downFileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleExportModule (type) {
+      let title = ''
+      let url = ""
+      if (type === 'community') {
+        title = '小区导入模板'
+        url = '/gov/org/neighborhood/exporttemplate'
+
+      } else if (type === 'building') {
+        title = '楼栋导入模板'
+        url = '/gov/org/building/exporttemplate'
+
+      } else if (type === 'room') {
+        title = '房间导入模板'
+        url = '/gov/org/house/exporttemplate'
+      }
+
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    //导出一户一档
+    handleExportYihuyidang () {
+      this.yihuyidangDisabled = true
+      let title = this.agencyObj.label
+      title = title + '-一户一档'
+      let url = "/gov/org/house/exportHouseUser"
+
+
+      let params = {
+        agencyId: '',
+        gridId: '',
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+      }
+
+      if (this.agencyObj.level === 'grid') {
+        params.gridId = this.agencyObj.id
+        params.agencyId = ''
+      } else {
+        params.gridId = ''
+        params.agencyId = this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+          this.yihuyidangDisabled = false
+        },
+        (rspMsg, data) => {
+          this.yihuyidangDisabled = false
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+
+    // 导出一房一码
+
+    handleExportYihuyima () {
+      this.exportBtn = true
+      this.yihuyimaDisabled = true
+      let title = this.agencyObj.label
+      title = title + '-一房一码'
+      let url = "/gov/org/house/downloadZip"
+
+
+      let params = {
+        level: this.agencyObj.level,
+        id: this.agencyObj.id
+      }
+
+
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.Zip')
+          this.exportBtn = false
+          this.yihuyimaDisabled = false
+        },
+        (rspMsg, data) => {
+          this.exportBtn = false
+          this.yihuyimaDisabled = false
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+
+
+    // 上传文件之前的钩子
+    beforeUpload (file, type) {
+      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
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+
+    async uploadFile (type) {
+
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+
+      //清空上传列表
+      let url = ''
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level === 'grid' ? 'grid' : 'agency');//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      if (type === 'community') {
+        this.importCommunityLoading = true
+        this.$refs['upload_community'].clearFiles()
+        url = '/gov/org/icneighborhood/neighborhoodimport'
+
+
+      } else if (type === 'building') {
+        this.$refs['upload_building'].clearFiles()
+        url = '/gov/org/building/buildingimport'
+        this.importBuildingLoading = true
+
+      } else if (type === 'room') {
+        this.$refs['upload_room'].clearFiles()
+        url = '/gov/org/house/houseimport'
+        this.importRoomLoading = true
+      }
+
+      window.app.ajax.post2(url, fileFormData,
+        (data, rspMsg) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          // this.showMessage(rspMsg)
+          if (type === 'community') {
+            this.importCommunityLoading = false
+
+          } else if (type === 'building') {
+            this.importBuildingLoading = false
+
+          } else if (type === 'room') {
+            this.importRoomLoading = false
+          }
+        },
+        (rspMsg, data) => {
+          if (type === 'community') {
+            this.importCommunityLoading = false
+
+          } else if (type === 'building') {
+            this.importBuildingLoading = false
+
+          } else if (type === 'room') {
+            this.importRoomLoading = false
+          }
+          // this.$message.error(rspMsg)
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    },
+
+    showMessage (msg) {
+      this.$alert(msg, '操作结果', {
+        confirmButtonText: '关闭',
+        callback: action => {
+          this.$emit('refreshTree')
+          this.loadTable()
+        }
+      });
+    },
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  watch: {
+    selection (val) {
+
+      if (val.length > 0) {
+        this.showDeletBtn = true
+      } else {
+        this.showDeletBtn = false
+      }
+    }
+  },
+  props: {
+    staffAgencyId: {
+      type: String,
+      default: '',
+    },
+    ownerName: {
+      type: String,
+      default: '',
+    },
+    ownerPhone: {
+      type: String,
+      default: '',
+    },
+    rentFlag: {
+      type: String,
+      default: '',
+    },
+    purpose: {
+      type: String,
+      default: '',
+    },
+    remark: {
+      type: String,
+      default: '',
+    },
+    updateStartDate: {
+      type: String,
+      default: '',
+    },
+    updateEndDate: {
+      type: String,
+      default: '',
+    },
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManage.scss";
+</style>
+
+<style >
+.el-message.is-closable .el-message__content {
+  line-height: 20px;
+}
+</style>
+
diff --git a/src/views/modules/base/communityYantai/roomDetail.vue b/src/views/modules/base/communityYantai/roomDetail.vue
new file mode 100644
index 000000000..f1b066107
--- /dev/null
+++ b/src/views/modules/base/communityYantai/roomDetail.vue
@@ -0,0 +1,303 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <div class="div_tuomin">
+        <el-button v-if="view_real_data"
+                   size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">所属楼栋：</span>
+            <span>{{ agencyObj.neighborHoodName }}-{{agencyObj.label}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">单元号：</span>
+            <span>{{ dataForm.unitName?dataForm.unitName:'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">门牌号：</span>
+            <span>{{ dataForm.doorName}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">房屋编码：</span>
+            <span>{{ dataForm.coding?dataForm.coding:'--'}}</span>
+          </div>
+          <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 class="info-prop">
+            <span class="info-title-2">房屋类型：</span>
+            <span>{{dataForm.houseTypeName?dataForm.houseTypeName:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">房屋用途：</span>
+            <span>{{dataForm.purposeName?dataForm.purposeName:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">房屋状态：</span>
+            <span>{{dataForm.rentName?dataForm.rentName:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">房主姓名：</span>
+            <span>{{dataForm.ownerName?dataForm.ownerName:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">联系方式：</span>
+            <span>{{dataForm.showOwnerPhone?dataForm.showOwnerPhone:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">房主身份证：</span>
+            <span>{{dataForm.showOwnerIdCard?dataForm.showOwnerIdCard:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">备注：</span>
+            <span>{{dataForm.remark?dataForm.remark:'--' }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</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 () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      initLoading: 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: ''
+      },
+
+      keyWords: '',
+      agencyObj: {},
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+    handleCancle () {
+      // this.diaDestroy()
+      this.$emit('diaDetailClose')
+
+    },
+    diaDestroy () {
+      if (map) {
+        map.destroy()
+      }
+    },
+    async initForm (row, agencyObj) {
+
+
+      //  this.dataForm = JSON.parse(JSON.stringify(row))
+      this.agencyObj = agencyObj
+      this.houseId = row.houseId
+      await this.loadHouseInfo()
+      this.initLoading = true
+
+
+
+
+      // this.$refs.ref_form.resetFields();
+      // this.agencyObj = agencyObj
+      // this.formType = type
+      // console.log('agencyObj-----', agencyObj)
+      // if (row) {
+
+      //   this.houseId = row.houseId
+      //   await this.loadHouseInfo()
+
+
+      // } else {
+
+      //   this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+      //   this.dataForm.buildingId = this.agencyObj.id
+      // }
+
+
+      // await this.loadUnitList()
+
+    },
+
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.houseId,
+        type: "checkHouse",
+      });
+
+      if (code === 0) {
+        this.$set(this.dataForm, 'showOwnerPhone', data.mobile)
+        this.$set(this.dataForm, 'showOwnerIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
+    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)
+      }
+
+    },
+
+
+    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: {
+    dataRule () {
+      return {
+        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: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
+</style>
diff --git a/src/views/modules/base/communityYantai/roomForm.vue b/src/views/modules/base/communityYantai/roomForm.vue
new file mode 100644
index 000000000..496095faa
--- /dev/null
+++ b/src/views/modules/base/communityYantai/roomForm.vue
@@ -0,0 +1,473 @@
+<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="单元号"
+                      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">
+          <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="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="房屋用途"
+                      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 class="item_width_1"
+                    maxlength="30"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </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 () {
+    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: ''
+      },
+
+      keyWords: '',
+      agencyObj: {},
+
+    }
+  },
+  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: {
+    dataRule () {
+      return {
+        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: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ],
+      }
+    },
+
+  },
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+}
+</style>
diff --git a/src/views/modules/base/communityYantai/roomTable.vue b/src/views/modules/base/communityYantai/roomTable.vue
new file mode 100644
index 000000000..a03e289c7
--- /dev/null
+++ b/src/views/modules/base/communityYantai/roomTable.vue
@@ -0,0 +1,987 @@
+<template>
+  <div>
+    <div class="div_btn">
+      <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
+                 v-show="btnAuths.ic_house_add"
+                 style="float: left"
+                 class="diy-button--add"
+                 size="small"
+                 @click="handleAdd">新增房屋</el-button>
+      <div class="btn_upload"
+           v-if="showImportBtn">
+        <el-button :headers="$getElUploadHeaders()"
+                   v-if="btnAuths.ic_house_import"
+                   style="float: left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载房屋模板</el-button>
+        <el-upload ref="upload"
+                   v-if="btnAuths.ic_house_import"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--delete">导入房屋数据</el-button>
+        </el-upload>
+      </div>
+      <el-button style="float: left; margin-left: 10px"
+                 v-if="btnAuths.ic_house_export"
+                 class="diy-button--reset"
+                 size="small"
+                 @click="handleExport">导出</el-button>
+      <el-button style="float: left; margin-left: 10px"
+                 v-if="btnAuths.ic_house_batch_del"
+                 class="diy-button--more"
+                 size="small"
+                 @click="deleteBatch">批量删除</el-button>
+      <el-button style="margin-left: 10px"
+                 v-if="btnAuths.ic_house_export_yhyd"
+                 class="diy-button--export"
+                 size="small"
+                 :disabled="yihuyidangDisabled"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+      <el-button size="small"
+                 class="diy-button--add"
+                 v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn"
+                 @click="reportForm">智能填报</el-button>
+    </div>
+
+    <div class="div_table_item">
+      <el-table ref="ref_table"
+                :data="tableData"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                v-loading="tableLoading"
+                @sort-change="handleSortOrderChange"
+                border
+                :height="tableHeight"
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55">
+        </el-table-column>
+        <el-table-column fixed="left"
+                         width="55"
+                         type="index"
+                         label="序号"
+                         :index="indexMethod">
+        </el-table-column>
+
+        <el-table-column prop="houseNameShow"
+                         label="房屋名称"
+                         fixed="left"
+                         min-width="160">
+        </el-table-column>
+        <el-table-column prop="neighborHoodName"
+                         label="所属小区"
+                         min-width="150">
+        </el-table-column>
+        <el-table-column prop="buildingName"
+                         label="所属楼栋"
+                         width="80">
+        </el-table-column>
+        <el-table-column prop="unitNum"
+                         label="单元号"
+                         width="70">
+        </el-table-column>
+        <el-table-column prop="doorName"
+                         label="门牌号"
+                         width="70">
+        </el-table-column>
+        <el-table-column prop="houseType"
+                         label="类型"
+                         width="50">
+        </el-table-column>
+        <el-table-column prop="purpose"
+                         label="用途"
+                         width="50">
+        </el-table-column>
+        <el-table-column prop="rentFlag"
+                         label="房屋状态"
+                         width="80">
+        </el-table-column>
+        <el-table-column prop="ownerName"
+                         label="房主姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="ownerPhone"
+                         label="联系方式"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="ownerIdCard"
+                         label="身份证"
+                         width="170">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         label="备注"
+                         width="170">
+        </el-table-column>
+
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="140"
+                         label="排序">
+          <template slot-scope="scope">
+            <div @click="handleEditSort(scope.row)">
+              <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
+              <el-input-number v-else
+                               @change="handleChangeSort(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :precision="2"
+                               size="small"
+                               :min="0"
+                               :max="9999"
+                               label="描述文字"></el-input-number>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       v-if="btnAuths.ic_house_view"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button v-if="btnAuths.ic_house_update && scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="btnAuths.ic_house_del && scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <room-form ref="ref_form"
+                 :view_real_data="btnAuths.ic_house_view_real_data"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></room-form>
+    </el-dialog>
+
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'查看房屋'"
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="detailFormCancle">
+      <room-detail ref="ref_form_detail"
+                   :view_real_data="btnAuths.ic_house_view_real_data"
+                   @diaDetailClose="detailFormCancle"></room-detail>
+    </el-dialog>
+
+    <baobiao ref="baobiao" />
+  </div>
+</template>
+
+<script>
+import roomForm from "./roomForm";
+import roomDetail from "./roomDetail";
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import baobiao from "@/views/modules/cpts/baobiao";
+
+let loading; // 加载动画
+export default {
+  data () {
+    return {
+      source: "tree", //来源
+      importRoomLoading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      sortType: "asc", //asc：正，desc：倒
+      tableLoading: true,
+
+      // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
+
+      agencyObj: {}, //树所选的小区对象
+      agencyLevel: "", //树对应的level， grid neighborHood building agency
+
+      validTableDataNum: 0, //有效的数据数量，即有权限操作的数据数量
+      selection: [],
+      showDeletBtn: false,
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: "新增房屋",
+      detailShow: false,
+
+      rentList: [
+        {
+          value: "1",
+          label: "出租",
+        },
+        {
+          value: "2",
+          label: "闲置",
+        },
+        {
+          value: "0",
+          label: "自住",
+        },
+      ],
+
+      yihuyidangDisabled: false,
+
+      displayedBaobiaoBtn: false,
+
+      btnAuths: {
+        ic_house_add: false, //新增
+        ic_house_import: false, //导入
+        ic_house_export: false, //导出
+        ic_house_batch_del: false, //批量删除
+        ic_house_export_yhyd: false, //导出一户一档
+        ic_house_smart_import: false, //智能填表
+        ic_house_del: false, //删除
+        ic_house_view: false, //查看
+        ic_house_update: false, //修改
+        ic_house_view_real_data: false, //显示脱敏信息
+      },
+    };
+  },
+  components: {
+    baobiao,
+    roomForm,
+    roomDetail,
+  },
+  async mounted () {
+    this.updateBtnAuths();
+
+    console.log(this.buildingId)
+
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ["house_info"],
+        categoryKey: "house_info",
+      },
+    });
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 425 + this.iframeHeight
+        : this.clientHeight - 425;
+    },
+
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
+    reportForm () {
+      let paramMap = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyLevel,
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
+      };
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys: ["house_info"],
+          categoryKey: "house_info",
+          paramMap,
+        },
+      });
+    },
+
+    indexMethod (index) {
+      return index + 1;
+    },
+    handleSortOrderChange (value) {
+      this.sortType = value.order === "ascending" ? "asc" : "desc";
+      this.loadTable();
+    },
+    handleSortChange (value) {
+      this.sortType = value.order === "ascending" ? "asc" : "desc";
+      this.loadTable();
+    },
+
+    handleEditSort (row) {
+      if (!row.isChange) {
+        row.isChange = true;
+      }
+    },
+
+    async handleChangeSort (row, index) {
+      // row.isChange = false
+
+      let params = {
+        id: row.houseId,
+        sort: row.sort,
+        type: "house",
+      };
+
+      let url = "/gov/org/house/update-sort";
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        // this.$message({
+        //   type: 'success',
+        //   message: '修改成功'
+        // })
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    checkSelect (row, index) {
+      let isChecked = false;
+      if (row.showBtn) {
+        // 判断里面是否存在某个参数
+        isChecked = true;
+      } else {
+        isChecked = false;
+      }
+      return isChecked;
+    },
+
+    loadTreeFromSearch () { },
+
+    async loadTable (source, treeObj) {
+      this.source = source;
+      this.tableLoading = true;
+
+      if (source === "tree") {
+        //来源于tree，查询数据清空
+        this.sortType = "asc";
+        this.agencyObj = treeObj;
+      } else if (source === "search") {
+        //来源于查询
+        this.agencyObj = treeObj;
+      }
+
+      if (this.agencyObj.level === "grid") {
+        this.agencyLevel = "grid";
+      } else if (this.agencyObj.level === "neighborHood") {
+        this.agencyLevel = "neighborHood";
+      } else if (this.agencyObj.level === "building") {
+        this.agencyLevel = "building";
+      } else {
+        this.agencyLevel = "agency";
+      }
+
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        level: this.agencyLevel,
+        id: this.agencyObj.id,
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        sortType: this.sortType,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+        // neighborHoodId: this.neighborHoodId,
+        // buildingId: this.buildingId,
+        // buildingUnitId: this.buildingUnitId,
+        // houseId: this.houseId,
+        orgType: this.orgType,
+        orgId: this.orgId,
+      };
+
+      const url = "/gov/org/house/houselist";
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.total = data.total;
+        this.validTableDataNum = 0;
+        data.list.forEach((item) => {
+          item.sort = parseInt(item.sort) || 0;
+          item.sort = item.sort.toFixed(2);
+          item.isChange = false;
+          item.houseNameShow =
+            item.neighborHoodName +
+            item.buildingName +
+            item.unitNum +
+            item.doorName;
+
+          if (item.agencyId === this.staffAgencyId) {
+            item.showBtn = true;
+            this.validTableDataNum++;
+          } else {
+            item.showBtn = false;
+          }
+        });
+        this.tableData = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+      this.tableLoading = false;
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData();
+      this.formShow = false;
+    },
+
+    handleDetail (row) {
+      // this.formTitle = "房屋详情";
+      // this.formShow = true;
+      // this.$nextTick(() => {
+      //   this.$refs.ref_form.initForm("detail", row, this.agencyObj);
+      // });
+
+      this.detailShow = true;
+
+      // const _data = await this.detail(row)
+      this.$nextTick(() => {
+        this.$refs.ref_form_detail.initForm(row, this.agencyObj);
+      });
+    },
+
+    detailFormCancle () {
+      // this.$refs.ref_form_detail.diaDestroy()
+      this.detailShow = false;
+    },
+
+    handleAdd () {
+      this.formTitle = "新增房屋";
+      this.formShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm("add", null, this.agencyObj);
+      });
+    },
+
+    handleEdit (row) {
+      this.formTitle = "修改房屋";
+      this.formShow = true;
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm("edit", row, this.agencyObj);
+      });
+    },
+
+    addFormCancle () {
+      this.formShow = false;
+    },
+    addFormOk () {
+      this.formShow = false;
+      this.loadTable();
+    },
+
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("确认删除选择的房屋?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.deleteCommunityBatch();
+          })
+          .catch((err) => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+          });
+      } else {
+        this.$message.warning("请先选择要删除的房屋");
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection;
+    },
+    selectionChange (selection) {
+      this.selection = selection;
+    },
+
+    async handleDelete (row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.deleteRoom(row);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
+        });
+    },
+
+    async deleteCommunityBatch () {
+      let ids = [];
+      this.selection.forEach((element) => {
+        ids.push(element.houseId);
+      });
+
+      const url = "/gov/org/house/delete";
+
+      let params = {
+        type: "house",
+        ids: ids,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功",
+        });
+        this.$emit("refreshTree");
+        this.loadTable();
+      } else if (code > 8000) {
+        this.$message({
+          showClose: true,
+          message: msg,
+          duration: 0,
+        });
+        this.$emit("refreshTree");
+        this.loadTable();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async deleteRoom (row) {
+      const url = "/gov/org/house/housedel";
+
+      let params = {
+        houseId: row.houseId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功",
+        });
+        this.$emit("refreshTree");
+        this.loadTable();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label;
+      title = title + "—房屋列表";
+
+      const url = "/gov/org/house/exporthouseinfo";
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+        buildingId: this.agencyObj.id,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
+      };
+
+      if (this.agencyObj.level === "grid") {
+        params.gridId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.neighborHoodId = "";
+      } else if (this.agencyObj.level === "neighborHood") {
+        params.neighborHoodId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.gridId = "";
+      } else if (this.agencyObj.level === "building") {
+        params.buildingId = this.agencyObj.id;
+        params.agencyId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
+      } else {
+        params.agencyId = this.agencyObj.id;
+        params.buildingId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xls");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return;
+      }
+
+      var csvData = new Blob([data]);
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      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 () {
+      let title = "";
+      title = "房屋模板";
+
+      const url = "/gov/org/house/exporttemplate";
+      let params = {};
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xls");
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    //导出一户一档
+    handleExportYihuyidang () {
+      this.yihuyidangDisabled = true;
+      let title = this.agencyObj.label;
+      title = title + "-一户一档";
+      let url = "/gov/org/house/exportHouseUser";
+
+      let params = {
+        agencyId: "",
+        gridId: "",
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        rentFlag: this.rentFlag,
+        purpose: this.purpose,
+        remark: this.remark,
+        updateStartDate: this.updateStartDate,
+        updateEndDate: this.updateEndDate,
+        neighborHoodId: this.neighborHoodId,
+        buildingId: this.buildingId,
+        buildingUnitId: this.buildingUnitId,
+        houseId: this.houseId,
+        buildingId: "",
+        neighborHoodId: "",
+      };
+
+      if (this.agencyObj.level === "grid") {
+        params.gridId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.neighborHoodId = "";
+      } else if (this.agencyObj.level === "neighborHood") {
+        params.neighborHoodId = this.agencyObj.id;
+        params.agencyId = "";
+        params.buildingId = "";
+        params.gridId = "";
+      } else if (this.agencyObj.level === "building") {
+        params.buildingId = this.agencyObj.id;
+        params.agencyId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
+      } else {
+        params.agencyId = this.agencyObj.id;
+        params.buildingId = "";
+        params.neighborHoodId = "";
+        params.gridId = "";
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+          this.download(data, title + ".xls");
+          this.yihuyidangDisabled = false;
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+          this.yihuyidangDisabled = false;
+        }
+      );
+    },
+    // 上传文件之前的钩子
+    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("请选择正确格式的文件");
+        return false;
+      } else {
+        this.fileName = file.name;
+        return true;
+      }
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning("请选择要上传的文件！");
+        return false;
+      }
+
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+
+      //清空上传列表
+      this.$refs["upload"].clearFiles();
+
+      var url = "/gov/org/house/houseimport";
+
+      let fileFormData = new FormData();
+      fileFormData.append("file", this.files); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("orgId", this.agencyObj.id); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append("orgType", this.agencyObj.level); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      this.importRoomLoading = true;
+      window.app.ajax.post2(
+        url,
+        fileFormData,
+        (data, rspMsg) => {
+          if (data.code === 0 && data.msg == "success") {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit("refreshTree");
+          this.loadTable();
+          this.importRoomLoading = false;
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false;
+        },
+        { headers: { "Content-Type": "multipart/form-data" } }
+      );
+    },
+
+    showMessage (msg) {
+      this.$alert(msg, "操作结果", {
+        confirmButtonText: "关闭",
+        callback: (action) => {
+          this.$emit("refreshTree");
+          this.loadTable();
+        },
+      });
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  watch: {
+    selection (val) {
+      if (val.length > 0) {
+        this.showDeletBtn = true;
+      } else {
+        this.showDeletBtn = false;
+      }
+    },
+  },
+  props: {
+    staffAgencyId: {
+      type: String,
+      default: "",
+    },
+    showImportBtn: {
+      type: Boolean,
+      default: false,
+    },
+    ownerName: {
+      type: String,
+      default: "",
+    },
+    ownerPhone: {
+      type: String,
+      default: "",
+    },
+    rentFlag: {
+      type: String,
+      default: "",
+    },
+    purpose: {
+      type: String,
+      default: "",
+    },
+    remark: {
+      type: String,
+      default: "",
+    },
+    updateStartDate: {
+      type: String,
+      default: "",
+    },
+    updateEndDate: {
+      type: String,
+      default: "",
+    },
+    neighborHoodId: {
+      type: String,
+      default: "",
+    },
+    buildingId: {
+      type: String,
+      default: "",
+    },
+    buildingUnitId: {
+      type: String,
+      default: "",
+    },
+    houseId: {
+      type: String,
+      default: "",
+    },
+    orgType: {
+      type: String,
+      default: "",
+    },
+    orgId: {
+      type: String,
+      default: "",
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManage.scss";
+
+.item_width_4 {
+  width: 120px;
+}
+
+/deep/.el-input-number--medium .el-input-number__decrease,
+/deep/.el-input-number--medium .el-input-number__increase {
+  width: 26px;
+}
+/deep/.el-input-number--medium .el-input__inner {
+  padding-left: 0px;
+  padding-right: 0px;
+}
+</style>
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 22eef0ace..0de31f867 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -292,6 +292,7 @@
                :close-on-press-escape="false"
                :title="formTitle"
                width="1150px"
+               :z-index="2000"
                top="5vh"
                class="dialog-h"
                @closed="handleCnalceForm">
@@ -862,7 +863,7 @@ export default {
       let params = {
         id
       }
-
+      // this.$message.error('111')
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 63d9fb32e..750e0087c 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -223,6 +223,7 @@
                            :form-info="item.formInfo && item.formInfo"
                            :support-add="item.supportAdd"
                            :form-id="item.columnName"
+                           :labelWidth="'160px'"
                            :form-list="item.itemList" />
               </el-tab-pane>
             </el-tabs>
@@ -275,7 +276,7 @@
                            :muti-list="item.mutiList"
                            :form-list="item.itemList"
                            :disabled="disabled"
-                           :label-width="'140px'"
+                           :labelWidth="'140px'"
                            :agency-id="editAgencyId" />
               </el-tab-pane>
             </el-tabs>
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
index 3c122790b..bbc79ac31 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addActivity.vue
@@ -149,7 +149,8 @@
                       label="附件"
                       label-width="150px"
                       prop="attach">
-          <el-upload :headers="$getElUploadHeaders()"  class="upload-demo"
+          <el-upload :headers="$getElUploadHeaders()"
+                     class="upload-demo"
                      :action="uploadUlr"
                      accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
                      :on-success="handleFileSuccess"
@@ -170,14 +171,14 @@
 
     </div>
 
-    <div class="div_btn">
+    <!-- <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> -->
   </div>
 </template>
 
@@ -585,10 +586,10 @@ export default {
       }
     },
 
-    
-    handlePreview(src) {
+
+    handlePreview (src) {
       console.log(src)
-      if(src){
+      if (src) {
         window.open(src);
       }
     },
diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index fdf967767..df60972ef 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -1,229 +1,304 @@
 <template>
   <div>
-    <div class="dialog-h-content scroll-h"
-         :class="{ 'visiual-form': source === 'visiual' }">
-      <el-form v-if="formType === 'add'"
-               ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               class="div_form">
-        <el-form-item label="服务分类"
-                      prop="serviceCategoryKey"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-select v-model="formData.serviceCategoryKey"
-                     class="item_width_1"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in categrayOptions"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+    <div
+      class="dialog-h-content scroll-h"
+      :class="{ 'visiual-form': source === 'visiual' }"
+    >
+      <el-form
+        v-if="formType === 'add'"
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
+      >
+        <el-form-item
+          label="服务分类"
+          prop="serviceCategoryKey"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.serviceCategoryKey"
+            class="item_width_1"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in categrayOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="服务名称"
-                      prop="serviceName"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入服务名称"
-                    v-model="formData.serviceName">
+        <el-form-item
+          label="服务名称"
+          prop="serviceName"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入服务名称"
+            v-model="formData.serviceName"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="服务组织"
-                      prop="serviceOrgId"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-select v-model="formData.serviceOrgType"
-                     class="input-width-small"
-                     placeholder="请选择"
-                     clearable
-                     @change="handleServiceChange('add', $event)">
-            <el-option v-for="item in serviceOptions"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item
+          label="服务组织"
+          prop="serviceOrgId"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.serviceOrgType"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+            @change="handleServiceChange('add', $event)"
+          >
+            <el-option
+              v-for="item in serviceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
           -
-          <el-select v-model="formData.serviceOrgId"
-                     class="input-width-middle"
-                     filterable
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in serviceOptiondList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model="formData.serviceOrgId"
+            class="input-width-middle"
+            filterable
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceOptiondList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="服务范围"
-                      prop="objList"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-cascader class="item_width_1"
-                       ref="myCascader"
-                       v-model="scopeIdArray"
-                       :key="iscascaderShow"
-                       :options="casOptions"
-                       :props="optionProps"
-                       :show-all-levels="false"
-                       @change="handleChangeScope"></el-cascader>
+        <el-form-item
+          label="服务范围"
+          prop="objList"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-cascader
+            class="item_width_1"
+            ref="myCascader"
+            v-model="scopeIdArray"
+            :key="iscascaderShow"
+            :options="casOptions"
+            :props="optionProps"
+            :show-all-levels="false"
+            @change="handleChangeScope"
+          ></el-cascader>
         </el-form-item>
 
-        <el-form-item label="政策依据"
-                      prop="policyId"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-select v-model="formData.policyId"
-                     class="input-width-small"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in policyList"
-                       :key="item.policyId"
-                       :label="item.title"
-                       :value="item.policyId">
+        <el-form-item
+          label="政策依据"
+          prop="policyId"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-select
+            v-model="formData.policyId"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in policyList"
+              :key="item.policyId"
+              :label="item.title"
+              :value="item.policyId"
+            >
             </el-option>
           </el-select>
 
-          <el-button style="margin-left: 10px"
-                     type="primary"
-                     size="small"
-                     @click="handlePersonList">预览</el-button>
+          <el-button
+            style="margin-left: 10px"
+            type="primary"
+            size="small"
+            @click="handlePersonList"
+            >预览</el-button
+          >
         </el-form-item>
 
-        <el-form-item label="经办人"
-                      prop="principalName"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人姓名"
-                    v-model="formData.principalName">
+        <el-form-item
+          label="经办人"
+          prop="principalName"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入联系人姓名"
+            v-model="formData.principalName"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="联系方式"
-                      prop="principalContact"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入联系人电话"
-                    v-model="formData.principalContact">
+        <el-form-item
+          label="联系方式"
+          prop="principalContact"
+          :class="{ 'form-item': source === 'visiual' }"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入联系人电话"
+            v-model="formData.principalContact"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="服务时间"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      prop="serviceTimeStart">
-          <el-date-picker v-model="formData.serviceTimeStart"
-                          :picker-options="startPickerOptions"
-                          class="item_width_2"
-                          style="width: 220px"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          value="yyyy-MM-dd"
-                          placeholder="开始时间">
+        <el-form-item
+          label="服务时间"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          prop="serviceTimeStart"
+        >
+          <el-date-picker
+            v-model="formData.serviceTimeStart"
+            :picker-options="startPickerOptions"
+            class="item_width_2"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
           </el-date-picker>
           <span class="data-tag">至</span>
-          <el-date-picker v-model="formData.serviceTimeEnd"
-                          :picker-options="endPickerOptions"
-                          class="item_width_2 data-tag"
-                          style="width: 220px"
-                          type="date"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          value="yyyy-MM-dd"
-                          placeholder="结束时间">
+          <el-date-picker
+            v-model="formData.serviceTimeEnd"
+            :picker-options="endPickerOptions"
+            class="item_width_2 data-tag"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过1000字"
-                    v-model="formData.remark"></el-input>
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过1000字"
+            v-model="formData.remark"
+          ></el-input>
         </el-form-item>
-        <el-form-item label="直接反馈"
-                      prop="remark"
-                      label-width="150px"
-                      :class="{ 'form-item': source === 'visiual' }"
-                      style="display: block">
-          <el-checkbox :label="'是'"
-                       v-model="showFeedback"
-                       @change="handleChangeFeedback"></el-checkbox>
+        <el-form-item
+          label="直接反馈"
+          prop="remark"
+          label-width="150px"
+          :class="{ 'form-item': source === 'visiual' }"
+          style="display: block"
+        >
+          <el-checkbox
+            :label="'是'"
+            v-model="showFeedback"
+            @change="handleChangeFeedback"
+          ></el-checkbox>
         </el-form-item>
       </el-form>
       <div v-show="formType === 'feedback' || showFeedback">
         <!-- <h3 class="d-h3">反馈内容</h3> -->
 
-        <el-form ref="ref_form_feedback"
-                 :inline="true"
-                 :model="feedbackFormData"
-                 :rules="feedbackDataRule"
-                 class="div_form">
-          <el-form-item label="服务目标"
-                        prop="serviceGoal"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务目标，不超过1000字"
-                      v-model="feedbackFormData.serviceGoal"></el-input>
+        <el-form
+          ref="ref_form_feedback"
+          :inline="true"
+          :model="feedbackFormData"
+          :rules="feedbackDataRule"
+          class="div_form"
+        >
+          <el-form-item
+            label="服务目标"
+            prop="serviceGoal"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              type="textarea"
+              maxlength="1000"
+              show-word-limit
+              :rows="3"
+              placeholder="请输入服务目标，不超过1000字"
+              v-model="feedbackFormData.serviceGoal"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="服务效果"
-                        prop="serviceEffect"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      type="textarea"
-                      maxlength="1000"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入服务效果，不超过1000字"
-                      v-model="feedbackFormData.serviceEffect"></el-input>
+          <el-form-item
+            label="服务效果"
+            prop="serviceEffect"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              type="textarea"
+              maxlength="1000"
+              show-word-limit
+              :rows="3"
+              placeholder="请输入服务效果，不超过1000字"
+              v-model="feedbackFormData.serviceEffect"
+            ></el-input>
           </el-form-item>
 
-          <el-form-item label="服务人数"
-                        style="display: block"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        prop="servicePeopleNumber"
-                        label-width="150px">
-            <el-input-number class="item_width_2"
-                             v-model="feedbackFormData.servicePeopleNumber"
-                             :min="0"
-                             :max="9999"
-                             label="服务人数"></el-input-number>
+          <el-form-item
+            label="服务人数"
+            style="display: block"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="servicePeopleNumber"
+            label-width="150px"
+          >
+            <el-input-number
+              class="item_width_2"
+              v-model="feedbackFormData.servicePeopleNumber"
+              :min="0"
+              :max="9999"
+              label="服务人数"
+            ></el-input-number>
           </el-form-item>
 
-          <el-form-item label="服务状态"
-                        style="display: block"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        prop="serviceStatus">
+          <el-form-item
+            label="服务状态"
+            style="display: block"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="serviceStatus"
+          >
             <span>已完成</span>
             <!-- <el-select class="item_width_1"
                        v-model="feedbackFormData.serviceStatus"
@@ -236,71 +311,93 @@
               </el-option>
             </el-select> -->
           </el-form-item>
-          <el-form-item label="满意度"
-                        style="display: block"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        prop="satisfaction">
-            <el-select class="item_width_2"
-                       v-model="feedbackFormData.satisfaction"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in satisfyArray"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <el-form-item
+            label="满意度"
+            style="display: block"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            prop="satisfaction"
+          >
+            <el-select
+              class="item_width_2"
+              v-model="feedbackFormData.satisfaction"
+              placeholder="全部"
+              clearable
+            >
+              <el-option
+                v-for="item in satisfyArray"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="地址"
-                        prop="address"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      v-model="feedbackFormData.address"></el-input>
+          <el-form-item
+            label="地址"
+            prop="address"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            style="display: block"
+          >
+            <el-input
+              class="item_width_1"
+              v-model="feedbackFormData.address"
+            ></el-input>
           </el-form-item>
-          <el-form-item label="地图位置"
-                        label-width="150px"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        style="display: block">
+          <el-form-item
+            label="地图位置"
+            label-width="150px"
+            :class="{ 'form-item': source === 'visiual' }"
+            style="display: block"
+          >
             <div style="width: 500px">
               <div class="div_map">
                 <div id="map_app"></div>
                 <div class="div_searchmap">
-                  <el-input maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
+                  <el-input
+                    maxlength="50"
+                    placeholder="请输入关键字"
+                    v-model="keyWords"
+                  >
                   </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
+                  <el-button
+                    style="margin-left: 10px"
+                    type="primary"
+                    size="mini"
+                    @click="handleSearchMap"
+                    >查询</el-button
+                  >
                 </div>
               </div>
             </div>
           </el-form-item>
 
-          <el-form-item class="block"
-                        label="附件"
-                        :class="{ 'form-item': source === 'visiual' }"
-                        label-width="150px"
-                        prop="attach">
-            <el-upload :headers="$getElUploadHeaders()"
-                       class="upload-demo"
-                       :action="uploadUlr"
-                       accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                       :on-success="handleFileSuccess"
-                       :on-remove="handleFileRemove"
-                       :limit="3"
-                       :before-upload="beforeUpload"
-                       :file-list="fileList">
-              <el-button size="small"
-                         :disabled="fileList.length === 3"
-                         type="primary">点击上传</el-button>
-              <div slot="tip"
-                   class="el-upload__tip">支持图片、word、pdf</div>
+          <el-form-item
+            class="block"
+            label="附件"
+            :class="{ 'form-item': source === 'visiual' }"
+            label-width="150px"
+            prop="attach"
+          >
+            <el-upload
+              :headers="$getElUploadHeaders()"
+              class="upload-demo"
+              :action="uploadUlr"
+              accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+              :on-success="handleFileSuccess"
+              :on-remove="handleFileRemove"
+              :limit="3"
+              :before-upload="beforeUpload"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                :disabled="fileList.length === 3"
+                type="primary"
+                >点击上传</el-button
+              >
+              <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
             </el-upload>
           </el-form-item>
         </el-form>
@@ -308,29 +405,35 @@
     </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>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
 
-    <el-dialog v-if="showPersonList"
-               :visible.sync="showPersonList"
-               :append-to-body="true"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'政策预览'"
-               width="1150px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showPersonList = false">
-      <person-list ref="ref_detail_form"
-                   :policyId="policyId"
-                   :ruleList="ruleList"
-                   @handleOk="handleOk"
-                   @handleClose="handleClose">
+    <el-dialog
+      v-if="showPersonList"
+      :visible.sync="showPersonList"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'政策预览'"
+      width="1150px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showPersonList = false"
+    >
+      <person-list
+        ref="ref_detail_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      >
       </person-list>
     </el-dialog>
   </div>
@@ -342,14 +445,11 @@ import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import personList from "../policy/personList";
 import nextTick from "dai-js/tools/nextTick";
-
-var map;
-var search;
-var markers;
-var infoWindowList;
-var geocoder; // 新建一个正逆地址解析类
+import daiMap from "@/utils/dai-map";
 
 let loading; // 加载动画
+let map;
+
 export default {
   props: {
     defaultData: {
@@ -377,7 +477,7 @@ export default {
     },
     categrayArray: {
       type: Array,
-      default () {
+      default() {
         return [];
       },
     },
@@ -388,7 +488,7 @@ export default {
     },
   },
 
-  data () {
+  data() {
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();
@@ -501,7 +601,7 @@ export default {
   },
 
   computed: {
-    dataRule () {
+    dataRule() {
       return {
         serviceName: [
           { required: true, message: "服务名称不能为空", trigger: "change" },
@@ -518,7 +618,7 @@ export default {
         ],
       };
     },
-    feedbackDataRule () {
+    feedbackDataRule() {
       return {
         serviceGoal: [
           { required: true, message: "服务目标不能为空", trigger: "blur" },
@@ -552,7 +652,7 @@ export default {
 
   components: { personList },
 
-  async mounted () {
+  async mounted() {
     this.startLoading();
     // 都已经重置了，还放在prop里干嘛，我不理解
     this.categrayOptions = this.categrayArray;
@@ -560,7 +660,7 @@ export default {
     this.getCategrayList();
     this.getDictOptions();
     this.getPolicyList();
-    if (this.formType === 'feedback' || this.showFeedback) {
+    if (this.formType === "feedback" || this.showFeedback) {
       this.initMap();
       this.$refs.ref_form_feedback.resetFields();
     }
@@ -577,7 +677,7 @@ export default {
   },
 
   methods: {
-    async iniDefaultData () {
+    async iniDefaultData() {
       const { defaultData } = this;
       console.log("iniDefaultData3", defaultData);
       if (defaultData) {
@@ -598,7 +698,7 @@ export default {
     },
 
     //加载组织数据
-    async handlePersonList () {
+    async handlePersonList() {
       if (!this.formData.policyId) {
         this.$message.info("请先选择政策");
         return false;
@@ -610,7 +710,7 @@ export default {
       this.showPersonList = true;
     },
 
-    async loadRuleList () {
+    async loadRuleList() {
       const url = "/heart/policy/rulelist/" + this.policyId;
 
       let params = {};
@@ -624,14 +724,14 @@ export default {
       }
     },
 
-    handleClose () {
+    handleClose() {
       this.showPersonList = false;
     },
-    handleOk () {
+    handleOk() {
       this.showPersonList = false;
     },
 
-    async getPolicyList () {
+    async getPolicyList() {
       const url = "/heart/policy/policyListSelect";
 
       let params = {};
@@ -644,7 +744,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDictOptions () {
+    async getDictOptions() {
       this.$http
         .post("/sys/dict/data/dictlist", {
           dictType: "user_demand_service_type",
@@ -662,7 +762,7 @@ export default {
     },
 
     // 字典
-    async getCategrayList () {
+    async getCategrayList() {
       const url = "/sys/dict/data/dictlist";
 
       let params = {
@@ -677,14 +777,14 @@ export default {
         this.$message.error(msg);
       }
     },
-    handleServiceChange (type, val) {
+    handleServiceChange(type, val) {
       if (val === "social_org") {
         if (type === "add") this.getServiceuserList(val, "add_demand");
         else this.getServiceuserList(val, "query_demand");
       } else this.getServiceuserList(val, "");
     },
 
-    async getServiceuserList (serviceType, query) {
+    async getServiceuserList(serviceType, query) {
       if (!serviceType) return false;
 
       const params = {
@@ -705,7 +805,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleChangeFeedback (val) {
+    handleChangeFeedback(val) {
       this.showFeedback = val;
 
       if (this.firstInitMap) {
@@ -716,7 +816,7 @@ export default {
     },
 
     // 获取服务范围树
-    async loadScopeTree () {
+    async loadScopeTree() {
       const url = "/gov/org/icServiceProject/service/serviceScopeTree";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {};
@@ -733,7 +833,7 @@ export default {
       }
     },
 
-    handleChangeScope (value) {
+    handleChangeScope(value) {
       this.formData.objList = [];
       let selArray = this.$refs["myCascader"].getCheckedNodes();
       console.log("handleChangeScope", selArray);
@@ -743,8 +843,8 @@ export default {
             element.data.objectType === "grid"
               ? "grid"
               : element.data.objectType === "neighborhood"
-                ? "neighborhood"
-                : "agency",
+              ? "neighborhood"
+              : "agency",
           objectId: element.data.objectId,
           objectName: element.data.objectName,
         };
@@ -752,7 +852,7 @@ export default {
       });
     },
 
-    async handleComfirm () {
+    async handleComfirm() {
       if (this.formType === "add") {
         this.handleAdd();
       } else if (this.formType === "feedback") {
@@ -760,7 +860,7 @@ export default {
       }
     },
 
-    async handleAdd () {
+    async handleAdd() {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -794,7 +894,7 @@ export default {
       });
     },
 
-    async addFuwu () {
+    async addFuwu() {
       if (this.showFeedback) {
         this.feedbackFormData.fileList = [];
         this.feedbackFormData.fileList = [...this.fileList];
@@ -839,7 +939,7 @@ export default {
       }
     },
 
-    async handleFeedback () {
+    async handleFeedback() {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -855,7 +955,7 @@ export default {
       });
     },
 
-    async addFeecback () {
+    async addFeecback() {
       this.feedbackFormData.fileList = [];
       this.feedbackFormData.fileList = [...this.fileList];
       this.feedbackFormData.serviceRecordId = this.serviceRecordId;
@@ -880,7 +980,7 @@ export default {
       }
     },
 
-    beforeUpload (file) {
+    beforeUpload(file) {
       const array = file.name.split(".");
       const extension = array[array.length - 1];
 
@@ -906,7 +1006,7 @@ export default {
       }
     },
 
-    handleFileRemove (file) {
+    handleFileRemove(file) {
       if (file && file.status === "success") {
         this.fileList.splice(
           this.fileList.findIndex((item) => item.uid === file.uid),
@@ -915,7 +1015,7 @@ export default {
       }
     },
 
-    handleFileSuccess (res, file) {
+    handleFileSuccess(res, file) {
       if (res.code === 0 && res.msg === "success") {
         const array = file.name.split(".");
         const fileType = array[array.length - 1];
@@ -948,7 +1048,7 @@ export default {
     },
 
     //下载
-    handleFileDownload (file) {
+    handleFileDownload(file) {
       var a = document.createElement("a");
       var event = new MouseEvent("click");
       a.download = file.name;
@@ -956,137 +1056,61 @@ export default {
       a.href = file.url;
       a.dispatchEvent(event);
     },
-    handleCancle () {
+    handleCancle() {
       this.resetData();
       this.$emit("handleClose");
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
+    initMap() {
       let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
 
-
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      var center = new window.TMap.LatLng(latitude, longitude)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById("map_app"), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45, // 设置地图旋转角度
-      });
-
-      search = new window.TMap.service.Search({ pageSize: 10 });
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: [],
-      });
-      infoWindowList = Array(10);
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+      map = new daiMap(
+        document.getElementById("map_app"),
+        { latitude, longitude },
+        {
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
+        }
+      );
 
       // 监听地图平移结束
-      map.on("panend", () => {
-        this.handleMoveCenter();
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
       });
-      this.handleMoveCenter();
-      // this.convert();
 
-      this.firstInitMap = false;
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
     },
 
-    setMarker (lat, lng) {
-      markers.setGeometries([]);
-      markers.add([
-        {
-          id: "4",
-          styleId: "marker",
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: "marker4",
-          },
-        },
-      ]);
-    },
-
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close();
-      });
-      infoWindowList.length = 0;
-      markers.setGeometries([]);
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchNearby({
-          keyword: this.keyWords,
-          radius: 1000,
-          autoExtend: true,
-          center: map.getCenter(),
-        })
-        .then((result) => {
-          let { data } = result;
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng },
-            } = data[0];
-
-            map.setCenter(new TMap.LatLng(lat, lng));
-            this.setMarker(lat, lng);
-            this.feedbackFormData.latitude = lat;
-            this.feedbackFormData.longitude = lng;
-            this.convert();
-          } else {
-            this.$message.error("未检索到相关位置坐标");
-          }
-        });
-    },
-
-    handleMoveCenter () {
+    async handleMoveCenter() {
       //修改地图中心点
-      const center = map.getCenter();
-      const lat = center.getLat();
-      const lng = center.getLng();
+      const { lat, lng } = map.getCenter();
       this.feedbackFormData.latitude = lat;
       this.feedbackFormData.longitude = lng;
-      this.setMarker(lat, lng);
-      this.convert(lat, lng);
+      map.setMarker(lat, lng);
+
+      let { msg, data } = await map.getAddress(lat, lng);
+      if (msg == "success") {
+        this.feedbackFormData.address = data.address;
+      }
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location;
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
+    async handleSearchMap() {
+      const { msg, data } = await map.searchNearby(this.keyWords);
+      if (msg == "success") {
+        const { lat, lng } = data;
+        map.setCenter(lat, lng);
+        map.setMarker(lat, lng);
+        this.feedbackFormData.latitude = lat;
+        this.feedbackFormData.longitude = lng;
       } else {
-        location = new TMap.LatLng(
-          this.feedbackFormData.latitude,
-          this.feedbackFormData.longitude
-        );
+        this.$message.error("未检索到相关位置坐标");
       }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: "main", // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.feedbackFormData.address = result.result.address;
-          // 显示搜索到的地址
-        });
     },
 
-    resetData () {
+    resetData() {
       this.formData = {
         objList: [], //
         principalName: "", //经办人(责任人)姓名
@@ -1109,7 +1133,7 @@ export default {
       };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1117,7 +1141,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue
index eade139ad..a666746ca 100644
--- a/src/views/modules/communityService/fuwujilu/detailForm.vue
+++ b/src/views/modules/communityService/fuwujilu/detailForm.vue
@@ -1,511 +1,377 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <div v-if="initLoading"
-           class="m-row">
+      <div v-if="initLoading" class="m-row">
         <div class="m-info">
           <div class="info-prop">
             <span class="info-title-2">服务名称：</span>
-            <span>{{ formData.serviceName||'--'  }}</span>
+            <span>{{ formData.serviceName || "--" }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">服务组织：</span>
-            <span>{{ serviceOrgName||'--'  }}</span>
+            <span>{{ serviceOrgName || "--" }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">服务范围：</span>
-            <span>{{ formData.gridIdListName ||'--' }}</span>
+            <span>{{ formData.gridIdListName || "--" }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">政策依据：</span>
-            <span>{{ formData.policyTitle||'--'  }}</span>
-            <el-button v-if="formData.policyId"
-                       style="margin-left: 10px"
-                       type="primary"
-                       size="small"
-                       @click="handlePersonList">预览</el-button>
+            <span>{{ formData.policyTitle || "--" }}</span>
+            <el-button
+              v-if="formData.policyId"
+              style="margin-left: 10px"
+              type="primary"
+              size="small"
+              @click="handlePersonList"
+              >预览</el-button
+            >
           </div>
           <div class="info-prop">
             <span class="info-title-2">经办人：</span>
-            <span>{{ formData.principalName||'--'  }}</span>
+            <span>{{ formData.principalName || "--" }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">联系方式：</span>
-            <span>{{ formData.principalContact||'--' }}</span>
+            <span>{{ formData.principalContact || "--" }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">服务时间：</span>
-            <span>{{ formData.serviceTimeStart||'--' }}</span>至
-            <span>{{ formData.serviceTimeEnd||'--' }}</span>
+            <span>{{ formData.serviceTimeStart || "--" }}</span
+            >至
+            <span>{{ formData.serviceTimeEnd || "--" }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">备注：</span>
-            <span>{{ formData.remark||'--' }}</span>
+            <span>{{ formData.remark || "--" }}</span>
           </div>
 
-          <div v-show="formData.serviceStatus==='completed'">
+          <div v-show="formData.serviceStatus === 'completed'">
             <h3 class="d-h3">反馈内容</h3>
 
             <div class="info-prop">
               <span class="info-title-2">服务目标：</span>
-              <span>{{ feedbackFormData.serviceGoal||'--'  }}</span>
+              <span>{{ feedbackFormData.serviceGoal || "--" }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">服务效果：</span>
-              <span>{{ feedbackFormData.serviceEffect||'--'  }}</span>
+              <span>{{ feedbackFormData.serviceEffect || "--" }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">服务人数：</span>
-              <span>{{ feedbackFormData.servicePeopleNumber||0  }}</span>
+              <span>{{ feedbackFormData.servicePeopleNumber || 0 }}</span>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">服务状态：</span>
-              <span>{{ feedbackFormData.serviceStatusShow||'--'  }}</span>
+              <span>{{ feedbackFormData.serviceStatusShow || "--" }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">满意度：</span>
-              <span>{{ feedbackFormData.satisfactionShow||'--'  }}</span>
+              <span>{{ feedbackFormData.satisfactionShow || "--" }}</span>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">地理位置：</span>
-              <span>{{ feedbackFormData.address||'--'  }}</span>
+              <span>{{ feedbackFormData.address || "--" }}</span>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">地图位置：</span>
               <div class="div_map">
-
                 <div id="app_detail"></div>
-
               </div>
             </div>
 
             <div class="info-prop">
               <span class="info-title-2">附件：</span>
-              <file-list v-if="fileList.length>0"
-                         :fileList="fileList"></file-list>
+              <file-list
+                v-if="fileList.length > 0"
+                :fileList="fileList"
+              ></file-list>
               <span v-else>--</span>
-
             </div>
-
           </div>
-
         </div>
       </div>
-
     </div>
 
     <div class="div-btn">
-      <el-button size="small"
-                 @click="handleCancle">关 闭</el-button>
-
+      <el-button size="small" @click="handleCancle">关 闭</el-button>
     </div>
 
-    <el-dialog v-if="showPersonList"
-               :visible.sync="showPersonList"
-               :append-to-body="true"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'政策预览'"
-               width="1150px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showPersonList = false">
-      <person-list ref="ref_detail_form"
-                   :policyId="policyId"
-                   :ruleList="ruleList"
-                   @handleOk="handleOk"
-                   @handleClose="handleClose">
+    <el-dialog
+      v-if="showPersonList"
+      :visible.sync="showPersonList"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'政策预览'"
+      width="1150px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showPersonList = false"
+    >
+      <person-list
+        ref="ref_detail_form"
+        :policyId="policyId"
+        :ruleList="ruleList"
+        @handleOk="handleOk"
+        @handleClose="handleClose"
+      >
       </person-list>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
 import personList from "../policy/personList";
-import fileList from '@/views/components/fileList'
+import fileList from "@/views/components/fileList";
+import daiMap from "@/utils/dai-map";
 
+var map;
+let loading; // 加载动画
 
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-let loading // 加载动画
 export default {
-  data () {
-
+  data() {
     return {
-
-
       initLoading: false,
 
-      keyWords: '',
+      keyWords: "",
       formData: {},
 
       feedbackFormData: {
-        serviceProjectId: '',//	服务项目id	
-        serviceName: '',
-        serviceGoal: '',//	服务目标	
-        serviceEffect: '',//	服务效果	
-        servicePeopleNumber: null,//	服务人数	
-        serviceStatus: 'completed',//	服务状态。in_service服务中；completed:已完成	
-        satisfaction: '',//满意度。不满意:bad、基本满意:good、非常满意:perfect	
-        longitude: '',//	经度	
-        latitude: '',//	维度	
-        address: '',
-        fileList: [],//	附件列表
+        serviceProjectId: "", //	服务项目id
+        serviceName: "",
+        serviceGoal: "", //	服务目标
+        serviceEffect: "", //	服务效果
+        servicePeopleNumber: null, //	服务人数
+        serviceStatus: "completed", //	服务状态。in_service服务中；completed:已完成
+        satisfaction: "", //满意度。不满意:bad、基本满意:good、非常满意:perfect
+        longitude: "", //	经度
+        latitude: "", //	维度
+        address: "",
+        fileList: [], //	附件列表
       },
 
-
       policyId: "",
       showPersonList: false,
       ruleList: [],
       policyList: [],
-
-
-
-
-    }
+    };
   },
   components: { personList, fileList },
-  async mounted () {
-    await this.getPolicyList()
+  async mounted() {
+    await this.getPolicyList();
     // if (this.serviceRecordId) {//详情
-    await this.loadInfo()
-    this.initLoading = true
+    await this.loadInfo();
+    this.initLoading = true;
 
-    if (this.formData.serviceStatus === 'completed') {
+    if (
+      this.formData.serviceStatus === "completed" &&
+      this.feedbackFormData.latitude
+    ) {
       this.$nextTick(() => {
-        this.initMap()
-      })
+        this.initMap();
+      });
     }
   },
 
-
   methods: {
-
-    diaDestroy () {
-      if (map) {
-        map.destroy()
-      }
-    },
+    diaDestroy() {},
 
     //加载组织数据
-    async handlePersonList () {
+    async handlePersonList() {
       if (!this.formData.policyId) {
-        this.$message.info('请先选择政策')
-        return false
+        this.$message.info("请先选择政策");
+        return false;
       }
 
-      this.policyId = this.formData.policyId
-      await this.loadRuleList()
+      this.policyId = this.formData.policyId;
+      await this.loadRuleList();
 
       this.showPersonList = true;
     },
 
-    async loadRuleList () {
+    async loadRuleList() {
+      const url = "/heart/policy/rulelist/" + this.policyId;
 
-      const url = "/heart/policy/rulelist/" + this.policyId
+      let params = {};
 
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.ruleList = data
-
+        this.ruleList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handleClose () {
-      this.showPersonList = false
+    handleClose() {
+      this.showPersonList = false;
     },
 
+    async getPolicyList() {
+      const url = "/heart/policy/policyListSelect";
 
-    async getPolicyList () {
-      const url = '/heart/policy/policyListSelect'
-
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.policyList = data
+        this.policyList = data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
     //加载组织
-    async loadInfo () {
-      const url = '/heart/icServiceRecordV2/detail'
+    async loadInfo() {
+      const url = "/heart/icServiceRecordV2/detail";
 
       let params = {
-        serviceRecordId: this.serviceRecordId
-      }
+        serviceRecordId: this.serviceRecordId,
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.formData = { ...data }
-        this.formData.serviceRecordId = this.serviceRecordId
-        this.feedbackFormData = { ...data.feedback }
-        this.formData.policyName = ''
-        this.formData.gridIdListName = ''
-        this.feedbackFormData.serviceStatusShow = ''
-        this.feedbackFormData.satisfactionShow = ''
-
-        let arr = []
-        this.formData.gridIdList.forEach(element => {
-          arr.push(element.objectName)
+        this.formData = { ...data };
+        this.formData.serviceRecordId = this.serviceRecordId;
+        this.feedbackFormData = { ...data.feedback };
+        this.formData.policyName = "";
+        this.formData.gridIdListName = "";
+        this.feedbackFormData.serviceStatusShow = "";
+        this.feedbackFormData.satisfactionShow = "";
+
+        let arr = [];
+        this.formData.gridIdList.forEach((element) => {
+          arr.push(element.objectName);
         });
-        this.formData.gridIdListName = arr.join(',')
-        this.statusArray.forEach(element => {
+        this.formData.gridIdListName = arr.join(",");
+        this.statusArray.forEach((element) => {
           if (this.formData.serviceStatus === element.value) {
-            this.feedbackFormData.serviceStatusShow = element.label
+            this.feedbackFormData.serviceStatusShow = element.label;
           }
         });
-        this.satisfyArray.forEach(element => {
+        this.satisfyArray.forEach((element) => {
           if (this.feedbackFormData.satisfaction === element.value) {
-            this.feedbackFormData.satisfactionShow = element.label
+            this.feedbackFormData.satisfactionShow = element.label;
           }
         });
-        this.policyList.forEach(element => {
+        this.policyList.forEach((element) => {
           if (this.formData.policyId === element.policyId) {
-            this.formData.policyName = element.title
+            this.formData.policyName = element.title;
           }
         });
 
-        this.fileList = []
-        if (data.feedback && data.feedback.fileList && data.feedback.fileList.length > 0) {
-          data.feedback.fileList.forEach(element => {
+        this.fileList = [];
+        if (
+          data.feedback &&
+          data.feedback.fileList &&
+          data.feedback.fileList.length > 0
+        ) {
+          data.feedback.fileList.forEach((element) => {
             let obj = {
               name: element.name,
               format: element.format,
               url: element.url,
-              type: element.type
-
-            }
-            this.fileList.push(obj)
+              type: element.type,
+            };
+            this.fileList.push(obj);
           });
         }
-
-
-
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
 
-
-
-    handleCancle () {
-      this.resetData()
-      this.$emit('diaDetailClose')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("diaDetailClose");
     },
 
-
-
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      let { latitude, longitude } = this.$store.state.user;
-      console.log('lat' + latitude + ',lon' + longitude)
-
-      if (this.formData.latitude && this.formData.longitude) {
-        latitude = this.formData.latitude
-        longitude = this.formData.longitude
-      }
-      if (!latitude || latitude == "" || latitude == "0") {
-        latitude = 39.9088810666821;
-        longitude = 116.39743841556731;
-      }
-      var center = new window.TMap.LatLng(latitude, latitude)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_detail'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
+    initMap() {
+      let { latitude, longitude } = this.feedbackFormData;
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
+      map = new daiMap(
+        document.getElementById("app_detail"),
+        { latitude, longitude },
         {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
         }
-      ])
-    },
+      );
 
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
-    },
-
-    handleMoveCenter () {
-      //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
-      } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
-      }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.formData.address = result.result.address
-          // 显示搜索到的地址
-        });
-    },
-    handleOk () {
-      this.showPersonList = false
+    handleOk() {
+      this.showPersonList = false;
     },
 
-    resetData () {
-      this.formData = {}
+    resetData() {
+      this.formData = {};
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
-    }
+    },
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-
-
         serviceTimeStart: [
-          { required: true, message: '服务时间不能为空', trigger: 'blur' }
+          { required: true, message: "服务时间不能为空", trigger: "blur" },
         ],
-
-
-      }
+      };
     },
   },
   props: {
-
     serviceRecordId: {
       type: String,
-      required: true
+      required: true,
     },
     serviceOrgName: {
       type: String,
-      required: true
+      required: true,
     },
 
-
     satisfyArray: {
       type: Array,
-      default () {
-        return []
-      }
+      default() {
+        return [];
+      },
     },
     statusArray: {
       type: Array,
-      default () {
-        return []
-      }
+      default() {
+        return [];
+      },
     },
-  }
-}
+  },
+};
 </script>
 
-
-<style lang="scss" scoped >
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/detail-main.scss";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 685e21816..7e66c198d 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -123,6 +123,7 @@
         <el-table ref="ref_table"
                   :data="tableData"
                   border
+                  :empty-text="loadInfo"
                   :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
                   class="table"
                   style="width: 100%"
@@ -386,6 +387,7 @@ export default {
   data () {
     return {
       tableData: [],
+      loadInfo: '',
 
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -741,6 +743,7 @@ export default {
     },
 
     async getTableData () {
+      this.loadInfo = '数据加载中'
       const { tableUrl: url } = this;
       if (!url) return;
 
@@ -754,6 +757,12 @@ export default {
       if (code === 0) {
         this.total = data.total || 0;
         this.tableData = data.list ? this.cookTableData(data.list) : [];
+        if (this.tableData.length === 0) {
+          this.loadInfo = '暂无数据'
+        } else {
+          this.loadInfo = ''
+
+        }
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index f25e3efa7..e7f30bc90 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -56,9 +56,37 @@
 <!--        <div class="resi-row-btn">-->
 <!--          <el-button type="warning" size="small" class="diy-button&#45;&#45;add" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
 <!--        </div>-->
+          <div class="exportBtn">
         <div class="resi-row-btn">
-          <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
+            <el-button style="margin-left: 10px"
+                       class="diy-button--export"
+                       size="small"
+                       @click="handleExportModule()">下载模板</el-button>
+            <el-upload :headers="$getElUploadHeaders()"
+                       style=""
+                       ref="upload"
+                       :multiple="false"
+                       :show-file-list="false"
+                       :before-upload="
+            (file) => {
+              beforeUpload(file);
+            }
+          "
+                       action=""
+                       accept=".xls,.xlsx"
+                       :http-request="
+            () => {
+              uploadFile();
+            }
+          ">
+                <el-button style="margin-left: 10px"
+                           size="small"
+                           class="diy-button--delete">导入</el-button>
+            </el-upload>
+            <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
+
+          </div>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号"
@@ -180,6 +208,108 @@ export default {
         }
     },
     methods: {
+        handleExportModule () {
+            let title = "福利人员模板";
+            let url = "/epmetuser/changeWelfare/exporttemplate";
+
+            let params = {};
+
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    this.download(data, title + ".xls");
+                },
+                (rspMsg, data) => {
+                    this.$message.error(rspMsg);
+                }
+            );
+        },
+        // 下载文件
+        download (data, fileName) {
+            if (!data) {
+                return;
+            }
+
+            var csvData = new Blob([data]);
+
+            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                window.navigator.msSaveOrOpenBlob(csvData, fileName);
+            }
+            // for Non-IE (chrome, firefox etc.)
+            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);
+            }
+        },
+        // 上传文件之前的钩子
+        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 () {
+            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是要传的文件名
+
+            url = "/epmetuser/changeWelfare/pointImport";
+
+            window.app.ajax.post2(
+                url,
+                fileFormData,
+                (data, rspMsg) => {
+                    if (data.code === 0 && data.msg == "success") {
+                        // 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" } }
+            );
+        },
       exportHandle () {
         const url = this.mixinViewModuleOptions.exportURL
         this.$http({
@@ -275,6 +405,11 @@ export default {
 <style lang="scss" scoped>
   @import "@/assets/scss/buttonstyle.scss";
 
+  .exportBtn {
+      display: flex;
+      align-items: center;
+  }
+
   .resi-container .resi-card-table {
     ::v-deep .el-table th {
       color: #fff;
diff --git a/src/views/modules/plugins/change/resiwelfare.vue b/src/views/modules/plugins/change/resiwelfare.vue
index 4b2d325b7..4e323498f 100644
--- a/src/views/modules/plugins/change/resiwelfare.vue
+++ b/src/views/modules/plugins/change/resiwelfare.vue
@@ -400,7 +400,7 @@ export default {
   },
   methods: {
     searchFilter (columnName) {
-      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD' ]
+      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD', 'IS_BDHJ' ]
       return filterName.some(item => {
         return item == columnName
       })
diff --git a/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue b/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
new file mode 100644
index 000000000..74dcade31
--- /dev/null
+++ b/src/views/modules/plugins/rent/plirentcontractinfolog-add-or-update.vue
@@ -0,0 +1,334 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="社区ID" prop="communityId">
+          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="社区" prop="communityName">
+          <el-input v-model="dataForm.communityName" placeholder="社区"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="网格" prop="gridName">
+          <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋小区ID" prop="villageId">
+          <el-input v-model="dataForm.villageId" placeholder="房屋小区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋小区" prop="villageName">
+          <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
+      </el-form-item>
+          <el-form-item label="楼号ID" prop="buildId">
+          <el-input v-model="dataForm.buildId" placeholder="楼号ID"></el-input>
+      </el-form-item>
+          <el-form-item label="楼号" prop="buildName">
+          <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
+      </el-form-item>
+          <el-form-item label="单元ID" prop="unitId">
+          <el-input v-model="dataForm.unitId" placeholder="单元ID"></el-input>
+      </el-form-item>
+          <el-form-item label="单元" prop="unitName">
+          <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋ID" prop="homeId">
+          <el-input v-model="dataForm.homeId" placeholder="房屋ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋" prop="homeName">
+          <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+      </el-form-item>
+          <el-form-item label="房主姓名" prop="ownerName">
+          <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="状态：0未审核，1审核通过，2审核不通过（盈余字段）" prop="state">
+          <el-input v-model="dataForm.state" placeholder="状态：0未审核，1审核通过，2审核不通过（盈余字段）"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人姓名" prop="lessorName">
+          <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人身份证" prop="lessorIdCard">
+          <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人手机" prop="lessorMobile">
+          <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人关系" prop="lessorRelation">
+          <el-input v-model="dataForm.lessorRelation" placeholder="出租人关系"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人姓名" prop="lesseeName">
+          <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人身份证" prop="lesseeIdCard">
+          <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人手机" prop="lesseeMobile">
+          <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人工作单位" prop="lesseeUnit">
+          <el-input v-model="dataForm.lesseeUnit" placeholder="承租人工作单位"></el-input>
+      </el-form-item>
+          <el-form-item label="签署日期" prop="signDate">
+          <el-input v-model="dataForm.signDate" placeholder="签署日期"></el-input>
+      </el-form-item>
+          <el-form-item label="审核日期" prop="reviewDate">
+          <el-input v-model="dataForm.reviewDate" placeholder="审核日期"></el-input>
+      </el-form-item>
+          <el-form-item label="合同开始日期" prop="startDate">
+          <el-input v-model="dataForm.startDate" placeholder="合同开始日期"></el-input>
+      </el-form-item>
+          <el-form-item label="合同结束日期" prop="endDate">
+          <el-input v-model="dataForm.endDate" placeholder="合同结束日期"></el-input>
+      </el-form-item>
+          <el-form-item label="审核-原因" prop="reason">
+          <el-input v-model="dataForm.reason" placeholder="审核-原因"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="客户ID" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户ID"></el-input>
+      </el-form-item>
+          <el-form-item label="出租人现居住地" prop="lessorLiveAddress">
+          <el-input v-model="dataForm.lessorLiveAddress" placeholder="出租人现居住地"></el-input>
+      </el-form-item>
+          <el-form-item label="承租人户籍地地址" prop="lesseeHouseAddress">
+          <el-input v-model="dataForm.lesseeHouseAddress" placeholder="承租人户籍地地址"></el-input>
+      </el-form-item>
+          <el-form-item label="是否来源于PC端录入（0:否；1:是）" prop="isPcInput">
+          <el-input v-model="dataForm.isPcInput" placeholder="是否来源于PC端录入（0:否；1:是）"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        communityId: '',
+        communityName: '',
+        gridId: '',
+        gridName: '',
+        villageId: '',
+        villageName: '',
+        buildId: '',
+        buildName: '',
+        unitId: '',
+        unitName: '',
+        homeId: '',
+        homeName: '',
+        ownerName: '',
+        state: '',
+        lessorName: '',
+        lessorIdCard: '',
+        lessorMobile: '',
+        lessorRelation: '',
+        lesseeName: '',
+        lesseeIdCard: '',
+        lesseeMobile: '',
+        lesseeUnit: '',
+        signDate: '',
+        reviewDate: '',
+        startDate: '',
+        endDate: '',
+        reason: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        customerId: '',
+        lessorLiveAddress: '',
+        lesseeHouseAddress: '',
+        isPcInput: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        villageId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        villageName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        ownerName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        state: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorIdCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorMobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorRelation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeIdCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeMobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeUnit: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        signDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reviewDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        startDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        endDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        reason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lessorLiveAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        lesseeHouseAddress: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        isPcInput: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/pli/power/plirentcontractinfolog/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/plirentcontractinfolog/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/plirentcontractinfolog.vue b/src/views/modules/plugins/rent/plirentcontractinfolog.vue
new file mode 100644
index 000000000..3eb0a2df1
--- /dev/null
+++ b/src/views/modules/plugins/rent/plirentcontractinfolog.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-/pli/power__plirentcontractinfolog}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" label="社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridName" label="网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageId" label="房屋小区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageName" label="房屋小区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildId" label="楼号ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildName" label="楼号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitId" label="单元ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitName" label="单元" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeId" label="房屋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeName" label="房屋" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="state" label="状态：0未审核，1审核通过，2审核不通过（盈余字段）" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorName" label="出租人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorIdCard" label="出租人身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorMobile" label="出租人手机" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorRelation" label="出租人关系" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeName" label="承租人姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeIdCard" label="承租人身份证" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeMobile" label="承租人手机" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeUnit" label="承租人工作单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="signDate" label="签署日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reviewDate" label="审核日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="startDate" label="合同开始日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="endDate" label="合同结束日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="reason" label="审核-原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorLiveAddress" label="出租人现居住地" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeHouseAddress" label="承租人户籍地地址" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="isPcInput" label="是否来源于PC端录入（0:否；1:是）" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('/pli/power:plirentcontractinfolog:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './plirentcontractinfolog-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/pli/power/plirentcontractinfolog/page',
+        getDataListIsPage: true,
+        deleteURL: '/pli/power/plirentcontractinfolog',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 0ca43f14d..fc98783a2 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -7,7 +7,8 @@
               <el-select v-model.trim="dataForm.communityId"
                 placeholder="请选择"
                 clearable
-                @change="handleChangeAgency">
+                @change="handleChangeAgency"
+                style="width: 300px;">
                 <el-option v-for="item in agencyOptions"
                   :key="item.orgId"
                   :label="item.orgName"
@@ -20,7 +21,8 @@
                 :disabled="changeCDisabled"
                 placeholder="请选择"
                 clearable
-                @change="handleChangeGrid">
+                @change="handleChangeGrid"
+                style="width: 300px;">
                 <el-option v-for="item in gridOptions"
                   :key="item.value"
                   :label="item.label"
@@ -95,7 +97,7 @@
             </el-form-item>
             <br/>
             <el-form-item label="房主姓名" prop="ownerName">
-                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;" disabled></el-input>
+                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" style="width: 210px;"></el-input>
             </el-form-item>
 
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同信息</div>
@@ -112,7 +114,7 @@
         <el-form-item label="与房主关系" prop="lessorRelation" label-width="140px">
             <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
             <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系">
-                <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                <el-option v-for="item in lessorRelationArr_" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
                 </el-option>
             </el-select>
         </el-form-item>
@@ -149,118 +151,230 @@
           <br/>
           <el-button @click="addMember()" type="primary">添加成员</el-button>
           <div><br/></div>
-          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
-              <el-table-column label="序号" header-align="center" align="center" width="50px" fixed="left">
-                  <template slot-scope="scope">
-                      {{scope.$index+1}}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="name" label="姓名" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].name'" required :show-message="false">
-                    <el-input v-model="scope.row.name"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="yfzgx" label="与户主关系" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].yfzgx'" required :show-message="false">
-                  <!--<el-input v-model="dataForm.tenantList[scope.$index].yfzgx" placeholder="租客"></el-input>-->
-                    <el-select v-model="scope.row.yfzgx" placeholder="与房主关系">
-                        <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
-                        </el-option>
-                    </el-select>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="mobile" label="手机" :render-header="renderHeader" header-align="center" align="center" width="145">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].mobile'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].mobile"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="idCard" label="证件号" :render-header="renderHeader" header-align="center" align="center" width="180">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].idCard'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].idCard"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
+          <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
+              <el-form-item label="姓名" :prop="'tenantList['+ index +'].name'" :rules="tip" label-width="150px">
+                  <el-input v-model="dataForm.tenantList[index].name" placeholder="请输入" ></el-input>
+              </el-form-item>
 
-              <el-table-column prop="hjszd" label="户籍地" :render-header="renderHeader" header-align="center" align="center" width="180">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].hjszd'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].hjszd"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
+              <el-form-item label="手机" :prop="'tenantList['+ index +'].mobile'" :rules="tip" label-width="150px">
+                <el-input v-model="dataForm.tenantList[index].mobile" placeholder="请输入"></el-input>
+              </el-form-item>
 
-              <el-table-column prop="unit" label="工作单位" :render-header="renderHeader" header-align="center" align="center" width="180" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].unit'" required :show-message="false">
-                    <el-input v-model="dataForm.tenantList[scope.$index].unit"></el-input>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="politicalStatus" label="政治面貌" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].politicalStatus'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].politicalStatus" placeholder="请选择">
-                      <el-option
-                        v-for="item in zzmmOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </template>
-              </el-table-column>
-              <el-table-column prop="isMilitary" label="是否服过兵役" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].isMilitary'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].isMilitary" placeholder="请选择">
-                      <el-option
-                        v-for="item in shifouOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+              <el-form-item label="证件号" :prop="'tenantList['+index+'].idCard'" :rules="tip" label-width="150px">
+                <el-input v-model="dataForm.tenantList[index].idCard" placeholder="请输入"></el-input>
+              </el-form-item>
+
+              <el-form-item label="户籍地" :prop="'tenantList['+index+'].hjszd'" :rules="tip" label-width="150px">
+                <el-input v-model="dataForm.tenantList[index].hjszd" placeholder="请输入"></el-input>
+              </el-form-item>
+
+              <el-form-item label="工作单位" :prop="'tenantList['+index+'].unit'" :rules="tip" label-width="150px">
+                <el-input v-model="dataForm.tenantList[index].unit" placeholder="请输入"></el-input>
+              </el-form-item>
+
+              <el-form-item label="与户主关系" :prop="'tenantList['+index+'].yfzgx'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].yfzgx" placeholder="请选择">
+                    <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                    </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="政治面貌" :prop="'tenantList['+index+'].politicalStatus'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].politicalStatus" placeholder="请选择">
+                  <el-option
+                    v-for="item in zzmmOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="是否服过兵役" :prop="'tenantList['+index+'].isMilitary'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].isMilitary" placeholder="请选择">
+                  <el-option
+                    v-for="item in shifouOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="国籍" :prop="'tenantList['+index+'].nation'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].nation" placeholder="请选择">
+                  <el-option
+                    v-for="item in nationOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+
+              <el-form-item label="证件照片" label-width="150px">
+                <template>
+                  <upload-image 
+                      :defaultFileList="dataForm.tenantList[index].idCardImgList" 
+                      :limit="2" 
+                      :rowIndex="index" 
+                      @change="onChangeTenantListIdImgList"></upload-image>
                 </template>
-              </el-table-column>
-              <el-table-column prop="nation" label="国籍" :render-header="renderHeader" header-align="center" align="center" width="120">
-                <template slot-scope="scope">
-                  <el-form-item :prop="'tenantList['+scope.$index+'].nation'" required :show-message="false">
-                    <el-select v-model="dataForm.tenantList[scope.$index].nation" placeholder="请选择">
-                      <el-option
-                        v-for="item in nationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
+              </el-form-item>
+
+              <el-form-item label="照片" label-width="150px">
+                <template>
+                  <upload-image 
+                    :defaultFileList="dataForm.tenantList[index].imgList" 
+                    :limit="3" 
+                    :rowIndex="index" 
+                    @change="onChangeImgList"></upload-image>
                 </template>
-              </el-table-column>
-              <el-table-column label="证件照片" header-align="center" align="center" width="245px">
-                  <template slot-scope="scope">
-                    <upload-image :defaultFileList="dataForm.tenantList[scope.$index].idCardImgList" :limit="2" :rowIndex="scope.$index" @change="onChangeTenantListIdImgList"></upload-image>
-                  </template>
-              </el-table-column>
-              <el-table-column prop="imgList" label="照片" header-align="center" align="center" width="215px">
-                  <template slot-scope="scope">
-                    <upload-image :defaultFileList="dataForm.tenantList[scope.$index].imgList" :limit="3" :rowIndex="scope.$index" @change="onChangeImgList"></upload-image>
-                  </template>
-              </el-table-column>
-              <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="100">
-                  <template slot-scope="scope">
-                      <el-button type="text" size="small" @click="deleteMember(scope.$index)">删除</el-button>
-                  </template>
-              </el-table-column>
-          </el-table>
+              </el-form-item>
+              <br/>
+              <el-form-item label="民族" :prop="'tenantList['+index+'].mz'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择">
+                  <el-option
+                    v-for="item in mzOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+
+              <!-- <el-form-item label="性别" :prop="'tenantList['+index+'].gender'" required :show-message="false">
+                <el-select v-model="dataForm.tenantList[index].gender" placeholder="请选择">
+                  <el-option
+                    v-for="item in genderOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item> -->
+
+
+              <!-- <el-form-item label="出生日期" :prop="'tenantList['+index+'].birthday'" required :show-message="false" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].birthday"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item> -->
+
+              <el-form-item label="是否接种" :prop="'tenantList['+index+'].isVaccination'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].isVaccination" placeholder="请选择">
+                  <el-option
+                    v-for="item in isVaccinationOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br v-if="dataForm.tenantList[index].isVaccination === '1'"/>
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间" :prop="'tenantList['+index+'].firstVacTime'" :rules="tip_select" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].firstVacTime"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点" :prop="'tenantList['+index+'].firstVacSite'" :rules="tip_select" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].firstVacSite" placeholder="请选择">
+                  <el-option
+                    v-for="item in vacSiteOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br v-if="dataForm.tenantList[index].isVaccination === '1'"/>
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].secondVacTime"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].secondVacSite" placeholder="请选择">
+                  <el-option
+                    v-for="item in vacSiteOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br v-if="dataForm.tenantList[index].isVaccination === '1'"/>
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间" :show-message="false" label-width="150px">
+                <el-date-picker
+                    v-model="dataForm.tenantList[index].thirdVacTime"
+                    type="date"
+                    clearable
+                    placeholder="选择日期时间"
+                    value-format="yyyy-MM-dd"
+                    style="width: 200px; margin-right: 20px"
+                >
+                </el-date-picker>
+              </el-form-item>
+
+
+              <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].thirdVacSite" placeholder="请选择">
+                  <el-option
+                    v-for="item in vacSiteOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br/>
+
+              <el-form-item label="原因" :show-message="false" label-width="150px">
+                <el-select v-model="dataForm.tenantList[index].reason" placeholder="请选择">
+                  <el-option
+                    v-for="item in reasonOption"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="备注" :show-message="false" label-width="150px">
+                <el-input
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入备注，不超过500字"
+                    v-model="dataForm.tenantList[index].note"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button style="float: right" type="primary" size="small" @click="deleteMember(index)">删除</el-button>
+              </el-form-item>
+          </div>
         </div>
         <div style="margin-left: 30px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate" label-width="140px">
@@ -383,11 +497,23 @@ export default {
           yfzgx: '',
           type: 1,
           politicalStatus: '',
+          mz:'',
+          gender:'',
+          birthday:'',
+          isVaccination:'1',
           isMilitary: '',
           nation: '',
           imgList: [],
           idCardImgList: [],
-          unit: ''
+          unit: '',
+          firstVacTime: '',
+          firstVacSite:'',
+          secondVacTime:'',
+          secondVacSite:'',
+          thirdVacTime:'',
+          thirdVacSite:'',
+          reason:'',
+          note:'',
         }],
         fileList: [],
         docList: []
@@ -404,10 +530,38 @@ export default {
         { name: '中国', value: '中国' },
         { name: '其他', value: '其他' }
       ],
+      mzOptions:[],
+      isVaccinationOption: [
+        { value: '0', label: '否' },
+        { value: '1', label: '是' },
+      ],
+      vacSiteOption: [
+        { value: '本街道内接种', label: '本街道内接种' },
+        { value: '区内其他街道接种', label: '区内其他街道接种' },
+        { value: '区外其他地区接种', label: '区外其他地区接种' },
+      ],
+      reasonOption: [
+        { value: '禁忌症', label: '禁忌症' },
+        { value: '拒绝接种', label: '拒绝接种' },
+        { value: '其他原因', label: '其他原因' },
+      ],
+      genderOptions:[{label: "男", value: "1"}, {label: "女", value: "2"}],
         dataListLoading: false,
         dialogVisible: false,
         dialogImageUrl: '',
         lessorRelationArr: [
+            { dictValue: '本人', dictName: '本人' },
+            { dictValue: '配偶', dictName: '配偶' },
+            { dictValue: '子女', dictName: '子女' },
+            { dictValue: '父母', dictName: '父母' },
+            { dictValue: '岳父母或公婆', dictName: '岳父母或公婆' },
+            { dictValue: '祖父母', dictName: '祖父母' },
+            { dictValue: '媳婿', dictName: '媳婿' },
+            { dictValue: '孙子女', dictName: '孙子女' },
+            { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
+            { dictValue: '其他', dictName: '其他' }
+        ],
+        lessorRelationArr_: [
             { dictValue: '本人', dictName: '本人' },
             { dictValue: '配偶', dictName: '配偶' },
             { dictValue: '子女', dictName: '子女' },
@@ -429,7 +583,9 @@ export default {
         agencyOptions: [],
         uploadUrl: `${window.SITE_CONFIG['apiURL']}/oss/file/uploadqrcodeV2`,
         customerId: localStorage.getItem("customerId"),
-        limit: 3
+        limit: 3,
+        tip: { required: true, message: '必填项不能为空', trigger: 'blur' },
+        tip_select: { required: true, message: '必填项不能为空', trigger: 'change' }
     }
   },
   computed: {
@@ -568,11 +724,23 @@ export default {
           yfzgx: '',
           type: 1,
           politicalStatus: '',
+          mz: '',
+          gender:'',
+          birthday:'',
+          isVaccination:'1',
           isMilitary: '',
           nation: '',
           imgList: [],
           idCardImgList: [],
-          unit: ''
+          unit: '',
+          firstVacTime:'',
+          firstVacSite:'',
+          secondVacTime:'',
+          secondVacSite:'',
+          thirdVacTime:'',
+          thirdVacSite:'',
+          reason:'',
+          note:'',
         }],
         fileList: [],
         docList: [],
@@ -581,6 +749,7 @@ export default {
     },
     init () {
       this.visible = true
+      this.getMz()
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         this.dataFormReset()
@@ -668,11 +837,23 @@ export default {
         yfzgx: '',
         type: 1,
         politicalStatus: '',
+        mz: '',
+        gender:'',
+        birthday:'',
+        isVaccination: '1',
         isMilitary: '',
         nation: '',
         imgList: [],
         idCardImgList: [],
-        unit: ''
+        unit: '',
+        firstVacTime:'',
+        firstVacSite:'',
+        secondVacTime:'',
+        secondVacSite:'',
+        thirdVacTime:'',
+        thirdVacSite:'',
+        reason:'',
+        note:'',
       }
       this.dataForm.tenantList.push(ob)
     },
@@ -756,7 +937,7 @@ export default {
     },
     getAgencyList() {
       return new Promise((resolve, reject) => {
-        this.$http.post('/gov/org/agency/communityListByCustomerId')
+        this.$http.post('/gov/org/customeragency/getCurrentUserCommunityInfo')
           .then(({ data: res }) => {
             if (res.code !== 0) {
             reject(false)
@@ -905,6 +1086,15 @@ export default {
         this.editModeGetList()
       }).catch(() => {})
     },
+    getMz() {
+      this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.mzOptions = res.data
+        console.log(res)
+      }).catch(() => {})
+    },
     handleFlieSuccess(res, file) {
         if (res.code === 0 && res.msg === "success") {
             let ob = {
@@ -1006,6 +1196,16 @@ export default {
     margin-bottom: 0;
   }
 }
+
+.add-member{
+  border-bottom: 1px dashed #dcdfe6;
+  margin-bottom: 20px;
+  .el-form-item {
+    .el-form-item__content{
+      width: 190px !important;
+    }
+  }
+}
 </style>
 <style lang="scss" scoped>
     ::v-deep .el-upload-list__item.is-success.focusing .el-icon-close-tip {
@@ -1032,4 +1232,6 @@ export default {
     .margin_left10 {
         margin-left: 10px;
     }
+
+
 </style>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
index 4f651215a..487743d18 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-look-or-check.vue
@@ -74,35 +74,122 @@
 
         <div style="padding:20px 30px">
           <div style="height: 30px;font-weight: bold;">居住成员信息</div>
-          <el-table v-loading="dataListLoading" :data="dataForm.tenantList" border style="width: 100%">
-              <el-table-column label="序号" header-align="center" align="center" width="50px">
-                  <template slot-scope="scope">
-                      {{scope.$index+1}}
-                  </template>
-              </el-table-column>
-              <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="idCard" label="证件号" header-align="center" align="center" width="180"></el-table-column>
-              <el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
-              <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="idCardImgList" label="证件照片" header-align="center" align="center">
-                  <template slot-scope="scope">
-                      <div v-for="(item,index) in scope.row.idCardImgList" :key="index">
-                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                      </div>
-                  </template>
-              </el-table-column>
-              <el-table-column prop="imgList" label="照片" header-align="center" align="center">
-                  <template slot-scope="scope">
-                      <div v-for="(item,index) in scope.row.imgList" :key="index">
-                          <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
-                      </div>
-                  </template>
-              </el-table-column>
-          </el-table>
+        </div>
+
+        <div class="add-member" v-for="(item, index) in dataForm.tenantList" :key="index">
+          <el-form-item label="姓名">
+              <el-input v-model="dataForm.tenantList[index].name" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="手机">
+              <el-input v-model="dataForm.tenantList[index].mobile" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="证件号">
+              <el-input v-model="dataForm.tenantList[index].idCard" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="户籍地">
+            <el-input v-model="dataForm.tenantList[index].hjszd" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="工作单位">
+              <el-input v-model="dataForm.tenantList[index].unit" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="与户主关系">
+              <el-input v-model="dataForm.tenantList[index].yfzgx" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="政治面貌">
+              <el-input v-model="dataForm.tenantList[index].politicalStatus" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="是否服过兵役">
+              <el-input v-model="dataForm.tenantList[index].isMilitary" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="国籍">
+              <el-input v-model="dataForm.tenantList[index].nation" disabled></el-input>
+          </el-form-item>
+          <br/>
+
+          <el-form-item label="证件照片">
+            <template>
+                <div v-for="(item,index) in dataForm.tenantList[index].idCardImgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                </div>
+            </template>
+          </el-form-item>
+
+          <el-form-item label="照片">
+            <template>
+                <div v-for="(item,index) in dataForm.tenantList[index].imgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="40" height="40"  />
+                </div>
+            </template>
+          </el-form-item>
+          <br/>
+
+
+          <el-form-item label="民族">
+            <el-select v-model="dataForm.tenantList[index].mz" placeholder="请选择" disabled>
+              <el-option
+                v-for="item in mzOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <!-- <el-form-item label="性别" :prop="'tenantList['+ index +'].gender'">
+              <el-input v-model="dataForm.tenantList[index].gender === '1' ? '男' : '女'" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="出生日期" :prop="'tenantList['+ index +'].birthday'">
+              <el-input v-model="dataForm.tenantList[index].birthday" disabled></el-input>
+          </el-form-item> -->
+
+          <el-form-item label="是否接种">
+              <el-input v-model="dataForm.tenantList[index].isVaccination === '0' ? '否' : dataForm.tenantList[index].isVaccination === '1' ? '是' : ''" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种时间">
+              <el-input v-model="dataForm.tenantList[index].firstVacTime" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第一次接种地点">
+              <el-input v-model="dataForm.tenantList[index].firstVacSite" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种时间">
+              <el-input v-model="dataForm.tenantList[index].secondVacTime" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第二次接种地点">
+              <el-input v-model="dataForm.tenantList[index].secondVacSite" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种时间">
+              <el-input v-model="dataForm.tenantList[index].thirdVacTime" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item v-if="dataForm.tenantList[index].isVaccination === '1'" label="第三次接种地点">
+              <el-input v-model="dataForm.tenantList[index].thirdVacSite" disabled></el-input>
+          </el-form-item>
+
+          <el-form-item label="原因">
+              <el-input v-model="dataForm.tenantList[index].reason" disabled></el-input>
+          </el-form-item>
+          <br/>
+          <el-form-item label="备注">
+              <el-input
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  :rows="3"
+                  v-model="dataForm.tenantList[index].note" disabled></el-input>
+            </el-form-item>
         </div>
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate">
@@ -136,8 +223,10 @@
     <template slot="footer">
         <div class="resi-btns">
         <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-        <el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
-        <el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>
+        <!--<el-button v-if="dataForm.state === '0'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>-->
+        <!--<el-button v-if="dataForm.state === '0'" type="primary" @click="checkHandle('1')">{{ $t('checkTGBtn') }}</el-button>-->
+            <el-button v-if="pageId != 'rentcontractinfo'" type="danger" @click="openCheckReasonDialog">{{ $t('checkBTGBtn') }}</el-button>
+            <el-button v-if="pageId != 'rentcontractinfo'" type="primary" @click="checkHandle('1')" :disabled="disabledBtn_check">{{ $t('checkTGBtn') }}</el-button>
         </div>
     </template>
       <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -163,6 +252,7 @@ export default {
   data () {
     return {
       visible: false,
+      pageId:'',
       dataForm: {
         id: '',
         flag: '',
@@ -204,11 +294,13 @@ export default {
             { dictValue: '媳婿', dictName: '媳婿' },
             { dictValue: '孙子女', dictName: '孙子女' },
             { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
-            { dictValue: '中介', dictName: '中介' }
+            { dictValue: '其他', dictName: '其他' }
         ],
         checkReason: '',
         checkVisible: false,
-        disabledBtn: false
+        disabledBtn: false,
+        disabledBtn_check: false,
+        mzOptions:[],
     }
   },
   computed: {
@@ -291,7 +383,8 @@ export default {
       },
     // 获取信息
     getInfo () {
-      this.$http.get(`/pli/power/rentContractInfo/${this.dataForm.id}`).then(({ data: res }) => {
+      let Url = this.pageId === 'rentcontractinfo' ? 'plirentcontractinfolog' : 'rentContractInfo'
+      this.$http.get(`/pli/power/${Url}/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -299,6 +392,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.getMz()
       }).catch(() => {})
     },
       // 打开审核不通过对话框
@@ -324,7 +418,9 @@ export default {
           lessorRelation: this.dataForm.lessorRelation,
           reason: this.checkReason
         }
+        this.disabledBtn_check = true,
         this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
+          this.disabledBtn_check = false
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -354,6 +450,15 @@ export default {
     downFile(fileUrl) {
         window.open(fileUrl)
     },
+    getMz() {
+      this.$http.post(`/sys/dict/data/nation`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.mzOptions = res.data
+        console.log(res)
+      }).catch(() => {})
+    },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
       this.$refs['dataForm'].validate((valid) => {
@@ -396,4 +501,13 @@ export default {
     // width: 280px;
   }
 }
+.add-member{
+  border-bottom: 1px dashed #dcdfe6;
+  margin-bottom: 20px;
+  .el-form-item {
+    .el-form-item__content{
+      width: 190px !important;
+    }
+  }
+}
 </style>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 4ee321e33..6a1f7533e 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -203,9 +203,9 @@ export default {
     data: function () {
         return {
             mixinViewModuleOptions: {
-                getDataListURL: '/pli/power/rentContractInfo/page',
+                getDataListURL: '/pli/power/plirentcontractinfolog/page',
                 getDataListIsPage: true,
-                deleteURL: '/pli/power/rentContractInfo',
+                deleteURL: '/pli/power/plirentcontractinfolog',
                 deleteIsBatch: true
             },
             optionsV: [],
@@ -295,6 +295,7 @@ export default {
           this.$nextTick(() => {
               this.$refs.addOrUpdate.dataForm.id = id
               this.$refs.addOrUpdate.dataForm.flag = flag
+              this.$refs.addOrUpdate.pageId= 'rentcontractinfo'
               this.$refs.addOrUpdate.init()
           })
       },
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 9049969df..8a8366e8f 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -195,10 +195,13 @@
         <el-table-column prop="isBlack" label="是否黑名单人员" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
-             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
-            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>-->
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>-->
+            <!--<el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
+            <!--<el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>-->
+            <el-button type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/renFangTongJi/index.vue b/src/views/modules/renFangTongJi/index.vue
index 8fcd403d7..c4b8224fe 100644
--- a/src/views/modules/renFangTongJi/index.vue
+++ b/src/views/modules/renFangTongJi/index.vue
@@ -1,107 +1,86 @@
 <template>
   <el-card class="g-cnt">
     <div class="m-cards">
-      <div
-        class="item"
-        :key="item.name"
-        @click="handleClickCard(item)"
-        v-for="item in list"
-      >
+      <div class="item"
+           :key="item.name"
+           @click="handleClickCard(item)"
+           v-for="item in list">
         <div class="item-left">
           <div class="num">{{ item.num }}</div>
           <div class="name">{{ item.name }}</div>
         </div>
-        <div class="item-right">
+        <!-- <div class="item-right">
           <div class="hint">
             <div class="hint-title">较上月</div>
             <b v-if="item.variation >= 0">+ {{ item.variationAbs }}</b>
             <b v-else>- {{ item.variationAbs }}</b>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
 
     <div class="m-tb">
       <h3>下级平台使用进度汇总</h3>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="tb"
-        :height="maxTableHeight"
-        align="center"
-      >
-        <el-table-column label="序号" type="index" align="center" width="50" />
-        <el-table-column
-          prop="orgName"
-          label="所属组织"
-          width="150"
-          align="center"
-        >
+      <el-table :data="tableData"
+                border
+                style="width: 100%"
+                class="tb"
+                :empty-text="loadInfo"
+                :height="maxTableHeight"
+                align="center">
+        <el-table-column label="序号"
+                         type="index"
+                         align="center"
+                         width="50" />
+        <el-table-column prop="orgName"
+                         label="所属组织"
+                         width="150"
+                         align="center">
         </el-table-column>
-        <el-table-column
-          prop="usingCommunityNum"
-          label="开通平台社区数"
-          align="center"
-        >
+        <el-table-column prop="usingCommunityNum"
+                         label="开通平台社区数"
+                         align="center">
           <template slot-scope="scope">
-            <a style="cursor: pointer" @click="showDetail(scope.row.orgId)">{{
+            <a style="cursor: pointer"
+               @click="showDetail(scope.row.orgId)">{{
               scope.row.usingCommunityNum
             }}</a>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="userTotal"
-          label="人口总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="czUserTotal"
-          label="常住人口总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="ldUserTotal"
-          label="流动人口总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="houseTotal"
-          label="房屋总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="zzHouseTotal"
-          label="自住房屋总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="czHouseTotal"
-          label="出租房屋总数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="xzHouseTotal"
-          label="闲置房屋总数"
-          align="center"
-        ></el-table-column>
+        <el-table-column prop="userTotal"
+                         label="人口总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="czUserTotal"
+                         label="常住人口总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="ldUserTotal"
+                         label="流动人口总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="houseTotal"
+                         label="房屋总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="zzHouseTotal"
+                         label="自住房屋总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="czHouseTotal"
+                         label="出租房屋总数"
+                         align="center"></el-table-column>
+        <el-table-column prop="xzHouseTotal"
+                         label="闲置房屋总数"
+                         align="center"></el-table-column>
       </el-table>
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      v-if="displayedDetail"
-      :visible="true"
-      title="社区列表 "
-      width="1150px"
-      top="5vh"
-      @close="displayedDetail = false"
-    >
-      <shequtongji
-        ref="shequtongji"
-        :orgId="detailOrgId"
-        :orgIds="[orgId, detailOrgId]"
-      />
+    <el-dialog v-if="displayedDetail"
+               :visible="true"
+               title="社区列表 "
+               width="1150px"
+               top="5vh"
+               @close="displayedDetail = false">
+      <shequtongji ref="shequtongji"
+                   :orgId="detailOrgId"
+                   :orgIds="[orgId, detailOrgId]" />
     </el-dialog>
   </el-card>
 </template>
@@ -115,10 +94,12 @@ import shequtongji from "./cpts/shequtongji";
 export default {
   name: "renFangTongJi",
   components: { shequtongji },
-  data() {
+  data () {
     return {
       displayedDetail: false,
       tableData: [],
+      tableLoading: false,
+      loadInfo: '',
 
       orgId: "",
       orgType: "",
@@ -185,35 +166,35 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
+    maxTableHeight () {
       return this.clientHeight - 420;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
-    orgId() {
+    orgId () {
       this.getTableData();
     },
   },
-  mounted() {
+  mounted () {
     this.getCommunityData();
     this.getResiData();
     this.getHouseData();
     this.getTableData();
   },
   methods: {
-    handleClickCard(item) {
+    handleClickCard (item) {
       if (item.name == "开通平台社区数") {
         this.showDetail();
       }
     },
 
-    async showDetail(orgId = "") {
+    async showDetail (orgId = "") {
       this.displayedDetail = true;
       this.detailOrgId = orgId;
     },
 
-    async getCommunityData() {
+    async getCommunityData () {
       const url = "/gov/org/agency/usingCommunityStats";
 
       const { data, code, msg } = await requestPost(url, {
@@ -230,7 +211,7 @@ export default {
       }
     },
 
-    async getResiData() {
+    async getResiData () {
       const url = "/epmetuser/icresiuser/userchart";
 
       const { data, code, msg } = await requestPost(url, {
@@ -257,7 +238,7 @@ export default {
       }
     },
 
-    async getHouseData() {
+    async getHouseData () {
       const url = "/gov/org/house/housechart";
 
       const { data, code, msg } = await requestPost(url, {
@@ -286,7 +267,9 @@ export default {
       }
     },
 
-    async getTableData() {
+    async getTableData () {
+      this.loadInfo = '数据加载中'
+      this.tableLoading = true
       const url = "/gov/org/house/subuserhouselist";
 
       const { data, code, msg } = await requestPost(url, {
@@ -297,9 +280,17 @@ export default {
       if (code === 0) {
         this.tableData = data
           ? data.map((item) => {
-              return item;
-            })
+            return item;
+          })
           : [];
+
+        if (this.tableData.length === 0) {
+          this.loadInfo = '暂无数据'
+        } else {
+          this.loadInfo = ''
+
+        }
+
       }
     },
   },
@@ -318,6 +309,7 @@ export default {
 
   .item {
     display: flex;
+    justify-content: center;
     width: 24%;
     margin-top: 15px;
     // margin-right: 1%;
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 8e20b49ef..1f7d8d23f 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -308,6 +308,9 @@ export default {
 
   data () {
     return {
+      customerId: '',
+      isXiaozhaizi: false,
+
       fieldList: [],
       groupList: [],
       groupIndex: 0,
@@ -405,6 +408,16 @@ export default {
   },
 
   mounted () {
+    //磐石街道：1580460084738760705
+    //烟台客户id:   1535072605621841922
+    //小寨子客户id:   1536638904600752130
+    this.customerId = localStorage.getItem("customerId");
+
+    this.isXiaozhaizi = false
+
+    if (this.customerId === '1536638904600752130') {
+      this.isXiaozhaizi = true
+    }
     this.getApiData();
   },
 
@@ -589,7 +602,8 @@ export default {
             tableName: "ic_hs",
           },
         ];
-        if (!this.isShundeju) {
+
+        if (!this.isShundeju && !this.isXiaozhaizi) {
           arr = [
             ...arr,
             {
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index 77c0193f0..f5a0c1bce 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="">
-    <el-form ref="ref_form"
-             :inline="false"
-             :model="formData"
-             :rules="dataRule"
-             label-width="100px">
+    <el-form
+      ref="ref_form"
+      :inline="false"
+      :model="formData"
+      :rules="dataRule"
+      label-width="100px"
+    >
       <!-- <el-form-item label="事件分类"
                     label-width="150px"
                     prop="categoryId">
@@ -17,105 +19,124 @@
                      :show-all-levels="false"
                      @change="handleChangeCate"></el-cascader>
       </el-form-item> -->
-      <el-form-item label="服务内容"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="content">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.content"
-                    :autosize="{ minRows: 2, maxRows: 10 }"
-                    type="textarea"
-                    clearable
-                    class="cell-width-area"
-                    placeholder="请输入内容"></el-input>
+      <el-form-item
+        label="服务内容"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="content"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.content"
+            :autosize="{ minRows: 2, maxRows: 10 }"
+            type="textarea"
+            clearable
+            class="cell-width-area"
+            placeholder="请输入内容"
+          ></el-input>
         </div>
       </el-form-item>
 
-      <el-form-item label="服务类型"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="categoryCode">
-        <div :class="{'visiual-form':source==='visiual'}">
-
-          <el-cascader v-model="formData.categoryCode"
-                       :options="demandOptions"
-                       clearable
-                       class="cell-width-1"
-                       @change="handleCateSlect"></el-cascader>
+      <el-form-item
+        label="服务类型"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="categoryCode"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-cascader
+            v-model="formData.categoryCode"
+            :options="demandOptions"
+            clearable
+            class="cell-width-1"
+            @change="handleCateSlect"
+          ></el-cascader>
         </div>
-
       </el-form-item>
 
-      <el-form-item label="服务时间"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="wantServiceTime">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-date-picker v-model="formData.wantServiceTime"
-                          type="datetime"
-                          class="cell-width-1"
-                          clearable
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择日期时间">
+      <el-form-item
+        label="服务时间"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="wantServiceTime"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-date-picker
+            v-model="formData.wantServiceTime"
+            type="datetime"
+            class="cell-width-1"
+            clearable
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="选择日期时间"
+          >
           </el-date-picker>
         </div>
       </el-form-item>
 
-      <el-form-item label="需求人"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="demandUserName">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserName"
-                    class="cell-width-1"></el-input>
+      <el-form-item
+        label="需求人"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="demandUserName"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.demandUserName"
+            class="cell-width-1"
+          ></el-input>
         </div>
-
       </el-form-item>
-      <el-form-item label="联系电话"
-                    label-width="150px"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="demandUserMobile">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.demandUserMobile"
-                    class="cell-width-1"></el-input>
+      <el-form-item
+        label="联系电话"
+        label-width="150px"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="demandUserMobile"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.demandUserMobile"
+            class="cell-width-1"
+          ></el-input>
         </div>
-
       </el-form-item>
-      <el-form-item label="服务地点"
-                    prop="serviceLocation"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    style="display: block">
-
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input class="cell-width-1"
-                    v-model="formData.serviceLocation">
+      <el-form-item
+        label="服务地点"
+        prop="serviceLocation"
+        :class="{ 'form-item': source === 'visiual' }"
+        label-width="150px"
+        style="display: block"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input class="cell-width-1" v-model="formData.serviceLocation">
           </el-input>
         </div>
-
       </el-form-item>
-      <el-form-item label="位置坐标"
-                    :class="{'form-item':source==='visiual'}"
-                    prop="longitude"
-                    label-width="150px"
-                    style="display: block">
-        <div style="width:500px">
-
+      <el-form-item
+        label="位置坐标"
+        :class="{ 'form-item': source === 'visiual' }"
+        prop="longitude"
+        label-width="150px"
+        style="display: block"
+      >
+        <div style="width: 500px">
           <div class="div_map">
-            <div id="app_map">
-
-            </div>
+            <div id="app_map"></div>
             <div class="div_searchmap">
-              <el-input class="cell-width-map"
-                        maxlength="50"
-                        size="mini"
-                        placeholder="请输入关键字"
-                        v-model="keyWords">
+              <el-input
+                class="cell-width-map"
+                maxlength="50"
+                size="mini"
+                placeholder="请输入关键字"
+                v-model="keyWords"
+              >
               </el-input>
-              <el-button style="margin-left: 10px"
-                         type="primary"
-                         size="mini"
-                         @click="handleSearchMap">查询</el-button>
+              <el-button
+                style="margin-left: 10px"
+                type="primary"
+                size="mini"
+                @click="handleSearchMap"
+                >查询</el-button
+              >
             </div>
           </div>
 
@@ -136,103 +157,108 @@
         </div>
       </el-form-item>
 
-      <el-form-item label="门牌号"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    prop="locationDetail">
-        <div :class="{'visiual-form':source==='visiual'}">
-          <el-input v-model="formData.locationDetail"
-                    class="cell-width-1"></el-input>
+      <el-form-item
+        label="门牌号"
+        :class="{ 'form-item': source === 'visiual' }"
+        label-width="150px"
+        prop="locationDetail"
+      >
+        <div :class="{ 'visiual-form': source === 'visiual' }">
+          <el-input
+            v-model="formData.locationDetail"
+            class="cell-width-1"
+          ></el-input>
         </div>
-
       </el-form-item>
 
-      <el-form-item label="服务方"
-                    :class="{'form-item':source==='visiual'}"
-                    label-width="150px"
-                    prop="serverId">
-
+      <el-form-item
+        label="服务方"
+        :class="{ 'form-item': source === 'visiual' }"
+        label-width="150px"
+        prop="serverId"
+      >
         <template>
-          <div :class="[{'single-select':source==='visiual'},'sel-service']">
-            <el-select v-model="formData.serviceType"
-                       class="cell-width-1"
-                       placeholder="请选择"
-                       clearable
-                       @change="handleServiceChange('add', $event)">
-              <el-option v-for="item in serviceOptions"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+          <div
+            :class="[{ 'single-select': source === 'visiual' }, 'sel-service']"
+          >
+            <el-select
+              v-model="formData.serviceType"
+              class="cell-width-1"
+              placeholder="请选择"
+              clearable
+              @change="handleServiceChange('add', $event)"
+            >
+              <el-option
+                v-for="item in serviceOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
             -
-            <el-select v-model="formData.serverId"
-                       class="cell-width-1"
-                       filterable
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in serviceOptiondList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
+            <el-select
+              v-model="formData.serverId"
+              class="cell-width-1"
+              filterable
+              placeholder="请选择"
+              clearable
+            >
+              <el-option
+                v-for="item in serviceOptiondList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </div>
         </template>
       </el-form-item>
-
     </el-form>
-
   </div>
 </template>
 
 <script>
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
-import formVltHelper from "dai-js/tools/formVltHelper";
-
-import { isCard } from "@/utils/validate";
+import daiMap from "@/utils/dai-map";
 
 let loading; // 加载动画
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
+var map;
 
-function iniFmData () {
+function iniFmData() {
   return {
-    operationType: '2',//处理方式[0:已回复 1:已转项目  2:已转服务]	
-    icEventId: '',//事件Id	
-    gridId: '',//	
-    categoryCode: '',//	二级服务分类编码	
-    parentCode: '',//	父级服务分类编码	
-    content: '',//		服务内容1000字	
-    reportType: 'self_help',//	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help	
-    reportUserName: '',//	上报人姓名	
-    reportUserMobile: '',//	自身上报时存储注册居民的手机号	
-    reportTime: '',//	上报时间	
-    demandUserId: '',//	需求人：user.id或者ic_resi_user.id	
-    demandUserName: '',//	需求人姓名	
-    demandUserMobile: '',//需求人联系电话	
-    wantServiceTime: '',//	希望服务时间
-    serviceType: '',
-    serverId: '',
-    locationDetail: '',
-    serviceLocation: '',//事件地址	
-    latitude: '',//	经度	
-    longitude: '',//维度	
+    operationType: "2", //处理方式[0:已回复 1:已转项目  2:已转服务]
+    icEventId: "", //事件Id
+    gridId: "", //
+    categoryCode: "", //	二级服务分类编码
+    parentCode: "", //	父级服务分类编码
+    content: "", //		服务内容1000字
+    reportType: "self_help", //	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
+    reportUserName: "", //	上报人姓名
+    reportUserMobile: "", //	自身上报时存储注册居民的手机号
+    reportTime: "", //	上报时间
+    demandUserId: "", //	需求人：user.id或者ic_resi_user.id
+    demandUserName: "", //	需求人姓名
+    demandUserMobile: "", //需求人联系电话
+    wantServiceTime: "", //	希望服务时间
+    serviceType: "",
+    serverId: "",
+    locationDetail: "",
+    serviceLocation: "", //事件地址
+    latitude: "", //	经度
+    longitude: "", //维度
     // categoryId: ''
   };
 }
 export default {
-  data () {
+  data() {
     return {
       btnDisable: false,
       customerId: localStorage.getItem("customerId"),
       demandOptions: [],
-      serviceOptions: [
-      ],
+      serviceOptions: [],
       serviceOptiondList: [],
 
       casOptions: [],
@@ -241,25 +267,25 @@ export default {
       selCateObj: {},
       optionProps: {
         multiple: false,
-        value: 'id',
-        label: 'name',
-        children: 'subCategory',
+        value: "id",
+        label: "name",
+        children: "subCategory",
       },
 
       formData: iniFmData(),
 
-
       okflag: false,
       //地图相关
-      keyWords: '',
+      keyWords: "",
 
-      eventDetailCopy: {}
+      eventDetailCopy: {},
     };
   },
+
   components: {},
-  computed: {
-    dataRule () {
 
+  computed: {
+    dataRule() {
       return {
         // categoryId: [
         //   { required: true, message: "请填写事件分类", trigger: "blur" },
@@ -285,14 +311,11 @@ export default {
         serverId: [
           { required: true, message: "服务方不能为空", trigger: "blur" },
         ],
-
       };
     },
-
-
   },
-  props: {
 
+  props: {
     demandUserId: {
       type: String,
       default: "",
@@ -312,156 +335,142 @@ export default {
 
     eventDetailData: {
       type: Object,
-      default () {
-        return {}
-      }
+      default() {
+        return {};
+      },
     },
 
-    source: {//展示来源：manage  管理平台    visiual  可视化平台
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
       type: String,
-      default: 'manage'
-    }
-
+      default: "manage",
+    },
   },
+
   watch: {
     demandUserName: function (val) {
-
-      this.formData.reportUserName = val
-      this.formData.demandUserName = val
+      this.formData.reportUserName = val;
+      this.formData.demandUserName = val;
     },
     demandUserMobile: function (val) {
-
-      this.formData.reportUserMobile = val
-      this.formData.demandUserMobile = val
+      this.formData.reportUserMobile = val;
+      this.formData.demandUserMobile = val;
     },
     demandUserId: function (val) {
-
-      this.formData.demandUserId = val
+      this.formData.demandUserId = val;
     },
   },
-  created () {
-
 
-  },
-
-  async mounted () {
-    const { user } = this.$store.state
-    this.agencyId = user.agencyId
-    this.getCategoryList();
-    this.getDemandOptions();
-    this.getServiceOption()
-    // this.formData = { ...this.formDataTemp }
-    this.initMap()
+  async mounted() {
+    const { user } = this.$store.state;
+    this.agencyId = user.agencyId;
 
     if (this.eventId) {
       this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-      this.formData.reportUserMobile = this.eventDetailCopy.mobile
-      this.formData.reportUserName = this.eventDetailCopy.name
-      this.formData.reportTime = this.eventDetailCopy.happenTime
-      this.formData.gridId = this.eventDetailCopy.gridId
-      this.formData.demandUserId = this.eventDetailCopy.reportUserId
-      this.formData.demandUserName = this.eventDetailCopy.name
-      this.formData.demandUserMobile = this.eventDetailCopy.mobile
-
-      if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
+      this.formData.reportUserMobile = this.eventDetailCopy.mobile;
+      this.formData.reportUserName = this.eventDetailCopy.name;
+      this.formData.reportTime = this.eventDetailCopy.happenTime;
+      this.formData.gridId = this.eventDetailCopy.gridId;
+      this.formData.demandUserId = this.eventDetailCopy.reportUserId;
+      this.formData.demandUserName = this.eventDetailCopy.name;
+      this.formData.demandUserMobile = this.eventDetailCopy.mobile;
+
+      if (
+        this.eventDetailCopy.parentCategoryId &&
+        this.eventDetailCopy.categoryId
+      ) {
         // this.selCategoryArray = []
         // this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
         // this.selCategoryArray.push(this.eventDetailCopy.categoryId)
         // this.formData.categoryId = this.eventDetailCopy.categoryId
-
         // this.selCateObj = {
         //   name: this.eventDetailCopy.categoryName,
         //   id: this.eventDetailCopy.categoryId
         // }
       }
-
     } else {
-      this.formData.demandUserName = this.demandUserName
-      this.formData.demandUserMobile = this.demandUserMobile
-      this.formData.demandUserId = this.demandUserId
+      this.formData.demandUserName = this.demandUserName;
+      this.formData.demandUserMobile = this.demandUserMobile;
+      this.formData.demandUserId = this.demandUserId;
     }
 
+    this.getCategoryList();
+    this.getDemandOptions();
+    this.getServiceOption();
+
+    this.initMap();
   },
 
   methods: {
+    async getCategoryList() {
+      const url = "/gov/issue/issueprojectcategorydict/list";
 
-    async getCategoryList () {
-      const url = "/gov/issue/issueprojectcategorydict/list"
+      let params = {};
 
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        let treeDataNew = this.filterTree(data)
+        let treeDataNew = this.filterTree(data);
 
         //组织级联数据
-        ++this.iscascaderShow
-        this.casOptions = []
-
-
-        this.casOptions = treeDataNew
+        ++this.iscascaderShow;
+        this.casOptions = [];
 
+        this.casOptions = treeDataNew;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    handleChangeCate () {
-      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
-      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-      this.formData.categoryId = this.selCateObj.id
+    handleChangeCate() {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data);
+      this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+      this.formData.categoryId = this.selCateObj.id;
     },
 
     //重构树，去除网格
-    filterTree (arr) {
-      let childs = arr
+    filterTree(arr) {
+      let childs = arr;
       for (let i = childs.length; i--; i > 0) {
         if (childs[i].subCategory) {
           if (childs[i].subCategory.length) {
-            this.filterTree(childs[i].subCategory)
+            this.filterTree(childs[i].subCategory);
           } else {
-            delete childs[i].subCategory
+            delete childs[i].subCategory;
           }
         }
       }
-      return arr
+      return arr;
     },
 
-    async getDemandOptions () {
-      const url = "/heart/icresidemanddict/demandoption"
-      let params = {}
+    async getDemandOptions() {
+      const url = "/heart/icresidemanddict/demandoption";
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.demandOptions = this.getFlagData(
           this.getTreeData(data),
           "usableFlag"
         );
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    async getServiceOption () {
-      const url = "/sys/dict/data/dictlist"
-      let params = { dictType: "user_demand_service_type", }
+    async getServiceOption() {
+      const url = "/sys/dict/data/dictlist";
+      let params = { dictType: "user_demand_service_type" };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.serviceOptions = data;
-
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
     },
 
-    getTreeData (data) {
+    getTreeData(data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -476,7 +485,8 @@ export default {
       });
       return arr;
     },
-    getFlagData (data, flag) {
+
+    getFlagData(data, flag) {
       if (!Array.isArray(data)) return [];
       let arr1 = data.filter((item) => item[flag]);
       let arr2 = arr1.map((item) => {
@@ -488,7 +498,7 @@ export default {
       return arr2;
     },
 
-    handleCateSlect (val) {
+    handleCateSlect(val) {
       console.log("val", val);
       if (val.length === 1) {
         this.demandOptions.forEach((item) => {
@@ -501,7 +511,7 @@ export default {
       }
     },
 
-    handleServiceChange (type, val) {
+    handleServiceChange(type, val) {
       if (val === "social_org") {
         if (type === "add") {
           this.getServiceuserList(val, "add_demand");
@@ -513,8 +523,7 @@ export default {
       }
     },
 
-    async getServiceuserList (serviceType, query) {
-
+    async getServiceuserList(serviceType, query) {
       if (!serviceType) return false;
       const { demandUserId } = this.formData;
       const params = {
@@ -523,154 +532,83 @@ export default {
         queryPurpose: query,
       };
 
+      const url = "/heart/userdemand/servicelist";
 
-      const url = "/heart/userdemand/servicelist"
-
-
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.serviceOptiondList = data.filter(
           (item) => item.value != demandUserId
         );
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
     },
 
-    async getDemandInfo () {
-      this.okflag = false
+    async getDemandInfo() {
+      this.okflag = false;
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
           // this.formData.categoryId = this.selCateObj.id
         } else {
-
-          this.okflag = true
+          this.okflag = true;
         }
       });
     },
 
+    resetData() {},
 
-    resetData () {
-
-    },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('app_map'), {
-        center: center, // 设置地图中心点坐标
-        zoom: 17.2, // 设置地图缩放级别
-        pitch: 43.5, // 设置俯仰角
-        rotation: 45 // 设置地图旋转角度
-      })
-
-      search = new window.TMap.service.Search({ pageSize: 10 })
-      // 新建一个地点搜索类
-      markers = new TMap.MultiMarker({
-        map: map,
-        geometries: []
-      })
-      infoWindowList = Array(10)
-
-      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
-
-      // 监听地图平移结束
-      map.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
+    initMap() {
+      let { latitude, longitude } = this.$store.state.user;
 
-    setMarker (lat, lng) {
-      markers.setGeometries([])
-      markers.add([
+      map = new daiMap(
+        document.getElementById("app_map"),
+        { latitude, longitude },
         {
-          id: '4',
-          styleId: 'marker',
-          position: new TMap.LatLng(lat, lng),
-          properties: {
-            title: 'marker4'
-          }
+          zoom: 16.2, // 设置地图缩放级别
+          pitch: 43.5, // 设置俯仰角
+          rotation: 45, // 设置地图旋转角度
         }
-      ])
-    },
+      );
 
-    handleSearchMap () {
-      infoWindowList.forEach((infoWindow) => {
-        infoWindow.close()
-      })
-      infoWindowList.length = 0
-      markers.setGeometries([])
-      // 在地图显示范围内以给定的关键字搜索地点
-      search
-        .searchRectangle({
-          keyword: this.keyWords,
-          bounds: map.getBounds()
-        })
-        .then((result) => {
-          let { data } = result
-          if (Array.isArray(data) && data.length > 0) {
-            const {
-              location: { lat, lng }
-            } = data[0]
-
-
-            map.setCenter(new TMap.LatLng(lat, lng))
-            this.setMarker(lat, lng)
-            this.formData.latitude = lat
-            this.formData.longitude = lng
-            this.convert()
-          } else {
-            this.$message.error('未检索到相关位置坐标')
-          }
-        })
+      // 监听地图平移结束
+      map.on("dragend", (e) => {
+        this.handleMoveCenter(e);
+      });
+
+      map.setCenter(latitude, longitude);
+      map.setMarker(latitude, longitude);
     },
 
-    handleMoveCenter () {
+    async handleMoveCenter() {
       //修改地图中心点
-      const center = map.getCenter()
-      const lat = center.getLat()
-      const lng = center.getLng()
-      this.formData.latitude = lat
-      this.formData.longitude = lng
-      this.setMarker(lat, lng)
-      this.convert(lat, lng)
+      const { lat, lng } = map.getCenter();
+      this.formData.latitude = lat;
+      this.formData.longitude = lng;
+      map.setMarker(lat, lng);
+
+      let { msg, data } = await map.getAddress(lat, lng);
+      if (msg == "success") {
+        this.formData.address = data.address;
+      }
     },
 
-    convert (lat, lng) {
-      markers.setGeometries([]);
-      // var input = document.getElementById('location').value.split(',');
-      let location
-      if (lat && lng) {
-        location = new TMap.LatLng(lat, lng);
+    async handleSearchMap() {
+      const { msg, data } = await map.searchNearby(this.keyWords);
+      if (msg == "success") {
+        const { lat, lng } = data;
+        map.setCenter(lat, lng);
+        map.setMarker(lat, lng);
+        this.formData.latitude = lat;
+        this.formData.longitude = lng;
       } else {
-        location = new TMap.LatLng(this.formData.latitude, this.formData.longitude);
+        this.$message.error("未检索到相关位置坐标");
       }
-
-      // map.setCenter(location);
-      markers.updateGeometries([
-        {
-          id: 'main', // 点标注数据数组
-          position: location,
-        },
-      ]);
-      geocoder
-        .getAddress({ location: location }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.formData.serviceLocation = result.result.address
-          // 显示搜索到的地址
-        });
     },
 
-
-
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -678,7 +616,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -688,14 +626,11 @@ export default {
 };
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/visual/a_customize.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
 </style>
 
-
-
-
 <style>
 .el-dialog__body {
   padding: 0 10px 20px !important;
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index 3084ebbe4..8decf5b23 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -211,6 +211,9 @@ export default {
 
   data () {
     return {
+      customerId: '',
+      isXiaozhaizi: false,
+
       fieldList: [],
       groupList: [],
       groupIndex: 0,
@@ -395,6 +398,16 @@ export default {
   },
 
   mounted () {
+    //磐石街道：1580460084738760705
+    //烟台客户id:   1535072605621841922
+    //小寨子客户id:   1536638904600752130
+    this.customerId = localStorage.getItem("customerId");
+
+    this.isXiaozhaizi = false
+
+    if (this.customerId === '1536638904600752130') {
+      this.isXiaozhaizi = true
+    }
     this.getApiData();
   },
 
@@ -536,7 +549,7 @@ export default {
             }
           });
         });
-        
+
         await Promise.all(
           this.groupList.map((subList, index) => {
             return Promise.all(
@@ -564,7 +577,7 @@ export default {
             tableName: "ic_hs",
           },
         ];
-        if (!this.isShundeju) {
+        if (!this.isShundeju && !this.isXiaozhaizi) {
           arr = [
             ...arr,
             {
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 8e39a89e2..7bf0ed5e4 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -1,57 +1,57 @@
 <template>
   <div class="g-app">
-    <div class="g-bd" v-if="isShowLogin || true">
+    <div class="g-bd"
+         v-if="isShowLogin || true">
       <div class="m-fm">
         <div class="wrap">
           <h2 class="title">{{ $t("brand.work") }}</h2>
           <div class="fm">
-            <el-form
-              :model="dataForm"
-              :rules="dataRule"
-              ref="dataForm"
-              @keyup.enter.native="dataFormSubmitHandle()"
-              status-icon
-            >
+            <el-form :model="dataForm"
+                     :rules="dataRule"
+                     ref="dataForm"
+                     @keyup.enter.native="dataFormSubmitHandle()"
+                     status-icon>
               <div class="fm-item">
                 <div class="ico">
-                  <img src="@/assets/img/login/zhanghao.png" alt="" />
+                  <img src="@/assets/img/login/zhanghao.png"
+                       alt="" />
                 </div>
-                <el-form-item prop="phone" class="input">
-                  <input
-                    type="text"
-                    v-model="dataForm.phone"
-                    placeholder="账号"
-                  />
+                <el-form-item prop="phone"
+                              class="input">
+                  <input type="text"
+                         v-model="dataForm.phone"
+                         placeholder="账号" />
                 </el-form-item>
               </div>
               <div class="fm-item">
                 <div class="ico">
-                  <img src="@/assets/img/login/mima.png" alt="" />
+                  <img src="@/assets/img/login/mima.png"
+                       alt="" />
                 </div>
-                <el-form-item prop="password" class="input">
-                  <input
-                    type="password"
-                    v-model="dataForm.password"
-                    :placeholder="$t('login.password')"
-                  />
+                <el-form-item prop="password"
+                              class="input">
+                  <input type="password"
+                         v-model="dataForm.password"
+                         :placeholder="$t('login.password')" />
                 </el-form-item>
               </div>
               <div class="fm-captcha">
                 <div class="fm-item">
-                  <el-form-item prop="captcha" class="input">
-                    <input
-                      type="text"
-                      v-model="dataForm.captcha"
-                      placeholder="验证码"
-                    />
+                  <el-form-item prop="captcha"
+                                class="input">
+                    <input type="text"
+                           v-model="dataForm.captcha"
+                           placeholder="验证码" />
                   </el-form-item>
                 </div>
                 <div class="captcha">
-                  <img :src="captchaPath" @click="getCaptcha()" />
+                  <img :src="captchaPath"
+                       @click="getCaptcha()" />
                 </div>
               </div>
 
-              <div class="fm-btn" @click="dataFormSubmitHandle()">
+              <div class="fm-btn"
+                   @click="dataFormSubmitHandle()">
                 {{ $t("login.title") }}
               </div>
               <div class="hint">请使用小程序端的账号密码登录</div>
@@ -63,25 +63,27 @@
       <div class="m-footer">
         <div class="login-footer">
           <p>
-            <a href="" target="_blank">{{ $t("login.copyright") }}</a>
+            <a href=""
+               target="_blank">{{ $t("login.copyright") }}</a>
           </p>
         </div>
       </div>
     </div>
 
-    <c-dialog
-      :showFooter="false"
-      :title="'选择客户'"
-      :isNest="false"
-      :visible="diaVisible"
-      :dialogHeight="0.8"
-      :width="30"
-      :top="'120px'"
-      @cancel="diaCancel"
-    >
+    <c-dialog :showFooter="false"
+              :title="'选择客户'"
+              :isNest="false"
+              :visible="diaVisible"
+              :dialogHeight="0.8"
+              :width="30"
+              :top="'120px'"
+              @cancel="diaCancel">
       <div class="m-pop">
-        <div v-for="(item, index) in tableData" :key="index" class="div_row">
-          <span @click="selectCustomer(item)" class="span_name">{{
+        <div v-for="(item, index) in tableData"
+             :key="index"
+             class="div_row">
+          <span @click="selectCustomer(item)"
+                class="span_name">{{
             item.customerName
           }}</span>
         </div>
@@ -100,7 +102,7 @@ import { Loading } from "element-ui"; // 引入Loading服务
 
 let loading; // 加载动画
 export default {
-  data() {
+  data () {
     return {
       pubKey: null, // 获取到公钥
       isShowLogin: true,
@@ -126,7 +128,7 @@ export default {
     CDialog,
   },
   computed: {
-    dataRule() {
+    dataRule () {
       return {
         phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
         password: [
@@ -138,7 +140,7 @@ export default {
       };
     },
   },
-  created() {
+  created () {
     //平阴联动平台 登陆
     if (this.$route.query.platformToken) {
       this.isShowLogin = false;
@@ -149,13 +151,24 @@ export default {
       this.getPubKey();
     }
   },
-  mounted() {
+  mounted () {
     localStorage.removeItem("showHeader");
   },
 
   methods: {
+    // 登陆后跳转逻辑
+    skipAfterLogin () {
+      let href = localStorage.getItem("thePageAtExit");
+      if (href && href.indexOf("login") == -1) {
+        localStorage.removeItem("thePageAtExit");
+        location.href = href;
+      } else {
+        localStorage.removeItem("thePageAtExit");
+        this.$router.replace({ name: "index" });
+      }
+    },
     // 获取公钥
-    getPubKey() {
+    getPubKey () {
       this.$http
         .post("/auth/govweb/getKey")
         .then(({ data: res }) => {
@@ -165,15 +178,15 @@ export default {
 
           this.pubKey = res.data; // 获取到公钥;
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 获取验证码
-    getCaptcha() {
+    getCaptcha () {
       this.dataForm.uuid = getUUID();
       this.captchaPath = `${window.SITE_CONFIG["apiURL"]}/auth/login/captcha?uuid=${this.dataForm.uuid}`;
     },
     // 表单提交
-    dataFormSubmitHandle() {
+    dataFormSubmitHandle () {
       this.$refs["dataForm"].validate((valid, messageObj) => {
         console.log(valid, messageObj);
         if (!valid) {
@@ -211,7 +224,7 @@ export default {
       });
     },
     // 平阴联动 自动登录接口
-    getAutoLogin(platformToken) {
+    getAutoLogin (platformToken) {
       this.dataForm.thirdToken = platformToken;
       this.dataForm.platform = "pyld";
       this.$http
@@ -229,11 +242,11 @@ export default {
           localStorage.setItem("token", res.data.token);
           this.$router.replace({ name: "index" });
         })
-        .catch(() => {});
+        .catch(() => { });
       // epmet-ext9.elinkservice.cn/platform-admin
     },
     //选择客户
-    selectCustomer(row) {
+    selectCustomer (row) {
       localStorage.setItem("customerId", row.customerId);
       localStorage.setItem("customerName", row.customerName);
       this.startLoading();
@@ -264,11 +277,11 @@ export default {
         });
     },
     // 取消
-    diaCancel() {
+    diaCancel () {
       this.diaVisible = false;
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -276,7 +289,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();