From 546bc935f41ca93b5f4cd6d23b6adcf14eee94c5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Jun 2022 11:06:25 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/fiveLayerMap.scss     |   4 +-
 src/views/modules/cpts/base/cpts/edit.vue     |   4 +-
 .../shequzhili/tuceng/anquan/weihua/index.vue | 104 ++++++++++++++++++
 .../shequzhili/tuceng/anquan/xuncha/index.vue | 104 ++++++++++++++++++
 .../shequzhili/tuceng/yingji/ziyuan/index.vue | 104 ++++++++++++++++++
 5 files changed, 316 insertions(+), 4 deletions(-)
 create mode 100644 src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue

diff --git a/src/assets/scss/modules/visual/fiveLayerMap.scss b/src/assets/scss/modules/visual/fiveLayerMap.scss
index 15ce8f9f..63b69152 100644
--- a/src/assets/scss/modules/visual/fiveLayerMap.scss
+++ b/src/assets/scss/modules/visual/fiveLayerMap.scss
@@ -97,7 +97,7 @@
          
           margin-bottom: 15px;
           display: flex;
-          justify-content: start;
+          justify-content: flex-start;
          
           // margin:auto;
        
@@ -105,7 +105,7 @@
           .list_item {
            
             // padding: 18px 59px 0;
-            justify-content: start;
+            justify-content: flex-start;
             flex:0 0 135px;
 
             > img {
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 176c1f8a..8222c786 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -33,7 +33,7 @@
             </el-input>
 
             <div style="width: 610px" v-else>
-              {{ item.value || "--" }}
+              {{ fmData[item.keyName] || "--" }}
             </div>
           </template>
 
@@ -55,7 +55,7 @@
             </el-input>
 
             <div style="width: 610px" v-else>
-              {{ item.value || "--" }}
+              {{ fmData[item.keyName] || "--" }}
             </div>
           </template>
 
diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
new file mode 100644
index 00000000..79e71c99
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <base-page
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :addUrl="addUrl"
+      :editUrl="editUrl"
+      :delUrl="delUrl"
+      :exportUrl="exportUrl"
+      :editParams="editParams"
+    ></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      searchParams: [
+        {
+          field: "服务类别",
+          keyName: "serviceType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_service_type",
+          },
+          optionList: [],
+        },
+        { field: "服务组织", keyName: "orgName", type: "input" },
+        { field: "服务地址", keyName: "address", type: "input" },
+        { field: "备注", keyName: "remark", type: "input" },
+      ],
+
+      tableParams: [
+        { field: "序号", keyName: "", type: "no" },
+        { field: "服务类别", keyName: "serviceType", type: "text" },
+        { field: "服务组织名称", keyName: "orgName", type: "text" },
+        { field: "服务地址", keyName: "address", type: "text" },
+        { field: "备注", keyName: "remark", type: "text" },
+      ],
+      tableUrl: "/heart/icServiceOrg/list",
+      exportUrl: "/gov/project/icEvent/export",
+
+      editParams: [
+        {
+          field: "服务类别",
+          keyName: "serviceType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_service_type",
+          },
+          optionList: [],
+          editDisabled: true,
+          rules: [
+            { required: true, message: "服务类别不能为空", trigger: "blur" },
+          ],
+        },
+        {
+          field: "服务组织",
+          keyName: "orgName",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "服务组织名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "服务地址",
+          keyName: "address",
+          type: "address",
+          supKeys: ["longitude", "latitude"],
+          supValues: ["", ""],
+        },
+        { field: "备注", keyName: "remark", type: "input" },
+      ],
+
+      addUrl: "/heart/icServiceOrg/add",
+      editUrl: "/heart/icServiceOrg/edit",
+      delUrl: "/heart/icServiceOrg/del",
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
new file mode 100644
index 00000000..79e71c99
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <base-page
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :addUrl="addUrl"
+      :editUrl="editUrl"
+      :delUrl="delUrl"
+      :exportUrl="exportUrl"
+      :editParams="editParams"
+    ></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      searchParams: [
+        {
+          field: "服务类别",
+          keyName: "serviceType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_service_type",
+          },
+          optionList: [],
+        },
+        { field: "服务组织", keyName: "orgName", type: "input" },
+        { field: "服务地址", keyName: "address", type: "input" },
+        { field: "备注", keyName: "remark", type: "input" },
+      ],
+
+      tableParams: [
+        { field: "序号", keyName: "", type: "no" },
+        { field: "服务类别", keyName: "serviceType", type: "text" },
+        { field: "服务组织名称", keyName: "orgName", type: "text" },
+        { field: "服务地址", keyName: "address", type: "text" },
+        { field: "备注", keyName: "remark", type: "text" },
+      ],
+      tableUrl: "/heart/icServiceOrg/list",
+      exportUrl: "/gov/project/icEvent/export",
+
+      editParams: [
+        {
+          field: "服务类别",
+          keyName: "serviceType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_service_type",
+          },
+          optionList: [],
+          editDisabled: true,
+          rules: [
+            { required: true, message: "服务类别不能为空", trigger: "blur" },
+          ],
+        },
+        {
+          field: "服务组织",
+          keyName: "orgName",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "服务组织名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "服务地址",
+          keyName: "address",
+          type: "address",
+          supKeys: ["longitude", "latitude"],
+          supValues: ["", ""],
+        },
+        { field: "备注", keyName: "remark", type: "input" },
+      ],
+
+      addUrl: "/heart/icServiceOrg/add",
+      editUrl: "/heart/icServiceOrg/edit",
+      delUrl: "/heart/icServiceOrg/del",
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
new file mode 100644
index 00000000..79e71c99
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <div>
+    <base-page
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :addUrl="addUrl"
+      :editUrl="editUrl"
+      :delUrl="delUrl"
+      :exportUrl="exportUrl"
+      :editParams="editParams"
+    ></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      searchParams: [
+        {
+          field: "服务类别",
+          keyName: "serviceType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_service_type",
+          },
+          optionList: [],
+        },
+        { field: "服务组织", keyName: "orgName", type: "input" },
+        { field: "服务地址", keyName: "address", type: "input" },
+        { field: "备注", keyName: "remark", type: "input" },
+      ],
+
+      tableParams: [
+        { field: "序号", keyName: "", type: "no" },
+        { field: "服务类别", keyName: "serviceType", type: "text" },
+        { field: "服务组织名称", keyName: "orgName", type: "text" },
+        { field: "服务地址", keyName: "address", type: "text" },
+        { field: "备注", keyName: "remark", type: "text" },
+      ],
+      tableUrl: "/heart/icServiceOrg/list",
+      exportUrl: "/gov/project/icEvent/export",
+
+      editParams: [
+        {
+          field: "服务类别",
+          keyName: "serviceType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_service_type",
+          },
+          optionList: [],
+          editDisabled: true,
+          rules: [
+            { required: true, message: "服务类别不能为空", trigger: "blur" },
+          ],
+        },
+        {
+          field: "服务组织",
+          keyName: "orgName",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "服务组织名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "服务地址",
+          keyName: "address",
+          type: "address",
+          supKeys: ["longitude", "latitude"],
+          supValues: ["", ""],
+        },
+        { field: "备注", keyName: "remark", type: "input" },
+      ],
+
+      addUrl: "/heart/icServiceOrg/add",
+      editUrl: "/heart/icServiceOrg/edit",
+      delUrl: "/heart/icServiceOrg/del",
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

From 2abe84d93f90ea334196dd871fbddb5c337311ea Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 20 Jun 2022 17:20:42 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/list-main.scss    |   4 +-
 src/views/modules/cpts/base/cpts/edit.vue     | 114 ++-
 src/views/modules/cpts/base/index.vue         | 155 ++-
 src/views/modules/shequ/cpts/people-more.vue  |  14 +-
 .../shequzhili/tuceng/anquan/weihua/index.vue | 111 ++-
 .../shequzhili/tuceng/yingji/ziyuan/index.vue |  98 +-
 .../shequzhili/tuceng/zhonghe/xinfang.vue     | 896 ++++++++++++++++--
 7 files changed, 1192 insertions(+), 200 deletions(-)

diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 132b39be..922bfaf7 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -36,12 +36,12 @@
   box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
   margin-top: 15px;
