diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
new file mode 100644
index 00000000..df346a61
--- /dev/null
+++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue
@@ -0,0 +1,468 @@
+<template>
+  <div>
+    <div>
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="dataForm"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="中心名称	"
+          prop="centerName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入中心名称	"
+            v-model="dataForm.centerName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="办公电话"
+          prop="workPhone"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入办公电话"
+            v-model="dataForm.workPhone"
+          >
+          </el-input>
+        </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="longitude"
+          label-width="150px"
+          style="display: block"
+        >
+          <div style="width: 500px">
+            <el-input
+              class="item_width_4"
+              maxlength="50"
+              placeholder="请输入关键字"
+              v-model="dataForm.address"
+            >
+            </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-item
+          label="可预约事项"
+          prop="matterList"
+          label-width="150px"
+          style="display: block"
+        >
+          <div class="m-staffs">
+            <div
+              class="item"
+              :key="'staff' + index"
+              v-for="(item, index) in dataForm.matterList"
+            >
+              <el-input
+                class="item_width_1"
+                maxlength="50"
+                show-word-limit
+                placeholder="成员姓名"
+                v-model="item.personName"
+              />
+
+              <el-input
+                style="margin-left: 10px"
+                class="item_width_1"
+                maxlength="50"
+                show-word-limit
+                placeholder="办公电话"
+                v-model="item.personPhone"
+              />
+
+              <el-button
+                style="margin-left: 10px"
+                size="small"
+                @click="handleDelStaff(index)"
+                >删除</el-button
+              >
+            </div>
+
+            <div class="item-add">
+              <el-button size="small" @click="handleAddStaff">添加</el-button>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form>
+    </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详情
+
+      btnDisable: false,
+
+      partyServiceCenterId: "",
+      dataForm: {
+        centerName: "",
+        address: "",
+        workPhone: "",
+        amStartTime: "",
+        amEndTime: "",
+        pmStartTime: "",
+        pmEndTime: "",
+        longitude: "",
+        latitude: "",
+        matterList: [],
+      },
+    };
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      return {
+        centerName: [
+          { required: true, message: "中心名称	不能为空", trigger: "blur" },
+          {
+            min: 1,
+            max: 50,
+            message: "中心名称	长度在 1 到 50个字符",
+            trigger: "blur",
+          },
+        ],
+        address: [{ required: true, message: "地址不能为空", trigger: "blur" }],
+        amStartTime: [
+          { required: true, message: "办公时间不能为空", trigger: "blur" },
+        ],
+        amEndTime: [
+          { required: true, message: "办公时间不能为空", trigger: "blur" },
+        ],
+        pmStartTime: [
+          { required: true, message: "办公时间不能为空", trigger: "blur" },
+        ],
+        pmEndTime: [
+          { required: true, message: "办公时间不能为空", trigger: "blur" },
+        ],
+        workPhone: [
+          { required: true, message: "办公电话不能为空", trigger: "blur" },
+        ],
+        longitude: [
+          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+  props: {},
+  watch: {},
+
+  async mounted() {
+    this.initMap();
+  },
+
+  methods: {
+    handleAddStaff() {
+      this.dataForm.matterList = [
+        ...this.dataForm.matterList,
+        { personName: "", personPhone: "" },
+      ];
+    },
+    handleDelStaff(index) {
+      const { matterList } = this.dataForm;
+      matterList.splice(index, 1);
+      this.dataForm.matterList = matterList;
+    },
+    // 地图初始化函数，本例取名为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.dataForm.address,
+          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) {
+      this.$refs.ref_form.resetFields();
+
+      this.formType = type;
+      console.log(row);
+      if (row) {
+        this.dataForm = { ...this.dataForm, ...row };
+        this.partyServiceCenterId = this.dataForm.partyServiceCenterId;
+        map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
+      }
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true;
+      setTimeout(() => {
+        this.btnDisable = false;
+      }, 10000);
+      this.$refs["ref_form"].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj);
+          this.btnDisable = false;
+        } else {
+          this.submit();
+        }
+      });
+    },
+
+    async submit() {
+      let url = "";
+      if (this.formType === "add") {
+        url = "/gov/org/icpartyservicecenter/addpartyservicecenter";
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+      } else {
+        url = "/gov/org/icpartyservicecenter/editpartyservicecenter";
+
+        this.dataForm.partyServiceCenterId = this.partyServiceCenterId;
+      }
+
+      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);
+      }
+    },
+
+    handleCancle() {
+      this.resetData();
+      this.$emit("dialogCancle");
+    },
+    resetData() {
+      this.partyServiceCenterId = "";
+      this.dataForm = {
+        centerName: "",
+        address: "",
+        workPhone: "",
+        amStartTime: "",
+        amEndTime: "",
+        pmStartTime: "",
+        pmEndTime: "",
+        longitude: "",
+        latitude: "",
+        matterList: [],
+      };
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" 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;
+}
+
+.m-staffs {
+  width: 468px;
+  .item {
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 7px;
+  }
+  .item-add {
+  }
+}
+</style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/communityService/dqfwzx/index.vue b/src/views/modules/communityService/dqfwzx/index.vue
new file mode 100644
index 00000000..2afa5533
--- /dev/null
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@@ -0,0 +1,316 @@
+<template>
+  <div>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button type="success" size="small" @click="handleAdd"
+          >新增</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="centerName" label="组织名称"> </el-table-column>
+        <el-table-column fixed="right" label="操作" align="center" width="120">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleWatch(scope.$index)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              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>
+    </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="eleEditForm"
+        @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,
+
+      agencyId: "",
+
+      tableData: [],
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {},
+  async mounted() {
+    await this.loadAgency();
+    this.getTableData();
+  },
+  methods: {
+    handleClose() {
+      this.formShow = false;
+    },
+
+    async handleAdd() {
+      this.formShow = true;
+      await nextTick();
+      console.log(this.$refs);
+      this.$refs.eleEditForm.initForm("add");
+    },
+
+    async handleWatch(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    },
+
+    async handleEdit(rowIndex) {
+      this.formShow = true;
+      await nextTick();
+      this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
+    },
+
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url =
+        "/heart/iccommunityselforganization/delcommunityselforganization";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+
+    async getTableData() {
+      const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
+      const { data, code, msg } = await requestPost(url, {
+        orgId: this.agencyId,
+        orgType: "agency",
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+
+    //加载组织
+    async loadAgency() {
+      const url = "/epmetuser/customerstaff/staffbasicinfo";
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.agencyId = data.agencyId;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</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;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+.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>
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index b8849d20..abf64bea 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -6,7 +6,33 @@
                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="firstResult">
+            <el-select class="item_width_1"
+                       v-model="formData.firstResult"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in resultList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="场所区域"
                         prop="gridId">
             <el-select class="item_width_1"
                        v-model="formData.gridId"
@@ -20,23 +46,17 @@
             </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="ninePlacsVal">
             <el-select class="item_width_1"
-                       v-model="formData.serviceMatter"
+                       v-model="formData.ninePlacsVal"
                        placeholder="请选择"
                        clearable>
-              <el-option v-for="item in serviceList"
+              <el-option v-for="item in placeTypeList"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value">
@@ -44,42 +64,19 @@
             </el-select>
 
           </el-form-item>
-        </div>
-        <div>
-          <el-form-item label="分类"
-                        prop="type">
+
+          <el-form-item label="最终结果"
+                        prop="finalResult">
             <el-select class="item_width_1"
-                       v-model="formData.type"
+                       v-model="formData.finalResult"
                        placeholder="请选择"
                        clearable>
-              <el-option v-for="item in typeList"
+              <el-option v-for="item in resultList"
                          :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 +91,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,82 +107,88 @@
                          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="180">
         </el-table-column>
-        <el-table-column prop="unitName"
+        <el-table-column prop="ninePlaceName"
                          header-align="center"
                          align="center"
-                         label="单位名称"
-                         width="180">
+                         label="场所类型"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="type"
+        <el-table-column prop="placePatrolTeamName"
                          header-align="center"
                          align="center"
-                         label="分类"
-                         width="180">
+                         label="分队名称"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="serviceMatter"
+        <el-table-column prop="inspectorsNames"
                          header-align="center"
                          align="center"
-                         label="服务事项"
-                         width="180">
+                         label="检察人员"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="contact"
+        <el-table-column prop="firstTime"
                          header-align="center"
                          align="center"
-                         label="联系人"
-                         width="100">
+                         label="首次巡检时间"
+                         min-width="150">
         </el-table-column>
-        <el-table-column prop="contactMobile"
+        <el-table-column prop="detailed"
                          header-align="center"
                          align="center"
-                         label="联系电话"
-                         width="110">
+                         label="隐患明细"
+                         min-width="280">
         </el-table-column>
-        <el-table-column prop="memberCount"
+        <el-table-column prop="firstResult"
                          header-align="center"
                          align="center"
-                         label="在职党员数"
-                         width="150">
+                         label="首次检查结果"
+                         min-width="180">
         </el-table-column>
-        <el-table-column prop="satisfaction"
+        <el-table-column prop="reviewTime"
                          header-align="center"
                          align="center"
-                         label="群众满意度"
-                         width="150">
+                         label="拟复查时间"
+                         min-width="110">
         </el-table-column>
-        <el-table-column prop="remark"
+        <el-table-column prop="finalResult"
                          header-align="center"
                          align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true"
-                         width="150">
+                         label="最新结果"
+                         min-width="110">
         </el-table-column>
+        <el-table-column prop="finalTime"
+                         header-align="center"
+                         align="center"
+                         label="最新检查时间"
+                         min-width="110">
+        </el-table-column>
+
         <el-table-column label="操作"
                          fixed="right"
-                         width="140"
+                         width="180"
                          header-align="center"
                          align="center"
                          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"
-                       @click="handleEdit(scope.row)">修改</el-button>
 
             <el-button type="text"
                        style="color:#D51010;text-decoration: underline;"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="text"
+                       style="color:#00A7A9;text-decoration: underline;"
+                       size="small"
+                       @click="handleReview(scope.row)">复查记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -216,7 +196,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 +212,25 @@
                width="850px"
                top="5vh"
                @closed="diaClose">
-      <units-form ref="ref_form"
-                  :gridList="gridList"
-                  :serviceList="serviceList"
-                  :typeList="typeList"
-                  @dialogCancle="addFormCancle"
-                  @dialogOk="addFormOk"></units-form>
+      <inspect-form ref="ref_form"
+                    :gridList="gridList"
+                    :resultList="resultList"
+                    :placeTypeList="placeTypeList"
+                    @dialogCancle="addFormCancle"
+                    @dialogOk="addFormOk"></inspect-form>
+    </el-dialog>
+
+    <!-- 复查记录弹出框 -->
+    <el-dialog :visible.sync="reviewShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'复查记录'"
+               width="80%"
+               top="5vh"
+               @closed="reviewDiaClose">
+      <inspect-review ref="ref_review"
+                      :resultList="resultList"
+                      @reviewDiaClose="reviewDiaClose"></inspect-review>
     </el-dialog>
 
   </div>
@@ -245,7 +238,8 @@
 
 <script>
 
-import unitsForm from './unitsForm'
+import inspectForm from './inspectForm'
+import inspectReview from './inspectReview'
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -260,63 +254,48 @@ export default {
       pageSize: 10,
       pageNo: 0,
       tableLoading: false,
+
       agencyId: '',
-      gridList: [],//所属网格list
-      unitList: [],//单位list
-      serviceList: [
+      gridList: [],//所属网格list--场所区域
+      resultList: [
         {
-          id: "1",
-          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。'
+          value: '0',
+          label: '合格'
         },
         {
-          id: "2",
-          name: '积极配合'
-        },
-        {
-          id: "3",
-          name: '积极配合社区安全巡查员进行'
-        },
-        {
-          id: "4",
-          name: '积极配合社区安全巡查员进行场所消防、安全等方面的检查。并具备安全意识及设备设施'
-        },
-      ],//服务list
-      typeList: [],//分类list
+          value: '1',
+          label: '不合格'
+        }
+      ],//是否合格list
+      placeTypeList: [],//场所类型list
 
-      unitId: '',
       formData: {
-        gridId: '',
-        unitName: '',
-        serviceMatter: '',
-        type: '',
-        contact: '',
-        contactMobile: ''
+        placeOrgName: '',//场所名称	
+        firstResult: '',//首次检查结果【0:合格 1:不合格】	
+        gridId: '',//场所区域【网格Id】	
+        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        finalResult: '',//最终检查结果【0:合格 1:不合格】	
       },
 
       tableData: [],
 
       //form相关
       formShow: false,
-      formTitle: '新增单位',
+      formTitle: '新增巡查',
 
-      files: "",
-      fileName: "",
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import'
+      reviewShow: false
 
     }
   },
   components: {
-    unitsForm
+    inspectForm, inspectReview
   },
   async created () {
 
   },
   async mounted () {
-    //获取服务事项
-    await this.loadService()
-
-    //获取分类
-    await this.loadType()
+    //获取场所类型
+    await this.loadPlaceType()
 
     const { user } = this.$store.state
     this.agencyId = user.agencyId
@@ -349,37 +328,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 +350,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/placepatrolrecord/getlist"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/getlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
-        agencyId: this.agencyId,
         ...this.formData
       }
 
@@ -417,11 +376,15 @@ export default {
       this.formShow = false
     },
 
+    reviewDiaClose () {
+      this.reviewShow = false
+    },
+
     handleDetail (row) {
       this.formTitle = '详情'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.id)
+        this.$refs.ref_form.initForm('detail', row.placePatrolRecordId)
       })
     },
 
