From fae02aa3c220c236c8fafaee6194d3da9512a4d9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 22 Nov 2021 13:55:24 +0800
Subject: [PATCH 1/6] ss

---
 .../communityService/shzz/cpts/edit.vue       | 543 +++++++++++++++++
 .../modules/communityService/shzz/index.vue   | 551 ++++++++++++++++++
 2 files changed, 1094 insertions(+)
 create mode 100644 src/views/modules/communityService/shzz/cpts/edit.vue
 create mode 100644 src/views/modules/communityService/shzz/index.vue

diff --git a/src/views/modules/communityService/shzz/cpts/edit.vue b/src/views/modules/communityService/shzz/cpts/edit.vue
new file mode 100644
index 000000000..c6875c5e6
--- /dev/null
+++ b/src/views/modules/communityService/shzz/cpts/edit.vue
@@ -0,0 +1,543 @@
+<template>
+  <div>
+    <div>
+      <div v-show="!propertyFormShow">
+        <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>{{ 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="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="详细地址"
+                        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-item label="位置坐标"
+                        prop="longitude"
+                        label-width="150px"
+                        style="display: block">
+            <div style="width:500px">
+              <el-input class="item_width_4"
+                        maxlength="50"
+                        placeholder="请输入关键字"
+                        v-model="keyWords">
+              </el-input>
+              <el-button style="margin-left: 10px"
+                         type="primary"
+                         size="small"
+                         @click="handleSearchMap">查询</el-button>
+              <div id="app"
+                   class="div_map"></div>
+              <div style="margin-top: 10px">
+                <span>经度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入经度"
+                          v-model="dataForm.longitude">
+                </el-input>
+                <span style="margin-left: 20px">纬度</span>
+                <el-input class="item_width_3"
+                          maxlength="50"
+                          placeholder="请输入纬度"
+                          v-model="dataForm.latitude">
+                </el-input>
+              </div>
+            </div>
+          </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 @click="handleCancle">取 消</el-button>
+      <el-button 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'
+var map
+var search
+var markers
+var infoWindowList
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      gridList: [],
+      propertyList: [],
+      btnDisable: false,
+
+      neighborHoodId: '', //小区ID
+      dataForm: {
+        neighborHoodName: '', // 小区名称【不超过50字】
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        propertyId: '', //关联物业
+        address: '', //详细地址
+        remark: '', //备注【最大500字】
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '' //纬度
+      },
+
+      propertyFormShow: false,
+      propertyForm: {
+        name: ''
+      },
+
+      keyWords: '',
+      agencyObj: {}
+    }
+  },
+  components: {},
+  mounted () {
+    this.initMap()
+  },
+
+  methods: {
+    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+    initMap () {
+      // 定义地图中心点坐标
+      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
+      // 定义map变量，调用 TMap.Map() 构造函数创建地图
+      map = new window.TMap.Map(document.getElementById('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)
+
+      // 监听地图平移结束
+      map.on('panend', () => {
+        this.handleMoveCenter()
+      })
+      this.handleMoveCenter()
+    },
+
+    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
+        .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.dataForm.latitude = lat
+            this.dataForm.longitude = lng
+          } else {
+            this.$message.error('未检索到相关位置坐标')
+          }
+        })
+    },
+
+    handleMoveCenter () {
+      //修改地图中心点
+      const center = map.getCenter()
+      const lat = center.getLat()
+      const lng = center.getLng()
+      this.dataForm.latitude = lat
+      this.dataForm.longitude = lng
+      this.setMarker(lat, lng)
+    },
+
+    async initForm (type, row, agencyObj) {
+      this.$refs.ref_form.resetFields();
+      this.agencyObj = agencyObj
+      // debugger
+      map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
+
+      this.formType = type
+      if (row) {
+
+        this.dataForm = JSON.parse(JSON.stringify(row))
+        this.neighborHoodId = this.dataForm.neighborHoodId
+      }
+
+
+      await this.loadAgency()
+      await this.loadGrid()
+      await this.loadProperty()
+    },
+
+    //加载组织
+    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.dataForm.propertyId = data.propertyId
+        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.keyWords = ''
+      this.neighborHoodId = '' //小区ID
+      this.dataForm = {
+        neighborHoodName: '', // 小区名称【不超过50字】
+        agencyId: '', // 所属组织ID
+        agencyName: '',
+        gridId: '', //所属网格ID
+        propertyId: '', //关联物业
+        address: '', //详细地址
+        remark: '', //备注【最大500字】
+        location: '', //坐标位置
+        longitude: '', //经度
+        latitude: '' //纬度
+      }
+      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' }
+        ],
+        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 scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+</style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
new file mode 100644
index 000000000..f55570b05
--- /dev/null
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -0,0 +1,551 @@
+<template>
+  <div>
+    <div class="resi-container">
+      <el-card class="resi-card">
+        <el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
+          <el-row class="resi-row" :gutter="20">
+            <el-col :span="8">
+              <div class="resi-cell">
+                <div class="resi-cell-label">组织名称</div>
+                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
+                  <el-input
+                    v-model="fmData.societyName"
+                    class="resi-cell-input"
+                    size="small"
+                    clearable
+                    placeholder="请输入"
+                  >
+                  </el-input>
+                </div>
+              </div>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="resi-cell">
+                <div class="resi-cell-label">负责人</div>
+                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
+                  <el-input
+                    v-model="fmData.personInCharge"
+                    class="resi-cell-input"
+                    size="small"
+                    clearable
+                    placeholder="请输入"
+                  >
+                  </el-input>
+                </div>
+              </div>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="resi-cell">
+                <div class="resi-cell-label">联系电话</div>
+                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
+                  <el-input
+                    v-model="fmData.mobile"
+                    class="resi-cell-input"
+                    size="small"
+                    clearable
+                    placeholder="请输入"
+                  >
+                  </el-input>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="resi-cell">
+                <div class="resi-cell-label">服务时间</div>
+                <div class="resi-cell-value" :class="'resi-cell-value-radio'">
+                  <el-date-picker
+                    v-model="fmData.serviceTime"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
+        </el-row>
+        <el-row class="resi-search">
+          <el-col :span="24">
+            <el-button type="primary" size="small" @click="handleSearch"
+              >查询</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-card>
+    </div>
+
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button type="success" size="small" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button @click="handleRu" type="warning" size="small"
+          >excel导入</el-button
+        >
+        <el-button @click="handleChu" type="danger" size="small"
+          >excel导出</el-button
+        >
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :max-height="maxTableHeight"
+      >
+        <el-table-column label="序号" type="index" align="center" width="50" />
+        <el-table-column prop="societyName" label="社会组织名称">
+        </el-table-column>
+        <el-table-column prop="serviceMatters" label="服务事项">
+        </el-table-column>
+        <el-table-column prop="personInCharge" label="负责人">
+        </el-table-column>
+        <el-table-column prop="mobile" label="负责人电话"> </el-table-column>
+        <el-table-column prop="serviceTime" label="服务时间"> </el-table-column>
+        <el-table-column fixed="right" label="操作" align="center" width="120">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleWatch(scope.row, scope.$index)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+
+            <el-button
+              @click="handleEdit(scope.row)"
+              type="text"
+              size="small"
+              style="margin-right: 10px; color: #00a7a9"
+              >编辑</el-button
+            >
+
+            <el-popconfirm
+              title="删除之后无法回复，确认删除？"
+              @onConfirm="handleDel(scope.row, scope.$index)"
+              @confirm="handleDel(scope.row, scope.$index)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                style="color: #d51010"
+                >删除</el-button
+              >
+            </el-popconfirm>
+          </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="parseInt(pageSize)"
+          layout="sizes, prev, pager, next"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="ref_form"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import editForm from "./cpts/edit";
+
+export default {
+  components: { editForm },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "",
+      formShow: false,
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+        {
+          societyName: "亿联科技",
+          personInCharge: "嘻嘻",
+          serviceMatters: "1111111111111",
+          mobile: "13512345678",
+          serviceTime: "2001-1-1至2022-2-2",
+        },
+      ],
+
+      fmData: {
+        societyName: "",
+        personInCharge: "",
+        mobile: "",
+        serviceStartTime: "",
+        serviceEndTime: "",
+        serviceTime: "",
+      },
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 450;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {
+    "fmData.serviceTime": function (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.serviceStartTime = val[0];
+        this.fmData.serviceEndTime = val[1];
+      }
+    },
+  },
+  mounted() {
+    this.getTableData();
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+    handleSearch(val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    handleAdd() {
+      this.formShow = true;
+    },
+    handleRu() {},
+    handleChu() {},
+    handleWatch(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      this.formShow = true;
+    },
+    handleEdit(rowData, rowIndex) {
+      this.formShow = true;
+    },
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url = "/heart/societyorg/del";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        societyId: tableData[rowIndex].societyId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+
+    async getTableData() {
+      const url = "/heart/societyorg/getlist";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total;
+        this.tableData = data.list.map((item) => {
+          item.serviceTime = item.serviceStartTime + "至" + item.serviceEndTime;
+          return item;
+        });
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.tabs-other-info {
+  .el-tabs__item {
+    // width: 50px;
+    height: 20px;
+    box-sizing: border-box;
+    margin-right: 7px;
+    padding: 0 10px !important;
+    font-size: 8px;
+    font-weight: 500;
+    color: #666666;
+    line-height: 20px;
+    background: #ebecf1;
+    border-radius: 2px;
+  }
+  .el-tabs__nav-wrap::after,
+  .el-tabs__active-bar {
+    display: none;
+  }
+  .el-tabs__nav-next,
+  .el-tabs__nav-prev {
+    line-height: 20px;
+  }
+}
+
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+}
+.resi-other {
+  width: 100%;
+  display: flex;
+  .resi-other-title {
+    width: 100px;
+    box-sizing: border-box;
+    margin-bottom: 10px;
+    // padding: 6px 12px 0 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+  }
+  .tabs-other-info {
+    // padding-left: 60px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+.resi-down {
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+  img {
+    display: block;
+  }
+}
+.resi-row-box {
+  height: 104px;
+  overflow: hidden;
+  transition: height 0.5s;
+}
+.resi-row-more {
+  height: max-content;
+  transition: height 0.5s;
+}
+.resi-row {
+  margin-bottom: 20px;
+}
+.resi-search {
+  .el-col {
+    text-align: right;
+  }
+}
+.resi-cell {
+  display: flex;
+  align-items: center;
+  .resi-cell-label {
+    width: 70px;
+    box-sizing: border-box;
+    margin-right: 15px;
+    text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 180px;
+  }
+  .resi-cell-select {
+    width: 180px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+</style>

From 856b84362089563a90f0e081b7a5c729064d70c9 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 22 Nov 2021 13:59:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E5=85=B3=E7=B3=BB=E4=BA=BA=E5=91=98=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E2=80=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/people.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/visual/basicinfo/people.vue b/src/views/modules/visual/basicinfo/people.vue
index 8fa9049e2..a75bebad5 100644
--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@@ -353,6 +353,7 @@ export default {
     },
     userId() {
       this.getApiData();
+      window.scrollTo(0, 0);
     },
   },
 

From c078479c54a2f7a15a27cc01369ab551f08e4e9e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 22 Nov 2021 14:20:23 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=8B=A5?=
 =?UTF-8?q?=E5=B9=B2=E4=BA=A7=E5=93=81=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/staff-default-avatar.png | Bin 0 -> 2142 bytes
 src/views/main-navbar.vue               |   4 ++--
 src/views/main-shuju/main-navbar.vue    |   8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)
 create mode 100644 src/assets/img/staff-default-avatar.png

diff --git a/src/assets/img/staff-default-avatar.png b/src/assets/img/staff-default-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6927f30595bedaff6b65ef63502f0a61cacca45
GIT binary patch
literal 2142
zcmaJ?c~leU9t|KhKmi5nQbdQKp#`%+fFvb_kg!S+Vlb4YF(d<tA(@a25cVx9)LL-?
zL@QtsE1&`j0<w4%QNaST6j7f(Hme9_?Gtz{+Qf=|e>^+q%zVqa_x`qf&Sd-hc^c|}
zs*gY*486S=EcJ@jyvUE#UrvLqlX}?*y9dF$pa?jQCkGKU0Td1b-V$CU$O3tS_~>@f
z8G+D2i`YSM5Yv~!ha^~@27^^fWNJ17;q0Q6@%Um82ExHek(7#>ZoG~HL;@;`<G{o-
zWpq#|@=B0{yAu4^`~)$dEI_$@2{<b$Y5@rd^8lqJN~)kJsi?QQ6!l(njY9!%A+VT=
z`YWj*rawT3<RIXHb;R%q_9VcGj3qdbNp{5TfE}LTh{Ka{1R@4cpy0_AJOOz3pw!Xi
zf(QzW;qfk(`b0$uVOU1N;o{=ruyOWSNFIqJkjZ2m-VSGHhfyOiig+o^Q(~kFs}%(X
zsNl;*GFSvj0gWOr9EyRdD0QZPl^~J5mz65swMpGDoRTNQ5wLhoNh?4m^Piy-$$PW{
zW`Td_`+tQM?06Z7V}S}NM$T6cF2YI^N=Bi}K^_dr*$@=9(nWtE1VaiTBm?MlP1l@&
z&p0Bf0E$z5{+7dJQoN-Km?!0f-V7>At%4Pa1Qeo!or5EdMkcyB&<F%~I*nvU_aL|t
zX=H+<2N7?-!ev1G7zrqaSGa<|xwH>*HFl85)R7sWToelmJmioBcw06_^x<5bKB)JO
zEBJ6Oqz`g&>SS=5;r`FCSFY3!(rn*bSABSIeo(4*yj*SVQrp3e2*j!`Zw8I6eANFH
zGs@iE>~*Z<P8WB=CV);)H(?!TrED|H5e7Sav#7^rWSFioLh1#Mq}4|cWemCHr0v+6
zQ|#Uh^rP7Ov`cgKKglo%aQ87~A7hQ7{j!kJmKQA&4=jvCJBy)_ux@m8;at39;}!dV
zC;t9R=TGKzq!u&V<dx6AnDqr!x&FAKH=ZZZe|RtMljY4=3~#ykb%9bBX<E1~$^9;J
z`sQ>J<}s3U^Tvcht%{=;JzNxeL^5z`-RvDCp*q3jSn{HWv)cwUv32I<?oZ-3f*(a1
z@Umns1H1R@HLJ>=*<4^W9hxybV=-YxxY?@O@pTrI&l9g6;JgOlwIglDz6UyDRHK2e
zpB`<EZZF$DyMSCclb~v7;&ufpU6Zn39>1e!{e6}v^0{8!_^UNVt5Z&P<@T(Z0Wb)P
zqu6wd^&~p<d1^*SX6CiCed}g^A*Z*lPmg-K`SN7L+6^y=RSvA^dCAey#`3mSR>^=*
z2>8Qt<f<;;as$g}8LwlBN4I>rH+)BZ_}np8`oz+Wr5Ynq-r-cMUQX8OZSr8j&*E}d
z?r86(nSt)$iXMsT$NuxZl@n<P?g(wr83(I|WT$tH47wY%*X-sj$B#4>PW6b!E5&1x
zS4syWE+4GY_X!I@ctq4(=n5@yCM~ShreH8$6_1uFsTj5s_YZHdc6(Ro0%4YVP1@@=
zA53>0+WRP5Io|xZWWO{&Y|^F?4$)h4xFw{l>|?pkkte8<dY{d3<*|WNkIifO|HYzP
z`VNbJtzGR~Gr-H<L(?LY%D&y8t@FE13jCn!7Bo{*dM<cK$VFK6XfJ)Qy~-wjWT^(H
z`VQTCc<N-lw#iHYOYpE88$_Z?EemVzheqz{W}*ult<!|J>ZH9brd%uUD-~OvfZ0^?
zCN%O?Q%ixbR;Eh?o|xArIO_DIl;^))ce?lfV5l)%w|b`IDR5OXH@RRxX+xJ^oCr4I
z=o)SEv2?V`D}X0UtGI(5=Mr?dO&e~9T|Bp5-@5+Q2~G_6b&^)~=K*F@DvO71?E(Av
zO?S<H{xQ;Cv99pV)_pZ~58?jfr@|K+A6(b<I~1Wm?B{0I7G=FHCotEx{|%KEAS90N
zyZzNJG!QnCm~zvm`aCneG_l;|v+N0!_>G%Y^u7P|7R@C4M=*D;-5fo?n@{pQE3gb4
z=?jY8(-Bn>TwHy-wsxm!#Jtr=*5f(~q*rXop6sh?@VSw!8hx<#8*%lruUq$2afrTW
z|Djui28@kut)SpRB3(DNlVa%QZBufIqe>nw?N2>pt2&Lj^n<>_x!mOW>G`yfT;r+A
z8|FLr2k^)4K8qu58|W-g!Q}e4d`ny4zBC&CH8QkP_i6j|+`&H6>m8lvZ3|ACF2-)n
z96t*#NJxutPjhF@{_z(3tgGuD%s$R59Q4vVW6hSfy_BDOQDU<-`TSt9-@{-({A<_x
zIv=khD`&<DT>fuk`m2%o6=}bL?ch`9)mXx^=Zid@@Mb}%JnIW8@m|y2BB9d4%lKYP
zzC&n3(D59@r2745U2>AqyDvN&uCIzKu~<*BxbL^<r3|k%7M}j@*3P|~vWxo3CQeC%
zW6+T$&sX=p7(1HY?P)$|9x~Qt8($ojqgXYq6%j*O=B8;O=tdtukzOMeX#V)#?tY9*
IZhJER1R(!%T>t<8

literal 0
HcmV?d00001

diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index bce1e51ab..0e9bdce5e 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -8,10 +8,10 @@
       <div class="aui-navbar__header">
         <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
           <a class="aui-navbar__brand-lg" href="javascript:;">{{
-            userType === 'work' ? customerName : $t('brand.lg')
+            customerName
           }}</a>
           <a class="aui-navbar__brand-mini" href="javascript:;">{{
-            $t('brand.mini')
+            customerName.slice(0, 2)
           }}</a>
         </h1>
       </div>
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 4891afad9..181e7d51a 100644
--- a/src/views/main-shuju/main-navbar.vue
+++ b/src/views/main-shuju/main-navbar.vue
@@ -10,7 +10,7 @@
             userType === 'work' ? customerName : $t('brand.lg')
           }}</a>
           <a class="navbar__brand-mini" href="javascript:;">{{
-            $t('brand.mini')
+            customerName.slice(0, 2)
           }}</a>
         </h1>
       </div>
@@ -94,11 +94,7 @@
           <el-menu-item index="4" class="navbar__avatar">
             <el-dropdown placement="bottom" :show-timeout="0">
               <span class="el-dropdown-link">
-                <img
-                  v-if="$store.state.user.gender === '2'"
-                  src="~@/assets/img/staff-default-avatar-girl.png"
-                />
-                <img v-else src="~@/assets/img/staff-default-avatar-boy.png" />
+                <img src="~@/assets/img/staff-default-avatar.png" />
                 <span>{{ $store.state.user.realName }}</span>
                 <i class="el-icon-arrow-down"></i>
               </span>

From 783b6bc00b6340c362df3f1453cfa61cd3668462 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 22 Nov 2021 16:31:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/buildTable.vue     |   2 +-
 .../modules/base/community/communityTable.vue |   2 +-
 .../modules/base/community/roomTable.vue      |   2 +-
 .../communityParty/regionalParty/units.vue    |  10 +-
 .../regionalParty/unitsForm.vue               |   8 +-
 .../ninePlaces/places/places.vue              | 334 +++--------
 .../ninePlaces/places/placesForm.vue          | 394 ++++---------
 .../communityService/ninePlaces/team/team.vue | 390 +++---------
 .../ninePlaces/team/teamForm.vue              | 440 ++++++++++++++
 .../ninePlaces/team/unitsForm.vue             | 553 ------------------
 10 files changed, 735 insertions(+), 1400 deletions(-)
 create mode 100644 src/views/modules/communityService/ninePlaces/team/teamForm.vue
 delete mode 100644 src/views/modules/communityService/ninePlaces/team/unitsForm.vue

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index afe06e31e..18c4a1574 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -118,7 +118,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 8c6f09364..4fc23e5ed 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -119,7 +119,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 7fb5197fb..8a065fb7e 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -129,7 +129,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index b8849d202..792c22440 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -151,7 +151,7 @@
                          label="分类"
                          width="180">
         </el-table-column>
-        <el-table-column prop="serviceMatter"
+        <el-table-column prop="serviceMatterShow"
                          header-align="center"
                          align="center"
                          label="服务事项"
@@ -404,6 +404,14 @@ export default {
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
+        this.tableData.forEach(item => {
+          item.serviceMatterShow = ''
+          if (item.serviceMatterList.length > 0) {
+            item.serviceMatterShow = item.serviceMatterList.jone('')
+
+          }
+
+        });
       } else {
         this.$message.error(msg)
       }
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 383174ba6..0f9371a13 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -54,12 +54,12 @@
 
           </el-form-item>
           <el-form-item label="服务事项"
-                        prop="serviceMatter"
+                        prop="serviceMatterList"
                         label-width="150px"
                         style="display: block">
             <el-checkbox-group class="item_width_1"
                                style="display:flex;flex-wrap:wrap"
-                               v-model="formData.serviceMatter">
+                               v-model="formData.serviceMatterList">
               <el-checkbox v-for="item in serviceList"
                            :key="item.value"
                            :label="item.value">{{item.label}}</el-checkbox>
@@ -197,7 +197,7 @@ export default {
       formData: {
         gridId: '',
         unitName: '',
-        serviceMatter: [],
+        serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
@@ -429,7 +429,7 @@ export default {
       this.formData = {
         gridId: '',
         unitName: '',
-        serviceMatter: [],
+        serviceMatterList: [],
         type: '',
         contact: '',
         contactMobile: '',
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 8db72b0e2..0d0dd69fc 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -6,7 +6,30 @@
                ref="ref_searchform"
                :label-width="'100px'">
         <div>
-          <el-form-item label="所属网格"
+
+          <el-form-item label="场所名称"
+                        prop="placeOrgName">
+            <el-input v-model="formData.placeOrgName"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入九小场所名称">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="联系电话"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入电话">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="场所区域"
                         prop="gridId">
             <el-select class="item_width_1"
                        v-model="formData.gridId"
@@ -20,20 +43,13 @@
             </el-select>
 
           </el-form-item>
-          <el-form-item label="单位名称"
-                        prop="unitName">
-            <el-input v-model="formData.unitName"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
 
-          </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatter">
+        </div>
+        <div>
+          <el-form-item label="规模"
+                        prop="scale">
             <el-select class="item_width_1"
-                       v-model="formData.serviceMatter"
+                       v-model="formData.scale"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in scaleList"
@@ -44,12 +60,10 @@
             </el-select>
 
           </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="分类"
-                        prop="type">
+          <el-form-item label="场所类型"
+                        prop="ninePlacsVal">
             <el-select class="item_width_1"
-                       v-model="formData.type"
+                       v-model="formData.ninePlacsVal"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
@@ -59,27 +73,6 @@
               </el-option>
             </el-select>
 
-          </el-form-item>
-          <el-form-item label="联系人"
-                        prop="contact">
-            <el-input v-model="formData.contact"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
-          </el-form-item>
-
-          <el-form-item label="联系电话"
-                        prop="contactMobile">
-            <el-input v-model="formData.contactMobile"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
           </el-form-item>
 
           <el-button style="margin-left:10px"
@@ -94,32 +87,9 @@
       </el-form>
     </div>
     <div class="div_table">
-      <div class="div_btn">
-        <el-button style="float:left"
-                   type="green"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-        <el-upload ref="upload"
-                   :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"
-                     type="red">导入</el-button>
-
-          <el-button style="float:left"
-                     type="yellow"
-                     size="small"
-                     @click="handleExport">导出</el-button>
-
-        </el-upload>
-
-      </div>
+      <el-button type="green"
+                 size="small"
+                 @click="handleAdd">新增</el-button>
 
       <el-table class="table"
                 :data="tableData"
@@ -133,61 +103,43 @@
                          align="center"
                          type="index"
                          width="50"></el-table-column>
-        <el-table-column prop="gridName"
+        <el-table-column prop="placeOrgName"
                          header-align="center"
                          align="center"
-                         label="所属网格"
-                         width="180">
+                         label="场所名称"
+                         min-width="280">
         </el-table-column>
-        <el-table-column prop="unitName"
+        <el-table-column prop="address"
                          header-align="center"
                          align="center"
-                         label="单位名称"
-                         width="180">
+                         label="场所地址"
+                         min-width="280">
         </el-table-column>
-        <el-table-column prop="type"
+        <el-table-column prop="ninePlaceName"
                          header-align="center"
                          align="center"
-                         label="分类"
-                         width="180">
+                         label="场所类型"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="serviceMatter"
+        <el-table-column prop="scale"
                          header-align="center"
                          align="center"
-                         label="服务事项"
-                         width="180">
+                         label="规模"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="contact"
+        <el-table-column prop="personInCharge"
                          header-align="center"
                          align="center"
-                         label="联系人"
-                         width="100">
+                         label="负责人"
+                         min-width="100">
         </el-table-column>
-        <el-table-column prop="contactMobile"
+        <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
                          label="联系电话"
-                         width="110">
-        </el-table-column>
-        <el-table-column prop="memberCount"
-                         header-align="center"
-                         align="center"
-                         label="在职党员数"
-                         width="150">
-        </el-table-column>
-        <el-table-column prop="satisfaction"
-                         header-align="center"
-                         align="center"
-                         label="群众满意度"
-                         width="150">
-        </el-table-column>
-        <el-table-column prop="remark"
-                         header-align="center"
-                         align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true"
-                         width="150">
+                         min-width="110">
         </el-table-column>
+
         <el-table-column label="操作"
                          fixed="right"
                          width="140"
@@ -196,10 +148,6 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
-                       style="color:#1C6AFD;text-decoration: underline;"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
             <el-button type="text"
                        style="color:#00A7A9;text-decoration: underline;"
                        size="small"
@@ -216,7 +164,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
@@ -266,25 +214,20 @@ export default {
       scaleList: [],//规模list
       placeTypeList: [],//场所类型list
 
-      unitId: '',
       formData: {
-        gridId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
+        placeOrgName: '',//场所名称	
+        mobile: '',//联系电话	
+        scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
+        gridId: '',//场所区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       },
 
       tableData: [],
 
       //form相关
       formShow: false,
-      formTitle: '新增单位',
-
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
+      formTitle: '新增场所',
 
     }
   },
@@ -295,11 +238,11 @@ export default {
 
   },
   async mounted () {
-    //获取服务事项
-    await this.loadService()
+    //获取规格
+    await this.loadScale()
 
-    //获取分类
-    await this.loadType()
+    //获取场所类型
+    await this.loadPlaceType()
 
     const { user } = this.$store.state
     this.agencyId = user.agencyId
@@ -332,13 +275,12 @@ export default {
 
     },
 
-    //获取服务事项下拉框
-    async loadService () {
-      // const url = "/heart/icresidemanddict/subcodelist"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
+    //获取场所类型
+    async loadScale () {
+      const url = "/sys/dict/data/dictlist"
 
       let params = {
-        parentCategoryCode: '1010'
+        dictType: 'scale'
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -351,12 +293,12 @@ export default {
       }
 
     },
-    //获取分类
-    async loadType () {
+    //获取场所类型
+    async loadPlaceType () {
       const url = "/sys/dict/data/dictlist"
 
       let params = {
-        dictType: 'party_unit_type'
+        dictType: 'nine_small_places'
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -373,12 +315,11 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/heart/icpartyunit/list"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
+      // const url = "/gov/org/placeorg/getlist"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        agencyId: this.agencyId,
         ...this.formData
       }
 
@@ -420,7 +361,7 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
+        this.$refs.ref_form.initForm('edit', row.placeOrgId)
       })
     },
 
@@ -441,7 +382,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.deleteUnit(row)
+          this.deletePlace(row)
         })
         .catch(err => {
           if (err == "cancel") {
@@ -451,12 +392,12 @@ export default {
         });
     },
 
-    async deleteUnit (row) {
-      // const url = "/heart/icpartyunit/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+    async deletePlace (row) {
+      // const url = "/gov/org/placeorg/del"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/del"
 
       let params = {
-        id: row.id
+        placeOrgId: row.placeOrgId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -476,118 +417,15 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        gridId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
-      }
-    },
-
-    //导出表格
-    async handleExport () {
-      let title = '联建单位列表'
-
-
-      const url = "/partyunit/export"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id
+        placeOrgName: '',//场所名称	
+        mobile: '',//联系电话	
+        scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
+        gridId: '',//场所区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
-
-      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('请选择正确格式的文件')
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile () {
-      this.loading = true
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      //清空上传列表
-      this.$refs['upload'].clearFiles()
-
-      var url = '/partyunit/import'
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      const { data, code, msg } = await requestPost(url, fileFormData)
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "导入成功"
-        });
-
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
 
     handleSizeChange (val) {
       this.pageSize = val
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 383174ba6..8b3fbe1c1 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -9,7 +9,23 @@
                  :disabled="formType === 'detail'"
                  class="form">
 
-          <el-form-item label="所属网格"
+          <el-form-item label="场所类型"
+                        label-width="150px"
+                        prop="ninePlacsVal">
+            <el-select class="item_width_1"
+                       v-model="formData.ninePlacsVal"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in placeTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="场所区域"
                         prop="gridId"
                         label-width="150px"
                         style="display: block">
@@ -25,27 +41,35 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="单位名称"
-                        prop="unitName"
+          <el-form-item label="场所名称"
                         label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      maxlength="50"
-                      show-word-limit
-                      placeholder="请输入单位名称"
-                      v-model="formData.unitName">
+                        prop="placeOrgName">
+            <el-input v-model="formData.placeOrgName"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入九小场所名称">
             </el-input>
+
           </el-form-item>
-          <el-form-item label="分类"
-                        prop="type"
+          <el-form-item label="场所地址"
                         label-width="150px"
-                        style="display: block">
+                        prop="address">
+            <el-input v-model="formData.address"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入场所地址">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="规模"
+                        label-width="150px"
+                        prop="scale">
             <el-select class="item_width_1"
-                       v-model="formData.type"
+                       v-model="formData.scale"
                        placeholder="请选择"
-                       filterable
                        clearable>
-              <el-option v-for="item in typeList"
+              <el-option v-for="item in scaleList"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -53,107 +77,24 @@
             </el-select>
 
           </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatter"
+          <el-form-item label="负责人"
                         label-width="150px"
-                        style="display: block">
-            <el-checkbox-group class="item_width_1"
-                               style="display:flex;flex-wrap:wrap"
-                               v-model="formData.serviceMatter">
-              <el-checkbox v-for="item in serviceList"
-                           :key="item.value"
-                           :label="item.value">{{item.label}}</el-checkbox>
-
-            </el-checkbox-group>
-
-          </el-form-item>
-          <el-form-item label="联系人"
-                        prop="contact"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      placeholder="请输入联系人姓名"
-                      v-model="formData.contact">
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入负责人姓名">
             </el-input>
+
           </el-form-item>
           <el-form-item label="联系电话"
-                        prop="contactMobile"
                         label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      placeholder="请输入联系人电话"
-                      v-model="formData.contactMobile">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="在职党员"
-                        style="display: block"
-                        prop="memberCount"
-                        label-width="150px">
-            <el-input-number class="item_width_1"
-                             v-model="formData.memberCount"
-                             :min="1"
-                             label="单元数"></el-input-number>
-          </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="formData.remark"></el-input>
-          </el-form-item>
-          <el-form-item label="位置坐标"
-                        prop="longitude"
-                        label-width="150px"
-                        style="display: block">
-            <div style="width:500px">
-
-              <div class="div_map">
-                <div id="app">
-
-                </div>
-                <div class="div_searchmap">
-                  <el-input class="item_width_4"
-                            maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
-                  </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
-                </div>
-              </div>
-
-              <div style="margin-top: 10px">
-                <span>经度</span>
-                <el-input class="item_width_3"
-                          maxlength="50"
-                          placeholder="请输入经度"
-                          v-model="formData.longitude">
-                </el-input>
-                <span style="margin-left: 20px">纬度</span>
-                <el-input class="item_width_3"
-                          maxlength="50"
-                          placeholder="请输入纬度"
-                          v-model="formData.latitude">
-                </el-input>
-              </div>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="地理位置"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
-
-            <el-input class="item_width_1"
-                      v-model="formData.address">
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      type='number'
+                      clearable
+                      placeholder="请输入电话">
             </el-input>
 
           </el-form-item>
@@ -176,14 +117,6 @@ import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
 
-
-
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
 let loading // 加载动画
 export default {
   data () {
@@ -192,41 +125,33 @@ export default {
 
       btnDisable: false,
 
-      unitId: '',
-      keyWords: '',
+      placeOrgId: '',
       formData: {
         gridId: '',
-        unitName: '',
-        serviceMatter: [],
-        type: '',
-        contact: '',
-        contactMobile: '',
-        memberCount: 0,
-        remark: '', //备注【最大500字】
-        address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
+        ninePlacsVal: '',
+        placeOrgName: '',
+        address: '',
+        scale: '',
+        personInCharge: '',
+        mobile: ''
       },
 
     }
   },
   components: {},
   mounted () {
-    this.initMap()
+
   },
 
   methods: {
 
-    async initForm (type, unitId) {
+    async initForm (type, placeOrgId) {
       this.$refs.ref_form.resetFields();
 
-      // debugger
-      // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
       this.formType = type
-      if (unitId) {
-        this.unitId = unitId
-        this.formData.id = unitId
+      if (placeOrgId) {
+        this.placeOrgId = placeOrgId
+        this.formData.placeOrgId = placeOrgId
         await this.loadFormData()
       }
 
@@ -234,10 +159,10 @@ export default {
 
     //加载组织
     async loadFormData () {
-      // const url = '/heart/icpartyunit/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+      // const url = '/gov/org/placeorg/detail'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
       let params = {
-        id: this.unitId
+        placeOrgId: this.placeOrgId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -263,16 +188,16 @@ export default {
           app.util.validateRule(messageObj)
           this.btnDisable = false
         } else {
-          this.addUnit()
+          this.addPlace()
         }
 
       })
 
 
     },
-    async addUnit () {
+    async addPlace () {
       // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.contactMobile) === false) {
+      // if (regPhone.test(this.formData.mobile) === false) {
       //   this.btnDisable = false
       //   this.$message({
       //     type: 'warning',
@@ -281,18 +206,23 @@ export default {
       //   return false;
       // }
 
-      // let url = '/heart/icpartyunit/save'
-      let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
-      // if (this.formType === 'edit') {
-      //  this.formData.id = this.unitId
-      // } 
+      let url = ''
+
+      if (this.formType === 'edit') {
+        // url = '/gov/org/placeorg/edit'
+        url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
+
+      } else {
+        // url = "/gov/org/placeorg/add"
+        url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/add"
+      }
 
       const { data, code, msg } = await requestPost(url, this.formData)
 
       if (code === 0) {
         this.$message({
           type: 'success',
-          message: '新增联建单位成功'
+          message: '操作成功'
         })
         this.resetData()
         this.$emit('dialogOk')
@@ -311,133 +241,16 @@ export default {
 
     },
 
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('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.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
-
-    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
-        .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)
-    },
-
-    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
-          // 显示搜索到的地址
-        });
-    },
-
-
     resetData () {
-      this.unitId = ''
-      this.keyWords = ''
+      this.placeOrgId = ''
       this.formData = {
         gridId: '',
-        unitName: '',
-        serviceMatter: [],
-        type: '',
-        contact: '',
-        contactMobile: '',
-        memberCount: 0,
-        remark: '', //备注【最大500字】
-        address: '', //详细地址
-        longitude: '', //经度
-        latitude: '' //纬度
+        ninePlacsVal: '',
+        placeOrgName: '',
+        address: '',
+        scale: '',
+        personInCharge: '',
+        mobile: ''
       }
     },
     // 开启加载动画
@@ -462,27 +275,24 @@ export default {
         gridId: [
           { required: true, message: '所属网格不能为空', trigger: 'blur' }
         ],
-        unitName: [
-          { required: true, message: '单位名称不能为空', trigger: 'blur' },
+        ninePlacsVal: [
+          { required: true, message: '场所类型不能为空', trigger: 'blur' },
         ],
-        type: [
-          { required: true, message: '分类不能为空', trigger: 'blur' }
+        placeOrgName: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' }
         ],
 
-        contact: [
-          { required: true, message: '联系人不能为空', trigger: 'blur' }
-        ],
-        contactMobile: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        address: [
+          { required: true, message: '场所地址不能为空', trigger: 'blur' }
         ],
-        memberCount: [
-          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
+        scale: [
+          { required: true, message: '场所规模不能为空', trigger: 'blur' }
         ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        personInCharge: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
         ],
-        longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
+        mobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
         ]
       }
     },
@@ -494,11 +304,11 @@ export default {
       type: Array,
       default: []
     },
-    typeList: {
+    scaleList: {
       type: Array,
       default: []
     },
-    serviceList: {
+    placeTypeList: {
       type: Array,
       default: []
     },
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index b8849d202..615cd8e02 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -6,37 +6,37 @@
                ref="ref_searchform"
                :label-width="'100px'">
         <div>
-          <el-form-item label="所属网格"
-                        prop="gridId">
-            <el-select class="item_width_1"
-                       v-model="formData.gridId"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in gridList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
+
+          <el-form-item label="负责人"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      class="item_width_1"
+                      size="small"
+                      clearable
+                      placeholder="请输入负责人姓名">
+            </el-input>
 
           </el-form-item>
-          <el-form-item label="单位名称"
-                        prop="unitName">
-            <el-input v-model="formData.unitName"
+
+          <el-form-item label="联系电话"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
                       class="item_width_1"
                       size="small"
                       clearable
-                      placeholder="请输入内容">
+                      placeholder="请输入电话">
             </el-input>
 
           </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatter">
+        </div>
+        <div>
+          <el-form-item label="负责区域"
+                        prop="gridId">
             <el-select class="item_width_1"
-                       v-model="formData.serviceMatter"
-                       placeholder="请选择"
+                       v-model="formData.gridId"
+                       placeholder="全部"
                        clearable>
-              <el-option v-for="item in serviceList"
+              <el-option v-for="item in gridList"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -44,42 +44,20 @@
             </el-select>
 
           </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="分类"
-                        prop="type">
+
+          <el-form-item label="场所类型"
+                        prop="ninePlacsVal">
             <el-select class="item_width_1"
-                       v-model="formData.type"
+                       v-model="formData.ninePlacsVal"
                        placeholder="请选择"
                        clearable>
-              <el-option v-for="item in typeList"
+              <el-option v-for="item in placeTypeList"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
               </el-option>
             </el-select>
 
-          </el-form-item>
-          <el-form-item label="联系人"
-                        prop="contact">
-            <el-input v-model="formData.contact"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
-          </el-form-item>
-
-          <el-form-item label="联系电话"
-                        prop="contactMobile">
-            <el-input v-model="formData.contactMobile"
-                      class="item_width_1"
-                      size="small"
-                      clearable
-                      placeholder="请输入内容">
-            </el-input>
-
           </el-form-item>
 
           <el-button style="margin-left:10px"
@@ -94,32 +72,9 @@
       </el-form>
     </div>
     <div class="div_table">
-      <div class="div_btn">
-        <el-button style="float:left"
-                   type="green"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-        <el-upload ref="upload"
-                   :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"
-                     type="red">导入</el-button>
-
-          <el-button style="float:left"
-                     type="yellow"
-                     size="small"
-                     @click="handleExport">导出</el-button>
-
-        </el-upload>
-
-      </div>
+      <el-button type="green"
+                 size="small"
+                 @click="handleAdd">新增</el-button>
 
       <el-table class="table"
                 :data="tableData"
@@ -133,61 +88,49 @@
                          align="center"
                          type="index"
                          width="50"></el-table-column>
-        <el-table-column prop="gridName"
-                         header-align="center"
-                         align="center"
-                         label="所属网格"
-                         width="180">
-        </el-table-column>
-        <el-table-column prop="unitName"
-                         header-align="center"
-                         align="center"
-                         label="单位名称"
-                         width="180">
-        </el-table-column>
-        <el-table-column prop="type"
+        <el-table-column prop="placeOrgName"
                          header-align="center"
                          align="center"
-                         label="分类"
-                         width="180">
+                         label="分队名称"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="serviceMatter"
+        <el-table-column prop="address"
                          header-align="center"
                          align="center"
-                         label="服务事项"
-                         width="180">
+                         label="负责人"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="contact"
+        <el-table-column prop="ninePlaceName"
                          header-align="center"
                          align="center"
-                         label="联系人"
-                         width="100">
+                         label="联系电话"
+                         min-width="110">
         </el-table-column>
-        <el-table-column prop="contactMobile"
+        <el-table-column prop="scale"
                          header-align="center"
                          align="center"
-                         label="联系电话"
-                         width="110">
+                         label="负责区域"
+                         min-width="280">
         </el-table-column>
-        <el-table-column prop="memberCount"
+        <el-table-column prop="personInCharge"
                          header-align="center"
                          align="center"
-                         label="在职党员数"
-                         width="150">
+                         label="负责场所类型"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="satisfaction"
+        <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
-                         label="群众满意度"
-                         width="150">
+                         label="监察计划"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="remark"
+        <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true"
-                         width="150">
+                         label="创建时间"
+                         min-width="120">
         </el-table-column>
+
         <el-table-column label="操作"
                          fixed="right"
                          width="140"
@@ -216,7 +159,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[10, 20, 50]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
@@ -232,12 +175,11 @@
                width="850px"
                top="5vh"
                @closed="diaClose">
-      <units-form ref="ref_form"
-                  :gridList="gridList"
-                  :serviceList="serviceList"
-                  :typeList="typeList"
-                  @dialogCancle="addFormCancle"
-                  @dialogOk="addFormOk"></units-form>
+      <team-form ref="ref_form"
+                 :gridList="gridList"
+                 :placeTypeList="placeTypeList"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></team-form>
     </el-dialog>
 
   </div>
@@ -245,7 +187,7 @@
 
 <script>
 
-import unitsForm from './unitsForm'
+import teamForm from './teamForm'
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -260,63 +202,37 @@ export default {
       pageSize: 10,
       pageNo: 0,
       tableLoading: false,
+
       agencyId: '',
-      gridList: [],//所属网格list
-      unitList: [],//单位list
-      serviceList: [
-        {
-          id: "1",
-          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
-        },
-        {
-          id: "2",
-          name: '积极配合'
-        },
-        {
-          id: "3",
-          name: '积极配合社区安全巡查员进行'
-        },
-        {
-          id: "4",
-          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
-        },
-      ],//服务list
-      typeList: [],//分类list
-
-      unitId: '',
+      gridList: [],//所属网格list--场所区域
+      scaleList: [],//规模list
+      placeTypeList: [],//场所类型list
+
       formData: {
-        gridId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       },
 
       tableData: [],
 
       //form相关
       formShow: false,
-      formTitle: '新增单位',
-
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
+      formTitle: '新增巡查人员',
 
     }
   },
   components: {
-    unitsForm
+    teamForm
   },
   async created () {
 
   },
   async mounted () {
-    //获取服务事项
-    await this.loadService()
-
-    //获取分类
-    await this.loadType()
+    //获取场所类型
+    await this.loadPlaceType()
 
     const { user } = this.$store.state
     this.agencyId = user.agencyId
@@ -349,37 +265,18 @@ export default {
 
     },
 
-    //获取服务事项下拉框
-    async loadService () {
-      // const url = "/heart/icresidemanddict/subcodelist"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icresidemanddict/subcodelist"
-
-      let params = {
-        parentCategoryCode: '1010'
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.serviceList = data
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-    //获取分类
-    async loadType () {
+    //获取场所类型
+    async loadPlaceType () {
       const url = "/sys/dict/data/dictlist"
 
       let params = {
-        dictType: 'party_unit_type'
+        dictType: 'nine_small_places'
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.typeList = data
+        this.placeTypeList = data
 
       } else {
         this.$message.error(msg)
@@ -390,12 +287,11 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/heart/icpartyunit/list"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
+      // const url = "/gov/org/placeorg/getlist"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        agencyId: this.agencyId,
         ...this.formData
       }
 
@@ -421,7 +317,7 @@ export default {
       this.formTitle = '详情'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.id)
+        this.$refs.ref_form.initForm('detail', row.teamId, this.agencyId)
       })
     },
 
@@ -429,7 +325,7 @@ export default {
       this.formTitle = '新增'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null)
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
       })
     },
 
@@ -437,7 +333,7 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
+        this.$refs.ref_form.initForm('edit', row.teamId, this.agencyId)
       })
     },
 
@@ -458,7 +354,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.deleteUnit(row)
+          this.deleteTeam(row)
         })
         .catch(err => {
           if (err == "cancel") {
@@ -468,12 +364,12 @@ export default {
         });
     },
 
-    async deleteUnit (row) {
-      // const url = "/heart/icpartyunit/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+    async deleteTeam (row) {
+      // const url = "/gov/org/placepatrolteam/del"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
 
       let params = {
-        id: row.id
+        teamId: row.teamId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -493,118 +389,14 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        gridId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
     },
 
-    //导出表格
-    async handleExport () {
-      let title = '联建单位列表'
-
-
-      const url = "/partyunit/export"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        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);
-        }
-      );
-
-    },
-
-    // 下载文件
-    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('请选择正确格式的文件')
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile () {
-      this.loading = true
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      //清空上传列表
-      this.$refs['upload'].clearFiles()
-
-      var url = '/partyunit/import'
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      const { data, code, msg } = await requestPost(url, fileFormData)
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "导入成功"
-        });
-
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
 
     handleSizeChange (val) {
       this.pageSize = val
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
new file mode 100644
index 000000000..534afb1fe
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -0,0 +1,440 @@
+<template>
+  <div>
+    <div>
+      <div>
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 :disabled="formType === 'detail'"
+                 class="form">
+
+          <el-form-item label="分队名称"
+                        label-width="150px"
+                        prop="teamName">
+            <el-input v-model="formData.teamName"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入分队名称">
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="负责区域"
+                        prop="gridIdArray"
+                        label-width="150px"
+                        style="display: block">
+            <el-select class="item_width_1"
+                       v-model="formData.gridIdArray"
+                       placeholder="全部"
+                       multiple
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="负责场所类型"
+                        prop="ninePlacsArray"
+                        label-width="150px"
+                        style="display: block">
+            <el-checkbox-group class="item_width_1"
+                               style="display:flex;flex-wrap:wrap"
+                               v-model="formData.ninePlacsArray">
+              <el-checkbox v-for="item in placeTypeList"
+                           :key="item.value"
+                           :label="item.value">{{item.label}}</el-checkbox>
+
+            </el-checkbox-group>
+
+          </el-form-item>
+
+          <el-form-item label="巡查计划"
+                        prop="plan"
+                        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="formData.plan"></el-input>
+          </el-form-item>
+
+          <el-form-item label="创建时间"
+                        style="display: block"
+                        prop="time"
+                        label-width="150px">
+            <el-date-picker v-model="formData.time"
+                            value-format="yyyyMMdd"
+                            type="date"
+                            placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="负责人"
+                        label-width="150px"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      class="item_width_1"
+                      clearable
+                      placeholder="请输入负责人姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="联系电话"
+                        label-width="150px"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      class="item_width_1"
+                      type='number'
+                      clearable
+                      placeholder="请输入电话">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="成员"
+                        label-width="150px"
+                        prop="member">
+            <el-button v-if="formType != 'detail'"
+                       type="primary"
+                       :disabled="btnDisable"
+                       size="mini"
+                       icon="el-icon-plus"
+                       @click="handleAddPerson"></el-button>
+            <div v-for="(item,index) in memberList"
+                 :key="index"
+                 class="div_person_list">
+              <span style="font-weight: bold">姓名</span>
+              <el-input v-if="item.isEdit"
+                        v-model="item.name"
+                        class="item_width_3"
+                        clearable
+                        placeholder="请输入电话">
+              </el-input>
+              <span class="item_width_span_3"
+                    v-if="!item.isEdit">{{item.name}}</span>
+
+              <span style="font-weight: bold;margin-left:20px">联系电话</span>
+              <el-input v-if="item.isEdit"
+                        v-model="item.mobile"
+                        class="item_width_4"
+                        clearable
+                        placeholder="请输入电话">
+              </el-input>
+              <span class="item_width_span_4"
+                    v-if="!item.isEdit">{{item.mobile}}</span>
+
+              <el-button style="margin-left:30px"
+                         type="red"
+                         size="mini"
+                         @click="handleDelPerson(index)">删除</el-button>
+            </div>
+
+          </el-form-item>
+        </el-form>
+      </div>
+
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button 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'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      teamId: '',
+      formData: {
+        agencyId: '',//组织Id
+        teamName: '',//分队名称	
+        gridIds: '',//负责区域，多个值逗号分隔	
+        gridIdArray: [],
+        ninePlacsVals: '',//负责场所类型，多个值逗号分隔	
+        ninePlacsArray: [],
+        plan: '',//巡查计划	
+        time: '',//时间
+        personInCharge: '',//负责人	
+        mobile: '',//联系电话	
+        memberList: ''//成员信息集合	
+      },
+
+      memberList: [
+        {
+          name: '成吉思汗',
+          mobile: '19999999999',
+          isEdit: false,
+        },
+        {
+          name: '成吉思汗',
+          mobile: '17465666567',
+          isEdit: true,
+        }
+      ],
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (type, teamId, agencyId) {
+      this.$refs.ref_form.resetFields();
+      this.formData.agencyId = agencyId
+      this.formType = type
+      if (teamId) {
+        this.teamId = teamId
+        this.formData.teamId = teamId
+        await this.loadFormData()
+      }
+
+    },
+
+    //加载组织
+    async loadFormData () {
+      // const url = '/gov/org/placepatrolteam/detail'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/detail'
+      let params = {
+        placePatrolTeamId: this.teamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.formData = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+
+
+    async handleComfirm () {
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          this.addTeam()
+        }
+
+      })
+
+
+    },
+    handleAddPerson () {
+      let obj = {
+        name: '',
+        mobile: '',
+        isEdit: true
+      }
+
+      this.memberList.push(obj)
+    },
+    handleDelPerson (index) {
+      this.memberList.splice(index, 1)
+    },
+    async addTeam () {
+      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }
+      if (this.formData.gridIdArray.length > 0) {
+        this.formData.gridIds = this.formData.gridIdArray.join(',')
+      } else {
+        return false
+      }
+      if (this.formData.ninePlacsArray.length > 0) {
+        this.formData.ninePlacsVals = this.formData.ninePlacsArray.join(',')
+      } else {
+        return false
+      }
+
+      let url = ''
+
+      if (this.formType === 'edit') {
+        // url = '/gov/org/placeorg/edit'
+        url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
+
+      } else {
+        // url = "/gov/org/placepatrolteam/add"
+        url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/add"
+      }
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.teamId = ''
+      this.formData = {
+        agencyId: '',//组织Id
+        teamName: '',//分队名称	
+        gridIds: '',//负责区域，多个值逗号分隔	
+        gridIdArray: [],
+        ninePlacsVals: '',//负责场所类型，多个值逗号分隔	
+        ninePlacsArray: [],
+        plan: '',//巡查计划	
+        time: '',//时间
+        personInCharge: '',//负责人	
+        mobile: '',//联系电话	
+        member: '1'//成员信息集合	
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        teamName: [
+          { required: true, message: '分队名称不能为空', trigger: 'blur' }
+        ],
+        gridIdArray: [
+          { required: true, message: '负责区域不能为空', trigger: 'blur' },
+        ],
+        ninePlacsArray: [
+          { required: true, message: '场所类型不能为空', trigger: 'blur' }
+        ],
+
+        plan: [
+          { required: true, message: '巡查计划	不能为空', trigger: 'blur' }
+        ],
+        personInCharge: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' }
+        ],
+        member: [
+          { required: true, message: '成员不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+    gridList: {
+      type: Array,
+      default: []
+    },
+
+    placeTypeList: {
+      type: Array,
+      default: []
+    },
+  }
+}
+</script>
+<style lang="scss"  scoped>
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 120px;
+}
+.item_width_4 {
+  margin-left: 10px;
+  width: 150px;
+}
+.item_width_span_3 {
+  margin-left: 10px;
+  width: 120px;
+}
+.item_width_span_4 {
+  margin-left: 10px;
+  width: 150px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.form {
+  margin-top: 30px;
+}
+.div_person_list {
+  margin-top: 10px;
+  width: 500px;
+  display: flex;
+}
+</style>
+
+<style lang=scss>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/team/unitsForm.vue b/src/views/modules/communityService/ninePlaces/team/unitsForm.vue
deleted file mode 100644
index 383174ba6..000000000
--- a/src/views/modules/communityService/ninePlaces/team/unitsForm.vue
+++ /dev/null
@@ -1,553 +0,0 @@
-<template>
-  <div>
-    <div>
-      <div>
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="formData"
-                 :rules="dataRule"
-                 :disabled="formType === 'detail'"
-                 class="form">
-
-          <el-form-item label="所属网格"
-                        prop="gridId"
-                        label-width="150px"
-                        style="display: block">
-            <el-select class="item_width_1"
-                       v-model="formData.gridId"
-                       placeholder="全部"
-                       clearable>
-              <el-option v-for="item in gridList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="单位名称"
-                        prop="unitName"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      maxlength="50"
-                      show-word-limit
-                      placeholder="请输入单位名称"
-                      v-model="formData.unitName">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="分类"
-                        prop="type"
-                        label-width="150px"
-                        style="display: block">
-            <el-select class="item_width_1"
-                       v-model="formData.type"
-                       placeholder="请选择"
-                       filterable
-                       clearable>
-              <el-option v-for="item in typeList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-
-          </el-form-item>
-          <el-form-item label="服务事项"
-                        prop="serviceMatter"
-                        label-width="150px"
-                        style="display: block">
-            <el-checkbox-group class="item_width_1"
-                               style="display:flex;flex-wrap:wrap"
-                               v-model="formData.serviceMatter">
-              <el-checkbox v-for="item in serviceList"
-                           :key="item.value"
-                           :label="item.value">{{item.label}}</el-checkbox>
-
-            </el-checkbox-group>
-
-          </el-form-item>
-          <el-form-item label="联系人"
-                        prop="contact"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      placeholder="请输入联系人姓名"
-                      v-model="formData.contact">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="联系电话"
-                        prop="contactMobile"
-                        label-width="150px"
-                        style="display: block">
-            <el-input class="item_width_1"
-                      placeholder="请输入联系人电话"
-                      v-model="formData.contactMobile">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="在职党员"
-                        style="display: block"
-                        prop="memberCount"
-                        label-width="150px">
-            <el-input-number class="item_width_1"
-                             v-model="formData.memberCount"
-                             :min="1"
-                             label="单元数"></el-input-number>
-          </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="formData.remark"></el-input>
-          </el-form-item>
-          <el-form-item label="位置坐标"
-                        prop="longitude"
-                        label-width="150px"
-                        style="display: block">
-            <div style="width:500px">
-
-              <div class="div_map">
-                <div id="app">
-
-                </div>
-                <div class="div_searchmap">
-                  <el-input class="item_width_4"
-                            maxlength="50"
-                            size="mini"
-                            placeholder="请输入关键字"
-                            v-model="keyWords">
-                  </el-input>
-                  <el-button style="margin-left: 10px"
-                             type="primary"
-                             size="mini"
-                             @click="handleSearchMap">查询</el-button>
-                </div>
-              </div>
-
-              <div style="margin-top: 10px">
-                <span>经度</span>
-                <el-input class="item_width_3"
-                          maxlength="50"
-                          placeholder="请输入经度"
-                          v-model="formData.longitude">
-                </el-input>
-                <span style="margin-left: 20px">纬度</span>
-                <el-input class="item_width_3"
-                          maxlength="50"
-                          placeholder="请输入纬度"
-                          v-model="formData.latitude">
-                </el-input>
-              </div>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="地理位置"
-                        prop="address"
-                        label-width="150px"
-                        style="display: block">
-
-            <el-input class="item_width_1"
-                      v-model="formData.address">
-            </el-input>
-
-          </el-form-item>
-        </el-form>
-      </div>
-
-    </div>
-    <div class="div_btn">
-      <el-button @click="handleCancle">取 消</el-button>
-      <el-button 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'
-
-
-
-var map
-var search
-var markers
-var infoWindowList
-var geocoder // 新建一个正逆地址解析类
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
-      btnDisable: false,
-
-      unitId: '',
-      keyWords: '',
-      formData: {
-        gridId: '',
-        unitName: '',
-        serviceMatter: [],
-        type: '',
-        contact: '',
-        contactMobile: '',
-        memberCount: 0,
-        remark: '', //备注【最大500字】
-        address: '', //详细地址
-        longitude: 36.0722275, //经度
-        latitude: 120.38945519 //纬度
-      },
-
-    }
-  },
-  components: {},
-  mounted () {
-    this.initMap()
-  },
-
-  methods: {
-
-    async initForm (type, unitId) {
-      this.$refs.ref_form.resetFields();
-
-      // debugger
-      // map.setCenter(new TMap.LatLng(agencyObj.latitude, agencyObj.longitude))
-
-      this.formType = type
-      if (unitId) {
-        this.unitId = unitId
-        this.formData.id = unitId
-        await this.loadFormData()
-      }
-
-    },
-
-    //加载组织
-    async loadFormData () {
-      // const url = '/heart/icpartyunit/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
-      let params = {
-        id: this.unitId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.formData = data
-
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-
-
-    async handleComfirm () {
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 10000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-          this.addUnit()
-        }
-
-      })
-
-
-    },
-    async addUnit () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      // if (regPhone.test(this.formData.contactMobile) === false) {
-      //   this.btnDisable = false
-      //   this.$message({
-      //     type: 'warning',
-      //     message: '请输入正确的手机号码'
-      //   })
-      //   return false;
-      // }
-
-      // let url = '/heart/icpartyunit/save'
-      let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
-      // if (this.formType === 'edit') {
-      //  this.formData.id = this.unitId
-      // } 
-
-      const { data, code, msg } = await requestPost(url, this.formData)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '新增联建单位成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-      } else {
-        this.btnDisable = false
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleCancle () {
-
-      this.resetData()
-      this.$emit('dialogCancle')
-
-    },
-
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
-      // 定义地图中心点坐标
-      var center = new window.TMap.LatLng(36.0722275, 120.38945519)
-      // 定义map变量，调用 TMap.Map() 构造函数创建地图
-      map = new window.TMap.Map(document.getElementById('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.on('panend', () => {
-        this.handleMoveCenter()
-      })
-      this.handleMoveCenter()
-      this.convert()
-    },
-
-    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
-        .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)
-    },
-
-    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
-          // 显示搜索到的地址
-        });
-    },
-
-
-    resetData () {
-      this.unitId = ''
-      this.keyWords = ''
-      this.formData = {
-        gridId: '',
-        unitName: '',
-        serviceMatter: [],
-        type: '',
-        contact: '',
-        contactMobile: '',
-        memberCount: 0,
-        remark: '', //备注【最大500字】
-        address: '', //详细地址
-        longitude: '', //经度
-        latitude: '' //纬度
-      }
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        gridId: [
-          { required: true, message: '所属网格不能为空', trigger: 'blur' }
-        ],
-        unitName: [
-          { required: true, message: '单位名称不能为空', trigger: 'blur' },
-        ],
-        type: [
-          { required: true, message: '分类不能为空', trigger: 'blur' }
-        ],
-
-        contact: [
-          { required: true, message: '联系人不能为空', trigger: 'blur' }
-        ],
-        contactMobile: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' }
-        ],
-        memberCount: [
-          { required: true, message: '在职党员数不能为空', trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        ],
-        longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]
-      }
-    },
-
-  },
-  props: {
-
-    gridList: {
-      type: Array,
-      default: []
-    },
-    typeList: {
-      type: Array,
-      default: []
-    },
-    serviceList: {
-      type: Array,
-      default: []
-    },
-  }
-}
-</script>
-<style scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
-.div_map {
-  position: relative;
-}
-.div_searchmap {
-  z-index: 5000;
-  position: absolute;
-  top: 5px;
-  left: 5px;
-}
-
-.div_btn {
-  display: flex;
-  justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-</style>
-
-<style lang=scss>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
-</style>

From 412d8469ef653c93bd722cd9e5ead8b0f56e4d6e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 22 Nov 2021 16:35:20 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=8B=A5?=
 =?UTF-8?q?=E5=B9=B2=E4=BA=A7=E5=93=81=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityService/shzz/index.vue   |   2 +-
 .../warning/components/screen-table/index.vue | 366 ++++++++++--------
 2 files changed, 212 insertions(+), 156 deletions(-)

diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index f55570b05..d09d1dff7 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -53,7 +53,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="24">
               <div class="resi-cell">
                 <div class="resi-cell-label">服务时间</div>
                 <div class="resi-cell-value" :class="'resi-cell-value-radio'">
diff --git a/src/views/modules/visual/warning/components/screen-table/index.vue b/src/views/modules/visual/warning/components/screen-table/index.vue
index 7b6dce78c..41c80f97f 100644
--- a/src/views/modules/visual/warning/components/screen-table/index.vue
+++ b/src/views/modules/visual/warning/components/screen-table/index.vue
@@ -1,62 +1,101 @@
 <template>
   <div class="warning-table">
-      <div class="table">
-        <div class="table-header">
-          <div class="table-header-th" v-for="(item,index) in headerList" :key='item.title' :style="headerStyle[index]">{{item.title}}</div>
+    <div class="table">
+      <div class="table-header">
+        <div
+          class="table-header-th"
+          v-for="(item, index) in headerList"
+          :key="item.title"
+          :style="headerStyle[index]"
+        >
+          {{ item.title }}
         </div>
-        <div class="table-body">
-          <div class="table-body-tr" v-for="(value,index) in tableData" :key='index'>
-            <div class="td" v-for="(item,indexs) in value" :key="indexs" :style="tableContentStyle[indexs]">{{item}}
-              <span v-if="(indexs+1==value.length) && item.length>8" class="more" @click="onClickMorePop(index)" ref='morePop'>
-                更多>
-                <span class="more-pop" v-if="visiblePopList[index]">
-                  <!-- 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧
+      </div>
+      <div class="table-body">
+        <div
+          class="table-body-tr"
+          v-for="(value, index) in tableData"
+          :key="index"
+        >
+          <div
+            class="td"
+            v-for="(item, indexs) in value"
+            :key="indexs"
+            :style="tableContentStyle[indexs]"
+          >
+            {{ item }}
+            <span
+              v-if="indexs + 1 == value.length && item.length > 8"
+              class="more"
+              @click.stop="onClickMorePop(index)"
+              ref="morePop"
+            >
+              更多>
+              <span class="more-pop" v-if="visiblePopList[index]">
+                <!-- 李佳琪、刘阳、赵欣、丁一、嘉敏、李岩、何嘉慧
                   李易峰、赵敏、何军、曲树惠 -->
-                  {{item}}
-                </span>
+                {{ item }}
               </span>
-            </div>
-          </div>
-          <screen-loading v-if="visibleLoading">加载中</screen-loading>
-          <div class="no-data" v-if="tableData.length==0 && !visibleLoading">
-            <img src="../../../../../../assets/img/modules/visual/noData.png" alt="" srcset="" class="no-data-img">
+            </span>
           </div>
         </div>
+        <screen-loading v-if="visibleLoading">加载中</screen-loading>
+        <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
+          <img
+            src="../../../../../../assets/img/modules/visual/noData.png"
+            alt=""
+            srcset=""
+            class="no-data-img"
+          />
+        </div>
       </div>
+    </div>
   </div>
 </template>
 
 <script>
-import ScreenLoading from '../screen-loading/index'
-import Vue from 'vue'
+import ScreenLoading from "../screen-loading/index";
+import Vue from "vue";
 export default {
-name: 'warning-table',
-components:{
-  ScreenLoading
-},
-props: {
+  name: "warning-table",
+  components: {
+    ScreenLoading,
+  },
+  props: {
     headerList: {
       type: Array,
       required: false,
       default: () => {
         return [
-          { title: '序号' },
-          { title: '所属网格'},
-          { title: '所属小区'},
-          { title: '楼号'},
-          { title: '姓名' },
-        ]
-      }
+          { title: "序号" },
+          { title: "所属网格" },
+          { title: "所属小区" },
+          { title: "楼号" },
+          { title: "姓名" },
+        ];
+      },
     },
     tableData: {
       type: Array,
       required: false,
       default: () => {
         return [
-        [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
-        [2,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
-        ]
-      }
+          // [
+          //   1,
+          //   "商丘路社区第一网格",
+          //   "商丘路小区",
+          //   "2号楼",
+          //   "杨颖、王平、刘佳敏、丁辉、杨萍",
+          // ],
+          // [
+          //   2,
+          //   "商丘路社区第一网格",
+          //   "商丘路小区",
+          //   "2号楼",
+          //   "杨颖、王平、刘佳敏、丁辉、杨萍",
+          // ],
+        ];
+      },
     },
     // 单独给头部设置样式
     headerStyle: {
@@ -70,8 +109,8 @@ props: {
           // {
           //   width:'200px'
           // }
-        ]
-      }
+        ];
+      },
     },
     // 单独给内容设置样式
     tableContentStyle: {
@@ -85,13 +124,13 @@ props: {
           // {
           //   width:'200px'
           // }
-        ]
-      }
+        ];
+      },
+    },
+    visibleLoading: {
+      type: Boolean,
+      default: true,
     },
-    visibleLoading:{
-      type:Boolean,
-      default:true
-    }
     // // 表格平均分的份数
     // ava: {
     //   type: Number,
@@ -110,145 +149,162 @@ props: {
   },
   data() {
     return {
-      visiblePopList:[false,false,false,false,false,false,false,false,false,false],
+      visiblePopList: [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+        false,
+      ],
     };
   },
-mounted () {
-    // window.addEventListener('click', e => {
-    //   if (this.$refs.morePop && !this.$refs.morePop.contains(e.target)) {
-    //      this.visiblePopList.forEach((item,indexs)=>{
-    //       Vue.set(this.visiblePopList, indexs, false)
-    //     })
-    //   }
-    // })
+  watch: {
+    tableData(arr) {
+      if (Array.isArray(arr)) {
+        this.visiblePopList = new Array(arr.length).fill(false);
+      }
+    },
   },
-  created(){
+
+  mounted() {
+    window.addEventListener("click", (e) => {
+      this.visiblePopList = new Array(this.visiblePopList.length).fill(false);
+    });
   },
+
+  created() {},
+
   methods: {
-      onClickMorePop(index) {
-        this.visiblePopList.forEach((item,indexs)=>{
-          if(index==indexs){
-            Vue.set(this.visiblePopList, index, true)
-              }else{
-            Vue.set(this.visiblePopList, indexs, false)
-          }
-        })
-      }
+    onClickMorePop(index) {
+      this.visiblePopList.forEach((item, indexs) => {
+        if (index == indexs) {
+          Vue.set(this.visiblePopList, index, true);
+        } else {
+          Vue.set(this.visiblePopList, indexs, false);
+        }
+      });
+    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.warning-table{
-     box-sizing: border-box;
-     width: 100%;
-     height: 100%;
-    .table {
+.warning-table {
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  .table {
+    width: 100%;
+    height: 100%;
+    &-header {
+      width: 100%;
+      height: 50px;
+      display: flex;
+      justify-content: space-around;
+      align-items: center;
+      background: rgba(8, 37, 134, 0.85);
+      font-size: 16px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-th {
+        text-align: center;
+        width: calc(100% / 5);
+      }
+    }
+
+    &-body {
+      box-sizing: border-box;
       width: 100%;
-      height: 100%;
-      &-header {
+      height: calc(100% - 50px);
+      font-size: 18px;
+      font-weight: 400;
+      color: #ffffff;
+
+      &-tr {
         width: 100%;
         height: 50px;
+        // height: calc(100% / 10);
         display: flex;
         justify-content: space-around;
         align-items: center;
-        background: rgba(8, 37, 134, 0.85);
-        font-size: 16px;
-        font-weight: 400;
-        color: #FFFFFF;
 
-        &-th {
+        .td {
           text-align: center;
           width: calc(100% / 5);
-        }
-      }
+          .more {
+            font-size: 18px;
+            font-weight: 400;
+            color: #e4dc00;
+            position: relative;
+            cursor: pointer;
 
-      &-body {
-        box-sizing: border-box;
-        width: 100%;
-        height: calc(100% - 50px);
-        font-size: 18px;
-        font-weight: 400;
-        color: #FFFFFF;
-
-        &-tr {
-          width: 100%;
-          height: 50px;
-          // height: calc(100% / 10);
-          display: flex;
-          justify-content: space-around;
-          align-items: center;
-
-          .td {
-            text-align: center;
-            width: calc(100% / 5);
-            .more {
-              font-size: 18px;
+            &-pop {
+              box-sizing: border-box;
+              display: block;
+              box-sizing: border-box;
+              width: 215px;
+              height: auto;
+              line-height: 20px;
+              border: 1px solid red;
+              position: absolute;
+              right: -100%;
+              top: 150%;
+              background: #06186d;
+              border: 1px solid #1a64cc;
+              border-radius: 5px;
+              font-size: 9px;
               font-weight: 400;
-              color: #E4DC00;
-              position: relative;
-              
-              &-pop{
-                box-sizing: border-box;
-                display: block;
-                box-sizing: border-box;
-                width: 215px;
-                height: auto;
-                line-height: 20px;
-                border: 1px solid red;
-                position: absolute;
-                left: -100%;
-                top: 150%;
-                background: #06186D;
-                border: 1px solid #1A64CC;
-                border-radius: 5px;
-                font-size: 9px;
-                font-weight: 400;
-                color: #FFFFFF;
-                padding:16px 8px 10px 9px;
-                z-index: 1;
-                // &::after{
-                //   position: absolute;
-                //   left: 30%;
-                //   top: -30%;
-                //   display: flex;
-                //   content:'';
-                //   width: 0;
-                //   height: 0;
-                //   border-width: 13px;
-                //   border-style: solid;
-                //   border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
-                //   // border-color: transparent transparent red transparent;
-                //   transform: translate(-50%,0);
-                // }
-              }
-          
+              color: #ffffff;
+              padding: 16px 8px 10px 9px;
+              z-index: 1;
+              cursor: default;
+              // &::after{
+              //   position: absolute;
+              //   left: 30%;
+              //   top: -30%;
+              //   display: flex;
+              //   content:'';
+              //   width: 0;
+              //   height: 0;
+              //   border-width: 13px;
+              //   border-style: solid;
+              //   border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
+              //   // border-color: transparent transparent red transparent;
+              //   transform: translate(-50%,0);
+              // }
             }
           }
         }
+      }
 
-        &-tr:nth-child(2n) {
-          background: rgba(16, 75, 164, 0.24);
-        }
+      &-tr:nth-child(2n) {
+        background: rgba(16, 75, 164, 0.24);
+      }
 
-        &-tr:hover {
-          background: url('../../../../../../assets/img/modules/visual/hover-bac.png') no-repeat center;
-          background-size: 100% 100%;
-        }
-        // 暂无数据
-        .no-data{
-          width: 100%;
-          height: calc(100% - 50px);
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          &-img{
-            width: 249px;
-            height: 172px;
-          }
+      &-tr:hover {
+        background: url("../../../../../../assets/img/modules/visual/hover-bac.png")
+          no-repeat center;
+        background-size: 100% 100%;
+      }
+      // 暂无数据
+      .no-data {
+        width: 100%;
+        height: calc(100% - 50px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        &-img {
+          width: 249px;
+          height: 172px;
         }
       }
-
     }
+  }
 }
-</style>
\ No newline at end of file
+</style>

From 5bbd1d0247583528d505d577b7f527d0f0019653 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 22 Nov 2021 16:47:56 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B1=95=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/basicInfoMain.scss    |   2 +-
 .../visual/basicinfo/basicInfoCommunity.vue   | 262 +-----------------
 .../visual/basicinfo/basicInfoMain.vue        |   2 +-
 .../modules/visual/basicinfo/peopleSearch.vue |  11 +-
 4 files changed, 14 insertions(+), 263 deletions(-)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index 70c4e5d9a..88e617d66 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -37,7 +37,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh);
+    height: calc(88vh - 5px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 50f54367a..dbb0a3c43 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -95,264 +95,7 @@ export default {
       selBuildingName: '',
 
       roomLoaded: false,
-      roomArray: [
-        {
-          houseId: "1",
-          houseName: "101室",
-          categoryList: [
-            {
-              name: '党员',
-              iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
-              isSpecial: '1',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "2",
-          houseName: "102室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "3",
-          houseName: "103室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "4",
-          houseName: "104室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "5",
-          houseName: "105室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "6",
-          houseName: "106室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        }, {
-          houseId: "1",
-          houseName: "101室",
-          categoryList: [
-            {
-              name: '党员',
-              iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
-              isSpecial: '1',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "2",
-          houseName: "102室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "3",
-          houseName: "103室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "4",
-          houseName: "104室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "5",
-          houseName: "105室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "6",
-          houseName: "106室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        }, {
-          houseId: "1",
-          houseName: "101室",
-          categoryList: [
-            {
-              name: '党员',
-              iconUrl: require('../../../../assets/img/shuju/dangyuan.png'),
-              isSpecial: '1',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "2",
-          houseName: "102室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            },
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "3",
-          houseName: "103室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "4",
-          houseName: "104室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "5",
-          houseName: "105室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        },
-        {
-          houseId: "6",
-          houseName: "106室",
-          categoryList: [
-            {
-              name: '低保',
-              iconUrl: require('../../../../assets/img/modules/visual/dabing.png'),
-              isSpecial: '0',
-            }
-          ]
-        }
-      ],
+      roomArray: [],
       selHouseId: '',
       selHouseName: '',
       selHouseIndex: 0,
@@ -414,6 +157,7 @@ export default {
     //点击全部成员
     async handleShowAllUser (selIndex) {
       // this.startLoading()
+      await this.loadUser(this.roomArray[selIndex].houseId, selIndex)
 
       this.roomArray.forEach((element, index) => {
         let obj = JSON.parse(JSON.stringify(element))
@@ -422,7 +166,7 @@ export default {
           obj.showAllUser = !obj.showAllUser
           this.$set(this.roomArray, selIndex, obj)
 
-          this.loadUser(element.houseId, selIndex)
+
         } else {
           obj.showAllUser = false
           this.$set(this.roomArray, index, obj)
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index fffed07dc..8c0f4a590 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -316,7 +316,7 @@ const vueGis = {
           name: '搜索'
         }
         this.$nextTick(() => {
-          this.$refs.ref_search.loadList();
+          this.$refs.ref_search.reset();
         });
 
       } else {
diff --git a/src/views/modules/visual/basicinfo/peopleSearch.vue b/src/views/modules/visual/basicinfo/peopleSearch.vue
index e19d780fa..7e44c6d3b 100644
--- a/src/views/modules/visual/basicinfo/peopleSearch.vue
+++ b/src/views/modules/visual/basicinfo/peopleSearch.vue
@@ -97,7 +97,10 @@ export default {
       }
 
     },
-
+    reset () {
+      this.searchName = ''
+      this.tableData = []
+    },
     async loadList () {
       if (this.searchName) {
         const url = "/epmetuser/icresiuser/searchbyname"
@@ -130,7 +133,11 @@ export default {
       this.pageNo = val
       this.loadList()
     },
-  }
+  },
+  destroyed () {
+    console.log("我已经离开了！");
+
+  },
 };
 </script>