-  padding: 10px;
+  padding: 10px 20px;
   position: relative;
 
   .div_btn {
     margin-top: 10px;
-    margin-left: 10px;
+    // margin-left: 10px;
     display: flex;
 
     .btn_upload {
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 8222c786..ec6637bc 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -2,6 +2,7 @@
   <div>
     <div class="dialog-h-content scroll-h">
       <el-form
+        v-if="iniLoaded"
         ref="ref_form"
         :model="fmData"
         :inline="true"
@@ -59,6 +60,22 @@
             </div>
           </template>
 
+          <template v-if="item.type == 'number'">
+            <el-input-number
+              v-model="fmData[item.keyName]"
+              type="textarea"
+              size="small"
+              clearable
+              show-word-limit
+              :rows="3"
+              :min="item.min || 0"
+              :max="item.max || 999999999999"
+              :placeholder="item.placeholder || '请输入'"
+            >
+            </el-input-number>
+            <span v-if="item.unitName">（{{ item.unitName }}）</span>
+          </template>
+
           <template v-else-if="item.type == 'select'">
             <el-select
               v-model="fmData[item.keyName]"
@@ -155,6 +172,27 @@ export default {
       type: String,
       default: "info",
     },
+    idName: {
+      type: String,
+      default: "",
+    },
+    addUrl: {
+      type: String,
+      default: "",
+    },
+    editUrl: {
+      type: String,
+      default: "",
+    },
+    delUrl: {
+      type: String,
+      default: "",
+    },
+    infoUrl: {
+      type: String,
+      default: "",
+    },
+
     editParams: {
       type: Array,
       default: () => [],
@@ -163,6 +201,8 @@ export default {
 
   data() {
     return {
+      iniLoaded: false,
+
       btnDisable: false,
 
       fmData: {},
@@ -192,10 +232,20 @@ export default {
       }
     },
 
+    computeFmData() {
+      console.log(this.fmData);
+    },
+
     iniFmData() {
-      const { editParams } = this;
-      editParams.forEach(async (item, index) => {
-        this.fmData[item.keyName] = item.value;
+      const { editParams, fmData } = this;
+      editParams.forEach((item, index) => {
+        fmData[item.keyName] = item.value || "";
+        if (item.supValues) {
+          item.supValues.forEach((value, index) => {
+            fmData[item.supKeys[index]] = value;
+          });
+        }
+
         if (item.type == "select") {
           if (item.optionUrl) {
             this.getFmOptions(
@@ -205,10 +255,16 @@ export default {
             );
           }
         } else if (item.type == "address") {
-          await nextTick(500);
-          this.initMap(item);
+          this.$nextTick(async () => {
+            await nextTick(500);
+            this.initMap(item);
+          });
         }
       });
+
+      this.fmData = { ...fmData };
+      console.log("------------------------------------", this.fmData);
+      this.iniLoaded = true;
     },
 
     async getFmOptions(index, url, params) {
@@ -286,8 +342,10 @@ export default {
             } = data[0];
             map.setCenter(new TMap.LatLng(lat, lng));
             this.setMarker(lat, lng);
-            item.supValues[0] = lng;
-            item.supValues[1] = lat;
+            // item.supValues[0] = lng;
+            // item.supValues[1] = lat;
+            this.fmData[item.supKeys[0]] = lng;
+            this.fmData[item.supKeys[1]] = lat;
           } else {
             this.$message.error("未检索到相关位置坐标");
           }
@@ -299,22 +357,26 @@ export default {
       const center = map.getCenter();
       const lat = center.getLat();
       const lng = center.getLng();
-      item.supValues[0] = lng;
-      item.supValues[1] = lat;
+      // item.supValues[0] = lng;
+      // item.supValues[1] = lat;
+      this.fmData[item.supKeys[0]] = lng;
+      this.fmData[item.supKeys[1]] = lat;
       this.setMarker(lat, lng);
 
       geocoder
         .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          item.value = result.result.address;
+          this.fmData[item.keyName] = result.result.address;
         });
     },
 
     async getInfo() {
-      const url = "/heart/icServiceOrg/detail";
+      const url = this.infoUrl;
+      if (!url) return;
+      const { idName } = this;
 
       const params = {
-        icServiceOrgId: this.formId,
+        [idName]: this.formId,
       };
 
       const { data, code, msg } = await requestPost(url, params);
@@ -322,9 +384,12 @@ export default {
         this.fmData = {
           ...this.fmData,
           ...data,
-          serviceTypeArr: data.serviceType.split(","),
         };
-        map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+        console.log("------------------------------------info", this.fmData);
+
+        if (map) {
+          map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+        }
       } else {
         this.$message.error(msg);
       }
@@ -339,7 +404,7 @@ export default {
       setTimeout(() => {
         this.btnDisable = false;
       }, 5000);
-      this.computeFmData();
+
       this.$refs["ref_form"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -350,25 +415,10 @@ export default {
       });
     },
 
-    computeFmData() {
-      console.log("11111111111111111112", this.fmData);
-      // let fmData = {};
-      // this.editParams.forEach((item) => {
-      //   fmData[item.keyName] = item.value;
-      //   if (item.supValues) {
-      //     item.supValues.forEach((value, index) => {
-      //       fmData[item.supKeys[index]] = value;
-      //     });
-      //   }
-      // });
-      // this.fmData = fmData;
-      return this.fmData;
-    },
-
     async submit() {
       let url = "";
       let params = {
-        ...this.computeFmData(),
+        ...this.fmData,
         // serviceType: this.fmData.serviceTypeArr.join(","),
       };
 
@@ -376,8 +426,6 @@ export default {
         url = this.addUrl;
       } else {
         url = this.editUrl;
-
-        // params.icServiceOrgId = this.formId;
       }
 
       const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 11a22dea..f0bfe47b 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -2,7 +2,7 @@
   <div class="div_main">
     <div v-show="true">
       <div class="div_search">
-        <el-form :inline="true" ref="ref_searchform" :label-width="'80px'">
+        <el-form :inline="true" ref="ref_searchform" label-width="100px">
           <div>
             <el-form-item
               v-for="item in searchParams"
@@ -67,12 +67,39 @@
             >新增</el-button
           >
 
-          <!-- <el-button
+          <el-button
+            v-if="mubanUrl"
+            class="btn_upload diy-button--export"
+            size="small"
+            @click="handleExportModule('room')"
+            >下载模板</el-button
+          >
+
+          <el-upload
+            v-if="importUrl"
+            ref="upload"
+            class="upload-btn"
+            action="uploadUlr"
+            :limit="1"
+            :accept="'.xls,.xlsx'"
+            :with-credentials="true"
+            :show-file-list="false"
+            :auto-upload="true"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
+          >
+            <el-button size="small" class="btn_upload diy-button--delete"
+              >导入</el-button
+            >
+          </el-upload>
+
+          <el-button
+            v-if="exportUrl"
             @click="handleExport"
-            class="diy-button--reset"
+            class="btn_upload diy-button--reset"
             size="small"
             >导出</el-button
-          > -->
+          >
         </div>
 
         <el-table
@@ -86,7 +113,7 @@
           <template v-for="item in tableParams" :prop="item.keyName">
             <el-table-column
               v-if="item.type == 'no'"
-              :key="'table' + item.keyName"
+              :key="'table-no' + item.keyName"
               :label="item.field"
               fixed="left"
               type="index"
@@ -95,8 +122,8 @@
             />
 
             <el-table-column
-              :key="'table' + item.keyName"
               v-else-if="item.type == 'text'"
+              :key="'table' + item.keyName"
               :prop="item.keyName"
               :label="item.field"
               align="center"
@@ -176,9 +203,13 @@
     >
       <edit-form
         ref="eleEditForm"
+        :idName="idName"
         :formId="formId"
         :formType="formType"
         :editParams="editParams"
+        :infoUrl="infoUrl"
+        :addUrl="addUrl"
+        :editUrl="editUrl"
         @close="handleClose"
         @afterEdit="handleEditSuccess"
       ></edit-form>
@@ -227,15 +258,32 @@ export default {
       type: String,
       default: "",
     },
+    infoUrl: {
+      type: String,
+      default: "",
+    },
     exportUrl: {
       type: String,
       default: "",
     },
+    importUrl: {
+      type: String,
+      default: "",
+    },
+    mubanUrl: {
+      type: String,
+      default: "",
+    },
 
     editParams: {
       type: Array,
       default: () => [],
     },
+
+    idName: {
+      type: String,
+      default: "id",
+    },
   },
 
   data() {
@@ -308,6 +356,89 @@ export default {
       this.getTableData();
     },
 
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      let { importUrl: url } = this;
+      if (!url) return;
+
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post(url, formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+            this.$refs.upload.clearFiles();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+    },
+
+    async handleExportModule() {
+      let { mubanUrl: url } = this;
+      if (!url) return;
+
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: {},
+      })
+        .then((res) => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
     async handleExport() {
       const { exportUrl: url } = this;
       if (!url) return;
@@ -353,15 +484,17 @@ export default {
     },
 
     handleWatch(row) {
+      const { idName } = this;
       this.formType = "watch";
-      this.formId = row.icServiceOrgId;
+      this.formId = row[idName];
       this.formTitle = "查看";
       this.formShow = true;
     },
 
     handleEdit(row) {
+      const { idName } = this;
       this.formType = "edit";
-      this.formId = row.icServiceOrgId;
+      this.formId = row[idName];
       this.formTitle = "编辑";
       this.formShow = true;
     },
@@ -380,10 +513,10 @@ export default {
       const { delUrl: url } = this;
       if (!url) return;
 
-      const { tableData } = this;
+      const { tableData, idName } = this;
 
       const { data, code, msg } = await requestPost(url, {
-        icServiceOrgId: tableData[rowIndex].icServiceOrgId,
+        [idName]: tableData[rowIndex][idName],
       });
 
       if (code === 0) {
@@ -447,5 +580,5 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
-@import "@/assets/scss/modules/shequzhili/event-info.scss";
+// @import "@/assets/scss/modules/shequzhili/event-info.scss";
 </style>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index 4ebad94f..69e549c3 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -252,6 +252,7 @@
             style="margin-top: 10px; padding: 0 20px"
           >
             <el-table
+              v-if="vaccineList"
               class="table"
               :data="vaccineList"
               border
@@ -368,6 +369,8 @@ export default {
       homeList: [],
       natList: [], // 核酸检测
       tripList: [], // 行程信息
+
+      vaccineList: [],
     };
   },
 
@@ -502,18 +505,19 @@ export default {
       return "--";
     },
 
-    getNodePath(node, val, path) { // node:所有数据，val:后台返回的id, path:要渲染的数组id
+    getNodePath(node, val, path) {
+      // node:所有数据，val:后台返回的id, path:要渲染的数组id
       for (let i = 0; i < node.length; i++) {
         const ele = node[i];
         if (ele.value === val) {
           path.push(ele.label);
-          return path
+          return path;
         } else if (ele.children && ele.children.length > 0) {
-          if (ele.children.some(row => row.value === val)) {
+          if (ele.children.some((row) => row.value === val)) {
             path.unshift(ele.label);
-            this.getNodePath(ele.children,val,path);
+            this.getNodePath(ele.children, val, path);
           } else {
-            this.getNodePath(ele.children,val,path);
+            this.getNodePath(ele.children, val, path);
           }
         }
       }
diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
index 79e71c99..91301a2e 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
@@ -7,8 +7,12 @@
       :addUrl="addUrl"
       :editUrl="editUrl"
       :delUrl="delUrl"
+      :infoUrl="infoUrl"
       :exportUrl="exportUrl"
+      :importUrl="importUrl"
+      :mubanUrl="mubanUrl"
       :editParams="editParams"
+      idName="icDangerousChemicalsId"
     ></base-page>
   </div>
 </template>
@@ -22,73 +26,114 @@ export default {
   data() {
     return {
       searchParams: [
+        { field: "企业名称", keyName: "name", type: "input" },
         {
-          field: "服务类别",
-          keyName: "serviceType",
+          field: "企业类型",
+          keyName: "category",
+          type: "select",
+          optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals",
+          optionUrlParams: {},
+          optionList: [],
+        },
+        {
+          field: "危化品种类",
+          keyName: "dangerType",
           type: "select",
           optionUrl: "/sys/dict/data/dictlist",
           optionUrlParams: {
-            dictType: "ic_service_type",
+            dictType: "ic_danger_type",
           },
           optionList: [],
         },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
 
       tableParams: [
         { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
+        { field: "企业名称", keyName: "name", type: "text" },
+        { field: "企业类别", keyName: "categoryName", type: "text" },
+        { field: "周边安全间距", keyName: "safeDistanceName", type: "text" },
+        { field: "危化品种类", keyName: "dangerTypeName", type: "text" },
+        { field: "经营地址", keyName: "address", type: "text" },
+        { field: "负责人", keyName: "principalName", type: "text" },
+        { field: "联系电话", keyName: "principalMobile", type: "text" },
         { field: "备注", keyName: "remark", type: "text" },
       ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
+      tableUrl: "/gov/org/icDangerousChemicals/list",
+      mubanUrl: "/gov/org/icDangerousChemicals/download",
+      importUrl: "/gov/org/icDangerousChemicals/import",
+      exportUrl: "/gov/org/icDangerousChemicals/export",
+
+      addUrl: "/gov/org/icDangerousChemicals/add",
+      editUrl: "/gov/org/icDangerousChemicals/edit",
+      infoUrl: "/gov/org/icDangerousChemicals/detail",
+      delUrl: "/gov/org/icDangerousChemicals/del",
 
       editParams: [
         {
-          field: "服务类别",
-          keyName: "serviceType",
+          field: "企业名称",
+          keyName: "name",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "企业名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "企业分类",
+          keyName: "category",
           type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
+          optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals",
           optionUrlParams: {
-            dictType: "ic_service_type",
+            // dictType: "ic_service_type",
           },
           optionList: [],
           editDisabled: true,
           rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
+            { required: true, message: "企业分类不能为空", trigger: "blur" },
           ],
         },
         {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
+          field: "周边安全间距",
+          keyName: "safeDistance",
+          type: "number",
+          min: 0,
+          max: 1000000000,
+          unitName: "公里",
+        },
+        {
+          field: "危化品种类",
+          keyName: "dangerType",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "ic_danger_type",
+          },
+          optionList: [],
           editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
         },
+        { field: "负责人", keyName: "principalName", type: "input" },
+        { field: "联系电话", keyName: "principalMobile", type: "input" },
         {
-          field: "服务地址",
+          field: "经营地址",
           keyName: "address",
           type: "address",
           supKeys: ["longitude", "latitude"],
           supValues: ["", ""],
+          rules: [
+            {
+              required: true,
+              message: "经营地址坐标不能为空",
+              trigger: "blur",
+            },
+          ],
         },
-        { field: "备注", keyName: "remark", type: "input" },
+        { field: "备注", keyName: "remark", type: "textarea" },
       ],
-
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
     };
   },
   components: { basePage },
diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
index 79e71c99..1d8aa749 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
@@ -7,8 +7,12 @@
       :addUrl="addUrl"
       :editUrl="editUrl"
       :delUrl="delUrl"
+      :infoUrl="infoUrl"
       :exportUrl="exportUrl"
+      :importUrl="importUrl"
+      :mubanUrl="mubanUrl"
       :editParams="editParams"
+      idName="icSuperiorResourceId"
     ></base-page>
   </div>
 </template>
@@ -22,73 +26,95 @@ export default {
   data() {
     return {
       searchParams: [
+        { field: "场所名称", keyName: "name", type: "input" },
         {
-          field: "服务类别",
+          field: "场所分类",
           keyName: "serviceType",
           type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
+          optionUrl: "/gov/org/coverage/dict-select-list/superior_resource",
+          optionUrlParams: {},
           optionList: [],
         },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
 
       tableParams: [
         { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
-        { field: "备注", keyName: "remark", type: "text" },
+        { field: "场所名称", keyName: "name", type: "text" },
+        { field: "场所类别", keyName: "categoryName", type: "text" },
+        { field: "占地面积", keyName: "areaCoveredName", type: "text" },
+        { field: "容纳人数", keyName: "capacityName", type: "text" },
+        { field: "地址", keyName: "address", type: "text" },
       ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
+      tableUrl: "/gov/org/icSuperiorResource/list",
+      mubanUrl: "/gov/org/icSuperiorResource/download",
+      importUrl: "/gov/org/icSuperiorResource/import",
+      exportUrl: "/gov/org/icSuperiorResource/export",
+
+      addUrl: "/gov/org/icSuperiorResource/add",
+      editUrl: "/gov/org/icSuperiorResource/edit",
+      infoUrl: "/gov/org/icSuperiorResource/detail",
+      delUrl: "/gov/org/icSuperiorResource/del",
 
       editParams: [
         {
-          field: "服务类别",
+          field: "场所名称",
+          keyName: "name",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "场所名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "场所分类",
           keyName: "serviceType",
           type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
+          optionUrl: "/gov/org/coverage/dict-select-list/superior_resource",
           optionUrlParams: {
-            dictType: "ic_service_type",
+            // dictType: "ic_service_type",
           },
           optionList: [],
           editDisabled: true,
           rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
+            { required: true, message: "场所分类不能为空", trigger: "blur" },
           ],
         },
         {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
-          editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
+          field: "占地面积",
+          keyName: "areaCovered",
+          type: "number",
+          min: 0,
+          max: 1000000000,
+          unitName: "平方公里",
+        },
+        {
+          field: "容纳人数",
+          keyName: "capacity",
+          type: "number",
+          min: 0,
+          max: 1000000000,
+          //   unitName: "个",
         },
         {
-          field: "服务地址",
+          field: "位置坐标",
           keyName: "address",
           type: "address",
           supKeys: ["longitude", "latitude"],
           supValues: ["", ""],
+          rules: [
+            {
+              required: true,
+              message: "地址坐标不能为空",
+              trigger: "blur",
+            },
+          ],
         },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
-
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
     };
   },
   components: { basePage },
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
index 79e71c99..0b98fd9e 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
@@ -1,104 +1,840 @@
 <template>
-  <div>
-    <base-page
-      :searchParams="searchParams"
-      :tableParams="tableParams"
-      :tableUrl="tableUrl"
-      :addUrl="addUrl"
-      :editUrl="editUrl"
-      :delUrl="delUrl"
-      :exportUrl="exportUrl"
-      :editParams="editParams"
-    ></base-page>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        :label-width="'100px'"
+        class="demo-form-inline"
+      >
+        <div>
+          <el-form-item prop="gridId" label="所属网格">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.gridId"
+                placeholder="请选择网格"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                @change="handleChangeGrid"
+              >
+                <el-option
+                  v-for="item in optionsG"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <div class="resi-cell-col">
+                <el-form-item prop="villageId">
+                  <el-select
+                    v-model.trim="fmData.villageId"
+                    placeholder="请选择小区"
+                    size="small"
+                    clearable
+                    class="resi-cell-select"
+                    @change="handleChangeV"
+                  >
+                    <el-option
+                      v-for="item in optionsV"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="buildId">
+                  <el-select
+                    v-model.trim="fmData.buildId"
+                    placeholder="楼号"
+                    size="small"
+                    clearable
+                    :disabled="changeVDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                    @change="handleChangeB"
+                  >
+                    <el-option
+                      v-for="item in optionsB"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="unitId">
+                  <el-select
+                    v-model.trim="fmData.unitId"
+                    placeholder="单元"
+                    size="small"
+                    clearable
+                    :disabled="changeBDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                    @change="handleChangeD"
+                  >
+                    <el-option
+                      v-for="item in optionsD"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="homeId">
+                  <el-select
+                    v-model.trim="fmData.homeId"
+                    placeholder="房号"
+                    size="small"
+                    clearable
+                    :disabled="changeDDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                  >
+                    <el-option
+                      v-for="item in optionsH"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+            </div>
+          </el-form-item>
+        </div>
+
+        <div>
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="fmData.name"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="手机号" prop="mobile">
+            <el-input
+              v-model="fmData.mobile"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="身份证号" prop="idCard">
+            <el-input
+              v-model="fmData.idCard"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              class="diy-button--search"
+              size="small"
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              class="diy-button--reset"
+              size="small"
+              @click="resetForm('searchForm')"
+              >重置</el-button
+            >
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+      >
+        <el-table-column
+          label="序号"
+          fixed="left"
+          type="index"
+          align="center"
+          width="50"
+        />
+
+        <el-table-column
+          prop="GRID_ID"
+          align="center"
+          label="所属网格"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="HOME_ID"
+          label="所属家庭"
+          align="center"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        />
+
+        <el-table-column
+          prop="NAME"
+          align="center"
+          label="姓名"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="MOBILE"
+          width="140"
+          align="center"
+          label="手机号"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column prop="GENDER" align="center" width="60" label="性别">
+        </el-table-column>
+
+        <el-table-column
+          prop="ID_CARD"
+          align="center"
+          min-width="160"
+          label="身份证号"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="BIRTHDAY"
+          align="center"
+          label="出生日期"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="REMARKS"
+          align="center"
+          label="备注"
+          :show-overflow-tooltip="true"
+        >
+        </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
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <people-more
+      v-if="showedPeopleMoreInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="currentPepeleGridName"
+      @close="showedPeopleMoreInfo = false"
+    />
   </div>
 </template>
 
 <script>
-import basePage from "@/views/modules/cpts/base/index";
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
 export default {
-  props: {},
-
+  components: { peopleMore },
   data() {
     return {
-      searchParams: [
-        {
-          field: "服务类别",
-          keyName: "serviceType",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
-          optionList: [],
-        },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
-      ],
+      openSearch: false,
 
-      tableParams: [
-        { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
-        { field: "备注", keyName: "remark", type: "text" },
-      ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
+      formShow: false,
+      formTitle: "",
 
-      editParams: [
-        {
-          field: "服务类别",
-          keyName: "serviceType",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
-          optionList: [],
-          editDisabled: true,
-          rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
-          ],
-        },
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      optionsWelfare: [
         {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
-          editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
+          value: "1",
+          label: "是",
         },
         {
-          field: "服务地址",
-          keyName: "address",
-          type: "address",
-          supKeys: ["longitude", "latitude"],
-          supValues: ["", ""],
+          value: "0",
+          label: "否",
         },
-        { field: "备注", keyName: "remark", type: "input" },
       ],
 
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
+      fmData: {
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+      },
+      rangeTime: [],
+
+      searchH: 0,
+      tableHeight: 0,
+
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+
+      currentPepeleId: "",
+      currentPepeleGridName: "",
     };
   },
-  components: { basePage },
-  computed: {},
-  watch: {},
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    maxTableHeight() {
+      console.log("computed-searchH---", this.searchH);
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
+      return this.$store.state.inIframe ? h : _h;
+    },
+
+    changeVDisabled() {
+      return !this.fmData.villageId;
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId;
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId;
+    },
+  },
+  watch: {
+    rangeTime: function (val) {
+      console.log("val----", val);
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0];
+        this.fmData.endTime = val[1];
+      } else {
+        this.fmData.startTime = "";
+        this.fmData.endTime = "";
+      }
+    },
+    searchH() {
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
 
-  async mounted() {},
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h;
+      });
+    },
+  },
+  mounted() {
+    this.getGridList();
+    this.getValiheList();
+    this.getTableData();
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
+    console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
+  },
+  methods: {
+    async handleWatch(rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentPepeleId = item.icResiUserId;
+      this.currentPepeleGridName = item.GRID_ID;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
+    },
+
+    handleClearVillage() {
+      this.fmData.buildId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearBuild() {
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearDan() {
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.fmData.villageId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.fmData.homeId = "";
+      this.getHouseList();
+    },
+
+    getGridList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.fmData.gridId,
+          agencyId: "",
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getBuildList() {
+      this.$http
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.fmData.villageId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList() {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.fmData.buildId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList() {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+    handleSearch(val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.handleSearch();
+    },
+
+    async handleChu() {
+      const url = "/epmetuser/icMoveIn/export";
+      const { pageSize, pageNo, fmData } = this;
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: {
+          pageSize,
+          pageNo,
+          ...{
+            formCode: "resi_base_info",
+            pageNo: 1,
+            pageSize: 20,
+            conditions: [
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "GRID_ID",
+                columnValue: [fmData.gridId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "VILLAGE_ID",
+                columnValue: [fmData.villageId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "BUILD_ID",
+                columnValue: [fmData.buildId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "UNIT_ID",
+                columnValue: [fmData.unitId],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "HOME_ID",
+                columnValue: [fmData.homeId],
+              },
+              {
+                queryType: "like",
+                tableName: "ic_resi_user",
+                columnName: "NAME",
+                columnValue: [fmData.name],
+              },
+              {
+                queryType: "like",
+                tableName: "ic_resi_user",
+                columnName: "MOBILE",
+                columnValue: [fmData.mobile],
+              },
+              {
+                queryType: "like",
+                tableName: "ic_resi_user",
+                columnName: "ID_CARD",
+                columnValue: [fmData.idCard],
+              },
+              {
+                queryType: "equal",
+                tableName: "ic_resi_user",
+                columnName: "IS_XFRY",
+                columnValue: ["1"],
+              },
+            ],
+          },
+        },
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          this.formatData(res);
+        })
+        .catch((err) => {
+          console.log("err", err);
+          this.exportLoading = false;
+          return this.$message.error("网络错误");
+        });
+    },
+    formatData(res) {
+      const fileReader = new FileReader();
+      fileReader.onloadend = () => {
+        try {
+          const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
+          // 后台信息
+          console.log("jsonData---1", jsonData);
+          return this.$message.error(jsonData.msg);
+        } catch (err) {
+          // 解析成对象失败，说明是正常的文件流
+          // 下载文件
+          console.log("errr-----", err, this);
+          this.downloadFile(res);
+        }
+      };
+      fileReader.readAsText(res.data);
+    },
+    downloadFile(res) {
+      if (res.headers["content-disposition"]) {
+        let fileName = window.decodeURI(
+          res.headers["content-disposition"].split(";")[1].split("=")[1]
+        );
+        console.log("filename", fileName);
+        let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+        var url = window.URL.createObjectURL(blob);
+        var aLink = document.createElement("a");
+        aLink.style.display = "none";
+        aLink.href = url;
+        aLink.setAttribute("download", fileName);
+        document.body.appendChild(aLink);
+        aLink.click();
+        document.body.removeChild(aLink); //下载完成移除元素
+        window.URL.revokeObjectURL(url); //释放掉blob对象
+        this.$message.success("导出成功");
+        this.$emit("close");
+      } else this.$message.error("下载失败");
+    },
 
-  methods: {},
+    async getTableData() {
+      const url = "/epmetuser/icresiuser/listresi";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...{
+          formCode: "resi_base_info",
+          pageNo: 1,
+          pageSize: 20,
+          conditions: [
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "GRID_ID",
+              columnValue: [fmData.gridId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "VILLAGE_ID",
+              columnValue: [fmData.villageId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "BUILD_ID",
+              columnValue: [fmData.buildId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "UNIT_ID",
+              columnValue: [fmData.unitId],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "HOME_ID",
+              columnValue: [fmData.homeId],
+            },
+            {
+              queryType: "like",
+              tableName: "ic_resi_user",
+              columnName: "NAME",
+              columnValue: [fmData.name],
+            },
+            {
+              queryType: "like",
+              tableName: "ic_resi_user",
+              columnName: "MOBILE",
+              columnValue: [fmData.mobile],
+            },
+            {
+              queryType: "like",
+              tableName: "ic_resi_user",
+              columnName: "ID_CARD",
+              columnValue: [fmData.idCard],
+            },
+            {
+              queryType: "equal",
+              tableName: "ic_resi_user",
+              columnName: "IS_XFRY",
+              columnValue: ["1"],
+            },
+          ],
+        },
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 120px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+</style>

From 372dd69cf8b25dfd35f2e739abd8c6fc1505bb2f Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 21 Jun 2022 10:42:06 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=92=8C=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/csgltc/csgl.vue  | 12 ++---
 .../modules/shequzhili/csgltc/csglDetail.vue  | 52 +++++++------------
 .../modules/shequzhili/csgltc/csglForm.vue    | 38 +++++---------
 src/views/modules/shequzhili/ggfwtc/ggfw.vue  |  8 +--
 .../modules/shequzhili/ggfwtc/ggfwDetail.vue  | 23 ++++++++
 .../modules/shequzhili/ggfwtc/ggfwForm.vue    | 38 +++++---------
 6 files changed, 79 insertions(+), 92 deletions(-)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index e617744d..6feeb685 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -24,9 +24,9 @@
                      size="small"
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.categoryKey"
-                       :label="item.categoryName"
-                       :value="item.categoryKey">
+                       :key="item.label"
+                       :label="item.value"
+                       :value="item.label">
             </el-option>
           </el-select>
 
@@ -202,7 +202,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
       agencyId: '',
@@ -428,8 +428,8 @@ export default {
     async handleExport () {
       let title = '城市管理图层'
 
-      // const url = "/gov/org/icCityManagement/export"
-      const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export"
+      const url = "/gov/org/icCityManagement/export"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export"
       let params = {
         ...this.formData
       }
diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue
index f07e1158..b568e532 100644
--- a/src/views/modules/shequzhili/csgltc/csglDetail.vue
+++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue
@@ -22,15 +22,6 @@
           <span class="detail_span">{{formData.categoryName}}</span>
 
         </el-form-item>
-        <!--<el-form-item label="服务事项："
-                      prop="serviceMatterList"
-                      label-width="150px"
-                      style="display: block">
-          <p class="detail_span"
-             v-for="(item,index) in formData.serviceMatterList"
-             :key="index">{{item}}</p>
-
-        </el-form-item>-->
         <el-form-item label="占地面积："
                       prop="areaCovered"
                       label-width="150px"
@@ -50,32 +41,29 @@
                       label-width="150px">
           <span class="detail_span">{{formData.address}}</span>
         </el-form-item>
-        <!--<el-form-item label="备注："
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <span class="detail_span">{{formData.remark?formData.remark:'无'}}</span>
-        </el-form-item>
-        <el-form-item label="地理位置："
-                      prop="address"
-                      label-width="150px"
-                      style="display: block">
-          <span class="detail_span">{{formData.address}}</span>
-
-        </el-form-item>
-        <el-form-item label="位置坐标："
+        <el-form-item label="位置坐标"
                       prop="longitude"
                       label-width="150px"
                       style="display: block">
-          <div style="width:500px">
-
-            <div id="app">
-
+          <div style="width: 500px">
+            <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="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>
       </el-form>
 
     </div>
@@ -106,8 +94,8 @@ export default {
     }
   },
   components: {},
-  mounted () {
-    this.initMap()
+  async mounted () {
+   await this.initMap()
   },
 
   methods: {
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index 8ddd65b6..2d94ed1f 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -48,9 +48,9 @@
                      filterable
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.categoryKey"
-                       :label="item.categoryName"
-                       :value="item.categoryKey">
+                       :key="item.label"
+                       :label="item.value"
+                       :value="item.label">
             </el-option>
           </el-select>
 
@@ -186,7 +186,7 @@ export default {
 
   methods: {
 
-    async initForm (type, unitId) {
+    async initForm (type, icCityManagementId) {
       this.startLoading()
       this.$refs.ref_form.resetFields();
 
@@ -194,9 +194,9 @@ export default {
       await this.loadService()
 
       this.formType = type
-      if (unitId) {
-        this.unitId = unitId
-        this.formData.id = unitId
+      if (icCityManagementId) {
+        this.icCityManagementId = icCityManagementId
+        this.formData.icCityManagementId = icCityManagementId
         await this.loadFormData()
       } else {
         map.setCenter(new TMap.LatLng(36.0722275, 120.38945519))
@@ -268,24 +268,13 @@ export default {
 
     },
     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 = '/gov/org/icCityManagement/add'
-      // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/add"
-      // if (this.formType === 'edit') {
-      //  this.formData.id = this.unitId
-      // } 
-
+      let url = ''
+      if (this.formType === 'add'){
+        url = '/gov/org/icCityManagement/add'
+      }else {
+        url = '/gov/org/icCityManagement/edit'
+      }
       const { data, code, msg } = await requestPost(url, this.formData)
-
       if (code === 0) {
         this.$message({
           type: 'success',
@@ -298,7 +287,6 @@ export default {
         this.btnDisable = false
         this.$message.error(msg)
       }
-
     },
 
     handleCancle () {
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index e912a6e2..ee3007d2 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -25,9 +25,9 @@
                        size="small"
                        clearable>
               <el-option v-for="item in serviceList"
-                         :key="item.categoryKey"
-                         :label="item.categoryName"
-                         :value="item.categoryKey">
+                         :key="item.label"
+                         :label="item.value"
+                         :value="item.label">
               </el-option>
             </el-select>
           </el-form-item>
@@ -197,7 +197,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
       agencyId: '',
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
index 6cf4af89..42d9d9a1 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue
@@ -41,6 +41,29 @@
                       label-width="150px">
           <span class="detail_span">{{formData.address}}</span>
         </el-form-item>
+        <el-form-item label="位置坐标"
+                      prop="longitude"
+                      label-width="150px"
+                      style="display: block">
+          <div style="width: 500px">
+            <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="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>
 
     </div>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index 30c30a8c..6c253542 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -30,9 +30,9 @@
                      filterable
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.categoryKey"
-                       :label="item.categoryName"
-                       :value="item.categoryKey">
+                       :key="item.label"
+                       :label="item.value"
+                       :value="item.label">
             </el-option>
           </el-select>
 
@@ -154,7 +154,7 @@
           latitude: 120.38945519 //纬度
         },
         serviceList: [],//服务list
-
+        publicServiceData: {},
       }
     },
     components: {},
@@ -210,12 +210,11 @@
         let params = {
           icPublicServiceId: this.icPublicServiceId
         }
-
         const { data, code, msg } = await requestPost(url, params)
-
         if (code === 0) {
-          if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
-            data.serviceMatterList = []
+          console.log(data)
+          if (null != data) {
+            data: this.publicServiceData
           }
 
           this.formData = { ...data }
@@ -247,24 +246,13 @@
 
       },
       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 = '/gov/org/icPublicService/add'
-        // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/add"
-        // if (this.formType === 'edit') {
-        //  this.formData.id = this.unitId
-        // }
-
+        let url = ''
+        if (this.formType === 'add'){
+          url = '/gov/org/icPublicService/add'
+        }else {
+          url = '/gov/org/icPublicService/edit'
+        }
         const { data, code, msg } = await requestPost(url, this.formData)
-
         if (code === 0) {
           this.$message({
             type: 'success',

From fc467a92c0b99d33ce93ff2214216407ef031839 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 21 Jun 2022 11:09:37 +0800
Subject: [PATCH 04/12] =?UTF-8?q?label=E5=92=8Cvalue=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/csgltc/csgl.vue     | 6 +++---
 src/views/modules/shequzhili/csgltc/csglForm.vue | 6 +++---
 src/views/modules/shequzhili/ggfwtc/ggfw.vue     | 6 +++---
 src/views/modules/shequzhili/ggfwtc/ggfwForm.vue | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 6feeb685..1a0dddc6 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -24,9 +24,9 @@
                      size="small"
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.label"
-                       :label="item.value"
-                       :value="item.label">
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
 
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index 2d94ed1f..b09e52fd 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -48,9 +48,9 @@
                      filterable
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.label"
-                       :label="item.value"
-                       :value="item.label">
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
 
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index ee3007d2..a16b0770 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -25,9 +25,9 @@
                        size="small"
                        clearable>
               <el-option v-for="item in serviceList"
-                         :key="item.label"
-                         :label="item.value"
-                         :value="item.label">
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index 6c253542..6b433e07 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -30,9 +30,9 @@
                      filterable
                      clearable>
             <el-option v-for="item in serviceList"
-                       :key="item.label"
-                       :label="item.value"
-                       :value="item.label">
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
             </el-option>
           </el-select>
 

From 0abc1f4259f09fba5d28a7d8e94e47582ef2dafd Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 21 Jun 2022 11:13:32 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=B0=B1=E4=BD=8D=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E8=BF=98=E9=9C=80=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/index.vue         |   8 +-
 .../tuceng/anquan/xuncha/cpts/edit.vue        | 531 +++++++++++
 .../shequzhili/tuceng/anquan/xuncha/index.vue | 319 ++++---
 .../tuceng/zhonghe/anzhibangjiao.vue          |  35 +
 .../shequzhili/tuceng/zhonghe/base.vue        | 788 +++++++++++++++++
 .../tuceng/zhonghe/buliangqingshaonian.vue    |  35 +
 .../tuceng/zhonghe/shequjiaozheng.vue         |  35 +
 .../tuceng/zhonghe/xidurenyuanvue.vue         |  35 +
 .../tuceng/zhonghe/xiejiaorenyuan.vue         |  35 +
 .../shequzhili/tuceng/zhonghe/xinfang.vue     | 837 +-----------------
 .../zhonghe/zhaoshizhaohuojingshenbing.vue    |  35 +
 11 files changed, 1766 insertions(+), 927 deletions(-)
 create mode 100644 src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/base.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue

diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index f0bfe47b..e3fe202b 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -510,13 +510,17 @@ export default {
 
     async handleDelete(rowData, rowIndex) {
       console.log(rowData, rowIndex);
-      const { delUrl: url } = this;
+      let { delUrl: url } = this;
       if (!url) return;
 
       const { tableData, idName } = this;
+      const idValue = tableData[rowIndex][idName];
+      if (url.endsWith("/")) {
+        url += idValue;
+      }
 
       const { data, code, msg } = await requestPost(url, {
-        [idName]: tableData[rowIndex][idName],
+        [idName]: idValue,
       });
 
       if (code === 0) {
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue
new file mode 100644
index 00000000..3b1d06b8
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue
@@ -0,0 +1,531 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="dataForm"
+               :rules="dataRule"
+               :disabled="formType === 'detail'"
+               class="form">
+        <el-form-item label="组织名称	"
+                      prop="organizationName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入组织名称	"
+                    v-model="dataForm.organizationName">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="分类名称	"
+                      prop="categoryCode"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model="dataForm.categoryCode"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in categoryList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="组织人数	"
+                      prop="organizationPersonCount"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="number"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入组织人数	"
+                    v-model="dataForm.organizationPersonCount">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="组织成员	"
+                      prop="organizationPersonnel"
+                      label-width="150px"
+                      style="display: block">
+          <div class="m-staffs">
+            <div class="item"
+                 :key="'staff' + index"
+                 v-for="(item, index) in dataForm.organizationPersonnel">
+              <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-item label="服务事项"
+                      prop="serviceItem"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入服务事项，不超过1000字"
+                    v-model="dataForm.serviceItem"></el-input>
+        </el-form-item>
+
+        <el-form-item label="负责人	"
+                      prop="principalName"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入负责人	"
+                    v-model="dataForm.principalName">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="联系电话	"
+                      prop="principalPhone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入联系电话	"
+                    v-model="dataForm.principalPhone">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="创建时间"
+                      prop="organizationCreatedTime"
+                      label-width="150px"
+                      style="display: block">
+          <el-date-picker v-model="dataForm.organizationCreatedTime"
+                          placeholder="创建时间"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </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="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入备注，不超过500字"
+                    v-model="dataForm.remark"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn resi-btns">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'detail'"
+                 type="primary"
+                 size="small"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from "dai-js/tools/formVltHelper";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+let loading; // 加载动画
+
+export default {
+  data () {
+    return {
+      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      orgId: "",
+      dataForm: {
+        organizationName: "",
+        categoryCode: "",
+        serviceItem: "",
+        organizationPersonCount: "",
+        principalName: "",
+        principalPhone: "",
+        organizationCreatedTime: "",
+        address: "",
+        remark: "",
+        longitude: "",
+        latitude: "",
+        organizationPersonnel: [],
+      },
+      categoryList: [],
+    };
+  },
+  components: {},
+  computed: {
+    dataRule () {
+      return {
+        organizationName: [
+          { required: true, message: "组织名称	不能为空", trigger: "blur" },
+          {
+            min: 1,
+            max: 50,
+            message: "组织名称	长度在 1 到 50个字符",
+            trigger: "blur",
+          },
+        ],
+        categoryCode: [
+          { required: true, message: "分类名称不能为空", trigger: "blur" },
+        ],
+        organizationPersonCount: [
+          { required: true, message: "组织人数不能为空", trigger: "blur" },
+        ],
+        serviceItem: [
+          { required: true, message: "服务事项不能为空", trigger: "blur" },
+        ],
+        principalName: [
+          { required: true, message: "负责人不能为空", trigger: "blur" },
+        ],
+        principalPhone: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        longitude: [
+          { required: true, message: "位置坐标不能为空", trigger: "blur" },
+        ],
+      };
+    },
+  },
+  props: {},
+  watch: {},
+
+  async created () {
+    this.getCategoryList();
+  },
+  async mounted () {
+    this.initMap();
+  },
+
+  methods: {
+    async getCategoryList () {
+      const url = "/sys/dict/data/dictlist";
+      const params = {
+        dictType: "self_org_category",
+      };
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.categoryList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    handleAddStaff () {
+      this.dataForm.organizationPersonnel = [
+        ...this.dataForm.organizationPersonnel,
+        { personName: "", personPhone: "" },
+      ];
+    },
+    handleDelStaff (index) {
+      const { organizationPersonnel } = this.dataForm;
+      organizationPersonnel.splice(index, 1);
+      this.dataForm.organizationPersonnel = organizationPersonnel;
+    },
+    // 地图初始化函数，本例取名为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.orgId = this.dataForm.orgId;
+        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 {
+          // if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
+          //   return this.$message({
+          //     type: "error",
+          //     message: "手机号格式有误",
+          //   });
+          // }
+          const {
+            dataForm: { organizationPersonnel },
+          } = this;
+          let vlt = organizationPersonnel.every((item) => {
+            return (
+              item.personName &&
+              item.personPhone
+            );
+          });
+          if (!vlt) {
+            return this.$message({
+              type: "error",
+              message: "成员姓名/手机号为空",
+            });
+          }
+          this.submit();
+        }
+      });
+    },
+
+    async submit () {
+      let url = "";
+      if (this.formType === "add") {
+        url = "/heart/iccommunityselforganization/addcommunityselforganization";
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
+      } else {
+        url =
+          "/heart/iccommunityselforganization/editcommunityselforganization";
+
+        this.dataForm.orgId = this.orgId;
+      }
+
+      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.orgId = "";
+      this.dataForm = {
+        organizationName: "",
+        serviceItem: "",
+        organizationPersonCount: "",
+        categoryCode: "",
+        principalName: "",
+        principalPhone: "",
+        organizationCreatedTime: "",
+        address: "",
+        remark: "",
+        longitude: "",
+        latitude: "",
+        organizationPersonnel: [],
+      };
+    },
+    // 开启加载动画
+    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>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index 79e71c99..0ae26f55 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -1,104 +1,215 @@
-<template>
-  <div>
-    <base-page
-      :searchParams="searchParams"
-      :tableParams="tableParams"
-      :tableUrl="tableUrl"
-      :addUrl="addUrl"
-      :editUrl="editUrl"
-      :delUrl="delUrl"
-      :exportUrl="exportUrl"
-      :editParams="editParams"
-    ></base-page>
-  </div>
-</template>
-
-<script>
-import basePage from "@/views/modules/cpts/base/index";
-
-export default {
-  props: {},
-
-  data() {
-    return {
-      searchParams: [
-        {
-          field: "服务类别",
-          keyName: "serviceType",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
-          optionList: [],
-        },
-        { field: "服务组织", keyName: "orgName", type: "input" },
-        { field: "服务地址", keyName: "address", type: "input" },
-        { field: "备注", keyName: "remark", type: "input" },
-      ],
-
-      tableParams: [
-        { field: "序号", keyName: "", type: "no" },
-        { field: "服务类别", keyName: "serviceType", type: "text" },
-        { field: "服务组织名称", keyName: "orgName", type: "text" },
-        { field: "服务地址", keyName: "address", type: "text" },
-        { field: "备注", keyName: "remark", type: "text" },
-      ],
-      tableUrl: "/heart/icServiceOrg/list",
-      exportUrl: "/gov/project/icEvent/export",
-
-      editParams: [
-        {
-          field: "服务类别",
-          keyName: "serviceType",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "ic_service_type",
-          },
-          optionList: [],
-          editDisabled: true,
-          rules: [
-            { required: true, message: "服务类别不能为空", trigger: "blur" },
-          ],
-        },
-        {
-          field: "服务组织",
-          keyName: "orgName",
-          type: "input",
-          maxlength: 100,
-          editDisabled: true,
-          rules: [
-            {
-              required: true,
-              message: "服务组织名称不能为空",
-              trigger: "blur",
-            },
-          ],
-        },
-        {
-          field: "服务地址",
-          keyName: "address",
-          type: "address",
-          supKeys: ["longitude", "latitude"],
-          supValues: ["", ""],
-        },
-        { field: "备注", keyName: "remark", type: "input" },
-      ],
-
-      addUrl: "/heart/icServiceOrg/add",
-      editUrl: "/heart/icServiceOrg/edit",
-      delUrl: "/heart/icServiceOrg/del",
-    };
-  },
-  components: { basePage },
-  computed: {},
-  watch: {},
-
-  async mounted() {},
-
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div>
+    <base-page
+      :searchParams="searchParams"
+      :tableParams="tableParams"
+      :tableUrl="tableUrl"
+      :addUrl="addUrl"
+      :editUrl="editUrl"
+      :delUrl="delUrl"
+      :infoUrl="infoUrl"
+      :exportUrl="exportUrl"
+      :importUrl="importUrl"
+      :mubanUrl="mubanUrl"
+      :editParams="editParams"
+      idName="enterpriseId"
+    ></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      searchParams: [
+        { field: "场所名称", keyName: "placeOrgName", type: "input" },
+        { field: "联系电话", keyName: "mobile", type: "input" },
+        {
+          field: "场所区域",
+          keyName: "gridId",
+          type: "select",
+          optionUrl: "/gov/org/customergrid/gridoption",
+          optionUrlParams: {
+            agencyId: this.$store.state.user.agencyId,
+            purpose: "query",
+          },
+          optionList: [],
+        },
+        {
+          field: "场所类型",
+          keyName: "placeType",
+          type: "select",
+          optionUrl: "/gov/org/coverage/dict-select-list/enterprise_patrol",
+          optionUrlParams: {},
+          optionList: [],
+        },
+        {
+          field: "规模",
+          keyName: "scale",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "scale",
+          },
+          optionList: [],
+        },
+        {
+          field: "巡查结果",
+          keyName: "result",
+          type: "select",
+          optionUrl: "",
+          optionUrlParams: {},
+          optionList: [
+            {
+              value: "0",
+              label: "合格",
+            },
+            {
+              value: "0",
+              label: "不合格",
+            },
+          ],
+        },
+        { field: "隐患明细", keyName: "detailed", type: "input" },
+      ],
+
+      tableParams: [
+        { field: "序号", keyName: "", type: "no" },
+        { field: "场所名称", keyName: "placeOrgName", type: "text" },
+        { field: "场所地址", keyName: "address", type: "text" },
+        { field: "场所类型", keyName: "placeType", type: "text" },
+        { field: "规模", keyName: "scale", type: "text" },
+        { field: "负责人", keyName: "personInCharge", type: "text" },
+        { field: "联系电话", keyName: "mobile", type: "text" },
+        { field: "最新检查时间", keyName: "remark", type: "text" },
+        { field: "最新结果", keyName: "result", type: "text" },
+      ],
+      tableUrl: "/gov/org/enterprise/list",
+      mubanUrl: "/gov/org/enterprise/download-tem",
+      importUrl: "/gov/org/enterprise/import",
+      exportUrl: "/gov/org/enterprise/export",
+
+      addUrl: "/gov/org/enterprise/addOrUpdate",
+      editUrl: "/gov/org/enterprise/addOrUpdate",
+      infoUrl: "/gov/org/enterprise/detail/",
+      delUrl: "/gov/org/enterprise/delete/",
+
+      editParams: [
+        {
+          field: "场所类型",
+          keyName: "placeType",
+          type: "select",
+          optionUrl: "/gov/org/coverage/dict-select-list/enterprise_patrol",
+          optionUrlParams: {
+            // dictType: "ic_service_type",
+          },
+          optionList: [],
+          editDisabled: true,
+          rules: [
+            { required: true, message: "场所类型不能为空", trigger: "blur" },
+          ],
+        },
+        {
+          field: "场所区域",
+          keyName: "gridId",
+          type: "select",
+          optionUrl: "/gov/org/customergrid/gridoption",
+          optionUrlParams: {
+            agencyId: this.$store.state.user.agencyId,
+            purpose: "query",
+          },
+          optionList: [],
+          editDisabled: true,
+          rules: [
+            { required: true, message: "场所区域不能为空", trigger: "blur" },
+          ],
+        },
+        {
+          field: "场所名称",
+          keyName: "placeOrgName",
+          type: "input",
+          maxlength: 100,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "场所名称不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "规模",
+          keyName: "scale",
+          type: "select",
+          optionUrl: "/sys/dict/data/dictlist",
+          optionUrlParams: {
+            dictType: "scale",
+          },
+          optionList: [],
+          editDisabled: false,
+          rules: [
+            {
+              required: true,
+              message: "规模不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "负责人",
+          keyName: "personInCharge",
+          type: "input",
+
+          rules: [
+            {
+              required: true,
+              message: "负责人不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "联系电话",
+          keyName: "mobile",
+          type: "input",
+          rules: [
+            {
+              required: true,
+              message: "联系电话不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "场所地址",
+          keyName: "address",
+          type: "address",
+          supKeys: ["longitude", "latitude"],
+          supValues: ["", ""],
+          rules: [
+            {
+              required: true,
+              message: "场所地址坐标不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue b/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue
new file mode 100644
index 00000000..cfa4e62a
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      elseParams: [
+        {
+          queryType: "list_equal",
+          tableName: "ic_special",
+          columnName: "SPECIAL_RQLB",
+          columnValue: ["anzhibangjiao"],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
new file mode 100644
index 00000000..0df94681
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
@@ -0,0 +1,788 @@
+<template>
+  <div class="resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form
+        ref="searchForm"
+        :inline="true"
+        :model="fmData"
+        :label-width="'100px'"
+        class="demo-form-inline"
+      >
+        <div>
+          <el-form-item prop="gridId" label="所属网格">
+            <div class="resi-cell-value">
+              <el-select
+                v-model.trim="fmData.gridId"
+                placeholder="请选择网格"
+                size="small"
+                clearable
+                class="resi-cell-select"
+                @change="handleChangeGrid"
+              >
+                <el-option
+                  v-for="item in optionsG"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </el-form-item>
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <div class="resi-cell-col">
+                <el-form-item prop="villageId">
+                  <el-select
+                    v-model.trim="fmData.villageId"
+                    placeholder="请选择小区"
+                    size="small"
+                    clearable
+                    class="resi-cell-select"
+                    @change="handleChangeV"
+                  >
+                    <el-option
+                      v-for="item in optionsV"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="buildId">
+                  <el-select
+                    v-model.trim="fmData.buildId"
+                    placeholder="楼号"
+                    size="small"
+                    clearable
+                    :disabled="changeVDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                    @change="handleChangeB"
+                  >
+                    <el-option
+                      v-for="item in optionsB"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="unitId">
+                  <el-select
+                    v-model.trim="fmData.unitId"
+                    placeholder="单元"
+                    size="small"
+                    clearable
+                    :disabled="changeBDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                    @change="handleChangeD"
+                  >
+                    <el-option
+                      v-for="item in optionsD"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item prop="homeId">
+                  <el-select
+                    v-model.trim="fmData.homeId"
+                    placeholder="房号"
+                    size="small"
+                    clearable
+                    :disabled="changeDDisabled"
+                    class="resi-cell-select resi-cell-select-middle"
+                  >
+                    <el-option
+                      v-for="item in optionsH"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+            </div>
+          </el-form-item>
+        </div>
+
+        <div>
+          <el-form-item label="姓名" prop="name">
+            <el-input
+              v-model="fmData.name"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="手机号" prop="mobile">
+            <el-input
+              v-model="fmData.mobile"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item label="身份证号" prop="idCard">
+            <el-input
+              v-model="fmData.idCard"
+              class="resi-cell-input"
+              size="small"
+              clearable
+              placeholder="请输入"
+            >
+            </el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              class="diy-button--search"
+              size="small"
+              @click="handleSearch"
+              >查询</el-button
+            >
+            <el-button
+              class="diy-button--reset"
+              size="small"
+              @click="resetForm('searchForm')"
+              >重置</el-button
+            >
+          </el-form-item>
+        </div>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
+      </div>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+      >
+        <el-table-column
+          label="序号"
+          fixed="left"
+          type="index"
+          align="center"
+          width="50"
+        />
+
+        <el-table-column
+          prop="GRID_ID"
+          align="center"
+          label="所属网格"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="HOME_ID"
+          label="所属家庭"
+          align="center"
+          min-width="160"
+          :show-overflow-tooltip="true"
+        />
+
+        <el-table-column
+          prop="NAME"
+          align="center"
+          label="姓名"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="MOBILE"
+          width="140"
+          align="center"
+          label="手机号"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column prop="GENDER" align="center" width="60" label="性别">
+        </el-table-column>
+
+        <el-table-column
+          prop="ID_CARD"
+          align="center"
+          min-width="160"
+          label="身份证号"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="BIRTHDAY"
+          align="center"
+          label="出生日期"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="REMARKS"
+          align="center"
+          label="备注"
+          :show-overflow-tooltip="true"
+        >
+        </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
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="parseInt(pageSize)"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+
+    <people-more
+      v-if="showedPeopleMoreInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="currentPepeleGridName"
+      @close="showedPeopleMoreInfo = false"
+    />
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+
+export default {
+  props: {
+    elseParams: {
+      type: Array,
+      default: () => [],
+    },
+  },
+
+  components: { peopleMore },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: "",
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      optionsWelfare: [
+        {
+          value: "1",
+          label: "是",
+        },
+        {
+          value: "0",
+          label: "否",
+        },
+      ],
+
+      fmData: {
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+      },
+      rangeTime: [],
+
+      searchH: 0,
+      tableHeight: 0,
+
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+    };
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    maxTableHeight() {
+      console.log("computed-searchH---", this.searchH);
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
+      return this.$store.state.inIframe ? h : _h;
+    },
+
+    changeVDisabled() {
+      return !this.fmData.villageId;
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId;
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId;
+    },
+  },
+  watch: {
+    rangeTime: function (val) {
+      console.log("val----", val);
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0];
+        this.fmData.endTime = val[1];
+      } else {
+        this.fmData.startTime = "";
+        this.fmData.endTime = "";
+      }
+    },
+    searchH() {
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
+
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h;
+      });
+    },
+  },
+  mounted() {
+    this.getGridList();
+    this.getValiheList();
+    this.getTableData();
+    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
+    console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
+  },
+  methods: {
+    async handleWatch(rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentPepeleId = item.icResiUserId;
+      this.currentPepeleGridName = item.GRID_ID;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
+    },
+
+    handleClearVillage() {
+      this.fmData.buildId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearBuild() {
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleClearDan() {
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+    },
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.fmData.villageId = "";
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getValiheList();
+    },
+    handleChangeV(val) {
+      console.log("val", val);
+      this.fmData.buildId = "";
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getBuildList();
+    },
+    handleChangeB(val) {
+      console.log("val", val);
+      this.fmData.unitId = "";
+      this.fmData.homeId = "";
+      this.getUniList();
+    },
+    handleChangeD(val) {
+      console.log("val", val);
+      this.fmData.homeId = "";
+      this.getHouseList();
+    },
+
+    getGridList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getValiheList() {
+      const { user } = this.$store.state;
+      this.$http
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
+          gridId: this.fmData.gridId,
+          agencyId: "",
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getBuildList() {
+      this.$http
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.fmData.villageId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getUniList() {
+      this.$http
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.fmData.buildId,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    getHouseList() {
+      this.$http
+        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleClose() {
+      this.formShow = false;
+    },
+    handleSearch(val) {
+      console.log(this.fmData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.handleSearch();
+    },
+
+    computeQueryParams() {
+      const { elseParams, fmData } = this;
+
+      return {
+        formCode: "resi_base_info",
+        pageNo: 1,
+        pageSize: 20,
+        conditions: [
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "GRID_ID",
+            columnValue: [fmData.gridId],
+          },
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "VILLAGE_ID",
+            columnValue: [fmData.villageId],
+          },
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "BUILD_ID",
+            columnValue: [fmData.buildId],
+          },
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "UNIT_ID",
+            columnValue: [fmData.unitId],
+          },
+          {
+            queryType: "equal",
+            tableName: "ic_resi_user",
+            columnName: "HOME_ID",
+            columnValue: [fmData.homeId],
+          },
+          {
+            queryType: "like",
+            tableName: "ic_resi_user",
+            columnName: "NAME",
+            columnValue: [fmData.name],
+          },
+          {
+            queryType: "like",
+            tableName: "ic_resi_user",
+            columnName: "MOBILE",
+            columnValue: [fmData.mobile],
+          },
+          {
+            queryType: "like",
+            tableName: "ic_resi_user",
+            columnName: "ID_CARD",
+            columnValue: [fmData.idCard],
+          },
+          ...elseParams,
+        ],
+      };
+    },
+
+    async handleChu() {
+      const url = "/epmetuser/icMoveIn/export";
+      const { pageSize, pageNo } = this;
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: {
+          pageSize,
+          pageNo,
+          ...this.computeQueryParams(),
+        },
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          this.formatData(res);
+        })
+        .catch((err) => {
+          console.log("err", err);
+          this.exportLoading = false;
+          return this.$message.error("网络错误");
+        });
+    },
+    formatData(res) {
+      const fileReader = new FileReader();
+      fileReader.onloadend = () => {
+        try {
+          const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
+          // 后台信息
+          console.log("jsonData---1", jsonData);
+          return this.$message.error(jsonData.msg);
+        } catch (err) {
+          // 解析成对象失败，说明是正常的文件流
+          // 下载文件
+          console.log("errr-----", err, this);
+          this.downloadFile(res);
+        }
+      };
+      fileReader.readAsText(res.data);
+    },
+    downloadFile(res) {
+      if (res.headers["content-disposition"]) {
+        let fileName = window.decodeURI(
+          res.headers["content-disposition"].split(";")[1].split("=")[1]
+        );
+        console.log("filename", fileName);
+        let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+        var url = window.URL.createObjectURL(blob);
+        var aLink = document.createElement("a");
+        aLink.style.display = "none";
+        aLink.href = url;
+        aLink.setAttribute("download", fileName);
+        document.body.appendChild(aLink);
+        aLink.click();
+        document.body.removeChild(aLink); //下载完成移除元素
+        window.URL.revokeObjectURL(url); //释放掉blob对象
+        this.$message.success("导出成功");
+        this.$emit("close");
+      } else this.$message.error("下载失败");
+    },
+
+    async getTableData() {
+      const url = "/epmetuser/icresiuser/listresi";
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...this.computeQueryParams(),
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 120px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue b/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue
new file mode 100644
index 00000000..51499380
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      elseParams: [
+        {
+          queryType: "list_equal",
+          tableName: "ic_special",
+          columnName: "SPECIAL_RQLB",
+          columnValue: ["buliangqingshaonian"],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue
new file mode 100644
index 00000000..0c59feaf
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      elseParams: [
+        {
+          queryType: "list_equal",
+          tableName: "ic_special",
+          columnName: "SPECIAL_RQLB",
+          columnValue: ["shequjiaozheng"],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue
new file mode 100644
index 00000000..f55fba23
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      elseParams: [
+        {
+          queryType: "list_equal",
+          tableName: "ic_special",
+          columnName: "SPECIAL_RQLB",
+          columnValue: ["xidurenyuan"],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue
new file mode 100644
index 00000000..477cd82d
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      elseParams: [
+        {
+          queryType: "list_equal",
+          tableName: "ic_special",
+          columnName: "SPECIAL_RQLB",
+          columnValue: ["xiejiaorenyuan"],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
index 0b98fd9e..a9624c93 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue
@@ -1,840 +1,35 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-      <el-form
-        ref="searchForm"
-        :inline="true"
-        :model="fmData"
-        :label-width="'100px'"
-        class="demo-form-inline"
-      >
-        <div>
-          <el-form-item prop="gridId" label="所属网格">
-            <div class="resi-cell-value">
-              <el-select
-                v-model.trim="fmData.gridId"
-                placeholder="请选择网格"
-                size="small"
-                clearable
-                class="resi-cell-select"
-                @change="handleChangeGrid"
-              >
-                <el-option
-                  v-for="item in optionsG"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-          <el-form-item label="所属房屋">
-            <div class="resi-cell-value">
-              <div class="resi-cell-col">
-                <el-form-item prop="villageId">
-                  <el-select
-                    v-model.trim="fmData.villageId"
-                    placeholder="请选择小区"
-                    size="small"
-                    clearable
-                    class="resi-cell-select"
-                    @change="handleChangeV"
-                  >
-                    <el-option
-                      v-for="item in optionsV"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="buildId">
-                  <el-select
-                    v-model.trim="fmData.buildId"
-                    placeholder="楼号"
-                    size="small"
-                    clearable
-                    :disabled="changeVDisabled"
-                    class="resi-cell-select resi-cell-select-middle"
-                    @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="unitId">
-                  <el-select
-                    v-model.trim="fmData.unitId"
-                    placeholder="单元"
-                    size="small"
-                    clearable
-                    :disabled="changeBDisabled"
-                    class="resi-cell-select resi-cell-select-middle"
-                    @change="handleChangeD"
-                  >
-                    <el-option
-                      v-for="item in optionsD"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select
-                    v-model.trim="fmData.homeId"
-                    placeholder="房号"
-                    size="small"
-                    clearable
-                    :disabled="changeDDisabled"
-                    class="resi-cell-select resi-cell-select-middle"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </div>
-            </div>
-          </el-form-item>
-        </div>
-
-        <div>
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="fmData.name"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="手机号" prop="mobile">
-            <el-input
-              v-model="fmData.mobile"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="身份证号" prop="idCard">
-            <el-input
-              v-model="fmData.idCard"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              class="diy-button--search"
-              size="small"
-              @click="handleSearch"
-              >查询</el-button
-            >
-            <el-button
-              class="diy-button--reset"
-              size="small"
-              @click="resetForm('searchForm')"
-              >重置</el-button
-            >
-          </el-form-item>
-        </div>
-      </el-form>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >导出</el-button
-        >
-      </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="resi-table"
-        :height="tableHeight"
-      >
-        <el-table-column
-          label="序号"
-          fixed="left"
-          type="index"
-          align="center"
-          width="50"
-        />
-
-        <el-table-column
-          prop="GRID_ID"
-          align="center"
-          label="所属网格"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column
-          prop="HOME_ID"
-          label="所属家庭"
-          align="center"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        />
-
-        <el-table-column
-          prop="NAME"
-          align="center"
-          label="姓名"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column
-          prop="MOBILE"
-          width="140"
-          align="center"
-          label="手机号"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column prop="GENDER" align="center" width="60" label="性别">
-        </el-table-column>
-
-        <el-table-column
-          prop="ID_CARD"
-          align="center"
-          min-width="160"
-          label="身份证号"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column
-          prop="BIRTHDAY"
-          align="center"
-          label="出生日期"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-
-        <el-table-column
-          prop="REMARKS"
-          align="center"
-          label="备注"
-          :show-overflow-tooltip="true"
-        >
-        </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
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
-        </el-pagination>
-      </div>
-    </el-card>
-
-    <people-more
-      v-if="showedPeopleMoreInfo && currentPepeleId"
-      :userId="currentPepeleId"
-      :gridName="currentPepeleGridName"
-      @close="showedPeopleMoreInfo = false"
-    />
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
   </div>
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
-import nextTick from "dai-js/tools/nextTick";
-import { mapGetters } from "vuex";
-import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
 
 export default {
-  components: { peopleMore },
+  props: {},
+
   data() {
     return {
-      openSearch: false,
-
-      formShow: false,
-      formTitle: "",
-
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
-
-      tableData: [],
-
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsD: [],
-      optionsG: [],
-
-      optionsWelfare: [
-        {
-          value: "1",
-          label: "是",
-        },
+      elseParams: [
         {
-          value: "0",
-          label: "否",
+          queryType: "equal",
+          tableName: "ic_resi_user",
+          columnName: "IS_XFRY",
+          columnValue: ["1"],
         },
       ],
-
-      fmData: {
-        gridId: "",
-        villageId: "",
-        buildId: "",
-        unitId: "",
-        homeId: "",
-        name: "",
-        mobile: "",
-        idCard: "",
-      },
-      rangeTime: [],
-
-      searchH: 0,
-      tableHeight: 0,
-
-      // 显示人员详情
-      showedPeopleMoreInfo: false,
-
-      currentPepeleId: "",
-      currentPepeleGridName: "",
     };
   },
-  computed: {
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-    maxTableHeight() {
-      console.log("computed-searchH---", this.searchH);
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-      return this.$store.state.inIframe ? h : _h;
-    },
-
-    changeVDisabled() {
-      return !this.fmData.villageId;
-    },
-    changeBDisabled() {
-      return !this.fmData.buildId;
-    },
-    changeDDisabled() {
-      return !this.fmData.unitId;
-    },
-  },
-  watch: {
-    rangeTime: function (val) {
-      console.log("val----", val);
-      if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startTime = val[0];
-        this.fmData.endTime = val[1];
-      } else {
-        this.fmData.startTime = "";
-        this.fmData.endTime = "";
-      }
-    },
-    searchH() {
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-
-      this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h;
-      });
-    },
-  },
-  mounted() {
-    this.getGridList();
-    this.getValiheList();
-    this.getTableData();
-    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
-    console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
-  },
-  methods: {
-    async handleWatch(rowIndex) {
-      let item = this.tableData[rowIndex];
-      this.currentPepeleId = item.icResiUserId;
-      this.currentPepeleGridName = item.GRID_ID;
-      await nextTick();
-      this.showedPeopleMoreInfo = true;
-    },
-
-    handleClearVillage() {
-      this.fmData.buildId = "";
-      this.fmData.homeId = "";
-    },
-    handleClearBuild() {
-      this.fmData.buildId = "";
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-    },
-    handleClearDan() {
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-    },
-    handleChangeGrid(val) {
-      console.log("val", val);
-      this.fmData.villageId = "";
-      this.fmData.buildId = "";
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-      this.getValiheList();
-    },
-    handleChangeV(val) {
-      console.log("val", val);
-      this.fmData.buildId = "";
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-      this.getBuildList();
-    },
-    handleChangeB(val) {
-      console.log("val", val);
-      this.fmData.unitId = "";
-      this.fmData.homeId = "";
-      this.getUniList();
-    },
-    handleChangeD(val) {
-      console.log("val", val);
-      this.fmData.homeId = "";
-      this.getHouseList();
-    },
-
-    getGridList() {
-      const { user } = this.$store.state;
-      this.$http
-        .post("/gov/org/customergrid/gridoption", {
-          agencyId: user.agencyId,
-          purpose: "query",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsG = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getValiheList() {
-      const { user } = this.$store.state;
-      this.$http
-        .post("/gov/org/icneighborhood/neighborhoodoption", {
-          gridId: this.fmData.gridId,
-          agencyId: "",
-          // agencyId: user.agencyId
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsV = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getBuildList() {
-      this.$http
-        .post("/gov/org/icbuilding/buildingoption", {
-          neighborHoodId: this.fmData.villageId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsB = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getUniList() {
-      this.$http
-        .post("/gov/org/icbuildingunit/unitoption", {
-          buildingId: this.fmData.buildId,
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsD = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
-    getHouseList() {
-      this.$http
-        .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            console.log("获取查询详情成功", res.data);
-            this.optionsH = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-    },
+  components: { basePage },
+  computed: {},
+  watch: {},
 
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-      this.pageSize = val;
-      window.localStorage.setItem("pageSize", val);
-      this.getTableData();
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-      this.pageNo = val;
-      this.getTableData();
-    },
+  async mounted() {},
 
-    handleClose() {
-      this.formShow = false;
-    },
-    handleSearch(val) {
-      console.log(this.fmData);
-      this.pageNo = 1;
-      this.getTableData();
-    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-      this.handleSearch();
-    },
-
-    async handleChu() {
-      const url = "/epmetuser/icMoveIn/export";
-      const { pageSize, pageNo, fmData } = this;
-      await this.$http({
-        method: "POST",
-        url,
-        responseType: "blob",
-        data: {
-          pageSize,
-          pageNo,
-          ...{
-            formCode: "resi_base_info",
-            pageNo: 1,
-            pageSize: 20,
-            conditions: [
-              {
-                queryType: "equal",
-                tableName: "ic_resi_user",
-                columnName: "GRID_ID",
-                columnValue: [fmData.gridId],
-              },
-              {
-                queryType: "equal",
-                tableName: "ic_resi_user",
-                columnName: "VILLAGE_ID",
-                columnValue: [fmData.villageId],
-              },
-              {
-                queryType: "equal",
-                tableName: "ic_resi_user",
-                columnName: "BUILD_ID",
-                columnValue: [fmData.buildId],
-              },
-              {
-                queryType: "equal",
-                tableName: "ic_resi_user",
-                columnName: "UNIT_ID",
-                columnValue: [fmData.unitId],
-              },
-              {
-                queryType: "equal",
-                tableName: "ic_resi_user",
-                columnName: "HOME_ID",
-                columnValue: [fmData.homeId],
-              },
-              {
-                queryType: "like",
-                tableName: "ic_resi_user",
-                columnName: "NAME",
-                columnValue: [fmData.name],
-              },
-              {
-                queryType: "like",
-                tableName: "ic_resi_user",
-                columnName: "MOBILE",
-                columnValue: [fmData.mobile],
-              },
-              {
-                queryType: "like",
-                tableName: "ic_resi_user",
-                columnName: "ID_CARD",
-                columnValue: [fmData.idCard],
-              },
-              {
-                queryType: "equal",
-                tableName: "ic_resi_user",
-                columnName: "IS_XFRY",
-                columnValue: ["1"],
-              },
-            ],
-          },
-        },
-      })
-        .then((res) => {
-          console.log("res----dddd", res);
-          this.formatData(res);
-        })
-        .catch((err) => {
-          console.log("err", err);
-          this.exportLoading = false;
-          return this.$message.error("网络错误");
-        });
-    },
-    formatData(res) {
-      const fileReader = new FileReader();
-      fileReader.onloadend = () => {
-        try {
-          const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
-          // 后台信息
-          console.log("jsonData---1", jsonData);
-          return this.$message.error(jsonData.msg);
-        } catch (err) {
-          // 解析成对象失败，说明是正常的文件流
-          // 下载文件
-          console.log("errr-----", err, this);
-          this.downloadFile(res);
-        }
-      };
-      fileReader.readAsText(res.data);
-    },
-    downloadFile(res) {
-      if (res.headers["content-disposition"]) {
-        let fileName = window.decodeURI(
-          res.headers["content-disposition"].split(";")[1].split("=")[1]
-        );
-        console.log("filename", fileName);
-        let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-        var url = window.URL.createObjectURL(blob);
-        var aLink = document.createElement("a");
-        aLink.style.display = "none";
-        aLink.href = url;
-        aLink.setAttribute("download", fileName);
-        document.body.appendChild(aLink);
-        aLink.click();
-        document.body.removeChild(aLink); //下载完成移除元素
-        window.URL.revokeObjectURL(url); //释放掉blob对象
-        this.$message.success("导出成功");
-        this.$emit("close");
-      } else this.$message.error("下载失败");
-    },
-
-    async getTableData() {
-      const url = "/epmetuser/icresiuser/listresi";
-      const { pageSize, pageNo, fmData } = this;
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        ...{
-          formCode: "resi_base_info",
-          pageNo: 1,
-          pageSize: 20,
-          conditions: [
-            {
-              queryType: "equal",
-              tableName: "ic_resi_user",
-              columnName: "GRID_ID",
-              columnValue: [fmData.gridId],
-            },
-            {
-              queryType: "equal",
-              tableName: "ic_resi_user",
-              columnName: "VILLAGE_ID",
-              columnValue: [fmData.villageId],
-            },
-            {
-              queryType: "equal",
-              tableName: "ic_resi_user",
-              columnName: "BUILD_ID",
-              columnValue: [fmData.buildId],
-            },
-            {
-              queryType: "equal",
-              tableName: "ic_resi_user",
-              columnName: "UNIT_ID",
-              columnValue: [fmData.unitId],
-            },
-            {
-              queryType: "equal",
-              tableName: "ic_resi_user",
-              columnName: "HOME_ID",
-              columnValue: [fmData.homeId],
-            },
-            {
-              queryType: "like",
-              tableName: "ic_resi_user",
-              columnName: "NAME",
-              columnValue: [fmData.name],
-            },
-            {
-              queryType: "like",
-              tableName: "ic_resi_user",
-              columnName: "MOBILE",
-              columnValue: [fmData.mobile],
-            },
-            {
-              queryType: "like",
-              tableName: "ic_resi_user",
-              columnName: "ID_CARD",
-              columnValue: [fmData.idCard],
-            },
-            {
-              queryType: "equal",
-              tableName: "ic_resi_user",
-              columnName: "IS_XFRY",
-              columnValue: ["1"],
-            },
-          ],
-        },
-      });
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-              return item;
-            })
-          : [];
-      } else {
-      }
-    },
-  },
+  methods: {},
 };
 </script>
 
-<style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
-
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
-
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
-}
-
-.demo-form-inline {
-  // display: flex;
-  // align-items: center;
-  // margin-bottom: 20px;
-
-  .resi-cell-label {
-    flex-shrink: 0;
-    min-width: 0;
-    box-sizing: border-box;
-    margin-right: 15px;
-    // text-align: right;
-    // line-height: 32;
-  }
-  .resi-cell-label1 {
-    width: max-content;
-  }
-  .resi-cell-value-radio {
-    display: flex;
-    align-items: center;
-    min-height: 32px;
-  }
-  .resi-cell-input {
-    width: 200px;
-  }
-  .resi-cell--daterange {
-    max-width: 260px;
-  }
-  .resi-cell-select {
-    width: 200px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 120px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
-  }
-}
-
-.mt10 {
-  margin-top: 10px;
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue b/src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue
new file mode 100644
index 00000000..013b03b6
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/zhaoshizhaohuojingshenbing.vue
@@ -0,0 +1,35 @@
+<template>
+  <div>
+    <base-page :elseParams="elseParams"></base-page>
+  </div>
+</template>
+
+<script>
+import basePage from "@/views/modules/shequzhili/tuceng/zhonghe/base";
+
+export default {
+  props: {},
+
+  data() {
+    return {
+      elseParams: [
+        {
+          queryType: "list_equal",
+          tableName: "ic_special",
+          columnName: "SPECIAL_RQLB",
+          columnValue: ["zhaoshizhaohuojingshenbing"],
+        },
+      ],
+    };
+  },
+  components: { basePage },
+  computed: {},
+  watch: {},
+
+  async mounted() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

From a12d1a301ad8f4b54fd991423e1a080f72bd5c1e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 21 Jun 2022 14:46:57 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/csgltc/csgl.vue | 8 ++++----
 src/views/modules/shequzhili/ggfwtc/ggfw.vue | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 1a0dddc6..ec69196c 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -33,7 +33,7 @@
         </el-form-item>
 
         <el-button style="margin-left:10px"
-                   class="diy-button--delete"
+                   class="diy-button--search"
                    size="small"
                    @click="handleSearch">查询</el-button>
         <el-button style="margin-left:10px"
@@ -45,10 +45,10 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--delete"
+        <el-button class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
-        <el-button class="diy-button--delete"
+        <el-button class="diy-button--search"
                    style="margin-left:10px"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
@@ -67,7 +67,7 @@
 
         </el-upload>
         <el-button style="float:left;margin-left:10px"
-                   class="diy-button--delete"
+                   class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
 
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index a16b0770..d2514045 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -32,7 +32,7 @@
             </el-select>
           </el-form-item>
           <el-button style="margin-left:10px"
-                     class="diy-button--delete"
+                     class="diy-button--search"
                      size="small"
                      @click="handleSearch">查询</el-button>
           <el-button style="margin-left:10px"
@@ -44,11 +44,11 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--delete"
+        <el-button class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button class="diy-button--delete"
+        <el-button class="diy-button--search"
                    style="margin-left:10px"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
@@ -66,7 +66,7 @@
                      size="small">导入</el-button>
         </el-upload>
         <el-button style="float:left;margin-left:10px"
-                   class="diy-button--delete"
+                   class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
       </div>

From 54c3144ac4ee58b0c5d42be97e6dcdc3be080471 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 21 Jun 2022 17:12:22 +0800
Subject: [PATCH 07/12] emm

---
 src/views/modules/shequzhili/csgltc/csgl.vue | 1 +
 src/views/modules/shequzhili/ggfwtc/ggfw.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index ec69196c..95eb455d 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -115,6 +115,7 @@
         <el-table-column prop="address"
                          header-align="center"
                          align="center"
+                         show-overflow-tooltip
                          label="地址"
                          width="120">
         </el-table-column>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index d2514045..2d355bea 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -112,6 +112,7 @@
         <el-table-column prop="address"
                          header-align="center"
                          align="center"
+                         show-overflow-tooltip
                          label="地址"
                          width="120">
         </el-table-column>

From 9e019f8a6127953524b0d5db850240f284a3db8a Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 22 Jun 2022 11:06:15 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/csgltc/csgl.vue | 16 ++++++++++++++--
 src/views/modules/shequzhili/ggfwtc/ggfw.vue | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 95eb455d..50d6bb80 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -132,12 +132,24 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="scope.row.agencyId === agencyId && (scope.row.longitude === '' || scope.row.longitude === null || scope.row.latitude === '' || scope.row.latitude === null) && scope.row.sourceType === 'import'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">待完善</el-button>
+            <el-button v-else-if="scope.row.agencyId === agencyId && (scope.row.longitude !== '' && scope.row.longitude !== null && scope.row.latitude !== '' && scope.row.latitude !== null) && scope.row.sourceType === 'import'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button v-else-if="scope.row.agencyId === agencyId && scope.row.sourceType === 'add'"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button type="text"
+            <el-button v-if="scope.row.agencyId === agencyId"
+                       type="text"
                        class="div-table-button--delete"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index 2d355bea..922a5649 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -128,11 +128,23 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="scope.row.agencyId === agencyId && (scope.row.longitude === '' || scope.row.longitude === null || scope.row.latitude === '' || scope.row.latitude === null) && scope.row.sourceType === 'import'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">待完善</el-button>
+            <el-button v-else-if="scope.row.agencyId === agencyId && scope.row.longitude !== '' && scope.row.longitude !== null && scope.row.latitude !== '' && scope.row.latitude !== null && scope.row.sourceType === 'import'"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
-            <el-button type="text"
+            <el-button v-else-if="scope.row.agencyId === agencyId && scope.row.sourceType === 'add'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button v-if="scope.row.agencyId === agencyId"
+                       type="text"
                        class="div-table-button--delete"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button>

From 49f0aefdda3d485ba2bbc51d5b0c402c476e7752 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 22 Jun 2022 11:22:24 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=B7=A1=E6=9F=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/cpts/edit.vue     | 487 +++++++++++-----
 src/views/modules/cpts/base/index.vue         |  50 +-
 .../tuceng/anquan/xuncha/cpts/edit.vue        | 531 -----------------
 .../tuceng/anquan/xuncha/cpts/record.vue      | 536 ++++++++++++++++++
 .../shequzhili/tuceng/anquan/xuncha/index.vue |  31 +-
 .../shequzhili/tuceng/yingji/ziyuan/index.vue |   4 +-
 6 files changed, 937 insertions(+), 702 deletions(-)
 delete mode 100644 src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue
 create mode 100644 src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue

diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index ec6637bc..47bbf6b4 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -7,134 +7,265 @@
         :model="fmData"
         :inline="true"
         :disabled="formType === 'watch'"
-        class="form"
+        class="m-fm"
+        :class="editParamsDiv ? 'z-div' : ''"
       >
-        <el-form-item
-          v-for="item in editParams"
-          label-width="150px"
-          style="display: block"
-          :key="'edit' + item.keyName"
-          :label="item.field"
-          :prop="item.keyName"
-          :rules="item.rules || []"
-        >
-          <template v-if="item.type == 'input'">
-            <el-input
-              v-if="
-                formType == 'add' || (formType == 'edit' && !item.editDisable)
-              "
-              v-model="fmData[item.keyName]"
-              class="item_width_1"
-              size="small"
-              clearable
-              show-word-limit
-              :maxlength="item.maxlength || ''"
-              :placeholder="item.placeholder || '请输入'"
-            >
-            </el-input>
-
-            <div style="width: 610px" v-else>
-              {{ fmData[item.keyName] || "--" }}
-            </div>
-          </template>
-
-          <template v-if="item.type == 'textarea'">
-            <el-input
-              v-if="
-                formType == 'add' || (formType == 'edit' && !item.editDisable)
-              "
-              v-model="fmData[item.keyName]"
-              type="textarea"
-              class="item_width_1"
-              size="small"
-              clearable
-              show-word-limit
-              :rows="3"
-              :maxlength="item.maxlength || ''"
-              :placeholder="item.placeholder || '请输入'"
-            >
-            </el-input>
-
-            <div style="width: 610px" v-else>
-              {{ fmData[item.keyName] || "--" }}
-            </div>
-          </template>
-
-          <template v-if="item.type == 'number'">
-            <el-input-number
-              v-model="fmData[item.keyName]"
-              type="textarea"
-              size="small"
-              clearable
-              show-word-limit
-              :rows="3"
-              :min="item.min || 0"
-              :max="item.max || 999999999999"
-              :placeholder="item.placeholder || '请输入'"
-            >
-            </el-input-number>
-            <span v-if="item.unitName">（{{ item.unitName }}）</span>
-          </template>
-
-          <template v-else-if="item.type == 'select'">
-            <el-select
-              v-model="fmData[item.keyName]"
-              :placeholder="item.placeholder || '请选择'"
-              size="small"
-              clearable
-              class="item_width_2"
-            >
-              <el-option
-                v-for="subItem in item.optionList"
-                :key="subItem.value"
-                :label="subItem.label"
-                :value="subItem.value"
+        <div class="list">
+          <el-form-item
+            v-for="item in editParams1"
+            label-width="150px"
+            style="display: block"
+            :key="'edit' + item.keyName"
+            :label="item.field"
+            :prop="item.keyName"
+            :rules="item.rules || []"
+          >
+            <template v-if="item.type == 'input'">
+              <el-input
+                v-if="
+                  formType == 'add' || (formType == 'edit' && !item.editDisable)
+                "
+                v-model="fmData[item.keyName]"
+                class="item-input"
+                size="small"
+                clearable
+                show-word-limit
+                :maxlength="item.maxlength || ''"
+                :placeholder="item.placeholder || '请输入'"
               >
-              </el-option>
-            </el-select>
-          </template>
+              </el-input>
 
-          <template v-else-if="item.type == 'address'">
-            <div style="width: 500px">
+              <div class="item-show" v-else>
+                {{ fmData[item.keyName] || "--" }}
+              </div>
+            </template>
+
+            <template v-if="item.type == 'textarea'">
               <el-input
-                class="item_width_4"
-                maxlength="100"
-                style="width: 430px"
-                show-word-limit
-                :placeholder="item.placeholder || '请输入所在地址'"
+                v-if="
+                  formType == 'add' || (formType == 'edit' && !item.editDisable)
+                "
                 v-model="fmData[item.keyName]"
+                type="textarea"
+                class="item-input"
+                size="small"
+                clearable
+                show-word-limit
+                :rows="3"
+                :maxlength="item.maxlength || ''"
+                :placeholder="item.placeholder || '请输入'"
               >
               </el-input>
-              <el-button
-                style="margin-left: 10px"
-                type="default"
+
+              <div class="item-show" v-else>
+                {{ fmData[item.keyName] || "--" }}
+              </div>
+            </template>
+
+            <template v-if="item.type == 'number'">
+              <el-input-number
+                v-model="fmData[item.keyName]"
+                class="item-number"
+                size="small"
+                clearable
+                show-word-limit
+                :rows="3"
+                :min="item.min || 0"
+                :max="item.max || 999999999999"
+                :placeholder="item.placeholder || '请输入'"
+              >
+              </el-input-number>
+              <span v-if="item.unitName">（{{ item.unitName }}）</span>
+            </template>
+
+            <template v-else-if="item.type == 'select'">
+              <el-select
+                v-model="fmData[item.keyName]"
+                :placeholder="item.placeholder || '请选择'"
                 size="small"
-                @click="handleSearchMap(item)"
-                >查询</el-button
+                clearable
+                class="item-select"
               >
-              <div id="app" class="div_map"></div>
-              <div style="margin-top: 10px">
-                <span>经度</span>
+                <el-option
+                  v-for="subItem in item.optionList"
+                  :key="subItem.value"
+                  :label="subItem.label"
+                  :value="subItem.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+
+            <template v-else-if="item.type == 'address'">
+              <div class="address-item">
                 <el-input
-                  class="item_width_3"
-                  maxlength="50"
-                  placeholder="请输入经度"
-                  v-model="fmData[item.supKeys[0]]"
+                  class="address-item-input"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="item.placeholder || '请输入所在地址'"
+                  v-model="fmData[item.keyName]"
                 >
                 </el-input>
-                <span style="margin-left: 20px">纬度</span>
+                <el-button
+                  style="margin-left: 10px"
+                  type="default"
+                  size="small"
+                  @click="handleSearchMap(item)"
+                  >查询</el-button
+                >
+                <div id="app" class="div_map"></div>
+                <div style="margin-top: 10px">
+                  <span>经度</span>
+                  <el-input
+                    class="address-item-input2"
+                    maxlength="50"
+                    placeholder="请输入经度"
+                    v-model="fmData[item.supKeys[0]]"
+                  >
+                  </el-input>
+                  <span style="margin-left: 20px">纬度</span>
+                  <el-input
+                    class="address-item-input2"
+                    maxlength="50"
+                    placeholder="请输入纬度"
+                    v-model="fmData[item.supKeys[1]]"
+                  >
+                  </el-input>
+                </div>
+              </div>
+            </template>
+          </el-form-item>
+        </div>
+
+        <div class="list" v-if="editParams2.length > 0">
+          <el-form-item
+            v-for="item in editParams2"
+            label-width="150px"
+            style="display: block"
+            :key="'edit' + item.keyName"
+            :label="item.field"
+            :prop="item.keyName"
+            :rules="item.rules || []"
+          >
+            <template v-if="item.type == 'input'">
+              <el-input
+                v-if="
+                  formType == 'add' || (formType == 'edit' && !item.editDisable)
+                "
+                v-model="fmData[item.keyName]"
+                class="item-input"
+                size="small"
+                clearable
+                show-word-limit
+                :maxlength="item.maxlength || ''"
+                :placeholder="item.placeholder || '请输入'"
+              >
+              </el-input>
+
+              <div class="item-show" v-else>
+                {{ fmData[item.keyName] || "--" }}
+              </div>
+            </template>
+
+            <template v-if="item.type == 'textarea'">
+              <el-input
+                v-if="
+                  formType == 'add' || (formType == 'edit' && !item.editDisable)
+                "
+                v-model="fmData[item.keyName]"
+                type="textarea"
+                class="item-input"
+                size="small"
+                clearable
+                show-word-limit
+                :rows="3"
+                :maxlength="item.maxlength || ''"
+                :placeholder="item.placeholder || '请输入'"
+              >
+              </el-input>
+
+              <div class="item-show" v-else>
+                {{ fmData[item.keyName] || "--" }}
+              </div>
+            </template>
+
+            <template v-if="item.type == 'number'">
+              <el-input-number
+                v-model="fmData[item.keyName]"
+                class="item-number"
+                size="small"
+                clearable
+                show-word-limit
+                :rows="3"
+                :min="item.min || 0"
+                :max="item.max || 999999999999"
+                :placeholder="item.placeholder || '请输入'"
+              >
+              </el-input-number>
+              <span v-if="item.unitName">（{{ item.unitName }}）</span>
+            </template>
+
+            <template v-else-if="item.type == 'select'">
+              <el-select
+                v-model="fmData[item.keyName]"
+                :placeholder="item.placeholder || '请选择'"
+                size="small"
+                clearable
+                class="item-select"
+              >
+                <el-option
+                  v-for="subItem in item.optionList"
+                  :key="subItem.value"
+                  :label="subItem.label"
+                  :value="subItem.value"
+                >
+                </el-option>
+              </el-select>
+            </template>
+
+            <template v-else-if="item.type == 'address'">
+              <div class="address-item">
                 <el-input
-                  class="item_width_3"
-                  maxlength="50"
-                  placeholder="请输入纬度"
-                  v-model="fmData[item.supKeys[1]]"
+                  class="address-item-input"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="item.placeholder || '请输入所在地址'"
+                  v-model="fmData[item.keyName]"
                 >
                 </el-input>
+                <el-button
+                  style="margin-left: 10px"
+                  type="default"
+                  size="small"
+                  @click="handleSearchMap(item)"
+                  >查询</el-button
+                >
+                <div id="app" class="div_map"></div>
+                <div style="margin-top: 10px">
+                  <span>经度</span>
+                  <el-input
+                    class="address-item-input2"
+                    maxlength="50"
+                    placeholder="请输入经度"
+                    v-model="fmData[item.supKeys[0]]"
+                  >
+                  </el-input>
+                  <span style="margin-left: 20px">纬度</span>
+                  <el-input
+                    class="address-item-input2"
+                    maxlength="50"
+                    placeholder="请输入纬度"
+                    v-model="fmData[item.supKeys[1]]"
+                  >
+                  </el-input>
+                </div>
               </div>
-            </div>
-          </template>
-        </el-form-item>
+            </template>
+          </el-form-item>
+        </div>
       </el-form>
+
+      <slot v-bind:id="formId" v-bind:info="fmData"  v-bind:formType="formType"></slot>
     </div>
 
     <div class="div_btn resi-btns">
@@ -197,6 +328,16 @@ export default {
       type: Array,
       default: () => [],
     },
+    editFixedParams: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    editParamsDiv: {
+      type: Number,
+      default: 0,
+    },
   },
 
   data() {
@@ -206,6 +347,9 @@ export default {
       btnDisable: false,
 
       fmData: {},
+
+      editParams1: [],
+      editParams2: [],
     };
   },
   components: {},
@@ -237,7 +381,7 @@ export default {
     },
 
     iniFmData() {
-      const { editParams, fmData } = this;
+      const { editParams, fmData, editParamsDiv } = this;
       editParams.forEach((item, index) => {
         fmData[item.keyName] = item.value || "";
         if (item.supValues) {
@@ -256,13 +400,19 @@ export default {
           }
         } else if (item.type == "address") {
           this.$nextTick(async () => {
-            await nextTick(500);
+            await nextTick(300);
             this.initMap(item);
           });
         }
       });
 
       this.fmData = { ...fmData };
+      if (editParamsDiv) {
+        this.editParams1 = editParams.slice(0, editParamsDiv);
+        this.editParams2 = editParams.slice(editParamsDiv);
+      } else {
+        this.editParams1 = editParams;
+      }
       console.log("------------------------------------", this.fmData);
       this.iniLoaded = true;
     },
@@ -302,8 +452,8 @@ export default {
       geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
 
       // 监听地图平移结束
-      map.on("panend", () => {
-        this.handleMoveCenter(item);
+      map.on("panend", (e) => {
+        this.handleMoveCenter(item, e);
       });
       this.handleMoveCenter(item);
     },
@@ -352,7 +502,8 @@ export default {
         });
     },
 
-    handleMoveCenter(item) {
+    handleMoveCenter(item, e) {
+      console.log(e);
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -363,20 +514,26 @@ export default {
       this.fmData[item.supKeys[1]] = lat;
       this.setMarker(lat, lng);
 
-      geocoder
-        .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.fmData[item.keyName] = result.result.address;
-        });
+      if (e && e.originalEvent) {
+        geocoder
+          .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
+          .then((result) => {
+            this.fmData[item.keyName] = result.result.address;
+          });
+      }
     },
 
     async getInfo() {
-      const url = this.infoUrl;
+      let url = this.infoUrl;
       if (!url) return;
-      const { idName } = this;
+      const { idName, formId } = this;
+
+      if (url.endsWith("/")) {
+        url += formId;
+      }
 
       const params = {
-        [idName]: this.formId,
+        [idName]: formId,
       };
 
       const { data, code, msg } = await requestPost(url, params);
@@ -387,6 +544,7 @@ export default {
         };
         console.log("------------------------------------info", this.fmData);
 
+        await nextTick(800);
         if (map) {
           map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
         }
@@ -419,6 +577,7 @@ export default {
       let url = "";
       let params = {
         ...this.fmData,
+        ...this.editFixedParams,
         // serviceType: this.fmData.serviceTypeArr.join(","),
       };
 
@@ -451,39 +610,57 @@ export default {
 </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;
-}
+.m-fm {
+  margin-top: 30px;
 
-.div_map {
-  margin-top: 10px;
-}
+  &.z-div {
+    display: flex;
 
-.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;
-}
+    .item-input {
+      width: 225px;
+    }
+    .item-select {
+      width: 225px;
+    }
+    .item-number {
+      width: 125px;
+    }
+
+    .address-item {
+      width: 450px;
 
-.attachement-list {
+      .address-item-input {
+        width: 85%;
+      }
+      .address-item-input2 {
+        margin-left: 5px;
+        width: 40%;
+      }
+    }
+  }
+  .item-input {
+    width: 450px;
+  }
+  .item-select {
+    width: 225px;
+  }
+  .item-number {
+    width: 125px;
+  }
+
+  .address-item {
+    width: 450px;
+
+    .address-item-input {
+      width: 85%;
+    }
+    .address-item-input2 {
+      margin-left: 5px;
+      width: 40%;
+    }
+  }
+  .div_map {
+    margin-top: 10px;
+  }
 }
 </style>
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index e3fe202b..3f78f374 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -30,7 +30,7 @@
                 >
                   <el-option
                     v-for="item in item.optionList"
-                    :key="item.value"
+                    :key="'serach' + item.keyName + item.value"
                     :label="item.label"
                     :value="item.value"
                   >
@@ -148,15 +148,15 @@
                 >查看</el-button
               >
               <el-button
-                v-if="editUrl"
+                v-if="editUrl && editAuth(scope.row)"
                 @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
                 class="div-table-button--edit"
-                >编辑</el-button
+                >{{ editBtnName(scope.row) }}</el-button
               >
               <el-popconfirm
-                v-if="delUrl"
+                v-if="delUrl && delAuth(scope.row)"
                 title="删除之后无法回复，确认删除？"
                 @onConfirm="handleDelete(scope.row, scope.$index)"
                 @confirm="handleDelete(scope.row, scope.$index)"
@@ -196,7 +196,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       :title="formTitle"
-      width="850px"
+      :width="editParamsDiv ? '1100px' : '850px'"
       top="5vh"
       class="dialog-h"
       @closed="handleClose"
@@ -206,13 +206,24 @@
         :idName="idName"
         :formId="formId"
         :formType="formType"
-        :editParams="editParams"
         :infoUrl="infoUrl"
         :addUrl="addUrl"
         :editUrl="editUrl"
+        :editParams="editParams"
+        :editParamsDiv="editParamsDiv"
+        :editFixedParams="editFixedParams"
         @close="handleClose"
         @afterEdit="handleEditSuccess"
-      ></edit-form>
+      >
+        <template v-slot="{ id, formType, info }">
+          <slot
+            name="editElse"
+            v-bind:id="id"
+            v-bind:formType="formType"
+            v-bind:info="info"
+          ></slot>
+        </template>
+      </edit-form>
     </el-dialog>
   </div>
 </template>
@@ -275,10 +286,33 @@ export default {
       default: "",
     },
 
+    editAuth: {
+      type: Function,
+      default: () => true,
+    },
+    editBtnName: {
+      type: Function,
+      default: () => "编辑",
+    },
+    delAuth: {
+      type: Function,
+      default: () => true,
+    },
+
     editParams: {
       type: Array,
       default: () => [],
     },
+    editFixedParams: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    editParamsDiv: {
+      type: Number,
+      default: 0,
+    },
 
     idName: {
       type: String,
@@ -495,7 +529,7 @@ export default {
       const { idName } = this;
       this.formType = "edit";
       this.formId = row[idName];
-      this.formTitle = "编辑";
+      this.formTitle = "修改";
       this.formShow = true;
     },
 
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue
deleted file mode 100644
index 3b1d06b8..00000000
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/edit.vue
+++ /dev/null
@@ -1,531 +0,0 @@
-<template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="dataForm"
-               :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
-        <el-form-item label="组织名称	"
-                      prop="organizationName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入组织名称	"
-                    v-model="dataForm.organizationName">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="分类名称	"
-                      prop="categoryCode"
-                      label-width="150px"
-                      style="display: block">
-          <el-select v-model="dataForm.categoryCode"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in categoryList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="组织人数	"
-                      prop="organizationPersonCount"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="number"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入组织人数	"
-                    v-model="dataForm.organizationPersonCount">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="组织成员	"
-                      prop="organizationPersonnel"
-                      label-width="150px"
-                      style="display: block">
-          <div class="m-staffs">
-            <div class="item"
-                 :key="'staff' + index"
-                 v-for="(item, index) in dataForm.organizationPersonnel">
-              <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-item label="服务事项"
-                      prop="serviceItem"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入服务事项，不超过1000字"
-                    v-model="dataForm.serviceItem"></el-input>
-        </el-form-item>
-
-        <el-form-item label="负责人	"
-                      prop="principalName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入负责人	"
-                    v-model="dataForm.principalName">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="联系电话	"
-                      prop="principalPhone"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入联系电话	"
-                    v-model="dataForm.principalPhone">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="创建时间"
-                      prop="organizationCreatedTime"
-                      label-width="150px"
-                      style="display: block">
-          <el-date-picker v-model="dataForm.organizationCreatedTime"
-                          placeholder="创建时间"
-                          value-format="yyyy-MM-dd">
-          </el-date-picker>
-        </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="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过500字"
-                    v-model="dataForm.remark"></el-input>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="div_btn resi-btns">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 type="primary"
-                 size="small"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from "vuex";
-import { Loading } from "element-ui"; // 引入Loading服务
-import { requestPost } from "@/js/dai/request";
-import formVltHelper from "dai-js/tools/formVltHelper";
-
-var map;
-var search;
-var markers;
-var infoWindowList;
-let loading; // 加载动画
-
-export default {
-  data () {
-    return {
-      formType: "add", //表单操作类型 add新增，edit编辑，detail详情
-
-      btnDisable: false,
-
-      orgId: "",
-      dataForm: {
-        organizationName: "",
-        categoryCode: "",
-        serviceItem: "",
-        organizationPersonCount: "",
-        principalName: "",
-        principalPhone: "",
-        organizationCreatedTime: "",
-        address: "",
-        remark: "",
-        longitude: "",
-        latitude: "",
-        organizationPersonnel: [],
-      },
-      categoryList: [],
-    };
-  },
-  components: {},
-  computed: {
-    dataRule () {
-      return {
-        organizationName: [
-          { required: true, message: "组织名称	不能为空", trigger: "blur" },
-          {
-            min: 1,
-            max: 50,
-            message: "组织名称	长度在 1 到 50个字符",
-            trigger: "blur",
-          },
-        ],
-        categoryCode: [
-          { required: true, message: "分类名称不能为空", trigger: "blur" },
-        ],
-        organizationPersonCount: [
-          { required: true, message: "组织人数不能为空", trigger: "blur" },
-        ],
-        serviceItem: [
-          { required: true, message: "服务事项不能为空", trigger: "blur" },
-        ],
-        principalName: [
-          { required: true, message: "负责人不能为空", trigger: "blur" },
-        ],
-        principalPhone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" },
-        ],
-        longitude: [
-          { required: true, message: "位置坐标不能为空", trigger: "blur" },
-        ],
-      };
-    },
-  },
-  props: {},
-  watch: {},
-
-  async created () {
-    this.getCategoryList();
-  },
-  async mounted () {
-    this.initMap();
-  },
-
-  methods: {
-    async getCategoryList () {
-      const url = "/sys/dict/data/dictlist";
-      const params = {
-        dictType: "self_org_category",
-      };
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.categoryList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    handleAddStaff () {
-      this.dataForm.organizationPersonnel = [
-        ...this.dataForm.organizationPersonnel,
-        { personName: "", personPhone: "" },
-      ];
-    },
-    handleDelStaff (index) {
-      const { organizationPersonnel } = this.dataForm;
-      organizationPersonnel.splice(index, 1);
-      this.dataForm.organizationPersonnel = organizationPersonnel;
-    },
-    // 地图初始化函数，本例取名为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.orgId = this.dataForm.orgId;
-        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 {
-          // if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
-          //   return this.$message({
-          //     type: "error",
-          //     message: "手机号格式有误",
-          //   });
-          // }
-          const {
-            dataForm: { organizationPersonnel },
-          } = this;
-          let vlt = organizationPersonnel.every((item) => {
-            return (
-              item.personName &&
-              item.personPhone
-            );
-          });
-          if (!vlt) {
-            return this.$message({
-              type: "error",
-              message: "成员姓名/手机号为空",
-            });
-          }
-          this.submit();
-        }
-      });
-    },
-
-    async submit () {
-      let url = "";
-      if (this.formType === "add") {
-        url = "/heart/iccommunityselforganization/addcommunityselforganization";
-        // url = "http://yapi.elinkservice.cn/mock/245/gov/org/neighborhood/neighborhoodadd"
-      } else {
-        url =
-          "/heart/iccommunityselforganization/editcommunityselforganization";
-
-        this.dataForm.orgId = this.orgId;
-      }
-
-      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.orgId = "";
-      this.dataForm = {
-        organizationName: "",
-        serviceItem: "",
-        organizationPersonCount: "",
-        categoryCode: "",
-        principalName: "",
-        principalPhone: "",
-        organizationCreatedTime: "",
-        address: "",
-        remark: "",
-        longitude: "",
-        latitude: "",
-        organizationPersonnel: [],
-      };
-    },
-    // 开启加载动画
-    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>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
new file mode 100644
index 00000000..6d681bd8
--- /dev/null
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
@@ -0,0 +1,536 @@
+<template>
+  <div class="m-record" style="padding: 0 20px">
+    <h3>巡查记录</h3>
+    <div class="mt10" v-if="formType == 'edit'">
+      <el-button
+        size="small"
+        class="diy-button--add"
+        :disabled="btnDisabled || disabled"
+        @click="handleAdd"
+        >新增</el-button
+      >
+    </div>
+    <el-table
+      :data="tableData"
+      row-key="id"
+      border
+      style="width: 100%"
+      class="resi-table"
+      height="400px"
+      :header-cell-style="getRowClass"
+    >
+      <el-table-column label="序号" type="index" align="center" width="50">
+      </el-table-column>
+
+      <el-table-column
+        prop="patrolTime"
+        label="巡查时间"
+        align="center"
+        width="200px"
+      >
+        <template slot-scope="scope">
+          <el-date-picker
+            v-if="scope.row.isEdit"
+            v-model="scope.row.patrolTime"
+            type="date"
+            class="input-width"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+          <div v-else class="div-content">{{ scope.row.patrolTime }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="staffId"
+        label="巡查人员"
+        align="center"
+        width="200px"
+      >
+        <template slot-scope="scope">
+          <el-select
+            v-if="scope.row.isEdit"
+            v-model="scope.row.staffId"
+            placeholder="请选择"
+            class="input-width"
+            @change="handleChangeStaff(scope.row)"
+            clearable
+          >
+            <el-option
+              v-for="subItem in optionStaff"
+              :key="subItem.value"
+              :label="subItem.label"
+              :value="subItem.value"
+            >
+            </el-option>
+          </el-select>
+          <div v-else class="div-content">{{ scope.row.staffName }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="mobile"
+        label="联系电话"
+        align="center"
+        width="200px"
+      >
+        <template slot-scope="scope">
+          <el-input
+            v-if="scope.row.isEdit"
+            type="number"
+            v-model="scope.row.mobile"
+            placeholder="请输入"
+            class="input-width"
+            clearable
+            disabled
+          ></el-input>
+          <div v-else class="div-content">{{ scope.row.mobile }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="result"
+        label="巡查结果"
+        align="center"
+        width="200px"
+      >
+        <template slot-scope="scope">
+          <el-select
+            v-if="scope.row.isEdit"
+            v-model="scope.row.result"
+            placeholder="请选择"
+            class="input-width"
+            size="small"
+            clearable
+          >
+            <el-option
+              v-for="subItem in optionResult"
+              :key="subItem.value"
+              :label="subItem.label"
+              :value="subItem.value"
+            >
+            </el-option>
+          </el-select>
+          <div v-else class="div-content">{{ scope.row.resultName }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="detailed"
+        label="隐患明细"
+        align="center"
+        width="200px"
+      >
+        <template slot-scope="scope">
+          <el-input
+            v-if="scope.row.isEdit"
+            type="number"
+            v-model="scope.row.detailed"
+            placeholder="请输入"
+            class="input-width"
+            maxlength="500"
+            clearable
+          ></el-input>
+          <div v-else class="div-content">{{ scope.row.detailed }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="imgList"
+        label="图片列表"
+        align="center"
+        width="150px"
+      >
+        <template slot-scope="scope">
+          <div v-if="scope.row.isEdit">
+            <el-upload
+              class="avatar-uploader"
+              :action="uploadUrl"
+              :data="{ customerId: customerId }"
+              :show-file-list="true"
+              :limit="3"
+              :file-list="scope.row.imgShowList"
+              :on-success="(res) => handleImgSuccess(res, scope.row)"
+              :on-remove="(res) => handleImgRemove(res, scope.row)"
+              list-type="picture"
+              :before-upload="beforeImgUpload"
+            >
+              <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片
+            </el-upload>
+          </div>
+
+          <div v-else class="div-content">
+            <el-image
+              v-if="scope.row.imgList.length > 0"
+              style="width: 100px; height: 50px"
+              :src="scope.row.imgList[0]"
+              fit="cover"
+              :preview-src-list="scope.row.imgList"
+            ></el-image>
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop="reviewTime"
+        label="拟复查时间"
+        align="center"
+        width="200px"
+      >
+        <template slot-scope="scope">
+          <el-date-picker
+            v-if="scope.row.isEdit"
+            v-model="scope.row.reviewTime"
+            type="date"
+            class="input-width"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          >
+          </el-date-picker>
+          <div v-else class="div-content">{{ scope.row.patrolTime }}</div>
+        </template>
+      </el-table-column>
+
+      <el-table-column v-if="!disabled" label="操作" align="center" width="120">
+        <template slot-scope="scope">
+          <template v-if="scope.row.isEdit">
+            <el-button
+              @click="handleEdit(scope.row)"
+              type="text"
+              size="small"
+              class="btn-color-edit"
+              >保存</el-button
+            >
+            <el-button
+              @click="handleChange(scope.row, 'cancle')"
+              type="text"
+              size="small"
+              class="btn-color-edit"
+              >取消</el-button
+            >
+          </template>
+          <template v-else>
+            <el-button
+              v-if="formType == 'edit'"
+              @click="handleChange(scope.row, 'edit')"
+              type="text"
+              size="small"
+              :disabled="disabled"
+              class="btn-color-edit"
+              >修改</el-button
+            >
+            <el-popconfirm
+              v-if="formType == 'edit'"
+              title="删除之后无法恢复，确认删除？"
+              @onConfirm="del(scope.row)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="btn-color-del"
+                style="margin-left: 10px"
+                >删除</el-button
+              >
+            </el-popconfirm>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  props: {
+    enterpriseId: {
+      type: String,
+      default: "",
+    },
+    enterpriseInfo: {
+      type: Object,
+      default: () => ({}),
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    formType: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
+      customerId: localStorage.getItem("customerId"),
+
+      btnDisabled: false,
+      btnType: "cancle",
+      isEdit: false,
+      tableData: [],
+      tempRow: {},
+
+      optionResult: [
+        {
+          label: "合格",
+          value: "0",
+        },
+        {
+          label: "不合格",
+          value: "1",
+        },
+      ],
+      optionStaff: [
+        // {
+        //   label: "人名",
+        //   value: "staffId",
+        // },
+      ],
+    };
+  },
+
+  computed: {
+    allowOperate() {
+      const {
+        enterpriseInfo: { agencyId },
+      } = this;
+      return agencyId && agencyId == this.$store.state.user.agencyId;
+    },
+  },
+  watch: {
+    enterpriseId: {
+      handler(val) {
+        console.log("val------points", val);
+        if (val.length > 0) {
+          this.btnDisabled = false;
+          this.getList();
+        } else this.btnDisabled = true;
+      },
+      immediate: true,
+    },
+  },
+
+  created() {
+    this.getOptionStaff();
+  },
+
+  methods: {
+    beforeImgUpload(file) {
+      console.log(file);
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      const srcType = file.type;
+      const format = file.name.split(".").pop();
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+        return false;
+      }
+      if (srcType.indexOf("image") == -1) {
+        this.$message.error("仅限图片格式");
+        return false;
+      }
+      return true;
+    },
+
+    handleImgSuccess(res, row) {
+      console.log("handleImgSuccess", res);
+      if (res.code === 0 && res.msg === "success") {
+        row.imgList.push(res.data.url);
+        this.computeImgShowList(row);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+
+    computeImgShowList(row) {
+      row.imgShowList = row.imgList.map((url) => {
+        return { name: "", url };
+      });
+    },
+
+    handleImgRemove(file, row) {
+      console.log("handleImgRemove", file);
+      if (file.response) {
+        row.imgList = row.imgList.map(
+          (item) => item !== file.response.data.url
+        );
+        this.computeImgShowList(row);
+      }
+    },
+
+    getRowClass({ rowIndex, columnIndex }) {
+      if (rowIndex === 0) {
+        return "background: #2195fe; color: #fff;";
+      }
+    },
+
+    handleChange(row, type) {
+      console.log("type----", type);
+      if (type == "cancle") {
+        row = { ...this.tempRow };
+        row.isEdit = false;
+        if (this.btnType == "add") this.tableData.pop();
+        this.getList();
+        console.log("row----", row);
+      } else {
+        this.tempRow = { ...row };
+        row.isEdit = true;
+      }
+      this.btnType = type;
+      this.isEdit = !this.isEdit;
+    },
+
+    handleChangeStaff(row) {
+      const { staffId } = row;
+      const { optionStaff } = this;
+      let item = optionStaff.find((item) => item.value == staffId);
+      if (item) {
+        row.staffName = item.name;
+        row.mobile = item.mobile;
+      }
+    },
+
+    async getOptionStaff() {
+      let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        this.optionStaff = data || [];
+      } else {
+        this.$message.error("请求工作人员数据失败！");
+      }
+    },
+
+    async handleEdit(row) {
+      if (this.btnType == "add") this.save(row);
+      else this.edit(row);
+    },
+
+    handleAdd() {
+      this.btnType = "add";
+      this.isEdit = true;
+
+      const item = {
+        isEdit: true,
+        enterpriseId: this.enterpriseId,
+        patrolTime: "",
+        staffId: "",
+        staffName: "",
+        mobile: "",
+        result: "",
+        imgList: [],
+        reviewTime: "",
+      };
+      this.computeImgShowList(item);
+      this.tableData.push(item);
+    },
+
+    async save(row) {
+      const params = {
+        partyMemberId: this.enterpriseId,
+        ...row,
+      };
+      await this.$http
+        .post("/gov/org/enterprise/addorupdate-patrol", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("保存成功");
+            row.isEdit = false;
+            this.isEdit = false;
+            this.btnType = "cancle";
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async edit(row) {
+      const params = {
+        ...row,
+      };
+
+      await this.$http
+        .post("/gov/org/enterprise/addorupdate-patrol", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("保存成功");
+            row.isEdit = false;
+            this.isEdit = false;
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async del(row) {
+      await this.$http
+        .post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("删除成功");
+            this.getList();
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async getList() {
+      const { enterpriseId } = this;
+
+      const params = {};
+
+      await this.$http
+        .post(`/gov/org/enterprise/patrollist/${enterpriseId}`, {
+          params,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.tableData = res.data.list.map((item) => {
+              this.computeImgShowList(item);
+              return {
+                ...item,
+                isEdit: false,
+              };
+            });
+          }
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-record {
+  .mt10 {
+    margin-bottom: 10px;
+  }
+  .input-width {
+    width: 170px;
+  }
+}
+</style>
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index 0ae26f55..6f088b43 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -8,19 +8,30 @@
       :editUrl="editUrl"
       :delUrl="delUrl"
       :infoUrl="infoUrl"
+      :editAuth="editAuth"
+      :delAuth="delAuth"
       :exportUrl="exportUrl"
       :importUrl="importUrl"
       :mubanUrl="mubanUrl"
       :editParams="editParams"
+      :editFixedParams="editFixedParams"
+      :editParamsDiv="5"
+      :editBtnName="(item) => (item.sourceType == 'import' ? '待完善' : '修改')"
       idName="enterpriseId"
-    ></base-page>
+    >
+      <template v-slot:editElse="{ id, formType, info }">
+        <record v-if="formType != 'add' && id" :formType="formType" :enterpriseId="id" :enterpriseInfo="info"></record>
+      </template>
+    </base-page>
   </div>
 </template>
 
 <script>
 import basePage from "@/views/modules/cpts/base/index";
+import record from "./cpts/record";
 
 export default {
+  components: { basePage, record },
   props: {},
 
   data() {
@@ -69,7 +80,7 @@ export default {
               label: "合格",
             },
             {
-              value: "0",
+              value: "1",
               label: "不合格",
             },
           ],
@@ -85,8 +96,8 @@ export default {
         { field: "规模", keyName: "scale", type: "text" },
         { field: "负责人", keyName: "personInCharge", type: "text" },
         { field: "联系电话", keyName: "mobile", type: "text" },
-        { field: "最新检查时间", keyName: "remark", type: "text" },
-        { field: "最新结果", keyName: "result", type: "text" },
+        { field: "最新检查时间", keyName: "latestPatrolTime", type: "text" },
+        { field: "最新结果", keyName: "latestResult", type: "text" },
       ],
       tableUrl: "/gov/org/enterprise/list",
       mubanUrl: "/gov/org/enterprise/download-tem",
@@ -97,6 +108,12 @@ export default {
       editUrl: "/gov/org/enterprise/addOrUpdate",
       infoUrl: "/gov/org/enterprise/detail/",
       delUrl: "/gov/org/enterprise/delete/",
+      editAuth(item) {
+        return item.agencyId == this.$store.state.user.agencyId;
+      },
+      delAuth(item) {
+        return item.agencyId == this.$store.state.user.agencyId;
+      },
 
       editParams: [
         {
@@ -120,7 +137,7 @@ export default {
           optionUrl: "/gov/org/customergrid/gridoption",
           optionUrlParams: {
             agencyId: this.$store.state.user.agencyId,
-            purpose: "query",
+            purpose: "addorupdate",
           },
           optionList: [],
           editDisabled: true,
@@ -200,9 +217,11 @@ export default {
           ],
         },
       ],
+      editFixedParams: {
+        agencyId: this.$store.state.user.agencyId,
+      },
     };
   },
-  components: { basePage },
   computed: {},
   watch: {},
 
diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
index 1d8aa749..61459b13 100644
--- a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
+++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
@@ -29,7 +29,7 @@ export default {
         { field: "场所名称", keyName: "name", type: "input" },
         {
           field: "场所分类",
-          keyName: "serviceType",
+          keyName: "category",
           type: "select",
           optionUrl: "/gov/org/coverage/dict-select-list/superior_resource",
           optionUrlParams: {},
@@ -72,7 +72,7 @@ export default {
         },
         {
           field: "场所分类",
-          keyName: "serviceType",
+          keyName: "category",
           type: "select",
           optionUrl: "/gov/org/coverage/dict-select-list/superior_resource",
           optionUrlParams: {

From 933625fbde3ab8f65c5aed1445dc047c566e8a7d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 22 Jun 2022 14:37:51 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwuzuzhi/cpts/edit.vue  |  43 +-
 .../communityService/sqzzz/cpts/edit.vue      | 444 +++++++++++-------
 .../shequzhili/tuceng/zhonghe/base.vue        | 103 ++--
 3 files changed, 352 insertions(+), 238 deletions(-)

diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
index 10929b97..dd59b13b 100644
--- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
@@ -30,7 +30,7 @@
             >
             </el-option>
           </el-select>
-          <div style="width:610px" v-else>{{ fmData.serviceTypeName }}</div>
+          <div style="width: 610px" v-else>{{ fmData.serviceTypeName }}</div>
         </el-form-item>
 
         <el-form-item
@@ -48,7 +48,7 @@
             v-model="fmData.orgName"
           >
           </el-input>
-          <div style="width:610px" v-else>{{ fmData.orgName || "--" }}</div>
+          <div style="width: 610px" v-else>{{ fmData.orgName || "--" }}</div>
         </el-form-item>
 
         <el-form-item
@@ -67,7 +67,9 @@
             placeholder="请输入服务内容，不超过1000字"
             v-model="fmData.orgDescribe"
           ></el-input>
-          <div style="width:610px" v-else>{{ fmData.orgDescribe || "--" }}</div>
+          <div style="width: 610px" v-else>
+            {{ fmData.orgDescribe || "--" }}
+          </div>
         </el-form-item>
 
         <el-form-item
@@ -84,7 +86,9 @@
             placeholder="请输入负责人姓名"
             v-model="fmData.principalName"
           ></el-input>
-          <div style="width:610px" v-else>{{ fmData.principalName || "--" }}</div>
+          <div style="width: 610px" v-else>
+            {{ fmData.principalName || "--" }}
+          </div>
         </el-form-item>
 
         <el-form-item
@@ -101,7 +105,9 @@
             placeholder="请输入联系方式"
             v-model="fmData.principalMobile"
           ></el-input>
-          <div style="width:610px" v-else>{{ fmData.principalMobile || "--" }}</div>
+          <div style="width: 610px" v-else>
+            {{ fmData.principalMobile || "--" }}
+          </div>
         </el-form-item>
 
         <el-form-item
@@ -165,7 +171,7 @@
             placeholder="请输入备注，不超过500字"
             v-model="fmData.remark"
           ></el-input>
-          <div style="width:610px" v-else>{{ fmData.remark || "--" }}</div>
+          <div style="width: 610px" v-else>{{ fmData.remark || "--" }}</div>
         </el-form-item>
       </el-form>
     </div>
@@ -188,6 +194,7 @@
 import { mapGetters } from "vuex";
 import { requestPost } from "@/js/dai/request";
 import formVltHelper from "dai-js/tools/formVltHelper";
+import nextTick from "dai-js/tools/nextTick";
 
 var map;
 var search;
@@ -288,8 +295,8 @@ export default {
       geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
 
       // 监听地图平移结束
-      map.on("panend", () => {
-        this.handleMoveCenter();
+      map.on("panend", (e) => {
+        this.handleMoveCenter(e);
       });
       this.handleMoveCenter();
     },
@@ -336,7 +343,7 @@ export default {
         });
     },
 
-    handleMoveCenter() {
+    handleMoveCenter(e) {
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -345,11 +352,13 @@ export default {
       this.fmData.longitude = lng;
       this.setMarker(lat, lng);
 
-      geocoder
-        .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
-        .then((result) => {
-          this.fmData.address = result.result.address;
-        });
+      if (e && e.originalEvent) {
+        geocoder
+          .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
+          .then((result) => {
+            this.fmData.address = result.result.address;
+          });
+      }
     },
 
     async getInfo() {
@@ -366,7 +375,11 @@ export default {
           ...data,
           serviceTypeArr: data.serviceType.split(","),
         };
-        map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+
+        await nextTick(800);
+        if (map) {
+          map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
+        }
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index 3b1d06b8..508d61ed 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -1,185 +1,246 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="dataForm"
-               :rules="dataRule"
-               :disabled="formType === 'detail'"
-               class="form">
-        <el-form-item label="组织名称	"
-                      prop="organizationName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入组织名称	"
-                    v-model="dataForm.organizationName">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="dataForm"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="组织名称	"
+          prop="organizationName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入组织名称	"
+            v-model="dataForm.organizationName"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="分类名称	"
-                      prop="categoryCode"
-                      label-width="150px"
-                      style="display: block">
-          <el-select v-model="dataForm.categoryCode"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in categoryList"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item
+          label="分类名称	"
+          prop="categoryCode"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model="dataForm.categoryCode"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="组织人数	"
-                      prop="organizationPersonCount"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="number"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入组织人数	"
-                    v-model="dataForm.organizationPersonCount">
+        <el-form-item
+          label="组织人数	"
+          prop="organizationPersonCount"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入组织人数	"
+            v-model="dataForm.organizationPersonCount"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="组织成员	"
-                      prop="organizationPersonnel"
-                      label-width="150px"
-                      style="display: block">
+        <el-form-item
+          label="组织成员	"
+          prop="organizationPersonnel"
+          label-width="150px"
+          style="display: block"
+        >
           <div class="m-staffs">
-            <div class="item"
-                 :key="'staff' + index"
-                 v-for="(item, index) in dataForm.organizationPersonnel">
-              <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
+              class="item"
+              :key="'staff' + index"
+              v-for="(item, index) in dataForm.organizationPersonnel"
+            >
+              <el-autocomplete
+                class="item_width_1"
+                v-model="item.personName"
+                :fetch-suggestions="querySearchVolunteer"
+                placeholder="成员姓名"
+                :maxlength="50"
+                show-word-limit
+                @select="(vItem) => handleSelectVolunteer(index, vItem)"
+                :disabled="item.icResiUserId != ''"
+              ></el-autocomplete>
+
+              <el-input
+                style="margin-left: 10px"
+                class="item_width_1"
+                show-word-limit
+                placeholder="联系电话"
+                :disabled="item.icResiUserId != ''"
+                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>
+              <el-button size="small" @click="handleAddStaff">添加</el-button>
             </div>
           </div>
         </el-form-item>
 
-        <el-form-item label="服务事项"
-                      prop="serviceItem"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入服务事项，不超过1000字"
-                    v-model="dataForm.serviceItem"></el-input>
+        <el-form-item
+          label="服务事项"
+          prop="serviceItem"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入服务事项，不超过1000字"
+            v-model="dataForm.serviceItem"
+          ></el-input>
         </el-form-item>
 
-        <el-form-item label="负责人	"
-                      prop="principalName"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入负责人	"
-                    v-model="dataForm.principalName">
+        <el-form-item
+          label="负责人	"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入负责人	"
+            v-model="dataForm.principalName"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="联系电话	"
-                      prop="principalPhone"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    maxlength="50"
-                    show-word-limit
-                    placeholder="请输入联系电话	"
-                    v-model="dataForm.principalPhone">
+        <el-form-item
+          label="联系电话	"
+          prop="principalPhone"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            placeholder="请输入联系电话	"
+            v-model="dataForm.principalPhone"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="创建时间"
-                      prop="organizationCreatedTime"
-                      label-width="150px"
-                      style="display: block">
-          <el-date-picker v-model="dataForm.organizationCreatedTime"
-                          placeholder="创建时间"
-                          value-format="yyyy-MM-dd">
+        <el-form-item
+          label="创建时间"
+          prop="organizationCreatedTime"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="dataForm.organizationCreatedTime"
+            placeholder="创建时间"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="位置坐标"
-                      prop="longitude"
-                      label-width="150px"
-                      style="display: block">
+        <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
+              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>
+            <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
+                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
+                class="item_width_3"
+                maxlength="50"
+                placeholder="请输入纬度"
+                v-model="dataForm.latitude"
+              >
               </el-input>
             </div>
           </div>
         </el-form-item>
 
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :rows="3"
-                    placeholder="请输入备注，不超过500字"
-                    v-model="dataForm.remark"></el-input>
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="500"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过500字"
+            v-model="dataForm.remark"
+          ></el-input>
         </el-form-item>
       </el-form>
     </div>
     <div class="div_btn resi-btns">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'detail'"
-                 type="primary"
-                 size="small"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'detail'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
     </div>
   </div>
 </template>
@@ -189,15 +250,19 @@ import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import formVltHelper from "dai-js/tools/formVltHelper";
+import nextTick from "dai-js/tools/nextTick";
 
 var map;
 var search;
 var markers;
 var infoWindowList;
 let loading; // 加载动画
+var geocoder; // 新建一个正逆地址解析类
 
 export default {
-  data () {
+  components: {},
+  props: {},
+  data() {
     return {
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
@@ -219,11 +284,11 @@ export default {
         organizationPersonnel: [],
       },
       categoryList: [],
+      volunteerList: [],
     };
   },
-  components: {},
   computed: {
-    dataRule () {
+    dataRule() {
       return {
         organizationName: [
           { required: true, message: "组织名称	不能为空", trigger: "blur" },
@@ -255,18 +320,53 @@ export default {
       };
     },
   },
-  props: {},
   watch: {},
 
-  async created () {
+  async mounted() {
     this.getCategoryList();
-  },
-  async mounted () {
+    this.getVolunteerList();
     this.initMap();
   },
 
   methods: {
-    async getCategoryList () {
+    querySearchVolunteer(queryString, cb) {
+      const { volunteerList } = this;
+      var results = queryString
+        ? volunteerList.filter((item) => {
+            return item.value.indexOf(queryString) !== -1;
+          })
+        : volunteerList;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+
+    handleSelectVolunteer(index, vItem) {
+      this.dataForm.organizationPersonnel[index] = {
+        personName: vItem.name,
+        personPhone: vItem.mobile,
+        icResiUserId: vItem.icResiUserId,
+      };
+    },
+
+    async getVolunteerList() {
+      const url = "/epmetuser/icresiuser/volunteer-list";
+      const params = {};
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.volunteerList = data.map((item) => {
+          return {
+            name: item.name,
+            value: item.label,
+            mobile: item.mobile,
+            icResiUserId: item.icResiUserId,
+          };
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    async getCategoryList() {
       const url = "/sys/dict/data/dictlist";
       const params = {
         dictType: "self_org_category",
@@ -278,19 +378,19 @@ export default {
         this.$message.error(msg);
       }
     },
-    handleAddStaff () {
+    handleAddStaff() {
       this.dataForm.organizationPersonnel = [
         ...this.dataForm.organizationPersonnel,
-        { personName: "", personPhone: "" },
+        { personName: "", personPhone: "", icResiUserId: "" },
       ];
     },
-    handleDelStaff (index) {
+    handleDelStaff(index) {
       const { organizationPersonnel } = this.dataForm;
       organizationPersonnel.splice(index, 1);
       this.dataForm.organizationPersonnel = organizationPersonnel;
     },
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
+    initMap() {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(36.0722275, 120.38945519);
       // 定义map变量，调用 TMap.Map() 构造函数创建地图
@@ -309,14 +409,16 @@ export default {
       });
       infoWindowList = Array(10);
 
+      geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类
+
       // 监听地图平移结束
-      map.on("panend", () => {
-        this.handleMoveCenter();
+      map.on("panend", (e) => {
+        this.handleMoveCenter(e);
       });
       this.handleMoveCenter();
     },
 
-    setMarker (lat, lng) {
+    setMarker(lat, lng) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -330,7 +432,7 @@ export default {
       ]);
     },
 
-    handleSearchMap () {
+    handleSearchMap() {
       infoWindowList.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -358,7 +460,8 @@ export default {
         });
     },
 
-    handleMoveCenter () {
+    handleMoveCenter(e) {
+      console.log(e);
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -366,9 +469,17 @@ export default {
       this.dataForm.latitude = lat;
       this.dataForm.longitude = lng;
       this.setMarker(lat, lng);
+
+      if (e && e.originalEvent) {
+        geocoder
+          .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址
+          .then((result) => {
+            this.dataForm.address = result.result.address;
+          });
+      }
     },
 
-    async initForm (type, row) {
+    async initForm(type, row) {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
@@ -376,11 +487,15 @@ export default {
       if (row) {
         this.dataForm = { ...this.dataForm, ...row };
         this.orgId = this.dataForm.orgId;
-        map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
+
+        await nextTick(800);
+        if (map) {
+          map.setCenter(new TMap.LatLng(row.latitude, row.longitude));
+        }
       }
     },
 
-    async handleComfirm () {
+    async handleComfirm() {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -400,10 +515,7 @@ export default {
             dataForm: { organizationPersonnel },
           } = this;
           let vlt = organizationPersonnel.every((item) => {
-            return (
-              item.personName &&
-              item.personPhone
-            );
+            return item.personName && item.personPhone;
           });
           if (!vlt) {
             return this.$message({
@@ -416,7 +528,7 @@ export default {
       });
     },
 
-    async submit () {
+    async submit() {
       let url = "";
       if (this.formType === "add") {
         url = "/heart/iccommunityselforganization/addcommunityselforganization";
@@ -444,11 +556,11 @@ export default {
       }
     },
 
-    handleCancle () {
+    handleCancle() {
       this.resetData();
       this.$emit("dialogCancle");
     },
-    resetData () {
+    resetData() {
       this.orgId = "";
       this.dataForm = {
         organizationName: "",
@@ -466,7 +578,7 @@ export default {
       };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -474,7 +586,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
index 0df94681..e1279300 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
@@ -277,6 +277,23 @@
       :gridName="currentPepeleGridName"
       @close="showedPeopleMoreInfo = false"
     />
+
+    <el-dialog
+      :visible.sync="diyDialog"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="1150px"
+      top="5vh"
+      class="dialog-h"
+    >
+      <diy-info
+        v-if="diyDialog"
+        ref="ref_diy"
+        :list="exportList"
+        :search="computeQueryParams()"
+        @close="diyDialog = false"
+      ></diy-info>
+    </el-dialog>
   </div>
 </template>
 
@@ -285,6 +302,7 @@ import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import diyInfo from "@/views/modules/base/diyInfo.vue";
 
 export default {
   props: {
@@ -294,7 +312,7 @@ export default {
     },
   },
 
-  components: { peopleMore },
+  components: { peopleMore, diyInfo },
   data() {
     return {
       openSearch: false,
@@ -345,6 +363,9 @@ export default {
 
       currentPepeleId: "",
       currentPepeleGridName: "",
+
+      diyDialog: false,
+      exportList: [],
     };
   },
   computed: {
@@ -620,64 +641,32 @@ export default {
     },
 
     async handleChu() {
-      const url = "/epmetuser/icMoveIn/export";
-      const { pageSize, pageNo } = this;
-      await this.$http({
-        method: "POST",
-        url,
-        responseType: "blob",
-        data: {
-          pageSize,
-          pageNo,
-          ...this.computeQueryParams(),
-        },
-      })
-        .then((res) => {
-          console.log("res----dddd", res);
-          this.formatData(res);
-        })
-        .catch((err) => {
-          console.log("err", err);
-          this.exportLoading = false;
-          return this.$message.error("网络错误");
-        });
+      this.getExportList();
     },
-    formatData(res) {
-      const fileReader = new FileReader();
-      fileReader.onloadend = () => {
-        try {
-          const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
-          // 后台信息
-          console.log("jsonData---1", jsonData);
-          return this.$message.error(jsonData.msg);
-        } catch (err) {
-          // 解析成对象失败，说明是正常的文件流
-          // 下载文件
-          console.log("errr-----", err, this);
-          this.downloadFile(res);
-        }
+
+    async getExportList() {
+      const url = "/oper/customize//icformitemgroup/list";
+      let params = {
+        formCode: "resi_base_info",
       };
-      fileReader.readAsText(res.data);
-    },
-    downloadFile(res) {
-      if (res.headers["content-disposition"]) {
-        let fileName = window.decodeURI(
-          res.headers["content-disposition"].split(";")[1].split("=")[1]
-        );
-        console.log("filename", fileName);
-        let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
-        var url = window.URL.createObjectURL(blob);
-        var aLink = document.createElement("a");
-        aLink.style.display = "none";
-        aLink.href = url;
-        aLink.setAttribute("download", fileName);
-        document.body.appendChild(aLink);
-        aLink.click();
-        document.body.removeChild(aLink); //下载完成移除元素
-        window.URL.revokeObjectURL(url); //释放掉blob对象
-        this.$message.success("导出成功");
-        this.$emit("close");
-      } else this.$message.error("下载失败");
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        data.forEach((item) => {
+          (async (id) => {
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = [];
+          })(item.id);
+        });
+        this.exportList = [...data];
+        this.$nextTick(() => {
+          this.diyDialog = true;
+        });
+        console.log("获取详情成功getExportList----", this.exportList);
+      } else {
+        this.$message.error(msg);
+      }
     },
 
     async getTableData() {

From f67b46b6b60350a2569e6bbe0864b95d673e543f Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 22 Jun 2022 15:55:38 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index 6f088b43..71aef199 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -97,7 +97,7 @@ export default {
         { field: "负责人", keyName: "personInCharge", type: "text" },
         { field: "联系电话", keyName: "mobile", type: "text" },
         { field: "最新检查时间", keyName: "latestPatrolTime", type: "text" },
-        { field: "最新结果", keyName: "latestResult", type: "text" },
+        { field: "最新结果", keyName: "latestResultName", type: "text" },
       ],
       tableUrl: "/gov/org/enterprise/list",
       mubanUrl: "/gov/org/enterprise/download-tem",

From 338209a99c071cb0a7132f7863638ffcc16071c7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 22 Jun 2022 16:57:10 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=B0=8F=E6=94=B9=E5=8A=A8=20=E4=B8=8D?=
 =?UTF-8?q?=E6=85=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/cpts/base/index.vue                       | 4 ++--
 src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 3f78f374..7c4d678c 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -40,14 +40,14 @@
             </el-form-item>
 
             <el-button
-              style="margin-left: 30px"
+              style="margin-left: 30px; margin-bottom: 20px"
               size="small"
               class="diy-button--search"
               @click="handleSearch"
               >查询</el-button
             >
             <el-button
-              style="margin-left: 10px"
+              style="margin-left: 10px; margin-bottom: 20px"
               size="small"
               class="diy-button--reset"
               @click="resetSearch"
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index 71aef199..82db5113 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -92,7 +92,7 @@ export default {
         { field: "序号", keyName: "", type: "no" },
         { field: "场所名称", keyName: "placeOrgName", type: "text" },
         { field: "场所地址", keyName: "address", type: "text" },
-        { field: "场所类型", keyName: "placeType", type: "text" },
+        { field: "场所类型", keyName: "placeTypeName", type: "text" },
         { field: "规模", keyName: "scale", type: "text" },
         { field: "负责人", keyName: "personInCharge", type: "text" },
         { field: "联系电话", keyName: "mobile", type: "text" },