@@ -433,21 +396,20 @@ export default {
       })
     },
 
-    handleEdit (row) {
-      this.formTitle = '修改'
-      this.formShow = true
+    handleReview (row) {
+      this.reviewShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.id)
+        this.$refs.ref_review.initTable(row.placePatrolRecordId)
       })
     },
 
     addFormCancle () {
       this.formShow = false
     },
+
     addFormOk () {
       this.formShow = false
       this.loadTable()
-
     },
 
     async handleDelete (row) {
@@ -458,7 +420,7 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.deleteUnit(row)
+          this.deleteRecord(row)
         })
         .catch(err => {
           if (err == "cancel") {
@@ -468,12 +430,12 @@ export default {
         });
     },
 
-    async deleteUnit (row) {
-      // const url = "/heart/icpartyunit/delete"
-      const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
+    async deleteRecord (row) {
+      // const url = "/gov/org/placepatrolrecord/del"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/del"
 
       let params = {
-        id: row.id
+        placePatrolRecordId: row.placePatrolRecordId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -493,118 +455,15 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.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) 有这个参数是给新增巡查记录时用的，默认是	
       }
     },
 
-    //导出表格
-    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/inspect/inspectForm.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
new file mode 100644
index 00000000..1c09cbc1
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectForm.vue
@@ -0,0 +1,441 @@
+<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="场所类型"
+                        label-width="150px"
+                        prop="ninePlaceVal">
+            <el-select class="item_width_1"
+                       v-model="formData.ninePlaceVal"
+                       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="场所名称"
+                        label-width="150px"
+                        prop="placeOrgId">
+            <el-select class="item_width_1"
+                       v-model="formData.placeOrgId"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in placesList"
+                         :key="item.placeOrgId"
+                         :label="item.placeOrgName"
+                         :value="item.placeOrgId">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+          <el-form-item label="分队名称"
+                        label-width="150px"
+                        prop="placePatrolTeamId">
+            <el-select class="item_width_1"
+                       v-model="formData.placePatrolTeamId"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="(item,index) in teamsList"
+                         @click.native="hancleChangeTeam(index)"
+                         :key="item.teamId"
+                         :label="item.teamName"
+                         :value="item.teamId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="检查人员"
+                        prop="inspectorArray"
+                        label-width="150px"
+                        style="display: block">
+            <el-checkbox-group class="item_width_1"
+                               style="display:flex;flex-wrap:wrap"
+                               v-model="formData.inspectorArray">
+              <el-checkbox v-for="item in inspectorsList"
+                           :key="item.name"
+                           :label="item.name">{{item.name}}</el-checkbox>
+
+            </el-checkbox-group>
+
+          </el-form-item>
+          <el-form-item label="首次巡查时间"
+                        style="display: block"
+                        prop="firstTime"
+                        label-width="150px">
+            <el-date-picker v-model="formData.firstTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="选择日期">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="隐患明细"
+                        prop="detailed"
+                        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.detailed"></el-input>
+          </el-form-item>
+
+          <el-form-item label="首次检查结论"
+                        prop="firstResult"
+                        label-width="150px"
+                        style="display: block">
+            <el-select class="item_width_1"
+                       v-model="formData.firstResult"
+                       placeholder="全部"
+                       clearable>
+              <el-option v-for="item in resultList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="拟复查时间"
+                        style="display: block"
+                        prop="reviewTime"
+                        label-width="150px">
+            <el-date-picker v-model="formData.reviewTime"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="选择日期">
+            </el-date-picker>
+          </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,
+
+      placesList: [],//场景列表
+      teamsList: [],//分队列表
+      inspectorsList: [],//检查人员列表
+
+      placePatrolRecordId: '',
+      formData: {
+        gridId: '',//网格Id	
+        ninePlaceVal: '',//九小场所类型value值	
+        placeOrgId: '',//场所下的组织Id-场所名称	
+        placePatrolTeamId: '',//场所下分队Id	
+        inspectorArray: [],//检查人员数组
+        inspectors: '',//检查人员Id，逗号分隔
+        firstTime: '',//首次巡查时间	
+        detailed: '',//隐患明细	
+        firstResult: '',//首次检查结果【0:合格 1:不合格】	
+        reviewTime: '',//拟复查时间	
+      },
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (type, placeOrgId) {
+      this.$refs.ref_form.resetFields();
+
+      await this.loadPlaces()
+      await this.loadTeams()
+
+      this.formType = type
+      if (placeOrgId) {
+        this.placeOrgId = placeOrgId
+        this.formData.placeOrgId = placeOrgId
+        await this.loadFormData()
+      }
+
+    },
+
+    //加载场所
+    async loadPlaces () {
+      // const url = '/gov/org/placeorg/getlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist'
+      let params = {
+        isPage: false
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.placesList = data.list
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //加载分队
+    async loadTeams () {
+      // const url = '/gov/org/placepatrolteam/getlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+      let params = {
+        isPage: false
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.teamsList = data.list
+        if (this.teamsList.length > 0) {
+          this.formData.placePatrolTeamId = this.teamsList[0].teamId
+
+          this.hancleChangeTeam(0)
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //点击分队切换人员
+    async hancleChangeTeam (index) {
+      // this.formData.placePatrolTeamId = this.teamsList[index].teamId
+      await this.loadInspectors()
+    },
+
+    //加载分队下人员
+    async loadInspectors () {
+      // const url = '/gov/org/placepatrolteamstaff/getlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      let params = {
+        teamId: this.formData.placePatrolTeamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.inspectorsList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    //加载form
+    async loadFormData () {
+      // const url = '/gov/org/placeorg/detail'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
+      let params = {
+        placeOrgId: this.placeOrgId
+      }
+
+      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.addRecord()
+        }
+
+      })
+
+    },
+    async addRecord () {
+
+      // let url = "/gov/org/placepatrolrecord/add"
+      let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
+      this.formData.inspectors = this.formData.inspectorArray.join(',')
+
+      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.formData = {
+        gridId: '',//网格Id	
+        ninePlaceVal: '',//九小场所类型value值	
+        placeOrgId: '',//场所下的组织Id-场所名称	
+        placePatrolTeamId: '',//场所下分队Id	
+        inspectorArray: [],//检查人员数组
+        inspectors: '',//检查人员Id，逗号分隔
+        firstTime: '',//首次巡查时间	
+        detailed: '',//隐患明细	
+        firstResult: '',//首次检查结果【0:合格 1:不合格】	
+        reviewTime: '',//拟复查时间	
+      }
+    },
+    // 开启加载动画
+    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' }
+        ],
+        ninePlaceVal: [
+          { required: true, message: '场所类型不能为空', trigger: 'blur' },
+        ],
+        placeOrgName: [
+          { required: true, message: '场所名称不能为空', trigger: 'blur' }
+        ],
+        placePatrolTeamId: [
+          { required: true, message: '分队不能为空', trigger: 'blur' }
+        ],
+
+        inspectorArray: [
+          { required: true, message: '巡检人员不能为空', trigger: 'blur' }
+        ],
+        firstTime: [
+          { required: true, message: '首次巡查时间不能为空', trigger: 'blur' }
+        ],
+        detailed: [
+          { required: true, message: '隐患明细不能为空', trigger: 'blur' }
+        ],
+        firstResult: [
+          { required: true, message: '首次巡检结果不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  props: {
+
+    gridList: {
+      type: Array,
+      default: []
+    },
+    resultList: {
+      type: Array,
+      default: []
+    },
+    placeTypeList: {
+      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_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+
+.form {
+  margin-top: 30px;
+}
+</style>
+
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
new file mode 100644
index 00000000..7af12868
--- /dev/null
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -0,0 +1,439 @@
+<template>
+  <div>
+    <div class="div_table">
+      <el-button type="green"
+                 size="small"
+                 @click="handleAdd">新增</el-button>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50">
+        </el-table-column>
+
+        <el-table-column prop="reviewTime"
+                         header-align="center"
+                         align="center"
+                         label="复查时间"
+                         width="250">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isSet">
+              <el-date-picker v-model="scope.row.reviewTime"
+                              value-format="yyyy-MM-dd"
+                              type="date"
+                              placeholder="选择日期">
+              </el-date-picker>
+            </div>
+            <span v-else>{{scope.row.reviewTime}}</span>
+          </template>
+
+        </el-table-column>
+        <el-table-column prop="ninePlaceName"
+                         header-align="center"
+                         align="center"
+                         label="分队名称"
+                         width="280">
+
+          <template slot-scope="scope">
+            <div v-if="scope.row.isSet">
+              <el-select class="item_width_1"
+                         v-model="scope.row.placePatrolTeamId"
+                         placeholder="请选择"
+                         clearable>
+                <el-option v-for="(item,index) in teamsList"
+                           @click.native="hancleChangeTeam(scope.row,index)"
+                           :key="item.teamId"
+                           :label="item.teamName"
+                           :value="item.teamId">
+                </el-option>
+              </el-select>
+            </div>
+            <span v-else>{{scope.row.placePatrolTeamName}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="inspectorsNames"
+                         header-align="center"
+                         align="center"
+                         label="检查人员"
+                         min-width="380">
+
+          <template slot-scope="scope">
+            <div v-if="scope.row.isSet">
+              <!-- <el-select class="item_width_1"
+                         multiple
+                         v-model="inspectorArray"
+                         placeholder="请选择"
+                         clearable>
+                <el-option v-for="item in scope.row.inspectorsList"
+                           :key="item.name"
+                           :label="item.name"
+                           :value="item.name">
+                </el-option>
+              </el-select> -->
+              <el-checkbox-group style="display:flex;flex-wrap:wrap"
+                                 v-model="inspectorArray[scope.$index]">
+                <el-checkbox v-for="item in scope.row.inspectorsList"
+                             :key="item.name"
+                             :label="item.name">{{item.name}}</el-checkbox>
+
+              </el-checkbox-group>
+            </div>
+            <span v-else>{{scope.row.inspectorsNames}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="reviewResult"
+                         header-align="center"
+                         align="center"
+                         label="复查结论"
+                         width="120">
+          <template slot-scope="scope">
+            <div v-if="scope.row.isSet">
+              <el-select class="item_width_2"
+                         v-model="scope.row.reviewResult"
+                         placeholder="全部"
+                         clearable>
+                <el-option v-for="item in resultList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <span v-else>{{scope.row.reviewResult==='0'?'合格':'不合格'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="180"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       style="color:#1C6AFD;text-decoration: underline;"
+                       size="small"
+                       @click="handleEdit(scope.row,scope.$index)">修改</el-button>
+
+            <el-button type="text"
+                       style="color:#D51010;text-decoration: underline;"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button type="primary"
+                 @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 {
+      tableLoading: false,
+      placePatrolRecordId: '',
+      tableData: [],
+      inspectorArray: [],
+
+      inspectorsList1: [
+        {
+          name: '张三'
+        },
+        {
+          name: '李四'
+        },
+        {
+          name: '王二麻'
+        },
+      ],
+      inspectorsList2: [
+        {
+          name: '张三2'
+        },
+        {
+          name: '李四2'
+        },
+        {
+          name: '王二麻2'
+        },
+      ],
+      inspectorsList3: [
+        {
+          name: '张三3'
+        },
+        {
+          name: '李四3'
+        },
+        {
+          name: '王二麻3'
+        },
+      ]
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (placePatrolRecordId) {
+      this.placePatrolRecordId = placePatrolRecordId
+      await this.loadTeams()
+
+      await this.loadTable()
+
+    },
+
+
+    //加载分队
+    async loadTeams () {
+      // const url = '/gov/org/placepatrolteam/getlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist'
+      let params = {
+        isPage: false
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.teamsList = data.list
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //点击分队切换人员
+    async hancleChangeTeam (index) {
+      // this.formData.placePatrolTeamId = this.teamsList[index].teamId
+      await this.loadInspectors()
+    },
+
+    //加载分队下人员
+    async loadInspectors (index) {
+
+
+      // const url = '/gov/org/placepatrolteamstaff/getlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist'
+      let params = {
+        teamId: this.tableData[index].placePatrolTeamId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let obj = this.tableData[index]
+        obj.isSet = true
+
+        obj.inspectorsList = this.inspectorsList1
+        this.$set(this.tableData, index, obj)
+        console.log(this.tableData)
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      // const url = /gov/org/placepatrolreviewrecord/getlist'
+      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist'
+      let params = {
+        placePatrolRecordId: this.placePatrolRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+        this.tableData = data.list
+        this.tableData.forEach(item => {
+          item.isSet = false
+          let array = item.inspectors.split(',')
+          this.inspectorArray.push(array)
+        });
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleAdd () {
+      let obj = {
+        isSet: true,
+        reviewTime: '',
+        placePatrolTeamId: '',
+        inspectors: '',
+        inspectorArray: [],
+        reviewResult: '',
+      }
+      this.tableData.push(obj)
+    },
+
+    handleEdit (row, index) {
+
+
+
+      this.loadInspectors(index)
+
+    },
+
+    async handleComfirm () {
+
+      this.addReview()
+
+    },
+    async addReview () {
+
+      // let url = "/gov/org/placepatrolrecord/add"
+      let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add"
+      this.formData.inspectors = this.formData.inspectorArray.join(',')
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+
+        this.$emit('dialogOk')
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteRecord(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteRecord (row) {
+      // const url = "/gov/org/placepatrolrecord/delreview"
+      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/delreview"
+
+      let params = {
+        placePatrolReviewRecordId: row.placePatrolReviewRecordId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+
+
+      this.$emit('dialogCancle')
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+
+    resultList: {
+      type: Array,
+      default: []
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/buttonstyle.scss";
+.item_width_1 {
+  width: 250px;
+}
+.item_width_2 {
+  width: 100px;
+}
+.div_table {
+  // background: #ffffff;
+  // box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  // border-radius: 4px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
+.div_btn {
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue b/src/views/modules/communityService/ninePlaces/inspect/unitsForm.vue
deleted file mode 100644
index 383174ba..00000000
--- a/src/views/modules/communityService/ninePlaces/inspect/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>
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index 0d0dd69f..46a14735 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -61,9 +61,9 @@
 
           </el-form-item>
           <el-form-item label="场所类型"
-                        prop="ninePlacsVal">
+                        prop="ninePlaceVal">
             <el-select class="item_width_1"
-                       v-model="formData.ninePlacsVal"
+                       v-model="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
@@ -219,7 +219,7 @@ export default {
         mobile: '',//联系电话	
         scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
         gridId: '',//场所区域【网格Id】	
-        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
         isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       },
 
@@ -313,10 +313,11 @@ export default {
     },
 
     async loadTable () {
+
       this.tableLoading = true
 
-      // const url = "/gov/org/placeorg/getlist"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      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,
@@ -393,8 +394,8 @@ export default {
     },
 
     async deletePlace (row) {
-      // const url = "/gov/org/placeorg/del"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/del"
+      const url = "/gov/org/placeorg/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/del"
 
       let params = {
         placeOrgId: row.placeOrgId
@@ -421,7 +422,7 @@ export default {
         mobile: '',//联系电话	
         scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】	
         gridId: '',//场所区域【网格Id】	
-        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
         isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
     },
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 8b3fbe1c..0a18ea44 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -11,9 +11,9 @@
 
           <el-form-item label="场所类型"
                         label-width="150px"
-                        prop="ninePlacsVal">
+                        prop="ninePlaceVal">
             <el-select class="item_width_1"
-                       v-model="formData.ninePlacsVal"
+                       v-model="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
@@ -128,7 +128,7 @@ export default {
       placeOrgId: '',
       formData: {
         gridId: '',
-        ninePlacsVal: '',
+        ninePlaceVal: '',
         placeOrgName: '',
         address: '',
         scale: '',
@@ -159,8 +159,8 @@ export default {
 
     //加载组织
     async loadFormData () {
-      // const url = '/gov/org/placeorg/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
+      const url = '/gov/org/placeorg/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/detail'
       let params = {
         placeOrgId: this.placeOrgId
       }
@@ -209,12 +209,12 @@ export default {
       let url = ''
 
       if (this.formType === 'edit') {
-        // url = '/gov/org/placeorg/edit'
-        url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/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"
+        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)
@@ -245,7 +245,7 @@ export default {
       this.placeOrgId = ''
       this.formData = {
         gridId: '',
-        ninePlacsVal: '',
+        ninePlaceVal: '',
         placeOrgName: '',
         address: '',
         scale: '',
@@ -275,7 +275,7 @@ export default {
         gridId: [
           { required: true, message: '所属网格不能为空', trigger: 'blur' }
         ],
-        ninePlacsVal: [
+        ninePlaceVal: [
           { required: true, message: '场所类型不能为空', trigger: 'blur' },
         ],
         placeOrgName: [
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 615cd8e0..fa406e2b 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -46,9 +46,9 @@
           </el-form-item>
 
           <el-form-item label="场所类型"
-                        prop="ninePlacsVal">
+                        prop="ninePlaceVal">
             <el-select class="item_width_1"
-                       v-model="formData.ninePlacsVal"
+                       v-model="formData.ninePlaceVal"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in placeTypeList"
@@ -88,43 +88,43 @@
                          align="center"
                          type="index"
                          width="50"></el-table-column>
-        <el-table-column prop="placeOrgName"
+        <el-table-column prop="teamName"
                          header-align="center"
                          align="center"
                          label="分队名称"
                          min-width="180">
         </el-table-column>
-        <el-table-column prop="address"
+        <el-table-column prop="personInCharge"
                          header-align="center"
                          align="center"
                          label="负责人"
-                         min-width="180">
+                         width="180">
         </el-table-column>
-        <el-table-column prop="ninePlaceName"
+        <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
                          label="联系电话"
-                         min-width="110">
+                         width="110">
         </el-table-column>
-        <el-table-column prop="scale"
+        <el-table-column prop="gridNames"
                          header-align="center"
                          align="center"
                          label="负责区域"
                          min-width="280">
         </el-table-column>
-        <el-table-column prop="personInCharge"
+        <el-table-column prop="ninePlaceNames"
                          header-align="center"
                          align="center"
                          label="负责场所类型"
                          min-width="180">
         </el-table-column>
-        <el-table-column prop="mobile"
+        <el-table-column prop="plan"
                          header-align="center"
                          align="center"
                          label="监察计划"
                          min-width="180">
         </el-table-column>
-        <el-table-column prop="mobile"
+        <el-table-column prop="time"
                          header-align="center"
                          align="center"
                          label="创建时间"
@@ -212,7 +212,7 @@ export default {
         personInCharge: '',//负责人		
         mobile: '',//联系电话	
         gridId: '',//负责区域【网格Id】	
-        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
         isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       },
 
@@ -287,8 +287,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      // const url = "/gov/org/placeorg/getlist"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      const url = "/gov/org/placepatrolteam/getlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -300,6 +300,11 @@ export default {
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
+
+        this.tableData.forEach(item => {
+          let timeArray = item.time.split(' ')
+          item.time = timeArray[0]
+        });
       } else {
         this.$message.error(msg)
       }
@@ -365,8 +370,8 @@ export default {
     },
 
     async deleteTeam (row) {
-      // const url = "/gov/org/placepatrolteam/del"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
 
       let params = {
         teamId: row.teamId
@@ -392,7 +397,7 @@ export default {
         personInCharge: '',//负责人		
         mobile: '',//联系电话	
         gridId: '',//负责区域【网格Id】	
-        ninePlacsVal: '',//场所类型【九小场所Value值】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
         isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
     },
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
index 534afb1f..db819678 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamForm.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -37,12 +37,12 @@
           </el-form-item>
 
           <el-form-item label="负责场所类型"
-                        prop="ninePlacsArray"
+                        prop="ninePlaceArray"
                         label-width="150px"
                         style="display: block">
             <el-checkbox-group class="item_width_1"
                                style="display:flex;flex-wrap:wrap"
-                               v-model="formData.ninePlacsArray">
+                               v-model="formData.ninePlaceArray">
               <el-checkbox v-for="item in placeTypeList"
                            :key="item.value"
                            :label="item.value">{{item.label}}</el-checkbox>
@@ -69,7 +69,7 @@
                         prop="time"
                         label-width="150px">
             <el-date-picker v-model="formData.time"
-                            value-format="yyyyMMdd"
+                            value-format="yyyy-MM-dd HH:mm:ss"
                             type="date"
                             placeholder="选择日期">
             </el-date-picker>
@@ -102,7 +102,6 @@
                         prop="member">
             <el-button v-if="formType != 'detail'"
                        type="primary"
-                       :disabled="btnDisable"
                        size="mini"
                        icon="el-icon-plus"
                        @click="handleAddPerson"></el-button>
@@ -110,24 +109,24 @@
                  :key="index"
                  class="div_person_list">
               <span style="font-weight: bold">姓名</span>
-              <el-input v-if="item.isEdit"
+              <el-input v-if="item.isSet"
                         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>
+                    v-else>{{item.name}}</span>
 
               <span style="font-weight: bold;margin-left:20px">联系电话</span>
-              <el-input v-if="item.isEdit"
+              <el-input v-if="item.isSet"
                         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>
+                    v-else>{{item.mobile}}</span>
 
               <el-button style="margin-left:30px"
                          type="red"
@@ -169,28 +168,18 @@ export default {
         agencyId: '',//组织Id
         teamName: '',//分队名称	
         gridIds: '',//负责区域，多个值逗号分隔	
+        ninePlaceArray: [],
+        ninePlaceVals: '',//负责场所类型，多个值逗号分隔	
         gridIdArray: [],
-        ninePlacsVals: '',//负责场所类型，多个值逗号分隔	
-        ninePlacsArray: [],
         plan: '',//巡查计划	
         time: '',//时间
         personInCharge: '',//负责人	
         mobile: '',//联系电话	
-        memberList: ''//成员信息集合	
+        memberList: [],//成员信息集合	
+        member: '1'//成员信息集合	
       },
 
-      memberList: [
-        {
-          name: '成吉思汗',
-          mobile: '19999999999',
-          isEdit: false,
-        },
-        {
-          name: '成吉思汗',
-          mobile: '17465666567',
-          isEdit: true,
-        }
-      ],
+      memberList: [],
 
     }
   },
@@ -215,24 +204,32 @@ export default {
 
     //加载组织
     async loadFormData () {
-      // const url = '/gov/org/placepatrolteam/detail'
-      const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/detail'
+      const url = '/gov/org/placepatrolteam/detail'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/detail'
       let params = {
-        placePatrolTeamId: this.teamId
+        teamId: this.teamId
       }
 
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.formData = data
+
+        data.ninePlaceArray = data.ninePlaceVals.split(',')
+        data.gridIdArray = data.gridIds.split(',')
+        data.member = '1'
+        this.formData = { ...data }
+
+        this.memberList = this.formData.memberList
+
+        this.memberList.forEach(item => {
+          item.isSet = false
+        });
 
       } else {
         this.$message.error(msg)
       }
     },
 
-
-
     async handleComfirm () {
 
       this.btnDisable = true
@@ -255,7 +252,7 @@ export default {
       let obj = {
         name: '',
         mobile: '',
-        isEdit: true
+        isSet: true
       }
 
       this.memberList.push(obj)
@@ -278,21 +275,32 @@ export default {
       } else {
         return false
       }
-      if (this.formData.ninePlacsArray.length > 0) {
-        this.formData.ninePlacsVals = this.formData.ninePlacsArray.join(',')
+      if (this.formData.ninePlaceArray.length > 0) {
+        this.formData.ninePlaceVals = this.formData.ninePlaceArray.join(',')
       } else {
         return false
       }
 
+      let msgMember = this.validataMemeberList()
+      if (msgMember) {
+        this.$message({
+          type: 'warning',
+          message: msgMember
+        })
+        return false
+      }
+
+      this.formData.memberList = this.memberList
+
       let url = ''
 
       if (this.formType === 'edit') {
-        // url = '/gov/org/placeorg/edit'
-        url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/edit'
+        url = '/gov/org/placepatrolteam/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"
+        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)
@@ -312,6 +320,18 @@ export default {
 
     },
 
+    validataMemeberList () {
+      if (this.memberList.length === 0) {
+        return '成员列表不能为空'
+      }
+      this.memberList.forEach(element => {
+        if (!element.mobile || !element.name) {
+          return '成员的姓名和电话不能为空'
+        }
+      });
+      return ''
+    },
+
     handleCancle () {
 
       this.resetData()
@@ -326,14 +346,15 @@ export default {
         teamName: '',//分队名称	
         gridIds: '',//负责区域，多个值逗号分隔	
         gridIdArray: [],
-        ninePlacsVals: '',//负责场所类型，多个值逗号分隔	
-        ninePlacsArray: [],
+        ninePlaceVals: '',//负责场所类型，多个值逗号分隔	
+        ninePlaceArray: [],
         plan: '',//巡查计划	
         time: '',//时间
         personInCharge: '',//负责人	
         mobile: '',//联系电话	
         member: '1'//成员信息集合	
       }
+      this.memberList = []
     },
     // 开启加载动画
     startLoading () {
@@ -360,7 +381,7 @@ export default {
         gridIdArray: [
           { required: true, message: '负责区域不能为空', trigger: 'blur' },
         ],
-        ninePlacsArray: [
+        ninePlaceArray: [
           { required: true, message: '场所类型不能为空', trigger: 'blur' }
         ],
 
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index cfa8d72c..e0a6ec96 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -183,8 +183,8 @@ export default {
 
       fmData: {
         organizationName: "",
-        startDate: "",
-        endDate: "",
+        startTime: "",
+        endTime: "",
         createTime: ["", ""],
       },
 
@@ -201,11 +201,11 @@ export default {
   watch: {
     "fmData.createTime": function (val) {
       if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startDate = val[0];
-        this.fmData.endDate = val[1];
+        this.fmData.startTime = val[0];
+        this.fmData.endTime = val[1];
       } else {
-        this.fmData.startDate = "";
-        this.fmData.endDate = "";
+        this.fmData.startTime = "";
+        this.fmData.endTime = "";
       }
     },
   },