From 112facafeed33f3a9bcc76169f0848d949de6fbd Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 17 Oct 2022 13:51:12 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/workSys/operAuth.vue | 383 +++++++++++++++++++++++++
 1 file changed, 383 insertions(+)
 create mode 100644 src/views/modules/workSys/operAuth.vue

diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
new file mode 100644
index 000000000..4b77c8d5d
--- /dev/null
+++ b/src/views/modules/workSys/operAuth.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+        <div>
+
+          <el-form-item label="操作时间"
+                        label-width="110px"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="datetimerange"
+                            @change="handleTimeChange"
+                            format="yyyy-MM-dd HH:mm"
+                            value-format="yyyy-MM-dd HH:mm"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
+          <div>
+            <el-form-item label="姓名"
+                          prop="name">
+              <el-input v-model="formData.name"
+                        size="small"
+                        class="list_item_width_1"
+                        clearable
+                        placeholder="请输入姓名">
+              </el-input>
+
+            </el-form-item>
+
+            <el-form-item label="手机"
+                          prop="mobile">
+              <el-input v-model="formData.mobile"
+                        size="small"
+                        class="list_item_width_1"
+                        clearable
+                        placeholder="请输入手机号">
+              </el-input>
+
+            </el-form-item>
+
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table class="table"
+                ref="ref_table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         min-width="110">
+        </el-table-column>
+
+        <el-table-column prop="natTime"
+                         header-align="center"
+                         align="center"
+                         label="操作事项"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="natAddress"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="操作时间"
+                         min-width="150">
+        </el-table-column>
+
+        <!-- <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+
+       
+          
+
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+
+
+      agencyId: '',
+
+
+      timeRange: [],
+      formData: {
+
+        name: '',//姓名
+        mobile: '',//手机号
+        idCard: '',//身份证号码
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+
+
+      },
+
+      tableData: [],
+
+
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+
+    await this.loadTable()
+  },
+
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+
+  methods: {
+
+    async handleSearch () {
+      this.isResiUser = this.formData.orgType === 'current'
+
+      await this.loadTable()
+
+      this.$nextTick(() => {
+        this.$refs.ref_table.doLayout() // 解决表格错位
+      })
+
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/icNat/natlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/natlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.tableData.forEach(item => {
+
+          item.isResiUserShow = item.isResiUser === '0' ? '否' : '是'
+          if (item.natResult === '1') {
+            item.natResultShow = '阳性'
+          } else if (item.natResult === '0') {
+            item.natResultShow = '阴性'
+          } else {
+            item.natResultShow = ''
+          }
+
+        });
+
+
+
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleTimeChange (time) {
+      if (time) {
+        this.formData.startTime = time[0]
+        this.formData.endTime = time[1]
+
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+
+      }
+
+    },
+
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        orgType: 'current',//当前组织:current 根组织：all
+        name: '',//姓名
+        mobile: '',//手机号
+        idCard: '',//身份证号码
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+      }
+      this.timeRange = []
+
+      this.pageNo = 0
+      // this.loadTable()
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '核酸检测信息'
+
+      const url = "/epmetuser/icNat/export"
+
+      app.ajax.exportFilePost(
+        url,
+        this.formData,
+        (data, rspMsg) => {
+          this.download(data, title + '.xlsx')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
+
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+

From dc28c6a354f12dfbc234e8067603d5e5d5a74d0d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Oct 2022 14:42:35 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report.20221017.102821.29368.0.001.json |  580 ++++++++
 src/router/index.js                     |   19 +-
 src/views/modules/base/resi.vue         | 1643 ++++++++++++-----------
 3 files changed, 1464 insertions(+), 778 deletions(-)
 create mode 100644 report.20221017.102821.29368.0.001.json

diff --git a/report.20221017.102821.29368.0.001.json b/report.20221017.102821.29368.0.001.json
new file mode 100644
index 000000000..b353bde73
--- /dev/null
+++ b/report.20221017.102821.29368.0.001.json
@@ -0,0 +1,580 @@
+
+{
+  "header": {
+    "event": "Allocation failed - JavaScript heap out of memory",
+    "trigger": "FatalError",
+    "filename": "report.20221017.102821.29368.0.001.json",
+    "dumpEventTime": "2022-10-17T10:28:21Z",
+    "processId": 29368,
+    "cwd": "D:\\Project\\Web\\epmet-oper-gov",
+    "commandLine": [
+      "node",
+      "D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin\\\\..\\_@vue_cli-service@3.12.1@@vue\\cli-service\\bin\\vue-cli-service.js",
+      "serve"
+    ],
+    "nodejsVersion": "v11.15.0",
+    "wordSize": 64,
+    "arch": "x64",
+    "platform": "win32",
+    "componentVersions": {
+      "node": "11.15.0",
+      "v8": "7.0.276.38-node.19",
+      "uv": "1.27.0",
+      "zlib": "1.2.11",
+      "brotli": "1.0.7",
+      "ares": "1.15.0",
+      "modules": "67",
+      "nghttp2": "1.37.0",
+      "napi": "4",
+      "llhttp": "1.1.1",
+      "http_parser": "2.8.0",
+      "openssl": "1.1.1b",
+      "cldr": "34.0",
+      "icu": "63.1",
+      "tz": "2018e",
+      "unicode": "11.0"
+    },
+    "release": {
+      "name": "node",
+      "headersUrl": "https://nodejs.org/download/release/v11.15.0/node-v11.15.0-headers.tar.gz",
+      "sourceUrl": "https://nodejs.org/download/release/v11.15.0/node-v11.15.0.tar.gz",
+      "libUrl": "https://nodejs.org/download/release/v11.15.0/win-x64/node.lib"
+    },
+    "osName": "Windows_NT",
+    "osRelease": "10.0.22621",
+    "osVersion": "Windows 10 Home China",
+    "osMachine": "x86_64",
+    "host": "DESKTOP-KD168PS"
+  },
+  "javascriptStack": {
+    "message": "No stack.",
+    "stack": [
+      "Unavailable."
+    ]
+  },
+  "nativeStack": [
+    {
+      "pc": "0x00007ff7ab21d24e",
+      "symbol": "std::basic_ios<char,std::char_traits<char> >::fill+16366"
+    },
+    {
+      "pc": "0x00007ff7ab21c0f9",
+      "symbol": "std::basic_ios<char,std::char_traits<char> >::fill+11929"
+    },
+    {
+      "pc": "0x00007ff7ab21b923",
+      "symbol": "std::basic_ios<char,std::char_traits<char> >::fill+9923"
+    },
+    {
+      "pc": "0x00007ff7ab30dc22",
+      "symbol": "uv_loop_fork+89362"
+    },
+    {
+      "pc": "0x00007ff7ab73609e",
+      "symbol": "v8::internal::FatalProcessOutOfMemory+798"
+    },
+    {
+      "pc": "0x00007ff7ab735fd7",
+      "symbol": "v8::internal::FatalProcessOutOfMemory+599"
+    },
+    {
+      "pc": "0x00007ff7ab7e9a14",
+      "symbol": "v8::internal::Heap::RootIsImmortalImmovable+14068"
+    },
+    {
+      "pc": "0x00007ff7ab7df822",
+      "symbol": "v8::internal::Heap::CollectGarbage+7234"
+    },
+    {
+      "pc": "0x00007ff7ab7de038",
+      "symbol": "v8::internal::Heap::CollectGarbage+1112"
+    },
+    {
+      "pc": "0x00007ff7ab7e7967",
+      "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5703"
+    },
+    {
+      "pc": "0x00007ff7ab7e79e6",
+      "symbol": "v8::internal::Heap::RootIsImmortalImmovable+5830"
+    },
+    {
+      "pc": "0x00007ff7ab91f8b1",
+      "symbol": "v8::internal::Factory::NewFillerObject+49"
+    },
+    {
+      "pc": "0x00007ff7ab9d9786",
+      "symbol": "v8::internal::StoreBuffer::StoreBufferOverflow+27190"
+    },
+    {
+      "pc": "0x00000104951d0481",
+      "symbol": ""
+    }
+  ],
+  "javascriptHeap": {
+    "totalMemory": 1501376512,
+    "totalCommittedMemory": 1501376512,
+    "usedMemory": 1346924536,
+    "availableMemory": 39500640,
+    "memoryLimit": 1526909922,
+    "heapSpaces": {
+      "read_only_space": {
+        "memorySize": 524288,
+        "committedMemory": 524288,
+        "capacity": 515584,
+        "used": 33520,
+        "available": 482064
+      },
+      "new_space": {
+        "memorySize": 33554432,
+        "committedMemory": 33554432,
+        "capacity": 16498688,
+        "used": 1868816,
+        "available": 14629872
+      },
+      "old_space": {
+        "memorySize": 1206063104,
+        "committedMemory": 1206063104,
+        "capacity": 1114694856,
+        "used": 1113755240,
+        "available": 939616
+      },
+      "code_space": {
+        "memorySize": 11534336,
+        "committedMemory": 11534336,
+        "capacity": 9093152,
+        "used": 9093152,
+        "available": 0
+      },
+      "map_space": {
+        "memorySize": 31993856,
+        "committedMemory": 31993856,
+        "capacity": 6363360,
+        "used": 6363360,
+        "available": 0
+      },
+      "large_object_space": {
+        "memorySize": 217706496,
+        "committedMemory": 217706496,
+        "capacity": 239259536,
+        "used": 215810448,
+        "available": 23449088
+      },
+      "new_large_object_space": {
+        "memorySize": 0,
+        "committedMemory": 0,
+        "capacity": 0,
+        "used": 0,
+        "available": 0
+      }
+    }
+  },
+  "resourceUsage": {
+    "userCpuSeconds": 2690.61,
+    "kernelCpuSeconds": 179.828,
+    "cpuConsumptionPercent": 0.692249,
+    "maxRss": 1829195776,
+    "pageFaults": {
+      "IORequired": 48054699,
+      "IONotRequired": 0
+    },
+    "fsActivity": {
+      "reads": 145756,
+      "writes": 5834
+    }
+  },
+  "libuv": [
+  ],
+  "environmentVariables": {
+    "=C:": "C:\\",
+    "=D:": "D:\\Project\\Web\\epmet-oper-gov",
+    "add_path": "D:\\APP\\cmder",
+    "add_to_path": "D:\\APP\\cmder",
+    "aliases": "D:\\APP\\cmder\\config\\user_aliases.cmd",
+    "ALLUSERSPROFILE": "C:\\ProgramData",
+    "ANSICON": "90x1000 (90x24)",
+    "ANSICON_DEF": "7",
+    "APPDATA": "C:\\Users\\lenovo\\AppData\\Roaming",
+    "architecture_bits": "64",
+    "BABEL_ENV": "development",
+    "ccall": "call \"D:\\APP\\cmder\\vendor\\bin\\cexec.cmd\"",
+    "cexec": "\"D:\\APP\\cmder\\vendor\\bin\\cexec.cmd\"",
+    "clink_architecture": "x64",
+    "CMDER_ALIASES": "1",
+    "CMDER_CLINK": "1",
+    "CMDER_CONFIGURED": "1",
+    "CMDER_INIT_END": "10:45:24.68",
+    "CMDER_INIT_START": "10:45:22.18",
+    "CMDER_ROOT": "D:\\APP\\cmder",
+    "CMDER_SHELL": "cmd",
+    "CMDER_USER_FLAGS": " ",
+    "COLUMNS": "90",
+    "CommonProgramFiles": "C:\\Program Files\\Common Files",
+    "CommonProgramFiles(x86)": "C:\\Program Files (x86)\\Common Files",
+    "CommonProgramW6432": "C:\\Program Files\\Common Files",
+    "COMPUTERNAME": "DESKTOP-KD168PS",
+    "ComSpec": "C:\\WINDOWS\\system32\\cmd.exe",
+    "ConEmuANSI": "ON",
+    "ConEmuAnsiLog": "",
+    "ConEmuArgs": "/Icon \"D:\\APP\\cmder\\icons\\cmder.ico\" /Title Cmder /dir \"D:\\Project\\Web\\epmet-oper-gov\"",
+    "ConEmuArgs2": "",
+    "ConEmuBackHWND": "0x00020E34",
+    "ConEmuBaseDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu",
+    "ConEmuBaseDirShort": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu",
+    "ConEmuBuild": "210912",
+    "ConEmuCfgDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5",
+    "ConEmuConfig": "",
+    "ConEmuDir": "D:\\APP\\cmder\\vendor\\conemu-maximus5",
+    "ConEmuDrawHWND": "0x00020E38",
+    "ConEmuDrive": "D:",
+    "ConEmuHooks": "Enabled",
+    "ConEmuHWND": "0x00390A98",
+    "ConEmuPalette": "Monokai",
+    "ConEmuPID": "24844",
+    "ConEmuServerPID": "14680",
+    "ConEmuTask": "{cmd::Cmder}",
+    "ConEmuWorkDir": "D:\\Project\\Web\\epmet-oper-gov",
+    "ConEmuWorkDrive": "D:",
+    "currenArgu": "/setpath",
+    "debug_output": "0",
+    "depth": "1",
+    "dp0": "D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin\\",
+    "DriverData": "C:\\Windows\\System32\\Drivers\\DriverData",
+    "fast_init": "0",
+    "feFlagName": " ",
+    "feNot": "false",
+    "find_query": "D:\\\\APP\\\\cmder",
+    "found": "1",
+    "git_executable": "D:\\APP\\Git\\cmd\\git.exe",
+    "GIT_INSTALL_ROOT": "D:\\APP\\Git",
+    "git_locale": "\"D:\\APP\\Git\\usr\\bin\\locale.exe\"",
+    "GIT_VERSION_USER": "2.31.1.windows.1",
+    "HOME": "C:\\Users\\lenovo",
+    "HOMEDRIVE": "C:",
+    "HOMEPATH": "\\Users\\lenovo",
+    "INIT_CWD": "D:\\Project\\Web\\epmet-oper-gov",
+    "LANG": "zh_CN.UTF-8",
+    "lib_base": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_base.cmd\"",
+    "lib_console": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\"",
+    "lib_git": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_git.cmd\"",
+    "lib_path": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_path.cmd\"",
+    "lib_profile": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_profile.cmd\"",
+    "LINES": "24",
+    "LOCALAPPDATA": "C:\\Users\\lenovo\\AppData\\Local",
+    "LOGONSERVER": "\\\\DESKTOP-KD168PS",
+    "max_depth": "1",
+    "nix_tools": "1",
+    "NODE": "D:\\APP\\nodejs\\node.exe",
+    "NODE_ENV": "development",
+    "NODE_EXE": "D:\\APP\\nodejs\\\\node.exe",
+    "NPM_CLI_JS": "D:\\APP\\nodejs\\\\node_modules\\npm\\bin\\npm-cli.js",
+    "npm_config_access": "",
+    "npm_config_allow_same_version": "",
+    "npm_config_also": "",
+    "npm_config_always_auth": "",
+    "npm_config_argv": "{\"remain\":[],\"cooked\":[\"run\",\"dev\"],\"original\":[\"run\",\"dev\"]}",
+    "npm_config_audit": "true",
+    "npm_config_audit_level": "low",
+    "npm_config_auth_type": "legacy",
+    "npm_config_bin_links": "true",
+    "npm_config_browser": "",
+    "npm_config_ca": "",
+    "npm_config_cache": "C:\\Users\\lenovo\\AppData\\Roaming\\npm-cache",
+    "npm_config_cache_lock_retries": "10",
+    "npm_config_cache_lock_stale": "60000",
+    "npm_config_cache_lock_wait": "10000",
+    "npm_config_cache_max": "Infinity",
+    "npm_config_cache_min": "10",
+    "npm_config_cafile": "",
+    "npm_config_cert": "",
+    "npm_config_cidr": "",
+    "npm_config_color": "true",
+    "npm_config_commit_hooks": "true",
+    "npm_config_depth": "Infinity",
+    "npm_config_description": "true",
+    "npm_config_dev": "",
+    "npm_config_dry_run": "",
+    "npm_config_editor": "notepad.exe",
+    "npm_config_engine_strict": "",
+    "npm_config_fetch_retries": "2",
+    "npm_config_fetch_retry_factor": "10",
+    "npm_config_fetch_retry_maxtimeout": "60000",
+    "npm_config_fetch_retry_mintimeout": "10000",
+    "npm_config_force": "",
+    "npm_config_git": "git",
+    "npm_config_git_tag_version": "true",
+    "npm_config_global": "",
+    "npm_config_globalconfig": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\etc\\npmrc",
+    "npm_config_globalignorefile": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\etc\\npmignore",
+    "npm_config_global_style": "",
+    "npm_config_group": "",
+    "npm_config_ham_it_up": "",
+    "npm_config_heading": "npm",
+    "npm_config_https_proxy": "",
+    "npm_config_if_present": "",
+    "npm_config_ignore_prepublish": "",
+    "npm_config_ignore_scripts": "",
+    "npm_config_init_author_email": "",
+    "npm_config_init_author_name": "",
+    "npm_config_init_author_url": "",
+    "npm_config_init_license": "ISC",
+    "npm_config_init_module": "C:\\Users\\lenovo\\.npm-init.js",
+    "npm_config_init_version": "1.0.0",
+    "npm_config_json": "",
+    "npm_config_key": "",
+    "npm_config_legacy_bundling": "",
+    "npm_config_link": "",
+    "npm_config_local_address": "",
+    "npm_config_loglevel": "notice",
+    "npm_config_logs_max": "10",
+    "npm_config_long": "",
+    "npm_config_maxsockets": "50",
+    "npm_config_message": "%s",
+    "npm_config_metrics_registry": "https://registry.npmjs.org/",
+    "npm_config_node_gyp": "D:\\APP\\nodejs\\node_modules\\npm\\node_modules\\node-gyp\\bin\\node-gyp.js",
+    "npm_config_node_options": "",
+    "npm_config_node_version": "11.15.0",
+    "npm_config_noproxy": "",
+    "npm_config_offline": "",
+    "npm_config_onload_script": "",
+    "npm_config_only": "",
+    "npm_config_optional": "true",
+    "npm_config_otp": "",
+    "npm_config_package_lock": "true",
+    "npm_config_package_lock_only": "",
+    "npm_config_parseable": "",
+    "npm_config_prefer_offline": "",
+    "npm_config_prefer_online": "",
+    "npm_config_prefix": "C:\\Users\\lenovo\\AppData\\Roaming\\npm",
+    "npm_config_preid": "",
+    "npm_config_production": "",
+    "npm_config_progress": "true",
+    "npm_config_proxy": "",
+    "npm_config_read_only": "",
+    "npm_config_rebuild_bundle": "true",
+    "npm_config_registry": "https://registry.npmjs.org/",
+    "npm_config_rollback": "true",
+    "npm_config_save": "true",
+    "npm_config_save_bundle": "",
+    "npm_config_save_dev": "",
+    "npm_config_save_exact": "",
+    "npm_config_save_optional": "",
+    "npm_config_save_prefix": "^",
+    "npm_config_save_prod": "",
+    "npm_config_scope": "",
+    "npm_config_scripts_prepend_node_path": "warn-only",
+    "npm_config_script_shell": "",
+    "npm_config_searchexclude": "",
+    "npm_config_searchlimit": "20",
+    "npm_config_searchopts": "",
+    "npm_config_searchstaleness": "900",
+    "npm_config_send_metrics": "",
+    "npm_config_shell": "C:\\WINDOWS\\system32\\cmd.exe",
+    "npm_config_shrinkwrap": "true",
+    "npm_config_sign_git_commit": "",
+    "npm_config_sign_git_tag": "",
+    "npm_config_sso_poll_frequency": "500",
+    "npm_config_sso_type": "oauth",
+    "npm_config_strict_ssl": "true",
+    "npm_config_tag": "latest",
+    "npm_config_tag_version_prefix": "v",
+    "npm_config_timing": "",
+    "npm_config_tmp": "C:\\Users\\lenovo\\AppData\\Local\\Temp",
+    "npm_config_umask": "0000",
+    "npm_config_unicode": "",
+    "npm_config_unsafe_perm": "true",
+    "npm_config_update_notifier": "true",
+    "npm_config_usage": "",
+    "npm_config_user": "",
+    "npm_config_userconfig": "C:\\Users\\lenovo\\.npmrc",
+    "npm_config_user_agent": "npm/6.7.0 node/v11.15.0 win32 x64",
+    "npm_config_version": "",
+    "npm_config_versions": "",
+    "npm_config_viewer": "browser",
+    "npm_execpath": "D:\\APP\\nodejs\\node_modules\\npm\\bin\\npm-cli.js",
+    "npm_lifecycle_event": "dev",
+    "npm_lifecycle_script": "vue-cli-service serve",
+    "npm_node_execpath": "D:\\APP\\nodejs\\node.exe",
+    "npm_package_browserslist_0": "> 1%",
+    "npm_package_browserslist_1": "last 2 versions",
+    "npm_package_browserslist_2=not ie <": " 10",
+    "npm_package_dependencies_async_validator": "^4.2.5",
+    "npm_package_dependencies_axios": "^0.19.0",
+    "npm_package_dependencies_babel_eslint": "^8.0.1",
+    "npm_package_dependencies_babel_plugin_component": "^1.1.1",
+    "npm_package_dependencies_echarts": "^5.2.2",
+    "npm_package_dependencies_echarts_gl": "^2.0.9",
+    "npm_package_dependencies_element_theme": "^2.0.1",
+    "npm_package_dependencies_element_ui": "^2.13.0",
+    "npm_package_dependencies_file_saver": "^2.0.5",
+    "npm_package_dependencies_gulp_autoprefixer": "^6.1.0",
+    "npm_package_dependencies_gulp_clean_css": "^4.2.0",
+    "npm_package_dependencies_gulp_load_plugins": "^2.0.0",
+    "npm_package_dependencies_gulp_rename": "^1.4.0",
+    "npm_package_dependencies_gulp_sass": "^4.0.2",
+    "npm_package_dependencies_jsencrypt": "^3.0.3",
+    "npm_package_dependencies_js_cookie": "^2.2.0",
+    "npm_package_dependencies_lodash": "^4.17.15",
+    "npm_package_dependencies_mint_ui": "^2.2.13",
+    "npm_package_dependencies_node_sass": "^4.12.0",
+    "npm_package_dependencies_ol": "^6.9.0",
+    "npm_package_dependencies_portfinder": "^1.0.21",
+    "npm_package_dependencies_qs": "^6.7.0",
+    "npm_package_dependencies_quill": "^1.3.6",
+    "npm_package_dependencies_sass_loader": "^7.1.0",
+    "npm_package_dependencies_screenfull": "^4.2.1",
+    "npm_package_dependencies_sortablejs": "^1.12.0",
+    "npm_package_dependencies_svg_sprite_loader": "^4.1.6",
+    "npm_package_dependencies_throttle_debounce": "^3.0.1",
+    "npm_package_dependencies_vue": "^2.6.11",
+    "npm_package_dependencies_vuex": "^3.1.1",
+    "npm_package_dependencies_vue_baidu_map": "^0.21.22",
+    "npm_package_dependencies_vue_i18n": "^8.12.0",
+    "npm_package_dependencies_vue_quill_editor": "^3.0.6",
+    "npm_package_dependencies_vue_router": "^3.0.7",
+    "npm_package_dependencies_v_distpicker": "^1.2.2",
+    "npm_package_dependencies_xlsx": "^0.17.1",
+    "npm_package_dependencies__antv_l7": "2.9.14",
+    "npm_package_dependencies__antv_l7_draw": "3.0.5",
+    "npm_package_dependencies__antv_l7_maps": "2.9.14",
+    "npm_package_dependencies__riophae_vue_treeselect": "^0.4.0",
+    "npm_package_dependencies__tinymce_tinymce_vue": "^3.2.8",
+    "npm_package_description": "## Project setup ``` npm install ```",
+    "npm_package_devDependencies_dai_js": "^0.0.12",
+    "npm_package_devDependencies_element_theme_chalk": "^2.13.0",
+    "npm_package_devDependencies_natives": "^1.1.6",
+    "npm_package_devDependencies_ol": "^6.9.0",
+    "npm_package_devDependencies_script_loader": "^0.7.2",
+    "npm_package_devDependencies_tinymce": "^5.8.2",
+    "npm_package_devDependencies_vue_template_compiler": "^2.6.11",
+    "npm_package_devDependencies__antv_f2": "^3.8.10-beta.1",
+    "npm_package_devDependencies__tinymce_tinymce_vue": "^3.2.8",
+    "npm_package_devDependencies__vue_cli_plugin_babel": "^3.10.0",
+    "npm_package_devDependencies__vue_cli_plugin_eslint": "^3.10.0",
+    "npm_package_devDependencies__vue_cli_service": "^3.10.0",
+    "npm_package_devDependencies__vue_eslint_config_standard": "^4.0.0",
+    "npm_package_element_theme_browsers_0": "> 1%",
+    "npm_package_element_theme_browsers_1": "last 2 versions",
+    "npm_package_element_theme_browsers_2=not ie <": " 10",
+    "npm_package_element_theme_config": "./src/element-ui/theme-variables.scss",
+    "npm_package_element_theme_minimize": "true",
+    "npm_package_element_theme_out": "./src/element-ui/theme",
+    "npm_package_engines_node=>": " 8.11.1",
+    "npm_package_engines_npm=>": " 5.6.0",
+    "npm_package_eslintConfig_env_node": "true",
+    "npm_package_eslintConfig_extends_0": "plugin:vue/essential",
+    "npm_package_eslintConfig_extends_1": "@vue/standard",
+    "npm_package_eslintConfig_parserOptions_parser": "babel-eslint",
+    "npm_package_eslintConfig_root": "true",
+    "npm_package_gitHead": "c3dee098d64cf40debbc5455d165b478a335f317",
+    "npm_package_name": "epmet-oper-web",
+    "npm_package_private": "true",
+    "npm_package_readmeFilename": "README.md",
+    "npm_package_scripts_build": "vue-cli-service build",
+    "npm_package_scripts_build_prod": "vue-cli-service build --mode production",
+    "npm_package_scripts_build_shibei_prod": "vue-cli-service build --mode shibei_production",
+    "npm_package_scripts_build_sit": "vue-cli-service build --mode production.sit",
+    "npm_package_scripts_build_uat": "vue-cli-service build --mode production.uat",
+    "npm_package_scripts_dev": "vue-cli-service serve",
+    "npm_package_scripts_et": "et",
+    "npm_package_scripts_et_init": "et -i",
+    "npm_package_scripts_et_list": "gulp themes",
+    "npm_package_scripts_lint": "vue-cli-service lint",
+    "npm_package_scripts_serve": "vue-cli-service serve",
+    "npm_package_version": "2.0.0",
+    "NPM_PREFIX_NPM_CLI_JS": "C:\\Users\\lenovo\\AppData\\Roaming\\npm\\node_modules\\npm\\bin\\npm-cli.js",
+    "NUMBER_OF_PROCESSORS": "8",
+    "OLD_PATH": "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\Scripts;D:\\APP\\cmder\\vendor\\conemu-maximus5;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\APP\\cmder;D:\\APP\\Git\\cmd;D:\\APP\\微信web开发者工具\\dll;D:\\APP\\nodejs\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;C:\\Users\\lenovo\\AppData\\Roaming\\npm;D:\\APP\\Git\\mingw64\\bin;D:\\APP\\Git\\usr\\bin;D:\\APP\\cmder\\vendor\\bin",
+    "OneDrive": "C:\\Users\\lenovo\\OneDrive",
+    "OS": "Windows_NT",
+    "Path": "D:\\APP\\nodejs\\node_modules\\npm\\node_modules\\npm-lifecycle\\node-gyp-bin;D:\\Project\\Web\\epmet-oper-gov\\node_modules\\.bin;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\Scripts;D:\\APP\\cmder\\vendor\\conemu-maximus5;D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;D:\\APP\\cmder;D:\\APP\\Git\\cmd;D:\\APP\\微信web开发者工具\\dll;D:\\APP\\nodejs\\;D:\\APP\\python\\Scripts\\;D:\\APP\\python\\;C:\\Users\\lenovo\\AppData\\Local\\Microsoft\\WindowsApps;D:\\APP\\Microsoft VS Code\\bin;C:\\Users\\lenovo\\AppData\\Roaming\\npm;D:\\APP\\Git\\mingw64\\bin;D:\\APP\\Git\\usr\\bin;D:\\APP\\cmder\\vendor\\bin",
+    "PATHEXT": ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JSE;.WSF;.WSH;.MSC",
+    "path_position": "append",
+    "PLINK_PROTOCOL": "ssh",
+    "position": "append",
+    "print_debug": "if 0 gtr 0 call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" debug_output",
+    "print_error": "call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" show_error",
+    "print_verbose": "if 0 gtr 0 call \"D:\\APP\\cmder\\vendor\\lib\\lib_console.cmd\" verbose_output",
+    "PROCESSOR_ARCHITECTURE": "AMD64",
+    "PROCESSOR_IDENTIFIER": "Intel64 Family 6 Model 142 Stepping 12, GenuineIntel",
+    "PROCESSOR_LEVEL": "6",
+    "PROCESSOR_REVISION": "8e0c",
+    "ProgramData": "C:\\ProgramData",
+    "ProgramFiles": "C:\\Program Files",
+    "ProgramFiles(x86)": "C:\\Program Files (x86)",
+    "ProgramW6432": "C:\\Program Files",
+    "PROMPT": "C\bL\bI\bN\bK\b \b$P$G",
+    "PSModulePath": "C:\\Program Files\\WindowsPowerShell\\Modules;C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\Modules",
+    "PUBLIC": "C:\\Users\\Public",
+    "SESSIONNAME": "Console",
+    "SVN_SSH": "D:\\\\APP\\\\Git\\\\bin\\\\ssh.exe",
+    "SystemDrive": "C:",
+    "SystemRoot": "C:\\WINDOWS",
+    "TEMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp",
+    "TERM": "cygwin",
+    "time_init": "0",
+    "TMP": "C:\\Users\\lenovo\\AppData\\Local\\Temp",
+    "USERDOMAIN": "DESKTOP-KD168PS",
+    "USERDOMAIN_ROAMINGPROFILE": "DESKTOP-KD168PS",
+    "USERNAME": "lenovo",
+    "USERPROFILE": "C:\\Users\\lenovo",
+    "user_aliases": "D:\\APP\\cmder\\config\\user_aliases.cmd",
+    "USER_BUILD": "windows.1",
+    "USER_MAJOR": "2",
+    "USER_MINOR": "31",
+    "USER_PATCH": "1",
+    "verbose_output": "0",
+    "VUE_APP_API_SERVER": "http://192.168.1.140/api",
+    "VUE_APP_NODE_ENV": "dev",
+    "VUE_APP_PUBLIC_PATH": "epmet-oper",
+    "VUE_CLI_ENTRY_FILES": "[\"D:\\\\Project\\\\Web\\\\epmet-oper-gov\\\\src\\\\main.js\"]",
+    "WEBPACK_DEV_SERVER": "true",
+    "windir": "C:\\WINDOWS",
+    "ZES_ENABLE_SYSMAN": "1",
+    "_prog": "node"
+  },
+  "sharedObjects": [
+    "D:\\APP\\nodejs\\node.exe",
+    "C:\\WINDOWS\\SYSTEM32\\ntdll.dll",
+    "C:\\WINDOWS\\System32\\KERNEL32.DLL",
+    "C:\\WINDOWS\\System32\\KERNELBASE.dll",
+    "C:\\WINDOWS\\System32\\PSAPI.DLL",
+    "C:\\WINDOWS\\System32\\WS2_32.dll",
+    "C:\\WINDOWS\\System32\\RPCRT4.dll",
+    "C:\\WINDOWS\\System32\\ADVAPI32.dll",
+    "C:\\WINDOWS\\System32\\msvcrt.dll",
+    "C:\\WINDOWS\\System32\\sechost.dll",
+    "C:\\WINDOWS\\System32\\USER32.dll",
+    "C:\\WINDOWS\\System32\\win32u.dll",
+    "C:\\WINDOWS\\System32\\GDI32.dll",
+    "C:\\WINDOWS\\System32\\gdi32full.dll",
+    "C:\\WINDOWS\\SYSTEM32\\dbghelp.dll",
+    "C:\\WINDOWS\\System32\\msvcp_win.dll",
+    "C:\\WINDOWS\\System32\\ucrtbase.dll",
+    "C:\\WINDOWS\\System32\\combase.dll",
+    "C:\\WINDOWS\\System32\\CRYPT32.dll",
+    "C:\\WINDOWS\\System32\\OLEAUT32.dll",
+    "C:\\WINDOWS\\SYSTEM32\\IPHLPAPI.DLL",
+    "C:\\WINDOWS\\SYSTEM32\\bcrypt.dll",
+    "C:\\WINDOWS\\SYSTEM32\\USERENV.dll",
+    "C:\\WINDOWS\\SYSTEM32\\WINMM.dll",
+    "C:\\WINDOWS\\System32\\IMM32.DLL",
+    "D:\\APP\\cmder\\vendor\\conemu-maximus5\\ConEmu\\ConEmuHk64.dll",
+    "C:\\WINDOWS\\SYSTEM32\\powrprof.dll",
+    "C:\\WINDOWS\\SYSTEM32\\UMPDC.dll",
+    "C:\\WINDOWS\\system32\\uxtheme.dll",
+    "C:\\WINDOWS\\system32\\mswsock.dll",
+    "C:\\WINDOWS\\SYSTEM32\\kernel.appcore.dll",
+    "C:\\WINDOWS\\System32\\bcryptprimitives.dll",
+    "C:\\WINDOWS\\system32\\napinsp.dll",
+    "C:\\WINDOWS\\system32\\pnrpnsp.dll",
+    "C:\\WINDOWS\\SYSTEM32\\DNSAPI.dll",
+    "C:\\WINDOWS\\System32\\NSI.dll",
+    "C:\\WINDOWS\\System32\\winrnr.dll",
+    "C:\\WINDOWS\\system32\\wshbth.dll",
+    "C:\\WINDOWS\\system32\\nlansp_c.dll",
+    "C:\\WINDOWS\\SYSTEM32\\dhcpcsvc6.DLL",
+    "C:\\WINDOWS\\SYSTEM32\\dhcpcsvc.DLL",
+    "C:\\WINDOWS\\SYSTEM32\\CRYPTBASE.DLL",
+    "\\\\?\\D:\\Project\\Web\\epmet-oper-gov\\node_modules\\_node-sass@4.14.1@node-sass\\vendor\\win32-x64-67\\binding.node"
+  ]
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 4f7d688fa..9ba8abf56 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -147,6 +147,18 @@ function cookApiDataItem(item) {
   // });
   return item;
 }
+// 把按钮都化为页面内部的权限
+function cookApiDataItem2(item) {
+  let { children } = item;
+  if (children && Array.isArray(children) && children.length > 0) {
+    let btns = item.children.filter((item) => item.type == 1);
+    item.btns = btns;
+    item.children = item.children
+      .filter((val) => val.type == 0)
+      .map((val) => cookApiDataItem2(val));
+  }
+  return item;
+}
 
 // 模块路由(基于主入口布局页面) 可视化数据
 export const moduleShujuRoutes = {
@@ -294,9 +306,9 @@ router.beforeEach((to, from, next) => {
           name: "login",
         });
       }
-      window.SITE_CONFIG["menuList"] = res.data.map((item) =>
-        cookApiDataItem(item)
-      );
+      window.SITE_CONFIG["menuList"] = res.data
+        .map((item) => cookApiDataItem2(item))
+        .map((item) => cookApiDataItem(item));
       fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);
       // next({ ...to, replace: true })
       next({
@@ -350,6 +362,7 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
         ...window.SITE_CONFIG["contentTabDefault"],
         menuId: menuList[i].id,
         title: menuList[i].name,
+        btns: menuList[i].btns || [],
       },
     };
     // eslint-disable-next-line
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index fa5584924..5b7a8a652 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -2,35 +2,48 @@
   <div class="resi-container">
     <el-card class="resi-card">
       <el-collapse v-if="openSearch" v-model="activeNames">
-        <el-collapse-item v-for="item in searchList" :key="item.itemGroupId" 
-           :name="item.itemGroupId">
-           <template slot="title">
-              <div class="collapse-title">{{ item.groupName }}</div>
-            </template>
-          <resi-search v-if="searchList.length > 0"
-                  :ref="'resiSearch' + item.itemGroupId"
-                  :form-list="item.queryItemList"
-                  :column-name="defaultCategotyKey"
-                  :show-grid="item.groupName == '基础信息'"
-                  />
+        <el-collapse-item
+          v-for="item in searchList"
+          :key="item.itemGroupId"
+          :name="item.itemGroupId"
+        >
+          <template slot="title">
+            <div class="collapse-title">{{ item.groupName }}</div>
+          </template>
+          <resi-search
+            v-if="searchList.length > 0"
+            :ref="'resiSearch' + item.itemGroupId"
+            :form-list="item.queryItemList"
+            :column-name="defaultCategotyKey"
+            :show-grid="item.groupName == '基础信息'"
+          />
         </el-collapse-item>
       </el-collapse>
       <template v-else>
-        <resi-search v-if="searchList.length > 0"
-                  ref="resiSearch"
-                  :form-list="searchList[0].queryItemList"
-                  :column-name="defaultCategotyKey"
-                  :show-grid="true"
-                  :is-arrow="true"
-                  @search="handleSearch" />
+        <resi-search
+          v-if="searchList.length > 0"
+          ref="resiSearch"
+          :form-list="searchList[0].queryItemList"
+          :column-name="defaultCategotyKey"
+          :show-grid="true"
+          :is-arrow="true"
+          @search="handleSearch"
+        />
       </template>
       <el-row v-if="openSearch" class="resi-search">
         <!-- <el-col :span="20">
           <el-button type="primary" size="mini">查询</el-button>
         </el-col> -->
         <el-col :span="24">
-          <el-button type="primary" size="small" @click="handleSearchFrom">查询</el-button>
-          <el-button class="diy-button--reset" size="small" @click="resetSearchForm">重置</el-button>
+          <el-button type="primary" size="small" @click="handleSearchFrom"
+            >查询</el-button
+          >
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetSearchForm"
+            >重置</el-button
+          >
         </el-col>
       </el-row>
       <div class="resi-down" @click="handleOpenSearch">
@@ -40,90 +53,107 @@
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button size="small"
-                   class="diy-button--add"
-                   @click="handleAdd">新增</el-button>
-        <el-button class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"  ref="upload"
-                   class="upload-demo"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest">
-          <el-button size="small"
-                     class="diy-button--delete"
-                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        <el-button size="small" class="diy-button--add" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
+        <el-upload
+          :headers="$getElUploadHeaders()"
+          ref="upload"
+          class="upload-demo"
+          action="uploadUlr"
+          :limit="1"
+          :accept="'.xls,.xlsx'"
+          :with-credentials="true"
+          :show-file-list="false"
+          :auto-upload="true"
+          :on-progress="handleProgress"
+          :on-success="handleExcelSuccess"
+          :before-upload="beforeExcelUpload"
+          :http-request="uploadHttpRequest"
+        >
+          <el-button
+            size="small"
+            class="diy-button--delete"
+            :loading="importLoading"
+            >{{ importBtnTitle }}</el-button
+          >
         </el-upload>
 
         <!-- <el-button size="small"
                    class="diy-button--reset"
                    :loading="exportBtn"
                    @click="handleExport">{{exportBtnTitle}}</el-button> -->
-        <el-button
-                     class="diy-button--reset"
-                     size="small"
-                     @click="diyExport">导出</el-button>
-        <el-button
-                     class="diy-button--add"
-                     size="small"
-                     @click="deleteBatch">批量删除</el-button>
+        <el-button class="diy-button--reset" size="small" @click="diyExport"
+          >导出</el-button
+        >
+        <el-button class="diy-button--add" size="small" @click="deleteBatch"
+          >批量删除</el-button
+        >
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
 
-        <el-button size="small" v-if="displayedBaobiaoBtn"
-                   class="diy-button--add"
-                   @click="reportForm">智能填报</el-button>
+        <el-button
+          size="small"
+          v-if="displayedBaobiaoBtn"
+          class="diy-button--add"
+          @click="reportForm"
+          >智能填报</el-button
+        >
       </div>
-      <el-table ref="ref_table"
-                :data="tableData"
-                v-loading="tableLoading"
-                border
-                style="width: 100%"
-                class="resi-table"
-                :height="tableHeight"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         fixed="left"
-                         align="center"
-                         :selectable="checkSelect"
-                         width="55" />
-        <el-table-column label="序号"
-                         type="index"
-                         fixed="left"
-                         align="center"
-                         width="50">
+      <el-table
+        ref="ref_table"
+        :data="tableData"
+        v-loading="tableLoading"
+        border
+        style="width: 100%"
+        class="resi-table"
+        :height="tableHeight"
+        @select-all="selectAll"
+        @selection-change="selectionChange"
+      >
+        <el-table-column
+          type="selection"
+          fixed="left"
+          align="center"
+          :selectable="checkSelect"
+          width="55"
+        />
+        <el-table-column
+          label="序号"
+          type="index"
+          fixed="left"
+          align="center"
+          width="50"
+        >
         </el-table-column>
-        <el-table-column v-for="item in tableHeader"
-                         :key="item.columnName"
-                         :prop="item.columnName"
-                         :label="item.label"
-                         align="center"
-                         :fixed="item.columnName == 'NAME' ? 'left' : false"
-                         :show-overflow-tooltip="true"
-                         :width="item.width || computedWidth(item.label, item.itemType)"
-                         >
-                         <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          align="center"
+          :fixed="item.columnName == 'NAME' ? 'left' : false"
+          :show-overflow-tooltip="true"
+          :width="item.width || computedWidth(item.label, item.itemType)"
+        >
+          <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
-            <a v-if="item.columnName == 'NAME'"
-               class="name-a"
-               @click="handleLook(scope.row)">
+            <a
+              v-if="item.columnName == 'NAME'"
+              class="name-a"
+              @click="handleLook(scope.row)"
+            >
               {{ handleFilterSpan(scope.row, item) }}
             </a>
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="150">
+        <el-table-column fixed="right" label="操作" align="center" width="150">
           <template slot-scope="scope">
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
@@ -133,17 +163,25 @@
                        type="text"
                        size="small"
                        class="div-table-button--detail">变动</el-button> -->
-            <el-button @click="handleChangeRecord(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">变更记录</el-button>
+            <el-button
+              @click="handleChangeRecord(scope.row)"
+              type="text"
+              size="small"
+              class="div-table-button--detail"
+              >变更记录</el-button
+            >
             <template v-if="filterEdit(scope.row.ORG_ID)">
-              <el-button @click="handleEdit(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--edit">修改</el-button>
-              <el-popconfirm title="删除之后无法回复，确认删除？"
-                             @onConfirm="handleDel(scope.row)">
+              <el-button
+                @click="handleEdit(scope.row)"
+                type="text"
+                size="small"
+                class="div-table-button--edit"
+                >修改</el-button
+              >
+              <el-popconfirm
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDel(scope.row)"
+              >
                 <!-- <el-button slot="reference"
                            type="text"
                            size="small"
@@ -166,49 +204,56 @@
                      @click="deleteBatch">删除</el-button> -->
         </div>
         <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="currentPage"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="pageSize"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="currentPage"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="pageSize"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
           </el-pagination>
         </div>
-
       </div>
     </el-card>
 
-    <el-dialog :title="formName"
-               :visible.sync="dialogVisible"
-               width="80%"
-               top="5vh"
-               append-to-body
-               class="dialog-h"
-               :close-on-click-modal="false"
-               :before-close="handlerCancle">
+    <el-dialog
+      :title="formName"
+      :visible.sync="dialogVisible"
+      width="80%"
+      top="5vh"
+      append-to-body
+      class="dialog-h"
+      :close-on-click-modal="false"
+      :before-close="handlerCancle"
+    >
       <div class="dialog-h-content scroll-h">
-        <resi-form v-if="dialogVisible"
-                   ref="baseForm"
-                   :fixed="true"
-                   :form-list="formList"
-                   @changegroup="handleChangeGroup" />
-        <div v-if="dialogVisible"
-             class="resi-other">
+        <resi-form
+          v-if="dialogVisible"
+          ref="baseForm"
+          :fixed="true"
+          :form-list="formList"
+          @changegroup="handleChangeGroup"
+        />
+        <div v-if="dialogVisible" class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
-                     @tab-click="handleClick">
-              <el-tab-pane v-for="item in tabsList"
-                           :key="item.groupId"
-                           :label="item.label"
-                           :name="'group' + item.groupId">
-                <resi-form :ref="'group' + item.groupId"
-                           :columns="3"
-                           :form-info="item.formInfo && item.formInfo "
-                           :support-add="item.supportAdd"
-                           :form-id="item.columnName"
-                           :form-list="item.itemList" />
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+              <el-tab-pane
+                v-for="item in tabsList"
+                :key="item.groupId"
+                :label="item.label"
+                :name="'group' + item.groupId"
+              >
+                <resi-form
+                  :ref="'group' + item.groupId"
+                  :columns="3"
+                  :form-info="item.formInfo && item.formInfo"
+                  :support-add="item.supportAdd"
+                  :form-id="item.columnName"
+                  :form-list="item.itemList"
+                />
               </el-tab-pane>
             </el-tabs>
           </div>
@@ -216,124 +261,149 @@
       </div>
 
       <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerCancle">取消</el-button>
-        <el-button type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleSUbmit">提交</el-button>
+        <el-button size="small" @click="handlerCancle">取消</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleSUbmit"
+          >提交</el-button
+        >
       </div>
     </el-dialog>
 
-    <el-dialog :title="formName"
-               :visible.sync="dialogEditVisible"
-               width="80%"
-               append-to-body
-               class="dialog-h"
-               top="5vh"
-               :close-on-click-modal="false"
-               :before-close="handlerEditCancle">
+    <el-dialog
+      :title="formName"
+      :visible.sync="dialogEditVisible"
+      width="80%"
+      append-to-body
+      class="dialog-h"
+      top="5vh"
+      :close-on-click-modal="false"
+      :before-close="handlerEditCancle"
+    >
       <div class="dialog-h-content scroll-h">
-        <edit-resi v-if="dialogEditVisible"
-                   ref="baseForm"
-                   :disabled="disabled"
-                   :form-info="editForm"
-                   :fixed="true"
-                   :form-list="formList"
-                   :agency-id="editAgencyId"
-                   @changegroup="handleChangeGroup" />
-        <div v-if="dialogEditVisible"
-             class="resi-other">
+        <edit-resi
+          v-if="dialogEditVisible"
+          ref="baseForm"
+          :disabled="disabled"
+          :form-info="editForm"
+          :fixed="true"
+          :form-list="formList"
+          :agency-id="editAgencyId"
+          @changegroup="handleChangeGroup"
+        />
+        <div v-if="dialogEditVisible" class="resi-other">
           <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
-            <el-tabs v-model="activeName"
-                     @tab-click="handleClick">
-              <el-tab-pane v-for="item in tabsList"
-                           :key="item.groupId"
-                           :label="item.label"
-                           :name="'group' + item.groupId">
-                <edit-resi :ref="'group' + item.groupId"
-                           :columns="3"
-                           :support-add="item.supportAdd"
-                           :form-id="item.columnName"
-                           :muti-list="item.mutiList"
-                           :form-list="item.itemList"
-                           :disabled="disabled"
-                           :label-width="'140px'"
-                           :agency-id="editAgencyId" />
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+              <el-tab-pane
+                v-for="item in tabsList"
+                :key="item.groupId"
+                :label="item.label"
+                :name="'group' + item.groupId"
+              >
+                <edit-resi
+                  :ref="'group' + item.groupId"
+                  :columns="3"
+                  :support-add="item.supportAdd"
+                  :form-id="item.columnName"
+                  :muti-list="item.mutiList"
+                  :form-list="item.itemList"
+                  :disabled="disabled"
+                  :label-width="'140px'"
+                  :agency-id="editAgencyId"
+                />
               </el-tab-pane>
             </el-tabs>
           </div>
         </div>
       </div>
       <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerEditCancle">取消</el-button>
-        <el-button v-if="!disabled"
-                   type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleEditSUbmit">提交</el-button>
+        <el-button size="small" @click="handlerEditCancle">取消</el-button>
+        <el-button
+          v-if="!disabled"
+          type="primary"
+          size="small"
+          :loading="btnLoading"
+          @click="handleEditSUbmit"
+          >提交</el-button
+        >
       </div>
     </el-dialog>
 
     <!-- 调动 -->
-    <el-dialog :visible.sync="tranferShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'人员变动'"
-               width="950px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <resi-transfer ref="ref_transfer"
-                     @dialogCancle="transferClose"></resi-transfer>
+    <el-dialog
+      :visible.sync="tranferShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'人员变动'"
+      width="950px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <resi-transfer
+        ref="ref_transfer"
+        @dialogCancle="transferClose"
+      ></resi-transfer>
     </el-dialog>
 
     <!-- 变更记录 -->
-    <el-dialog :visible.sync="changeRecordShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'变更记录'"
-               width="1150px"
-               top="5vh"
-               @closed="diaClose">
+    <el-dialog
+      :visible.sync="changeRecordShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'变更记录'"
+      width="1150px"
+      top="5vh"
+      @closed="diaClose"
+    >
       <resi-change-record ref="ref_changerecord"></resi-change-record>
     </el-dialog>
-    <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="{
-        formCode: 'resi_base_info',
-        pageNo: currentPage,
-        pageSize: pageSize,
-        conditions: conditions
-      }" @close="handleDiyClose"></diy-info>
+    <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="{
+          formCode: 'resi_base_info',
+          pageNo: currentPage,
+          pageSize: pageSize,
+          conditions: conditions,
+        }"
+        @close="handleDiyClose"
+      ></diy-info>
     </el-dialog>
-    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                 :userId="lookInfo.userId"
-                 :gridName="lookInfo.gridName"
-                 @close="handleCancleLook" />
+    <people-more
+      v-if="showedPeopleMoreInfo && lookInfo.userId"
+      :userId="lookInfo.userId"
+      :gridName="lookInfo.gridName"
+      @close="handleCancleLook"
+    />
     <baobiao ref="baobiao" />
   </div>
 </template>
 
 <script>
-import nextTick from 'dai-js/tools/nextTick'
-import resiSearch from '../../components/resiSearch.vue'
-import resiForm from '../../components/resiForm.vue'
-import editResi from '../../components/editResi.vue'
-import axios from 'axios'
-import { mapGetters } from 'vuex'
-import resiTransfer from '../../components/resiTransfer.vue'
-import resiChangeRecord from '../../components/resiChangeRecord.vue'
+import nextTick from "dai-js/tools/nextTick";
+import resiSearch from "../../components/resiSearch.vue";
+import resiForm from "../../components/resiForm.vue";
+import editResi from "../../components/editResi.vue";
+import axios from "axios";
+import { mapGetters } from "vuex";
+import resiTransfer from "../../components/resiTransfer.vue";
+import resiChangeRecord from "../../components/resiChangeRecord.vue";
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import baobiao from "@/views/modules/cpts/baobiao";
-import diyInfo from './diyInfo.vue'
+import diyInfo from "./diyInfo.vue";
 import { requestPost } from "@/js/dai/request";
 
 export default {
@@ -345,16 +415,16 @@ export default {
     resiTransfer,
     resiChangeRecord,
     peopleMore,
-    diyInfo
+    diyInfo,
   },
-  data () {
+  data() {
     return {
       activeNames: [],
       diyDialog: false,
       openSearch: false,
       exportBtn: false,
-      exportBtnTitle: '导出',
-      importBtnTitle: '导入',
+      exportBtnTitle: "导出",
+      importBtnTitle: "导入",
       importLoading: false,
       rowVisible: false,
       tableLoading: false,
@@ -368,190 +438,209 @@ export default {
       dialogVisible: false,
       // 显示人员详情
       showedPeopleMoreInfo: false,
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+      uploadUlr:
+        window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/importExcel",
       currentPage: 1,
       pageSize: 20,
       total: null,
       searchH: 0,
       conditions: [],
-      activeName: '',
+      activeName: "",
       tableData: [],
       searchList: [],
       exportList: [],
-      editAgencyId: '',
+      editAgencyId: "",
       editForm: {
-        GRID_ID: '',
-        VILLAGE_ID: '',
-        BUILD_ID: '',
-        HOME_ID: ''
+        GRID_ID: "",
+        VILLAGE_ID: "",
+        BUILD_ID: "",
+        HOME_ID: "",
       },
       editTableName: {},
-      formName: '',
+      formName: "",
       formList: [],
       tableHeader: [],
       tabsList: [],
       selection: [],
 
-      defaultCategotyKey: '',
+      defaultCategotyKey: "",
 
       tranferShow: false,
       changeRecordShow: false,
       lookInfo: {
-        userId: '',
-        gridName: ''
+        userId: "",
+        gridName: "",
       },
 
       displayedBaobiaoBtn: false,
-    }
-  },
-  props: {
 
+      btnAuths: {
+        ic_resi_add: false, //新增
+        ic_resi_export: false, //导出
+        ic_resi_batch_del: false, //批量删除
+        ic_resi_smart_import: false, //智能填表
+        ic_resi_del: false, //删除
+        ic_resi_view: false, //查看
+        ic_resi_update: false, //修改
+        ic_resi_change_rec: false, //变更记录
+        ic_resi_view_real_data: false, //显示脱敏信息
+      },
+    };
   },
-  async activated () {
-    console.log('this.$route.query---', this.$route.query)
+  props: {},
+  // 通过菜单路由配置按钮是否显示
+  beforeRouteEnter(to, from, next) {
+    next((that) => {
+      if (Array.isArray(to.meta.btns)) {
+        to.meta.btns.forEach((item) => {
+          that.btnAuths[item.permissions] = true;
+        });
+      }
+      console.log("^^^^^^^^^^^^^^^^^^btns", that.btnAuths);
+    });
+  },
+  async activated() {
+    console.log("this.$route.query---", this.$route.query);
     if (this.$route.query && this.$route.query.columnName) {
-      this.searchList = []
-      let query = this.$route.query
-      this.defaultCategotyKey = query.columnName
-      console.log('defaultCategotyKey----', this.defaultCategotyKey)
-      await this.getSearchList()
-      this.$refs.resiSearch.handleSearch()
+      this.searchList = [];
+      let query = this.$route.query;
+      this.defaultCategotyKey = query.columnName;
+      console.log("defaultCategotyKey----", this.defaultCategotyKey);
+      await this.getSearchList();
+      this.$refs.resiSearch.handleSearch();
     }
-
   },
   computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
+    ...mapGetters(["clientHeight", "iframeHeight"]),
     tableHeight() {
-      const h = this.clientHeight - this.searchH - 310 + this.iframeHeight
-      const _h = this.clientHeight - 310 - this.searchH
-      return this.$store.state.inIframe ? h : _h
-    }
+      const h = this.clientHeight - this.searchH - 310 + this.iframeHeight;
+      const _h = this.clientHeight - 310 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
+    },
   },
-  async created () {
+  async created() {
     if (this.$route.query) {
-      let query = this.$route.query
-      this.defaultCategotyKey = query.columnName
+      let query = this.$route.query;
+      this.defaultCategotyKey = query.columnName;
     }
 
-
-    await this.getSearchList()
+    await this.getSearchList();
     // await this.getFormList()
-    await this.getTableHeader()
+    await this.getTableHeader();
     // console.log('this.$refs.resiSearch', this)
-    this.$refs.resiSearch.handleSearch()
+    this.$refs.resiSearch.handleSearch();
 
     // this.handleSearch()
     // this.getTableData()
-    this.pageLoading = true
-    this.searchH = this.$refs.resiSearch.$el.offsetHeight
-    console.log('storeoooo----0000', this.$store)
-    console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight)
-    
+    this.pageLoading = true;
+    this.searchH = this.$refs.resiSearch.$el.offsetHeight;
+    console.log("storeoooo----0000", this.$store);
+    console.log("resiSearch", this.$refs.resiSearch.$el.offsetHeight);
   },
-  async mounted () {
-    
+  async mounted() {
     // this.$nextTick(() => {
     //   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
     // })
-    console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
+    console.log(
+      "document.documentElement.clientWidth",
+      document.documentElement.clientHeight
+    );
     this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
       elseParams: {
-        categoryKeys:['resi_info'], categoryKey: 'resi_info'
-      }
+        categoryKeys: ["resi_info"],
+        categoryKey: "resi_info",
+      },
     });
   },
   methods: {
-    reportForm(){
+    reportForm() {
       this.$refs.baobiao.init({
         elseParams: {
-          categoryKeys:['resi_info'], categoryKey: 'resi_info', paramMap:{
-            searchForm:{
-              formCode: 'resi_base_info',
+          categoryKeys: ["resi_info"],
+          categoryKey: "resi_info",
+          paramMap: {
+            searchForm: {
+              formCode: "resi_base_info",
               pageNo: this.currentPage,
               pageSize: this.pageSize,
-              conditions: this.conditions
-            }
-          }
-        }
-      })
+              conditions: this.conditions,
+            },
+          },
+        },
+      });
     },
-    checkSelect (row, index) {
-
-      return row.isChecked
+    checkSelect(row, index) {
+      return row.isChecked;
     },
     //调动
-    async handleTransfer (row) {
-      this.tranferShow = true
+    async handleTransfer(row) {
+      this.tranferShow = true;
 
-      await nextTick(200)
+      await nextTick(200);
 
-      this.$refs.ref_transfer.initForm(row)
+      this.$refs.ref_transfer.initForm(row);
     },
     //变更记录
-    async handleChangeRecord (row) {
-      this.changeRecordShow = true
+    async handleChangeRecord(row) {
+      this.changeRecordShow = true;
 
-      await nextTick(200)
+      await nextTick(200);
 
-      this.$refs.ref_changerecord.initForm(row)
+      this.$refs.ref_changerecord.initForm(row);
     },
 
-    diaClose () {
-      this.tranferShow = false
-      this.changeRecordShow = false
+    diaClose() {
+      this.tranferShow = false;
+      this.changeRecordShow = false;
     },
 
-    transferClose () {
-      this.tranferShow = false
-      this.getTableData()
+    transferClose() {
+      this.tranferShow = false;
+      this.getTableData();
     },
     handleDiyClose() {
-      this.diyDialog = false
+      this.diyDialog = false;
     },
     handleOpenSearch() {
-      if (!this.openSearch) this.activeNames = [this.searchList[0].itemGroupId]
-      this.openSearch = !this.openSearch
-      
+      if (!this.openSearch) this.activeNames = [this.searchList[0].itemGroupId];
+      this.openSearch = !this.openSearch;
     },
     async diyExport() {
-      await this.getExportList()
-      
-      
+      await this.getExportList();
     },
-    computedWidth (label, type) {
-      
-      let wd = ''
-      if (type == 'input' || type == 'select') wd = 40 * label.length
-      else if(type == 'radio') wd = 20 * label.length
-      console.log('type-----wd', wd)
-      return wd > 80 ? wd : 80
+    computedWidth(label, type) {
+      let wd = "";
+      if (type == "input" || type == "select") wd = 40 * label.length;
+      else if (type == "radio") wd = 20 * label.length;
+      console.log("type-----wd", wd);
+      return wd > 80 ? wd : 80;
     },
-    filterEdit (id) {
-      const { user } = this.$store.state
-      return id === user.agencyId
+    filterEdit(id) {
+      const { user } = this.$store.state;
+      return id === user.agencyId;
     },
-    selectionChange (selection) {
-      this.selection = selection
+    selectionChange(selection) {
+      this.selection = selection;
 
       if (selection.length === this.tableData.length) {
-        this.selAllFlag = true
-        this.isIndeterminate = false
+        this.selAllFlag = true;
+        this.isIndeterminate = false;
       } else if (selection.length > 0) {
-        this.selAllFlag = false
-        this.isIndeterminate = true
+        this.selAllFlag = false;
+        this.isIndeterminate = true;
       } else {
-        this.selAllFlag = false
-        this.isIndeterminate = false
+        this.selAllFlag = false;
+        this.isIndeterminate = false;
       }
     },
-    handleSelectAll (selectAllFlag) {
+    handleSelectAll(selectAllFlag) {
       // if (this.tableData.length == 0) {
       //   this.selAllFlag = false
       //   return
       // }
       this.$refs.ref_table.clearSelection();
       if (selectAllFlag) {
-        this.tableData.forEach(row => {
+        this.tableData.forEach((row) => {
           // this.$refs.ref_table.toggleRowSelection(row);
           if (row.isChecked) {
             this.$refs.ref_table.toggleRowSelection(row);
@@ -559,242 +648,247 @@ export default {
         });
       }
     },
-    selectAll (selection) {
-      this.selection = selection
+    selectAll(selection) {
+      this.selection = selection;
 
       if (selection.length > 0) {
-        this.selAllFlag = true
+        this.selAllFlag = true;
       } else {
-        this.selAllFlag = false
+        this.selAllFlag = false;
       }
-
     },
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("删除之后无法恢复，确认删除？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
-          type: "warning"
+          type: "warning",
         })
           .then(() => {
-            this.deleteresiBatch()
+            this.deleteresiBatch();
           })
-          .catch(err => {
+          .catch((err) => {
             if (err == "cancel") {
               // this.$message({
               //   type: "info",
               //   message: "已取消删除"
               // });
             }
-
           });
       } else {
-        this.$message.warning('请先选择要删除的居民')
+        this.$message.warning("请先选择要删除的居民");
       }
     },
-    handleSizeChange (val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getTableData()
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getTableData();
     },
-    handleCurrentChange (val) {
-      console.log(`当前页: ${val}`)
-      this.currentPage = val
-      this.getTableData()
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.currentPage = val;
+      this.getTableData();
     },
-    handleFilterSpan (row, item) {
-      let _val = ''
-      if (item.itemType === 'radio' && item.options.length > 0) {
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.itemType === "radio" && item.options.length > 0) {
         item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label
-        })
-        if (row[item.columnName] == '0') return _val = ''
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+        if (row[item.columnName] == "0") return (_val = "");
       }
-      
-      return _val || row[item.columnName]
+
+      return _val || row[item.columnName];
     },
     handleSearchFrom() {
-      let arr = []
-      this.searchList.forEach(item => {
-        const arr1 = this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch()
-        arr = arr.concat(arr1)
+      let arr = [];
+      this.searchList.forEach((item) => {
+        const arr1 =
+          this.$refs[`resiSearch${item.itemGroupId}`][0].handleSearch();
+        arr = arr.concat(arr1);
         // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
-      })
-      console.log('search-----refs', this.$refs)
+      });
+      console.log("search-----refs", this.$refs);
 
-      console.log('search-----arr', arr)
-      this.currentPage = 1
-      this.conditions = arr
-      this.getTableData()
+      console.log("search-----arr", arr);
+      this.currentPage = 1;
+      this.conditions = arr;
+      this.getTableData();
     },
-    handleSearch (val) {
-      console.log('searchhh--', val)
-      this.currentPage = 1
-      this.conditions = val
-      this.getTableData()
+    handleSearch(val) {
+      console.log("searchhh--", val);
+      this.currentPage = 1;
+      this.conditions = val;
+      this.getTableData();
     },
     resetSearchForm(formName) {
       // for(const n in this.form) {
       //   this.form[n] = ''
       // }
       // this.handleSearch()
-      this.searchList.forEach(item => {
-        this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm()
+      this.searchList.forEach((item) => {
+        this.$refs[`resiSearch${item.itemGroupId}`][0].resetForm();
         // console.log('search-----refs', this.$refs[`resiSearch${item.itemGroupId}`])
-      })
-      this.currentPage = 1
-      this.conditions = []
-      this.getTableData()
+      });
+      this.currentPage = 1;
+      this.conditions = [];
+      this.getTableData();
     },
-    async handleExportModule () {
-      let url = "/epmetuser/icresiuser/import/download-template"
-
+    async handleExportModule() {
+      let url = "/epmetuser/icresiuser/import/download-template";
 
-      let params = {}
+      let params = {};
       await this.$http({
-        method: 'POST',
+        method: "POST",
         url,
-        responseType: 'blob',
-        data: params
+        responseType: "blob",
+        data: params,
       })
-        .then(res => {
-          console.log('res----dddd', res)
+        .then((res) => {
+          console.log("res----dddd", 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('网络错误')
+            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("网络错误");
+        });
     },
     // 下载文件
-    download (data, fileName) {
-      console.log('data', data)
+    download(data, fileName) {
+      console.log("data", data);
       if (!data) {
-        return
+        return;
       }
 
-      var csvData = new Blob([data])
+      var csvData = new Blob([data]);
 
       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName)
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
       }
       // for Non-IE (chrome, firefox etc.)
       else {
-        var a = document.createElement('a')
-        document.body.appendChild(a)
-        a.style = 'display: none'
-        var url = window.URL.createObjectURL(csvData)
-        a.href = url
-        a.download = fileName
-        a.click()
-        a.remove()
-        window.URL.revokeObjectURL(url)
+        var a = document.createElement("a");
+        document.body.appendChild(a);
+        a.style = "display: none";
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
       }
     },
-    async handleExport () {
-      this.exportBtn = true
-      this.exportBtnTitle = '正在导出...'
+    async handleExport() {
+      this.exportBtn = true;
+      this.exportBtnTitle = "正在导出...";
       let params = {
-        formCode: 'resi_base_info',
-        conditions: this.conditions
-      }
+        formCode: "resi_base_info",
+        conditions: this.conditions,
+      };
 
       // .post('epmetuser/icresiuser/exportExcel', params)
       await axios({
-        url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
+        url: window.SITE_CONFIG["apiURL"] + "/epmetuser/icresiuser/exportExcel",
         // url: 'epmetuser/icresiuser/exportExcel',
-        method: 'post',
+        method: "post",
         data: params,
-        responseType: 'blob'
+        responseType: "blob",
       })
-        .then(res => {
-
-          console.log('resllll', res)
-          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对象
+        .then((res) => {
+          console.log("resllll", res);
+          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对象
         })
         .catch((err) => {
-          console.log('获取导出情失败', err)
-          this.$message.error('获取导出失败')
-        })
-      this.exportBtnTitle = '导出'
-      this.exportBtn = false
+          console.log("获取导出情失败", err);
+          this.$message.error("获取导出失败");
+        });
+      this.exportBtnTitle = "导出";
+      this.exportBtn = false;
     },
     // 上传大图标成功
-    handleExcelSuccess (res, file) {
-      if (res.code === 0 && res.msg === 'success') {
-
-        console.log('resss---ppp', res)
-
+    handleExcelSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
       } else {
-        this.$message.error(res.msg)
+        this.$message.error(res.msg);
       }
     },
-    handleProgress (event, file, fileList) {
-      console.log('percentage', file.percentage)
+    handleProgress(event, file, fileList) {
+      console.log("percentage", file.percentage);
     },
 
-    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) < 100
+    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 < 100;
       if (!fileType) {
-        this.$message.error('上传文件只能是xls/xlsx格式！')
+        this.$message.error("上传文件只能是xls/xlsx格式！");
       }
 
       if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 100MB!')
+        this.$message.error("上传文件大小不能超过 100MB!");
       }
-      return fileType && isLt1M
+      return fileType && isLt1M;
     },
-    async uploadHttpRequest (file) {
-      this.importLoading = true
-      this.importBtnTitle = '正在上传中...'
+    async uploadHttpRequest(file) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
       this.$message({
         showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append('file', file.file) //添加文件对象
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
       await this.$http
-        .post('/epmetuser/icresiuser/importExcel', formData).then(res => {
-          console.log('res-up', res)
-          if (res.data.code == 0 && res.data.msg == 'success') {
+        .post("/epmetuser/icresiuser/importExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
             // this.$message.success('导入成功')
-            this.getTableData()
-          } else this.$message.error(res.data.msg)
-        }).catch(err => {
-          console.log('失败', err)
-          file.onError() //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
         })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
       // await axios({
       //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
       //   method: 'post',
@@ -826,16 +920,16 @@ export default {
       //     file.onError() //上传失败的文件会从文件列表中删除
       //     this.$message.error('导入失败')
       //   })
-      this.importLoading = false
-      this.importBtnTitle = '导入'
-      this.$refs.upload.clearFiles()
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
     },
-    handleClick (tab, event) {
-      console.log(tab, event)
+    handleClick(tab, event) {
+      console.log(tab, event);
     },
-    async handleLook (row) {
-      this.lookInfo.userId = row.icResiUserId
-      this.lookInfo.gridName = row.GRID_ID
+    async handleLook(row) {
+      this.lookInfo.userId = row.icResiUserId;
+      this.lookInfo.gridName = row.GRID_ID;
       this.showedPeopleMoreInfo = true;
       // this.disabled = true
       // this.editAgencyId = row.ORG_ID
@@ -843,296 +937,297 @@ export default {
       // this.getrowInfo(row.icResiUserId)
     },
     handleCancleLook() {
-      this.lookInfo.userId = ''
-      this.lookInfo.gridName = ''
+      this.lookInfo.userId = "";
+      this.lookInfo.gridName = "";
       this.showedPeopleMoreInfo = false;
     },
-    async handleEdit (row) {
-      this.disabled = false
-      this.editAgencyId = row.ORG_ID
-      await this.getFormList('edit')
-      await this.getrowInfo(row.icResiUserId)
+    async handleEdit(row) {
+      this.disabled = false;
+      this.editAgencyId = row.ORG_ID;
+      await this.getFormList("edit");
+      await this.getrowInfo(row.icResiUserId);
     },
-    async handleAdd () {
-      await this.getFormList()
-      this.dialogVisible = true
+    async handleAdd() {
+      await this.getFormList();
+      this.dialogVisible = true;
     },
-    async handleChangeGroup (val) {
-      console.log('changeguoprrrrr----', val)
-      let { childGroup, value, partyInfo } = val
-      
-      let hasT = false
-      let i = 0
-      let list = [...this.tabsList]
+    async handleChangeGroup(val) {
+      console.log("changeguoprrrrr----", val);
+      let { childGroup, value, partyInfo } = val;
+
+      let hasT = false;
+      let i = 0;
+      let list = [...this.tabsList];
       list.forEach((item, index) => {
         if (item.tableName === childGroup.tableName) {
-          hasT = true
-          i = index
+          hasT = true;
+          i = index;
         }
-      })
-      if (value === 1 || value === '1') {
+      });
+      if (value === 1 || value === "1") {
         // console.log('changegroup----999', value)
         if (!hasT) {
           childGroup.itemList.forEach(async (item) => {
-            if (item.optionSourceType === 'remote') {
+            if (item.optionSourceType === "remote") {
               await this.getOptionsList(item.optionSourceValue).then((res) => {
-                item.options = this.getTreeData(res)
-                
-              })
+                item.options = this.getTreeData(res);
+              });
               // console.log('')
             }
-          })
-          if (partyInfo && partyInfo.length > 0 && childGroup.tableName == 'ic_party_member') {
-            list.push({...childGroup, formInfo: partyInfo[0] })
-          } else list.push(childGroup)
-          
+          });
+          if (
+            partyInfo &&
+            partyInfo.length > 0 &&
+            childGroup.tableName == "ic_party_member"
+          ) {
+            list.push({ ...childGroup, formInfo: partyInfo[0] });
+          } else list.push(childGroup);
         }
       } else {
         // console.log('changegroup----000', value)
-        if (hasT) list.splice(i, 1)
+        if (hasT) list.splice(i, 1);
       }
-      this.tabsList = [...list]
+      this.tabsList = [...list];
     },
-    formetForm () {
-      const _baseForm = this.$refs.baseForm.handleForm()
-      let arr = []
-      if (_baseForm.length === 0) return false
-      arr.push([..._baseForm])
+    formetForm() {
+      const _baseForm = this.$refs.baseForm.handleForm();
+      let arr = [];
+      if (_baseForm.length === 0) return false;
+      arr.push([..._baseForm]);
       this.tabsList.forEach((item) => {
-        arr.push([...this.$refs['group' + item.groupId][0].handleForm()])
-      })
+        arr.push([...this.$refs["group" + item.groupId][0].handleForm()]);
+      });
       let arr2 = arr.reduce(function (a, b) {
-        return a.concat(b)
-      })
-      let noChange = true
+        return a.concat(b);
+      });
+      let noChange = true;
       arr2.forEach((item) => {
-        if (item.list.length !== 0) noChange = false
-      })
-      console.log('arr2', arr2)
+        if (item.list.length !== 0) noChange = false;
+      });
+      console.log("arr2", arr2);
       if (noChange) {
-        this.$message.warning('您还没有做任何修改')
-        return false
+        this.$message.warning("您还没有做任何修改");
+        return false;
       }
       // 合并相同tableName的多个数组
-      let hash = {}
-      let i = 0
-      let res = []
-      let finalArr = []
+      let hash = {};
+      let i = 0;
+      let res = [];
+      let finalArr = [];
       arr2.forEach(function (item) {
-        let name = item.tableName
+        let name = item.tableName;
         if (hash[name]) {
-          res[hash[name] - 1].list.push(...item.list)
+          res[hash[name] - 1].list.push(...item.list);
         } else {
-          hash[name] = ++i
+          hash[name] = ++i;
           res.push({
             list: [...item.list],
             supportAdd: item.supportAdd,
-            tableName: name
-          })
+            tableName: name,
+          });
         }
-      })
-      console.log('res', res)
+      });
+      console.log("res", res);
       // 多个list合并成一个list子集
       res.forEach((item) => {
-        let _form = {}
+        let _form = {};
         item.list.length > 0 &&
           item.list.forEach((n) => {
-            _form = { ..._form, ...n }
-          })
+            _form = { ..._form, ...n };
+          });
         if (item.list.length > 0) {
           finalArr.push({
             tableName: item.tableName,
-            list: item.supportAdd ? [...item.list] : [{ ..._form }]
-          })
+            list: item.supportAdd ? [...item.list] : [{ ..._form }],
+          });
         }
-      })
-      console.log('finalArr', finalArr)
-      return finalArr
+      });
+      console.log("finalArr", finalArr);
+      return finalArr;
     },
-    async handleEditSUbmit () {
-      const arr = await this.formetForm()
-      if (arr) this.submitEdit(arr)
+    async handleEditSUbmit() {
+      const arr = await this.formetForm();
+      if (arr) this.submitEdit(arr);
     },
-    async handleSUbmit () {
-      const arr = await this.formetForm()
-      if (arr) this.submitAdd(arr)
+    async handleSUbmit() {
+      const arr = await this.formetForm();
+      if (arr) this.submitAdd(arr);
     },
-    handleDel (row) {
+    handleDel(row) {
       let params = {
-        formCode: 'resi_base_info',
-        userIds: [row.icResiUserId]
-      }
-      console.log('row1', row)
+        formCode: "resi_base_info",
+        userIds: [row.icResiUserId],
+      };
+      console.log("row1", row);
       this.$http
-        .post('/epmetuser/icresiuser/delete', params)
+        .post("/epmetuser/icresiuser/delete", params)
         .then(({ data: res }) => {
-          console.log('row2', row)
+          console.log("row2", row);
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('row3', row)
-            this.$message.success('删除成功')
-            this.getTableData()
+            console.log("row3", row);
+            this.$message.success("删除成功");
+            this.getTableData();
           }
         })
         .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
     },
-    handleFormatUrl (url) {
-      return url.includes('?')
+    handleFormatUrl(url) {
+      return url.includes("?");
     },
-    handlerEditCancle () {
-      this.$refs.baseForm.resetForm()
+    handlerEditCancle() {
+      this.$refs.baseForm.resetForm();
       this.tabsList.forEach((item) => {
-        this.$refs['group' + item.groupId][0].resetForm()
-      })
-      this.dialogEditVisible = false
+        this.$refs["group" + item.groupId][0].resetForm();
+      });
+      this.dialogEditVisible = false;
     },
-    handlerCancle () {
-      this.$refs.baseForm.resetForm()
+    handlerCancle() {
+      this.$refs.baseForm.resetForm();
       this.tabsList.forEach((item) => {
-        this.$refs['group' + item.groupId][0].resetForm()
-      })
-      this.dialogVisible = false
+        this.$refs["group" + item.groupId][0].resetForm();
+      });
+      this.dialogVisible = false;
     },
-    async submitAdd (arr) {
-      this.btnLoading = true
+    async submitAdd(arr) {
+      this.btnLoading = true;
       await this.$http
-        .post('/epmetuser/icresiuser/add', arr)
+        .post("/epmetuser/icresiuser/add", arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.$message.success('提交成功')
+            this.$message.success("提交成功");
             // this.$refs[formName].resetFields();
-            this.$refs.baseForm.resetForm()
+            this.$refs.baseForm.resetForm();
             this.tabsList.forEach((item) => {
-              this.$refs['group' + item.groupId][0].resetForm()
-            })
-            this.getTableData()
-            this.dialogVisible = false
+              this.$refs["group" + item.groupId][0].resetForm();
+            });
+            this.getTableData();
+            this.dialogVisible = false;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
     },
-    async submitEdit (arr) {
-      this.btnLoading = true
+    async submitEdit(arr) {
+      this.btnLoading = true;
       await this.$http
-        .post('/epmetuser/icresiuser/edit', arr)
+        .post("/epmetuser/icresiuser/edit", arr)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.$message.success('提交成功')
+            this.$message.success("提交成功");
             // this.$refs[formName].resetFields();
-            this.$refs.baseForm.resetForm()
+            this.$refs.baseForm.resetForm();
             this.tabsList.forEach((item) => {
-              this.$refs['group' + item.groupId][0].resetForm()
-            })
-            this.getTableData()
-            this.dialogEditVisible = false
+              this.$refs["group" + item.groupId][0].resetForm();
+            });
+            this.getTableData();
+            this.dialogEditVisible = false;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
     },
-    async getTableHeader () {
+    async getTableHeader() {
       await this.$http
-        .post('/oper/customize/icform/tableheaders', {
-          formCode: 'resi_base_info'
+        .post("/oper/customize/icform/tableheaders", {
+          formCode: "resi_base_info",
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.tableHeader = res.data
+            this.tableHeader = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    async getTableData () {
-      this.tableLoading = true
+    async getTableData() {
+      this.tableLoading = true;
       let params = {
-        formCode: 'resi_base_info',
+        formCode: "resi_base_info",
         pageNo: this.currentPage,
         pageSize: this.pageSize,
-        conditions: this.conditions
-      }
+        conditions: this.conditions,
+      };
       await this.$http
-        .post('/epmetuser/icresiuser/listresi', params)
+        .post("/epmetuser/icresiuser/listresi", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.tableData = res.data.list.map(item => {
+            this.tableData = res.data.list.map((item) => {
               return {
                 ...item,
-                isChecked: this.filterEdit(item.ORG_ID)
-              }
-            })
-            let _selAllFlagDisabled = true
-            this.tableData.forEach(item => {
-              if (item.isChecked) _selAllFlagDisabled = false
-            })
-            this.selAllFlagDisabled = _selAllFlagDisabled
-            this.total = res.data.total
+                isChecked: this.filterEdit(item.ORG_ID),
+              };
+            });
+            let _selAllFlagDisabled = true;
+            this.tableData.forEach((item) => {
+              if (item.isChecked) _selAllFlagDisabled = false;
+            });
+            this.selAllFlagDisabled = _selAllFlagDisabled;
+            this.total = res.data.total;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.tableLoading = false
+          return this.$message.error("网络错误");
+        });
+      this.tableLoading = false;
     },
-    getrowInfo (id) {
+    getrowInfo(id) {
       let params = {
-        formCode: 'resi_base_info',
-        icResiUserId: id
-      }
+        formCode: "resi_base_info",
+        icResiUserId: id,
+      };
       this.$http
-        .post('/epmetuser/icresiuser/detail', params)
+        .post("/epmetuser/icresiuser/detail", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
             // console.log('getrowInfo----', res.data)
-            let info = res.data
-            this.editTableName = { ...info }
-            let list = info[this.formList[0].tableName][0]
+            let info = res.data;
+            this.editTableName = { ...info };
+            let list = info[this.formList[0].tableName][0];
             for (let n in list) {
-              this.editForm[n] = list[n]
+              this.editForm[n] = list[n];
             }
             this.formList.forEach((item) => {
-              item.columnValue = list[item.columnName]
-              item.ID = list.ID
+              item.columnValue = list[item.columnName];
+              item.ID = list.ID;
 
               if (
-                item.columnValue == '1' &&
-                item.itemType === 'radio' &&
+                item.columnValue == "1" &&
+                item.itemType === "radio" &&
                 item.childGroup
               ) {
-                this.tabsList.push(item.childGroup)
+                this.tabsList.push(item.childGroup);
               }
 
               // if (item.childGroup && info[item.childGroup.tableName]) {
 
               // }
-            })
+            });
             this.tabsList.forEach((item) => {
-              let _info = info[item.tableName]
+              let _info = info[item.tableName];
               if (item.supportAdd) {
                 // console.log('tabsList---333', item.label)
-                const _list = [...item.itemList]
-                let mutiList = []
+                const _list = [...item.itemList];
+                let mutiList = [];
                 if (_info) {
                   _info.forEach((fo, index) => {
                     // console.log('mutiList----555' + index, mutiList, _list)
@@ -1143,212 +1238,210 @@ export default {
                         return {
                           ...m,
                           ID: fo.ID,
-                          columnValue: fo[m.columnName]
-                        }
-                      })
-                    })
+                          columnValue: fo[m.columnName],
+                        };
+                      }),
+                    });
                     // console.log('mutiList----666' + index, mutiList)
-                  })
+                  });
                 }
-                item.mutiList = mutiList
+                item.mutiList = mutiList;
               } else {
                 if (_info) {
                   item.itemList.forEach((n) => {
-                    n.ID = _info[0].ID
-                    n.columnValue = _info[0][n.columnName]
-                  })
+                    n.ID = _info[0].ID;
+                    n.columnValue = _info[0][n.columnName];
+                  });
                 }
               }
-            })
+            });
             // console.log('getrowInfo---formname', this.tabsList)
-            this.dialogEditVisible = true
+            this.dialogEditVisible = true;
           }
         })
         .catch((err) => {
-          console.log('getrowInfo---formnameerr', err)
-          return this.$message.error('网络错误')
-        })
+          console.log("getrowInfo---formnameerr", err);
+          return this.$message.error("网络错误");
+        });
     },
-    async getOptionsList (url) {
-      let options = []
+    async getOptionsList(url) {
+      let options = [];
       // console.log('getOptionsList----', url)
       await this.$http
-        .post(url, { formCode: 'resi_base_info' })
+        .post(url, { formCode: "resi_base_info" })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            options = res.data
+            options = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      return options
+          return this.$message.error("网络错误");
+        });
+      return options;
     },
-    async getSearchList () {
+    async getSearchList() {
       //  /oper/customize/icform/conditionlist
       await this.$http
-        .post('/oper/customize/icform/conditionlist-bygroup', {
-          formCode: 'resi_base_info',
-          dynamic: true
+        .post("/oper/customize/icform/conditionlist-bygroup", {
+          formCode: "resi_base_info",
+          dynamic: true,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功--sss', res)
-            
+            console.log("获取查询详情成功--sss", res);
+
             res.data.forEach((item) => {
-              item.queryItemList.forEach(n => {
-                if (n.optionSourceType === 'remote') {
+              item.queryItemList.forEach((n) => {
+                if (n.optionSourceType === "remote") {
                   this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = this.getTreeData(res)
-                  })
+                    n.options = this.getTreeData(res);
+                  });
                   // console.log('')
-                } else if (n.itemType == 'radio' && n.options.length == 0) {
+                } else if (n.itemType == "radio" && n.options.length == 0) {
                   n.options = [
-                      {
-                          label: "是",
-                          value: "1"
-                      },
-                      {
-                          label: "否",
-                          value: "0"
-                      }
-                    ]
+                    {
+                      label: "是",
+                      value: "1",
+                    },
+                    {
+                      label: "否",
+                      value: "0",
+                    },
+                  ];
                 }
-              })
-            })
-            this.searchList = res.data
+              });
+            });
+            this.searchList = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getTreeData (data) {
-      if (!Array.isArray(data)) return []
-      let arr = data.map(item => {
-        let _item = {}
+    getTreeData(data) {
+      if (!Array.isArray(data)) return [];
+      let arr = data.map((item) => {
+        let _item = {};
         if (item.children) {
-          if (item.children.length === 0) _item = { ...item, children: undefined }
-          else _item = { ...item, children: this.getTreeData(item.children) }
+          if (item.children.length === 0)
+            _item = { ...item, children: undefined };
+          else _item = { ...item, children: this.getTreeData(item.children) };
         } else {
-          _item = { ...item }
+          _item = { ...item };
         }
-        return _item
-      })
-      return arr
+        return _item;
+      });
+      return arr;
     },
-    async getFormList (type) {
+    async getFormList(type) {
       await this.$http
-        .post('/oper/customize/icform/getcustomerform', {
-          formCode: 'resi_base_info',
-          dynamic: true
+        .post("/oper/customize/icform/getcustomerform", {
+          formCode: "resi_base_info",
+          dynamic: true,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取详情成功getFormList')
-            let { itemList, groupList, formName } = res.data
-            this.formName = formName
-            this.activeName = 'group' + res.data.groupList[0].groupId
-            if (type !== 'edit') {
+            console.log("获取详情成功getFormList");
+            let { itemList, groupList, formName } = res.data;
+            this.formName = formName;
+            this.activeName = "group" + res.data.groupList[0].groupId;
+            if (type !== "edit") {
               itemList.forEach(async (item) => {
-                if (item.optionSourceType === 'remote') {
+                if (item.optionSourceType === "remote") {
                   await this.getOptionsList(item.optionSourceValue).then(
                     (res) => {
-                      item.options = this.getTreeData(res)
+                      item.options = this.getTreeData(res);
                     }
-                  )
+                  );
                 }
-              })
+              });
             }
             groupList.forEach((item) => {
               item.itemList.forEach(async (n) => {
-                n.tableName = item.tableName
-                if (n.optionSourceType === 'remote' && type !== 'edit') {
+                n.tableName = item.tableName;
+                if (n.optionSourceType === "remote" && type !== "edit") {
                   await this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = this.getTreeData(res)
-                  })
+                    n.options = this.getTreeData(res);
+                  });
                 }
-              })
-            })
+              });
+            });
             // }
-            this.formList = itemList
-            this.tabsList = groupList
+            this.formList = itemList;
+            this.tabsList = groupList;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    async getExportList (type) {
-      const url = '/oper/customize//icformitemgroup/list'
+    async getExportList(type) {
+      const url = "/oper/customize//icformitemgroup/list";
       let params = {
-        formCode: 'resi_base_info'
-      }
+        formCode: "resi_base_info",
+      };
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        data.forEach(item => {
+        data.forEach((item) => {
           (async (id) => {
             // item.queryItemList = await this.getExportChildList(id)
-            item.queryItemList = []
-          })(item.id)
-        })
-        this.exportList = [...data]
+            item.queryItemList = [];
+          })(item.id);
+        });
+        this.exportList = [...data];
         this.$nextTick(() => {
-          this.diyDialog = true
-        })
-        console.log('获取详情成功getExportList----', this.exportList)
-
+          this.diyDialog = true;
+        });
+        console.log("获取详情成功getExportList----", this.exportList);
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
-    async getExportChildList (groupId) {
-      const url = `/oper/customize/icformitem/getItemList/${groupId}`
-      let params = {}
+    async getExportChildList(groupId) {
+      const url = `/oper/customize/icformitem/getItemList/${groupId}`;
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-
-        return data
-
+        return data;
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
     },
-    async deleteresiBatch () {
-      if (this.selection.length === 0) return this.$message.error('请选择之后进行操作')
-      let userIds = this.selection.map(item => item.icResiUserId)
+    async deleteresiBatch() {
+      if (this.selection.length === 0)
+        return this.$message.error("请选择之后进行操作");
+      let userIds = this.selection.map((item) => item.icResiUserId);
       let params = {
-        formCode: 'resi_base_info',
-        userIds
-      }
+        formCode: "resi_base_info",
+        userIds,
+      };
       this.$http
-        .post('/epmetuser/icresiuser/delete', params)
+        .post("/epmetuser/icresiuser/delete", params)
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            this.$message.success('删除成功')
-            this.getTableData()
+            this.$message.success("删除成功");
+            this.getTableData();
           }
         })
         .catch((err) => {
-          console.log('row4', err)
-          return this.$message.error('网络错误')
-        })
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>

From 385cf3cc73daa1e72e624adc80bc0d404d726a31 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Oct 2022 15:13:32 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 51 ++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 5b7a8a652..ca1717579 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -53,16 +53,22 @@
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button size="small" class="diy-button--add" @click="handleAdd"
+        <el-button
+          v-if="btnAuths.ic_resi_add"
+          size="small"
+          class="diy-button--add"
+          @click="handleAdd"
           >新增</el-button
         >
         <el-button
+          v-if="ic_resi_import"
           class="diy-button--export"
           size="small"
           @click="handleExportModule('room')"
           >下载模板</el-button
         >
         <el-upload
+          v-if="ic_resi_import"
           :headers="$getElUploadHeaders()"
           ref="upload"
           class="upload-demo"
@@ -89,17 +95,25 @@
                    class="diy-button--reset"
                    :loading="exportBtn"
                    @click="handleExport">{{exportBtnTitle}}</el-button> -->
-        <el-button class="diy-button--reset" size="small" @click="diyExport"
+        <el-button
+          v-if="btnAuths.ic_resi_export"
+          class="diy-button--reset"
+          size="small"
+          @click="diyExport"
           >导出</el-button
         >
-        <el-button class="diy-button--add" size="small" @click="deleteBatch"
+        <el-button
+          v-if="btnAuths.ic_resi_batch_del"
+          class="diy-button--add"
+          size="small"
+          @click="deleteBatch"
           >批量删除</el-button
         >
         <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
 
         <el-button
           size="small"
-          v-if="displayedBaobiaoBtn"
+          v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
           class="diy-button--add"
           @click="reportForm"
           >智能填报</el-button
@@ -144,7 +158,7 @@
           <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
           <template slot-scope="scope">
             <a
-              v-if="item.columnName == 'NAME'"
+              v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
               class="name-a"
               @click="handleLook(scope.row)"
             >
@@ -164,6 +178,7 @@
                        size="small"
                        class="div-table-button--detail">变动</el-button> -->
             <el-button
+              v-if="btnAuths.ic_resi_change_rec"
               @click="handleChangeRecord(scope.row)"
               type="text"
               size="small"
@@ -172,6 +187,7 @@
             >
             <template v-if="filterEdit(scope.row.ORG_ID)">
               <el-button
+                v-if="btnAuths.ic_resi_update"
                 @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
@@ -179,6 +195,7 @@
                 >修改</el-button
               >
               <el-popconfirm
+                v-if="btnAuths.ic_resi_del"
                 title="删除之后无法回复，确认删除？"
                 @onConfirm="handleDel(scope.row)"
               >
@@ -384,6 +401,7 @@
     </el-dialog>
     <people-more
       v-if="showedPeopleMoreInfo && lookInfo.userId"
+      :view_real_data="btnAuths.view_real_data"
       :userId="lookInfo.userId"
       :gridName="lookInfo.gridName"
       @close="handleCancleLook"
@@ -476,6 +494,7 @@ export default {
 
       btnAuths: {
         ic_resi_add: false, //新增
+        ic_resi_import: false, //导入
         ic_resi_export: false, //导出
         ic_resi_batch_del: false, //批量删除
         ic_resi_smart_import: false, //智能填表
@@ -488,17 +507,6 @@ export default {
     };
   },
   props: {},
-  // 通过菜单路由配置按钮是否显示
-  beforeRouteEnter(to, from, next) {
-    next((that) => {
-      if (Array.isArray(to.meta.btns)) {
-        to.meta.btns.forEach((item) => {
-          that.btnAuths[item.permissions] = true;
-        });
-      }
-      console.log("^^^^^^^^^^^^^^^^^^btns", that.btnAuths);
-    });
-  },
   async activated() {
     console.log("this.$route.query---", this.$route.query);
     if (this.$route.query && this.$route.query.columnName) {
@@ -519,6 +527,8 @@ export default {
     },
   },
   async created() {
+    this.updateBtnAuths();
+
     if (this.$route.query) {
       let query = this.$route.query;
       this.defaultCategotyKey = query.columnName;
@@ -553,6 +563,15 @@ export default {
     });
   },
   methods: {
+    // 更新按钮权限
+    updateBtnAuths() {
+      let rot = this.router.currentRoute;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
     reportForm() {
       this.$refs.baobiao.init({
         elseParams: {

From 79d5abe611397cb70117d311297f3e6d4915bc9d Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Oct 2022 15:16:31 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/resi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index ca1717579..4f6a8443b 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -565,7 +565,7 @@ export default {
   methods: {
     // 更新按钮权限
     updateBtnAuths() {
-      let rot = this.router.currentRoute;
+      let rot = this.$route;
       if (Array.isArray(rot.meta.btns)) {
         rot.meta.btns.forEach((item) => {
           this.btnAuths[item.permissions] = true;

From e2748ba3a8b375a62734eb8952ddf4b4c39ecde8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Oct 2022 15:30:01 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/roomTable.vue      | 470 ++++++++++--------
 src/views/modules/base/resi.vue               |   6 +-
 2 files changed, 270 insertions(+), 206 deletions(-)

diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 354b3684d..40ea34e7c 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1,204 +1,245 @@
 <template>
   <div>
     <div class="div_btn">
-      <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
-                 style="float: left"
-                 class="diy-button--add"
-                 size="small"
-                 @click="handleAdd">新增房屋</el-button>
-      <div class="btn_upload"
-           v-if="showImportBtn">
-        <el-button :headers="$getElUploadHeaders()"
-                   style="float: left"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule">下载房屋模板</el-button>
-        <el-upload ref="upload"
-                   :multiple="false"
-                   :show-file-list="false"
-                   :before-upload="beforeUpload"
-                   action=""
-                   accept=".xls,.xlsx"
-                   :limit="1"
-                   :on-exceed="handleExceed"
-                   :http-request="uploadFile">
-          <el-button style="margin-left: 10px"
-                     size="small"
-                     class="diy-button--delete">导入房屋数据</el-button>
+      <el-button
+        v-if="agencyObj.level === 'building' || source !== 'search'"
+        v-show="btnAuths.ic_house_add"
+        style="float: left"
+        class="diy-button--add"
+        size="small"
+        @click="handleAdd"
+        >新增房屋</el-button
+      >
+      <div class="btn_upload" v-if="showImportBtn">
+        <el-button
+          :headers="$getElUploadHeaders()"
+          v-if="btnAuths.ic_house_import"
+          style="float: left"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule"
+          >下载房屋模板</el-button
+        >
+        <el-upload
+          ref="upload"
+          v-if="btnAuths.ic_house_import"
+          :multiple="false"
+          :show-file-list="false"
+          :before-upload="beforeUpload"
+          action=""
+          accept=".xls,.xlsx"
+          :limit="1"
+          :on-exceed="handleExceed"
+          :http-request="uploadFile"
+        >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--delete"
+            >导入房屋数据</el-button
+          >
         </el-upload>
       </div>
-      <el-button style="float: left; margin-left: 10px"
-                 class="diy-button--reset"
-                 size="small"
-                 @click="handleExport">导出</el-button>
-      <el-button style="float: left; margin-left: 10px"
-                 class="diy-button--more"
-                 size="small"
-                 @click="deleteBatch">批量删除</el-button>
-      <el-button style="margin-left: 10px"
-                 class="diy-button--export"
-                 size="small"
-                 :disabled="yihuyidangDisabled"
-                 @click="handleExportYihuyidang()">导出一户一档</el-button>
-      <el-button size="small"
-                 class="diy-button--add"
-                 v-if="displayedBaobiaoBtn"
-                 @click="reportForm">智能填报</el-button>
+      <el-button
+        style="float: left; margin-left: 10px"
+        v-if="btnAuths.ic_house_export"
+        class="diy-button--reset"
+        size="small"
+        @click="handleExport"
+        >导出</el-button
+      >
+      <el-button
+        style="float: left; margin-left: 10px"
+        v-if="btnAuths.ic_house_batch_del"
+        class="diy-button--more"
+        size="small"
+        @click="deleteBatch"
+        >批量删除</el-button
+      >
+      <el-button
+        style="margin-left: 10px"
+        v-if="btnAuths.ic_house_export_yhyd"
+        class="diy-button--export"
+        size="small"
+        :disabled="yihuyidangDisabled"
+        @click="handleExportYihuyidang()"
+        >导出一户一档</el-button
+      >
+      <el-button
+        size="small"
+        class="diy-button--add"
+        v-if="displayedBaobiaoBtn"
+        @click="reportForm"
+        >智能填报</el-button
+      >
     </div>
 
     <div class="div_table_item">
-      <el-table ref="ref_table"
-                :data="tableData"
-                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-                v-loading="tableLoading"
-                @sort-change="handleSortOrderChange"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                @select-all="selectAll"
-                @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
+      <el-table
+        ref="ref_table"
+        :data="tableData"
+        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+        v-loading="tableLoading"
+        @sort-change="handleSortOrderChange"
+        border
+        :height="tableHeight"
+        style="width: 100%"
+        @select-all="selectAll"
+        @selection-change="selectionChange"
+      >
+        <el-table-column type="selection" :selectable="checkSelect" width="55">
         </el-table-column>
-        <el-table-column fixed="left"
-                         width="55"
-                         type="index"
-                         label="序号"
-                         :index="indexMethod">
+        <el-table-column
+          fixed="left"
+          width="55"
+          type="index"
+          label="序号"
+          :index="indexMethod"
+        >
         </el-table-column>
 
-        <el-table-column prop="houseNameShow"
-                         label="房屋名称"
-                         fixed="left"
-                         min-width="160">
+        <el-table-column
+          prop="houseNameShow"
+          label="房屋名称"
+          fixed="left"
+          min-width="160"
+        >
         </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="所属小区"
-                         min-width="150">
+        <el-table-column
+          prop="neighborHoodName"
+          label="所属小区"
+          min-width="150"
+        >
         </el-table-column>
-        <el-table-column prop="buildingName"
-                         label="所属楼栋"
-                         width="80">
+        <el-table-column prop="buildingName" label="所属楼栋" width="80">
         </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号"
-                         width="70">
+        <el-table-column prop="unitNum" label="单元号" width="70">
         </el-table-column>
-        <el-table-column prop="doorName"
-                         label="门牌号"
-                         width="70">
+        <el-table-column prop="doorName" label="门牌号" width="70">
         </el-table-column>
-        <el-table-column prop="houseType"
-                         label="类型"
-                         width="50">
+        <el-table-column prop="houseType" label="类型" width="50">
         </el-table-column>
-        <el-table-column prop="purpose"
-                         label="用途"
-                         width="50">
+        <el-table-column prop="purpose" label="用途" width="50">
         </el-table-column>
-        <el-table-column prop="rentFlag"
-                         label="房屋状态"
-                         width="80">
+        <el-table-column prop="rentFlag" label="房屋状态" width="80">
         </el-table-column>
-        <el-table-column prop="ownerName"
-                         label="房主姓名"
-                         width="90">
+        <el-table-column prop="ownerName" label="房主姓名" width="90">
         </el-table-column>
-        <el-table-column prop="ownerPhone"
-                         label="联系方式"
-                         width="110">
+        <el-table-column prop="ownerPhone" label="联系方式" width="110">
         </el-table-column>
-        <el-table-column prop="ownerIdCard"
-                         label="身份证"
-                         width="170">
+        <el-table-column prop="ownerIdCard" label="身份证" width="170">
         </el-table-column>
-        <el-table-column prop="remark"
-                         label="备注"
-                         width="170">
+        <el-table-column prop="remark" label="备注" width="170">
         </el-table-column>
 
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="140"
-                         label="排序">
+        <el-table-column
+          prop="sort"
+          sortable="custom"
+          min-width="140"
+          label="排序"
+        >
           <template slot-scope="scope">
             <div @click="handleEditSort(scope.row)">
               <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               :precision="2"
-                               size="small"
-                               :min="0"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
+              <el-input-number
+                v-else
+                @change="handleChangeSort(scope.row)"
+                v-model="scope.row.sort"
+                class="item_width_4"
+                :precision="2"
+                size="small"
+                :min="0"
+                :max="9999"
+                label="描述文字"
+              ></el-input-number>
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
-                         header-align="center"
-                         align="center"
-                         class="operate">
+        <el-table-column
+          label="操作"
+          fixed="right"
+          width="140"
+          header-align="center"
+          align="center"
+          class="operate"
+        >
           <template slot-scope="scope">
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-button v-if="scope.row.showBtn"
-                       type="text"
-                       class="div-table-button--delete"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+            <el-button
+              type="text"
+              v-if="btnAuths.ic_house_view"
+              class="div-table-button--detail"
+              size="small"
+              @click="handleDetail(scope.row)"
+              >查看</el-button
+            >
+            <el-button
+              v-if="btnAuths.ic_house_update && scope.row.showBtn"
+              type="text"
+              class="div-table-button--edit"
+              size="small"
+              @click="handleEdit(scope.row)"
+              >修改</el-button
+            >
+
+            <el-button
+              v-if="btnAuths.ic_house_del && scope.row.showBtn"
+              type="text"
+              class="div-table-button--delete"
+              size="small"
+              @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
         </el-pagination>
       </div>
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <room-form ref="ref_form"
-                 @dialogCancle="addFormCancle"
-                 @dialogOk="addFormOk"></room-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <room-form
+        ref="ref_form"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      ></room-form>
     </el-dialog>
 
     <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
-      <room-detail ref="ref_form_detail"
-                   @diaDetailClose="detailFormCancle"></room-detail>
+    <el-dialog
+      :visible.sync="detailShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="detailFormCancle"
+    >
+      <room-detail
+        ref="ref_form_detail"
+        :view_real_data="btnAuths.ic_house_view_real_data"
+        @diaDetailClose="detailFormCancle"
+      ></room-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
@@ -215,7 +256,7 @@ import baobiao from "@/views/modules/cpts/baobiao";
 
 let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       source: "tree", //来源
       importRoomLoading: false,
@@ -259,22 +300,35 @@ export default {
       yihuyidangDisabled: false,
 
       displayedBaobiaoBtn: false,
+
+      btnAuths: {
+        ic_house_add: false, //新增
+        ic_house_import: false, //导入
+        ic_house_export: false, //导出
+        ic_house_batch_del: false, //批量删除
+        ic_house_export_yhyd: false, //导出一户一档
+        ic_house_del: false, //删除
+        ic_house_view: false, //查看
+        ic_house_update: false, //修改
+        ic_house_view_real_data: false, //显示脱敏信息
+      },
     };
   },
   components: {
     baobiao,
     roomForm,
-    roomDetail
+    roomDetail,
   },
-  async mounted () {
+  async mounted() {
     this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
       elseParams: {
-        categoryKeys: ['house_info'], categoryKey: 'house_info',
-      }
+        categoryKeys: ["house_info"],
+        categoryKey: "house_info",
+      },
     });
   },
   computed: {
-    tableHeight () {
+    tableHeight() {
       return this.$store.state.inIframe
         ? this.clientHeight - 425 + this.iframeHeight
         : this.clientHeight - 425;
@@ -283,7 +337,17 @@ export default {
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   methods: {
-    reportForm () {
+    // 更新按钮权限
+    updateBtnAuths() {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
+    reportForm() {
       let paramMap = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -307,25 +371,25 @@ export default {
       });
     },
 
-    indexMethod (index) {
+    indexMethod(index) {
       return index + 1;
     },
-    handleSortOrderChange (value) {
+    handleSortOrderChange(value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
-    handleSortChange (value) {
+    handleSortChange(value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
 
-    handleEditSort (row) {
+    handleEditSort(row) {
       if (!row.isChange) {
         row.isChange = true;
       }
     },
 
-    async handleChangeSort (row, index) {
+    async handleChangeSort(row, index) {
       // row.isChange = false
 
       let params = {
@@ -348,7 +412,7 @@ export default {
       }
     },
 
-    checkSelect (row, index) {
+    checkSelect(row, index) {
       let isChecked = false;
       if (row.showBtn) {
         // 判断里面是否存在某个参数
@@ -359,9 +423,9 @@ export default {
       return isChecked;
     },
 
-    loadTreeFromSearch () { },
+    loadTreeFromSearch() {},
 
-    async loadTable (source, treeObj) {
+    async loadTable(source, treeObj) {
       this.source = source;
       this.tableLoading = true;
 
@@ -434,32 +498,32 @@ export default {
       this.tableLoading = false;
     },
 
-    diaClose () {
+    diaClose() {
       this.$refs.ref_form.resetData();
       this.formShow = false;
     },
 
-    handleDetail (row) {
+    handleDetail(row) {
       // this.formTitle = "房屋详情";
       // this.formShow = true;
       // this.$nextTick(() => {
       //   this.$refs.ref_form.initForm("detail", row, this.agencyObj);
       // });
 
-      this.detailShow = true
+      this.detailShow = true;
 
       // const _data = await this.detail(row)
       this.$nextTick(() => {
-        this.$refs.ref_form_detail.initForm(row, this.agencyObj)
-      })
+        this.$refs.ref_form_detail.initForm(row, this.agencyObj);
+      });
     },
 
-    detailFormCancle () {
+    detailFormCancle() {
       // this.$refs.ref_form_detail.diaDestroy()
-      this.detailShow = false
+      this.detailShow = false;
     },
 
-    handleAdd () {
+    handleAdd() {
       this.formTitle = "新增房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -467,7 +531,7 @@ export default {
       });
     },
 
-    handleEdit (row) {
+    handleEdit(row) {
       this.formTitle = "修改房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -475,15 +539,15 @@ export default {
       });
     },
 
-    addFormCancle () {
+    addFormCancle() {
       this.formShow = false;
     },
-    addFormOk () {
+    addFormOk() {
       this.formShow = false;
       this.loadTable();
     },
 
-    deleteBatch () {
+    deleteBatch() {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的房屋?", "提示", {
           confirmButtonText: "确定",
@@ -505,14 +569,14 @@ export default {
         this.$message.warning("请先选择要删除的房屋");
       }
     },
-    selectAll (selection) {
+    selectAll(selection) {
       this.selection = selection;
     },
-    selectionChange (selection) {
+    selectionChange(selection) {
       this.selection = selection;
     },
 
-    async handleDelete (row) {
+    async handleDelete(row) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -531,7 +595,7 @@ export default {
         });
     },
 
-    async deleteCommunityBatch () {
+    async deleteCommunityBatch() {
       let ids = [];
       this.selection.forEach((element) => {
         ids.push(element.houseId);
@@ -566,7 +630,7 @@ export default {
       }
     },
 
-    async deleteRoom (row) {
+    async deleteRoom(row) {
       const url = "/gov/org/house/housedel";
 
       let params = {
@@ -588,7 +652,7 @@ export default {
     },
 
     //导出表格
-    async handleExport () {
+    async handleExport() {
       let title = this.agencyObj.label;
       title = title + "—房屋列表";
 
@@ -639,7 +703,7 @@ export default {
     },
 
     // 下载文件
-    download (data, fileName) {
+    download(data, fileName) {
       if (!data) {
         return;
       }
@@ -663,7 +727,7 @@ export default {
       }
     },
 
-    handleExportModule () {
+    handleExportModule() {
       let title = "";
       title = "房屋模板";
 
@@ -683,7 +747,7 @@ export default {
     },
 
     //导出一户一档
-    handleExportYihuyidang () {
+    handleExportYihuyidang() {
       this.yihuyidangDisabled = true;
       let title = this.agencyObj.label;
       title = title + "-一户一档";
@@ -739,7 +803,7 @@ export default {
       );
     },
     // 上传文件之前的钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       this.files = file;
 
       const isText = file.type === "application/vnd.ms-excel";
@@ -756,11 +820,11 @@ export default {
       }
     },
     // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
+    handleExceed(files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile () {
+    async uploadFile() {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -809,7 +873,7 @@ export default {
       );
     },
 
-    showMessage (msg) {
+    showMessage(msg) {
       this.$alert(msg, "操作结果", {
         confirmButtonText: "关闭",
         callback: (action) => {
@@ -819,18 +883,18 @@ export default {
       });
     },
 
-    handleSizeChange (val) {
+    handleSizeChange(val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange (val) {
+    handleCurrentChange(val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -838,7 +902,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -846,7 +910,7 @@ export default {
     },
   },
   watch: {
-    selection (val) {
+    selection(val) {
       if (val.length > 0) {
         this.showDeletBtn = true;
       } else {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 4f6a8443b..09456c5e8 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -61,14 +61,14 @@
           >新增</el-button
         >
         <el-button
-          v-if="ic_resi_import"
+          v-if="btnAuths.ic_resi_import"
           class="diy-button--export"
           size="small"
           @click="handleExportModule('room')"
           >下载模板</el-button
         >
         <el-upload
-          v-if="ic_resi_import"
+          v-if="btnAuths.ic_resi_import"
           :headers="$getElUploadHeaders()"
           ref="upload"
           class="upload-demo"
@@ -401,7 +401,7 @@
     </el-dialog>
     <people-more
       v-if="showedPeopleMoreInfo && lookInfo.userId"
-      :view_real_data="btnAuths.view_real_data"
+      :view_real_data="btnAuths.ic_resi_view_real_data"
       :userId="lookInfo.userId"
       :gridName="lookInfo.gridName"
       @close="handleCancleLook"

From 688153aedc80bbaea28d60710b09177140735627 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Oct 2022 15:36:53 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/roomTable.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 40ea34e7c..9d6473450 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -68,7 +68,7 @@
       <el-button
         size="small"
         class="diy-button--add"
-        v-if="displayedBaobiaoBtn"
+        v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn"
         @click="reportForm"
         >智能填报</el-button
       >
@@ -307,6 +307,7 @@ export default {
         ic_house_export: false, //导出
         ic_house_batch_del: false, //批量删除
         ic_house_export_yhyd: false, //导出一户一档
+        ic_house_smart_import: false, //智能填表
         ic_house_del: false, //删除
         ic_house_view: false, //查看
         ic_house_update: false, //修改
@@ -320,6 +321,8 @@ export default {
     roomDetail,
   },
   async mounted() {
+    this.updateBtnAuths();
+
     this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
       elseParams: {
         categoryKeys: ["house_info"],

From f743b9b8112cabf777cf102ef5de284224be720f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 17 Oct 2022 16:47:49 +0800
Subject: [PATCH 7/8] 11

---
 src/assets/scss/people-info.scss              |   7 +
 .../modules/base/community/roomDetail.vue     |  43 +-
 src/views/modules/base/community/roomForm.vue |  57 ++-
 .../modules/base/community/roomTable.vue      | 444 ++++++++----------
 src/views/modules/shequ/cpts/people-more.vue  | 440 ++++++++---------
 .../modules/shequzhili/event/cpts/add.vue     | 412 +++++++---------
 .../modules/visual/command/cpts/popup.vue     | 175 +++----
 src/views/modules/workSys/operAuth.vue        |  99 ++--
 8 files changed, 807 insertions(+), 870 deletions(-)

diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index b0aca9ec0..5aeac2e12 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -20,6 +20,7 @@
             width: 1180px;
             overflow-y: auto;
             overflow-x: hidden;
+            position: relative;
         }
 
         .title {
@@ -40,6 +41,12 @@
             }
         }
 
+        .div_tuomin{
+          position: absolute;
+          top:25px;
+          right:40px;
+        }
+
         .btn-close {
             position: absolute;
             z-index: 2;
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index 45bc21fc3..5570d3d7c 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -1,7 +1,12 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-
+      <div class="div_tuomin">
+        <el-button v-if="view_real_data"
+                   size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <div v-if="initLoading"
            class="m-row">
         <div class="m-info">
@@ -51,11 +56,11 @@
           </div>
           <div class="info-prop">
             <span class="info-title-2">联系方式：</span>
-            <span>{{dataForm.ownerPhone?dataForm.ownerPhone:'--' }}</span>
+            <span>{{dataForm.showOwnerPhone?dataForm.showOwnerPhone:'--' }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">房主身份证：</span>
-            <span>{{dataForm.ownerIdCard?dataForm.ownerIdCard:'--' }}</span>
+            <span>{{dataForm.showOwnerIdCard?dataForm.showOwnerIdCard:'--' }}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">备注：</span>
@@ -164,6 +169,24 @@ export default {
 
     },
 
+    async handleTuomin () {
+      const url = "/gov/org/ichouse/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.houseId,
+        type: "house",
+      });
+
+      if (code === 0) {
+        this.$set(this.dataForm, 'showOwnerPhone', data.mobile)
+        this.$set(this.dataForm, 'showOwnerIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+
     async loadHouseInfo () {
 
       const url = "/gov/org/ichouse/" + this.houseId
@@ -261,9 +284,21 @@ export default {
     },
 
   },
-  props: {}
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  }
 }
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/detail-main.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
 </style>
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 98cc148fe..2d6bfc00c 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -1,6 +1,12 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
+      <div v-if="false"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <el-form ref="ref_form"
                :inline="false"
                :model="dataForm"
@@ -39,7 +45,8 @@
                     v-model="dataForm.doorName">
           </el-input>
         </el-form-item>
-        <el-form-item v-if="formType != 'detail'" label="房屋编码"
+        <el-form-item v-if="formType != 'detail'"
+                      label="房屋编码"
                       prop="coding"
                       label-width="150px"
                       style="display: block">
@@ -47,12 +54,12 @@
                     maxlength="50"
                     placeholder="请输入楼栋编码"
                     v-model="dataForm.coding">
-          
+
           </el-input>
           <el-button style="margin-left: 10px"
-                       type="primary"
-                       size="small"
-                       @click="handleCode">生成</el-button>
+                     type="primary"
+                     size="small"
+                     @click="handleCode">生成</el-button>
         </el-form-item>
         <div v-if="formType === 'detail'">
           <el-form-item label="房屋编码"
@@ -225,6 +232,7 @@ export default {
   },
 
   methods: {
+
     async initForm (type, row, agencyObj) {
 
       this.$refs.ref_form.resetFields();
@@ -245,7 +253,7 @@ export default {
         // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
 
       } else {
-        
+
         this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
         this.dataForm.buildingId = this.agencyObj.id
       }
@@ -255,6 +263,24 @@ export default {
 
     },
 
+    async handleTuomin () {
+      const url = "/gov/org/ichouse/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.houseId,
+        type: "house",
+      });
+
+      if (code === 0) {
+        this.$set(this.dataForm, 'ownerPhone', data.mobile)
+        this.$set(this.dataForm, 'ownerIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+
     async loadHouseInfo () {
 
       const url = "/gov/org/ichouse/" + this.houseId
@@ -292,15 +318,15 @@ export default {
         this.$message.error(msg)
       }
     },
-    async handleCode() {
+    async handleCode () {
       if (!this.dataForm.buildingUnitId) return this.$message.error('请选择单元')
       const { data, code, msg } = await requestPost(
         "/gov/org/houseInformation/getHouseCoding/" + this.dataForm.buildingUnitId);
       if (msg == "success" && code == 0) {
         this.dataForm.coding = data.coding
         this.dataForm.sysCoding = data.sysCoding
-        
-      } 
+
+      }
     },
 
     async handleComfirm () {
@@ -450,9 +476,20 @@ export default {
     },
 
   },
-  props: {}
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  }
 }
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/visual/communityManageForm.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+}
 </style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 9d6473450..c16620f39 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -1,245 +1,213 @@
 <template>
   <div>
     <div class="div_btn">
-      <el-button
-        v-if="agencyObj.level === 'building' || source !== 'search'"
-        v-show="btnAuths.ic_house_add"
-        style="float: left"
-        class="diy-button--add"
-        size="small"
-        @click="handleAdd"
-        >新增房屋</el-button
-      >
-      <div class="btn_upload" v-if="showImportBtn">
-        <el-button
-          :headers="$getElUploadHeaders()"
-          v-if="btnAuths.ic_house_import"
-          style="float: left"
-          class="diy-button--export"
-          size="small"
-          @click="handleExportModule"
-          >下载房屋模板</el-button
-        >
-        <el-upload
-          ref="upload"
-          v-if="btnAuths.ic_house_import"
-          :multiple="false"
-          :show-file-list="false"
-          :before-upload="beforeUpload"
-          action=""
-          accept=".xls,.xlsx"
-          :limit="1"
-          :on-exceed="handleExceed"
-          :http-request="uploadFile"
-        >
-          <el-button
-            style="margin-left: 10px"
-            size="small"
-            class="diy-button--delete"
-            >导入房屋数据</el-button
-          >
+      <el-button v-if="agencyObj.level === 'building' || source !== 'search'"
+                 v-show="btnAuths.ic_house_add"
+                 style="float: left"
+                 class="diy-button--add"
+                 size="small"
+                 @click="handleAdd">新增房屋</el-button>
+      <div class="btn_upload"
+           v-if="showImportBtn">
+        <el-button :headers="$getElUploadHeaders()"
+                   v-if="btnAuths.ic_house_import"
+                   style="float: left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载房屋模板</el-button>
+        <el-upload ref="upload"
+                   v-if="btnAuths.ic_house_import"
+                   :multiple="false"
+                   :show-file-list="false"
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--delete">导入房屋数据</el-button>
         </el-upload>
       </div>
-      <el-button
-        style="float: left; margin-left: 10px"
-        v-if="btnAuths.ic_house_export"
-        class="diy-button--reset"
-        size="small"
-        @click="handleExport"
-        >导出</el-button
-      >
-      <el-button
-        style="float: left; margin-left: 10px"
-        v-if="btnAuths.ic_house_batch_del"
-        class="diy-button--more"
-        size="small"
-        @click="deleteBatch"
-        >批量删除</el-button
-      >
-      <el-button
-        style="margin-left: 10px"
-        v-if="btnAuths.ic_house_export_yhyd"
-        class="diy-button--export"
-        size="small"
-        :disabled="yihuyidangDisabled"
-        @click="handleExportYihuyidang()"
-        >导出一户一档</el-button
-      >
-      <el-button
-        size="small"
-        class="diy-button--add"
-        v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn"
-        @click="reportForm"
-        >智能填报</el-button
-      >
+      <el-button style="float: left; margin-left: 10px"
+                 v-if="btnAuths.ic_house_export"
+                 class="diy-button--reset"
+                 size="small"
+                 @click="handleExport">导出</el-button>
+      <el-button style="float: left; margin-left: 10px"
+                 v-if="btnAuths.ic_house_batch_del"
+                 class="diy-button--more"
+                 size="small"
+                 @click="deleteBatch">批量删除</el-button>
+      <el-button style="margin-left: 10px"
+                 v-if="btnAuths.ic_house_export_yhyd"
+                 class="diy-button--export"
+                 size="small"
+                 :disabled="yihuyidangDisabled"
+                 @click="handleExportYihuyidang()">导出一户一档</el-button>
+      <el-button size="small"
+                 class="diy-button--add"
+                 v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn"
+                 @click="reportForm">智能填报</el-button>
     </div>
 
     <div class="div_table_item">
-      <el-table
-        ref="ref_table"
-        :data="tableData"
-        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        v-loading="tableLoading"
-        @sort-change="handleSortOrderChange"
-        border
-        :height="tableHeight"
-        style="width: 100%"
-        @select-all="selectAll"
-        @selection-change="selectionChange"
-      >
-        <el-table-column type="selection" :selectable="checkSelect" width="55">
+      <el-table ref="ref_table"
+                :data="tableData"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                v-loading="tableLoading"
+                @sort-change="handleSortOrderChange"
+                border
+                :height="tableHeight"
+                style="width: 100%"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55">
         </el-table-column>
-        <el-table-column
-          fixed="left"
-          width="55"
-          type="index"
-          label="序号"
-          :index="indexMethod"
-        >
+        <el-table-column fixed="left"
+                         width="55"
+                         type="index"
+                         label="序号"
+                         :index="indexMethod">
         </el-table-column>
 
-        <el-table-column
-          prop="houseNameShow"
-          label="房屋名称"
-          fixed="left"
-          min-width="160"
-        >
+        <el-table-column prop="houseNameShow"
+                         label="房屋名称"
+                         fixed="left"
+                         min-width="160">
         </el-table-column>
-        <el-table-column
-          prop="neighborHoodName"
-          label="所属小区"
-          min-width="150"
-        >
+        <el-table-column prop="neighborHoodName"
+                         label="所属小区"
+                         min-width="150">
         </el-table-column>
-        <el-table-column prop="buildingName" label="所属楼栋" width="80">
+        <el-table-column prop="buildingName"
+                         label="所属楼栋"
+                         width="80">
         </el-table-column>
-        <el-table-column prop="unitNum" label="单元号" width="70">
+        <el-table-column prop="unitNum"
+                         label="单元号"
+                         width="70">
         </el-table-column>
-        <el-table-column prop="doorName" label="门牌号" width="70">
+        <el-table-column prop="doorName"
+                         label="门牌号"
+                         width="70">
         </el-table-column>
-        <el-table-column prop="houseType" label="类型" width="50">
+        <el-table-column prop="houseType"
+                         label="类型"
+                         width="50">
         </el-table-column>
-        <el-table-column prop="purpose" label="用途" width="50">
+        <el-table-column prop="purpose"
+                         label="用途"
+                         width="50">
         </el-table-column>
-        <el-table-column prop="rentFlag" label="房屋状态" width="80">
+        <el-table-column prop="rentFlag"
+                         label="房屋状态"
+                         width="80">
         </el-table-column>
-        <el-table-column prop="ownerName" label="房主姓名" width="90">
+        <el-table-column prop="ownerName"
+                         label="房主姓名"
+                         width="90">
         </el-table-column>
-        <el-table-column prop="ownerPhone" label="联系方式" width="110">
+        <el-table-column prop="ownerPhone"
+                         label="联系方式"
+                         width="110">
         </el-table-column>
-        <el-table-column prop="ownerIdCard" label="身份证" width="170">
+        <el-table-column prop="ownerIdCard"
+                         label="身份证"
+                         width="170">
         </el-table-column>
-        <el-table-column prop="remark" label="备注" width="170">
+        <el-table-column prop="remark"
+                         label="备注"
+                         width="170">
         </el-table-column>
 
-        <el-table-column
-          prop="sort"
-          sortable="custom"
-          min-width="140"
-          label="排序"
-        >
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="140"
+                         label="排序">
           <template slot-scope="scope">
             <div @click="handleEditSort(scope.row)">
               <span v-if="!scope.row.isChange">{{ scope.row.sort }}</span>
-              <el-input-number
-                v-else
-                @change="handleChangeSort(scope.row)"
-                v-model="scope.row.sort"
-                class="item_width_4"
-                :precision="2"
-                size="small"
-                :min="0"
-                :max="9999"
-                label="描述文字"
-              ></el-input-number>
+              <el-input-number v-else
+                               @change="handleChangeSort(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :precision="2"
+                               size="small"
+                               :min="0"
+                               :max="9999"
+                               label="描述文字"></el-input-number>
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          fixed="right"
-          width="140"
-          header-align="center"
-          align="center"
-          class="operate"
-        >
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              v-if="btnAuths.ic_house_view"
-              class="div-table-button--detail"
-              size="small"
-              @click="handleDetail(scope.row)"
-              >查看</el-button
-            >
-            <el-button
-              v-if="btnAuths.ic_house_update && scope.row.showBtn"
-              type="text"
-              class="div-table-button--edit"
-              size="small"
-              @click="handleEdit(scope.row)"
-              >修改</el-button
-            >
-
-            <el-button
-              v-if="btnAuths.ic_house_del && scope.row.showBtn"
-              type="text"
-              class="div-table-button--delete"
-              size="small"
-              @click="handleDelete(scope.row)"
-              >删除</el-button
-            >
+            <el-button type="text"
+                       v-if="btnAuths.ic_house_view"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button v-if="btnAuths.ic_house_update && scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="btnAuths.ic_house_del && scope.row.showBtn"
+                       type="text"
+                       class="div-table-button--delete"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="pageSize"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
     </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="formShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="formTitle"
-      width="900px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <room-form
-        ref="ref_form"
-        @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"
-      ></room-form>
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <room-form ref="ref_form"
+                 :view_real_data="btnAuths.ic_house_view_real_data"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></room-form>
     </el-dialog>
 
     <!-- 详情弹出框 -->
-    <el-dialog
-      :visible.sync="detailShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="formTitle"
-      width="900px"
-      top="5vh"
-      class="dialog-h"
-      @closed="detailFormCancle"
-    >
-      <room-detail
-        ref="ref_form_detail"
-        :view_real_data="btnAuths.ic_house_view_real_data"
-        @diaDetailClose="detailFormCancle"
-      ></room-detail>
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'查看房屋'"
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="detailFormCancle">
+      <room-detail ref="ref_form_detail"
+                   :view_real_data="btnAuths.ic_house_view_real_data"
+                   @diaDetailClose="detailFormCancle"></room-detail>
     </el-dialog>
 
     <baobiao ref="baobiao" />
@@ -256,7 +224,7 @@ import baobiao from "@/views/modules/cpts/baobiao";
 
 let loading; // 加载动画
 export default {
-  data() {
+  data () {
     return {
       source: "tree", //来源
       importRoomLoading: false,
@@ -320,7 +288,7 @@ export default {
     roomForm,
     roomDetail,
   },
-  async mounted() {
+  async mounted () {
     this.updateBtnAuths();
 
     this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
@@ -331,7 +299,7 @@ export default {
     });
   },
   computed: {
-    tableHeight() {
+    tableHeight () {
       return this.$store.state.inIframe
         ? this.clientHeight - 425 + this.iframeHeight
         : this.clientHeight - 425;
@@ -341,7 +309,7 @@ export default {
   },
   methods: {
     // 更新按钮权限
-    updateBtnAuths() {
+    updateBtnAuths () {
       let rot = this.$route;
       if (Array.isArray(rot.meta.btns)) {
         rot.meta.btns.forEach((item) => {
@@ -350,7 +318,7 @@ export default {
       }
     },
 
-    reportForm() {
+    reportForm () {
       let paramMap = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -374,25 +342,25 @@ export default {
       });
     },
 
-    indexMethod(index) {
+    indexMethod (index) {
       return index + 1;
     },
-    handleSortOrderChange(value) {
+    handleSortOrderChange (value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
-    handleSortChange(value) {
+    handleSortChange (value) {
       this.sortType = value.order === "ascending" ? "asc" : "desc";
       this.loadTable();
     },
 
-    handleEditSort(row) {
+    handleEditSort (row) {
       if (!row.isChange) {
         row.isChange = true;
       }
     },
 
-    async handleChangeSort(row, index) {
+    async handleChangeSort (row, index) {
       // row.isChange = false
 
       let params = {
@@ -415,7 +383,7 @@ export default {
       }
     },
 
-    checkSelect(row, index) {
+    checkSelect (row, index) {
       let isChecked = false;
       if (row.showBtn) {
         // 判断里面是否存在某个参数
@@ -426,9 +394,9 @@ export default {
       return isChecked;
     },
 
-    loadTreeFromSearch() {},
+    loadTreeFromSearch () { },
 
-    async loadTable(source, treeObj) {
+    async loadTable (source, treeObj) {
       this.source = source;
       this.tableLoading = true;
 
@@ -501,12 +469,12 @@ export default {
       this.tableLoading = false;
     },
 
-    diaClose() {
+    diaClose () {
       this.$refs.ref_form.resetData();
       this.formShow = false;
     },
 
-    handleDetail(row) {
+    handleDetail (row) {
       // this.formTitle = "房屋详情";
       // this.formShow = true;
       // this.$nextTick(() => {
@@ -521,12 +489,12 @@ export default {
       });
     },
 
-    detailFormCancle() {
+    detailFormCancle () {
       // this.$refs.ref_form_detail.diaDestroy()
       this.detailShow = false;
     },
 
-    handleAdd() {
+    handleAdd () {
       this.formTitle = "新增房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -534,7 +502,7 @@ export default {
       });
     },
 
-    handleEdit(row) {
+    handleEdit (row) {
       this.formTitle = "修改房屋";
       this.formShow = true;
       this.$nextTick(() => {
@@ -542,15 +510,15 @@ export default {
       });
     },
 
-    addFormCancle() {
+    addFormCancle () {
       this.formShow = false;
     },
-    addFormOk() {
+    addFormOk () {
       this.formShow = false;
       this.loadTable();
     },
 
-    deleteBatch() {
+    deleteBatch () {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的房屋?", "提示", {
           confirmButtonText: "确定",
@@ -572,14 +540,14 @@ export default {
         this.$message.warning("请先选择要删除的房屋");
       }
     },
-    selectAll(selection) {
+    selectAll (selection) {
       this.selection = selection;
     },
-    selectionChange(selection) {
+    selectionChange (selection) {
       this.selection = selection;
     },
 
-    async handleDelete(row) {
+    async handleDelete (row) {
       this.$confirm("确认删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -598,7 +566,7 @@ export default {
         });
     },
 
-    async deleteCommunityBatch() {
+    async deleteCommunityBatch () {
       let ids = [];
       this.selection.forEach((element) => {
         ids.push(element.houseId);
@@ -633,7 +601,7 @@ export default {
       }
     },
 
-    async deleteRoom(row) {
+    async deleteRoom (row) {
       const url = "/gov/org/house/housedel";
 
       let params = {
@@ -655,7 +623,7 @@ export default {
     },
 
     //导出表格
-    async handleExport() {
+    async handleExport () {
       let title = this.agencyObj.label;
       title = title + "—房屋列表";
 
@@ -706,7 +674,7 @@ export default {
     },
 
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       if (!data) {
         return;
       }
@@ -730,7 +698,7 @@ export default {
       }
     },
 
-    handleExportModule() {
+    handleExportModule () {
       let title = "";
       title = "房屋模板";
 
@@ -750,7 +718,7 @@ export default {
     },
 
     //导出一户一档
-    handleExportYihuyidang() {
+    handleExportYihuyidang () {
       this.yihuyidangDisabled = true;
       let title = this.agencyObj.label;
       title = title + "-一户一档";
@@ -806,7 +774,7 @@ export default {
       );
     },
     // 上传文件之前的钩子
-    beforeUpload(file) {
+    beforeUpload (file) {
       this.files = file;
 
       const isText = file.type === "application/vnd.ms-excel";
@@ -823,11 +791,11 @@ export default {
       }
     },
     // 上传文件个数超过定义的数量
-    handleExceed(files, fileList) {
+    handleExceed (files, fileList) {
       this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
     },
 
-    async uploadFile() {
+    async uploadFile () {
       if (this.fileName == "") {
         this.$message.warning("请选择要上传的文件！");
         return false;
@@ -876,7 +844,7 @@ export default {
       );
     },
 
-    showMessage(msg) {
+    showMessage (msg) {
       this.$alert(msg, "操作结果", {
         confirmButtonText: "关闭",
         callback: (action) => {
@@ -886,18 +854,18 @@ export default {
       });
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -905,7 +873,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -913,7 +881,7 @@ export default {
     },
   },
   watch: {
-    selection(val) {
+    selection (val) {
       if (val.length > 0) {
         this.showDeletBtn = true;
       } else {
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index b230cb661..f5805bf3f 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -1,46 +1,55 @@
 <template>
   <div class="m-pop">
     <div class="wrap">
-      <div class="btn-close" @click="handleClose">
+      <div class="btn-close"
+           @click="handleClose">
         <img src="@/assets/img/shuju/people/close.png" />
       </div>
       <div class="wrap2">
         <div class="title">
           <span>更多信息</span>
         </div>
+        <div v-if="view_real_data"
+             class="div_tuomin">
+          <el-button size="mini"
+                     class="diy-button--search"
+                     @click="handleTuomin">显示脱敏信息</el-button>
+        </div>
 
-        <div
-          :key="'fieldSubList' + index"
-          v-for="(fieldSubList, index) in fieldList"
-        >
+        <div :key="'fieldSubList' + index"
+             v-for="(fieldSubList, index) in fieldList">
           <div class="list">
-            <div class="item" v-if="index == 0">
+            <div class="item"
+                 v-if="index == 0">
               <span class="item-field">所属网格：</span>
               <span>{{ gridName }}</span>
             </div>
-            <div class="item" v-if="index == 0">
+            <div class="item"
+                 v-if="index == 0">
               <span class="item-field">所属小区：</span>
               <span>{{ xiaoquName }}</span>
             </div>
-            <div class="item" v-if="index == 0">
+            <div class="item"
+                 v-if="index == 0">
               <span class="item-field">所属楼栋：</span>
               <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
-            <div class="item" v-if="index == 0">
+            <div class="item"
+                 v-if="index == 0">
               <span class="item-field">所属家庭：</span>
               <span>{{ homeName }}</span>
             </div>
-            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
+            <div class="item"
+                 :key="field.itemId"
+                 v-for="field in fieldSubList">
               <span class="item-field">{{ field.label }}：</span>
-
-              <span
-                v-if="
+              <span v-if="field.columnName==='MOBILE'||field.columnName==='ID_CARD'">{{ info[field.columnName]||'--'}}</span>
+              <span v-else-if="
                   field.itemType == 'select' ||
                   field.itemType == 'radio' ||
                   field.itemType == 'checkbox' ||
                   field.itemType == 'cascader'
-                "
-                >{{
+                ">{{
                   info[field.columnName] == null
                     ? "--"
                     : getOptionLabel(
@@ -48,8 +57,7 @@
                         info[field.columnName],
                         field.itemType
                       )
-                }}</span
-              >
+                }}</span>
 
               <span v-else>{{
                 info[field.columnName] == null ? "--" : info[field.columnName]
@@ -61,63 +69,47 @@
         </div>
 
         <div class="tabs">
-          <div
-            class="tab-btn"
-            @click="subStartGroupIndex"
-            v-if="groupList.length > 9"
-          >
+          <div class="tab-btn"
+               @click="subStartGroupIndex"
+               v-if="groupList.length > 9">
             <img src="@/assets/img/shuju/people/arrow-double-left.png" />
           </div>
-          <div
-            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-            class="tab"
-            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
-            :key="'tab' + index"
-            @click="groupIndex = index"
-            v-for="(item, index) in groupList"
-          >
+          <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+               class="tab"
+               :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+               :key="'tab' + index"
+               @click="groupIndex = index"
+               v-for="(item, index) in groupList">
             {{ item.label }}
           </div>
-          <div
-            class="tab-btn"
-            @click="addStartGroupIndex"
-            v-if="groupList.length > 9"
-          >
+          <div class="tab-btn"
+               @click="addStartGroupIndex"
+               v-if="groupList.length > 9">
             <img src="@/assets/img/shuju/people/arrow-double-right.png" />
           </div>
         </div>
 
-        <div
-          :key="'group' + index"
-          v-show="groupIndex % groupList.length == index"
-          v-for="(group, index) in groupList"
-        >
-          <div
-            v-if="
+        <div :key="'group' + index"
+             v-show="groupIndex % groupList.length == index"
+             v-for="(group, index) in groupList">
+          <div v-if="
               group.tableName == 'ic_resi_demand' &&
               Array.isArray(allInfo.ic_resi_demand) &&
               allInfo.ic_resi_demand.length > 0
-            "
-          >
-            <div
-              class="list"
-              :key="'ic_resi_demand' + infoIndex"
-              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
-            >
-              <div
-                class="item"
-                :key="field.itemId"
-                v-for="field in group.itemList"
-              >
+            ">
+            <div class="list"
+                 :key="'ic_resi_demand' + infoIndex"
+                 v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
+              <div class="item"
+                   :key="field.itemId"
+                   v-for="field in group.itemList">
                 <span class="item-field">{{ field.label }}：</span>
-                <span
-                  v-if="
+                <span v-if="
                     field.itemType == 'select' ||
                     field.itemType == 'radio' ||
                     field.itemType == 'checkbox' ||
                     field.itemType == 'cascader'
-                  "
-                  >{{
+                  ">{{
                     infoItem[field.columnName] == null
                       ? "--"
                       : getOptionLabel(
@@ -125,8 +117,7 @@
                           infoItem[field.columnName],
                           field.itemType
                         )
-                  }}</span
-                >
+                  }}</span>
 
                 <span v-else>{{
                   infoItem[field.columnName] == null
@@ -136,179 +127,136 @@
               </div>
             </div>
           </div>
-          <div
-            v-else-if="group.tableName == 'ic_hs'"
-            style="margin-top: 10px; padding: 0 20px"
-          >
-            <el-table
-              class="table"
-              :data="natList"
-              border
-              height="400"
-              :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-              style="width: 100%"
-            >
-              <el-table-column
-                label="序号"
-                header-align="center"
-                align="center"
-                type="index"
-                width="50"
-              ></el-table-column>
-
-              <el-table-column
-                prop="testTime"
-                header-align="center"
-                align="center"
-                label="检测时间"
-                width="150"
-              >
+          <div v-else-if="group.tableName == 'ic_hs'"
+               style="margin-top: 10px; padding: 0 20px">
+            <el-table class="table"
+                      :data="natList"
+                      border
+                      height="400"
+                      :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                      style="width: 100%">
+              <el-table-column label="序号"
+                               header-align="center"
+                               align="center"
+                               type="index"
+                               width="50"></el-table-column>
+
+              <el-table-column prop="testTime"
+                               header-align="center"
+                               align="center"
+                               label="检测时间"
+                               width="150">
               </el-table-column>
-              <el-table-column
-                prop="address"
-                header-align="center"
-                align="center"
-                label="检测机构"
-                show-overflow-tooltip
-                min-width="180"
-              >
+              <el-table-column prop="address"
+                               header-align="center"
+                               align="center"
+                               label="检测机构"
+                               show-overflow-tooltip
+                               min-width="180">
               </el-table-column>
-              <el-table-column
-                prop="result"
-                header-align="center"
-                align="center"
-                label="检测结果"
-                width="240"
-              >
+              <el-table-column prop="result"
+                               header-align="center"
+                               align="center"
+                               label="检测结果"
+                               width="240">
               </el-table-column>
             </el-table>
           </div>
-          <div
-            v-else-if="group.tableName == 'ic_xc'"
-            style="margin-top: 10px; padding: 0 20px"
-          >
-            <el-table
-              class="table"
-              :data="tripList"
-              border
-              height="400"
-              :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-              style="width: 100%"
-            >
-              <el-table-column
-                label="序号"
-                header-align="center"
-                align="center"
-                type="index"
-                width="50"
-              ></el-table-column>
-
-              <el-table-column
-                prop="fromRegion"
-                header-align="center"
-                align="center"
-                label="来自地区"
-                show-overflow-tooltip
-                min-width="100"
-              >
+          <div v-else-if="group.tableName == 'ic_xc'"
+               style="margin-top: 10px; padding: 0 20px">
+            <el-table class="table"
+                      :data="tripList"
+                      border
+                      height="400"
+                      :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                      style="width: 100%">
+              <el-table-column label="序号"
+                               header-align="center"
+                               align="center"
+                               type="index"
+                               width="50"></el-table-column>
+
+              <el-table-column prop="fromRegion"
+                               header-align="center"
+                               align="center"
+                               label="来自地区"
+                               show-overflow-tooltip
+                               min-width="100">
               </el-table-column>
-              <el-table-column
-                prop="arrivalTime"
-                header-align="center"
-                align="center"
-                label="来到本地时间"
-                width="140"
-              >
+              <el-table-column prop="arrivalTime"
+                               header-align="center"
+                               align="center"
+                               label="来到本地时间"
+                               width="140">
               </el-table-column>
-              <el-table-column
-                prop="leaveTime"
-                header-align="center"
-                align="center"
-                label="离开本地时间"
-                width="140"
-              >
+              <el-table-column prop="leaveTime"
+                               header-align="center"
+                               align="center"
+                               label="离开本地时间"
+                               width="140">
               </el-table-column>
-              <el-table-column
-                prop="noticeTime"
-                header-align="center"
-                align="center"
-                label="最近一次通知时间"
-                width="140"
-              >
+              <el-table-column prop="noticeTime"
+                               header-align="center"
+                               align="center"
+                               label="最近一次通知时间"
+                               width="140">
               </el-table-column>
-              <el-table-column
-                prop="remark"
-                header-align="center"
-                align="center"
-                label="备注"
-                show-overflow-tooltip
-                width="120"
-              >
+              <el-table-column prop="remark"
+                               header-align="center"
+                               align="center"
+                               label="备注"
+                               show-overflow-tooltip
+                               width="120">
               </el-table-column>
             </el-table>
           </div>
-          <div
-            v-else-if="group.tableName == 'ic_ym'"
-            style="margin-top: 10px; padding: 0 20px"
-          >
-            <el-table
-              v-if="vaccineList"
-              class="table"
-              :data="vaccineList"
-              border
-              height="400"
-              :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-              style="width: 100%"
-            >
-              <el-table-column
-                label="序号"
-                header-align="center"
-                align="center"
-                type="index"
-                width="50"
-              ></el-table-column>
-
-              <el-table-column
-                prop="vaccinateTime"
-                header-align="center"
-                align="center"
-                label="接种时间"
-                show-overflow-tooltip
-                min-width="100"
-              >
+          <div v-else-if="group.tableName == 'ic_ym'"
+               style="margin-top: 10px; padding: 0 20px">
+            <el-table v-if="vaccineList"
+                      class="table"
+                      :data="vaccineList"
+                      border
+                      height="400"
+                      :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                      style="width: 100%">
+              <el-table-column label="序号"
+                               header-align="center"
+                               align="center"
+                               type="index"
+                               width="50"></el-table-column>
+
+              <el-table-column prop="vaccinateTime"
+                               header-align="center"
+                               align="center"
+                               label="接种时间"
+                               show-overflow-tooltip
+                               min-width="100">
               </el-table-column>
-              <el-table-column
-                prop="address"
-                header-align="center"
-                align="center"
-                label="接种地点"
-              >
+              <el-table-column prop="address"
+                               header-align="center"
+                               align="center"
+                               label="接种地点">
               </el-table-column>
-              <el-table-column
-                prop="manufactor"
-                header-align="center"
-                align="center"
-                label="疫苗厂家"
-              >
+              <el-table-column prop="manufactor"
+                               header-align="center"
+                               align="center"
+                               label="疫苗厂家">
               </el-table-column>
             </el-table>
           </div>
-          <div class="list" v-else>
-            <div
-              class="item"
-              :class="{ 'z-long': group.itemList.length == 1 }"
-              :key="field.itemId"
-              v-for="field in group.itemList"
-            >
+          <div class="list"
+               v-else>
+            <div class="item"
+                 :class="{ 'z-long': group.itemList.length == 1 }"
+                 :key="field.itemId"
+                 v-for="field in group.itemList">
               <span class="item-field">{{ field.label }}：</span>
-              <span
-                v-if="
+              <span v-if="
                   field.itemType == 'select' ||
                   field.itemType == 'radio' ||
                   field.itemType == 'checkbox' ||
                   field.itemType == 'cascader'
-                "
-                >{{
+                ">{{
                   !allInfo[group.tableName] ||
                   allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
@@ -317,8 +265,7 @@
                         allInfo[group.tableName][0][field.columnName],
                         field.itemType
                       )
-                }}</span
-              >
+                }}</span>
 
               <span v-else>{{
                 !allInfo[group.tableName] ||
@@ -349,13 +296,17 @@ export default {
       type: String,
       default: "",
     },
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
   },
 
   components: {
     cptCard,
   },
 
-  data() {
+  data () {
     return {
       fieldList: [],
       groupList: [],
@@ -376,11 +327,11 @@ export default {
   },
 
   computed: {
-    isShundeju() {
+    isShundeju () {
       return this.$store.state.user.customerId == "1550309684576591874";
     },
 
-    xiaoquName() {
+    xiaoquName () {
       const {
         xiaoquList,
         info: { VILLAGE_ID },
@@ -393,7 +344,7 @@ export default {
       }
       return "";
     },
-    louName() {
+    louName () {
       const {
         louList,
         info: { BUILD_ID },
@@ -406,7 +357,7 @@ export default {
       }
       return "";
     },
-    danyuanName() {
+    danyuanName () {
       const {
         danyuanList,
         info: { UNIT_ID },
@@ -419,7 +370,7 @@ export default {
       }
       return "";
     },
-    danyuanName() {
+    danyuanName () {
       const {
         danyuanList,
         info: { UNIT_ID },
@@ -432,7 +383,7 @@ export default {
       }
       return "";
     },
-    homeName() {
+    homeName () {
       const {
         homeList,
         info: { HOME_ID },
@@ -448,17 +399,34 @@ export default {
   },
 
   watch: {
-    userId() {
+    userId () {
       this.getApiData();
     },
   },
 
-  mounted() {
+  mounted () {
     this.getApiData();
   },
 
   methods: {
-    addStartGroupIndex() {
+    async handleTuomin () {
+      const url = "/gov/org/ichouse/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.userId,
+        type: "icResiUser",
+      });
+
+      if (code === 0) {
+        this.$set(this.info, 'MOBILE', data.mobile)
+        this.$set(this.info, 'ID_CARD', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+    addStartGroupIndex () {
       const { startGroupIndex, groupList } = this;
       if (startGroupIndex < groupList.length - 9) {
         this.startGroupIndex = startGroupIndex + 1;
@@ -466,7 +434,7 @@ export default {
         this.startGroupIndex = groupList.length - 9;
       }
     },
-    subStartGroupIndex() {
+    subStartGroupIndex () {
       const { startGroupIndex, groupList } = this;
       if (startGroupIndex > 0) {
         this.startGroupIndex = startGroupIndex - 1;
@@ -474,11 +442,11 @@ export default {
         this.startGroupIndex = 0;
       }
     },
-    handleClose() {
+    handleClose () {
       this.$emit("close");
     },
 
-    async getApiData() {
+    async getApiData () {
       await this.getField();
       await this.getInfo();
       this.getDetailList();
@@ -488,7 +456,7 @@ export default {
       this.getHomeList();
     },
 
-    getOptionLabel(options, value, type = "") {
+    getOptionLabel (options, value, type = "") {
       if (Array.isArray(options)) {
         let valueArr = value.split(",");
         if (type == "cascader") {
@@ -510,7 +478,7 @@ export default {
       return "--";
     },
 
-    getNodePath(node, val, path) {
+    getNodePath (node, val, path) {
       // node:所有数据，val:后台返回的id, path:要渲染的数组id
       for (let i = 0; i < node.length; i++) {
         const ele = node[i];
@@ -530,7 +498,7 @@ export default {
     },
 
     //加载组织数据
-    async getField() {
+    async getField () {
       const url = "/oper/customize/icform/getcustomerform";
 
       const { data, code, msg } = await requestPost(url, {
@@ -570,7 +538,7 @@ export default {
     },
 
     //加载组织数据
-    async getInfo() {
+    async getInfo () {
       const url = "/epmetuser/icresiuser/detail";
 
       const { data, code, msg } = await requestPost(url, {
@@ -651,7 +619,7 @@ export default {
     },
 
     //加载组织数据
-    async getOptions(url) {
+    async getOptions (url) {
       if (!url) return [];
 
       const { data, code, msg } = await requestPost(url, {});
@@ -663,7 +631,7 @@ export default {
       }
     },
 
-    async getXiaoquList() {
+    async getXiaoquList () {
       const url = "/gov/org/icneighborhood/neighborhoodoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -677,7 +645,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getLouList() {
+    async getLouList () {
       const url = "/gov/org/icbuilding/buildingoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -690,7 +658,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDanyuanList() {
+    async getDanyuanList () {
       const url = "/gov/org/icbuildingunit/unitoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -703,7 +671,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getHomeList() {
+    async getHomeList () {
       const url = "/gov/org/ichouse/houseoption";
 
       const { data, code, msg } = await requestPost(url, {
@@ -716,7 +684,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getDetailList() {
+    async getDetailList () {
       const url = "/epmetuser/epidemicPrevention/info";
       let params = {
         id: this.userId,
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index fd2048832..b3dd77459 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -2,202 +2,160 @@
   <div class="g-add">
     <div class="g-add-page">
       <div class="g-left">
-        <el-form
-          ref="ref_form1"
-          :inline="true"
-          :model="formData"
-          :rules="dataRule"
-          class="form"
-        >
-          <el-form-item
-            label="所属网格	"
-            prop="gridId"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-select
-              v-model.trim="formData.gridId"
-              placeholder="请选择"
-              clearable
-              class="cell-width-1"
-            >
-              <el-option
-                v-for="item in gridList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+        <el-form ref="ref_form1"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="form">
+          <el-form-item label="所属网格	"
+                        prop="gridId"
+                        label-width="150px"
+                        style="display: block">
+            <el-select v-model.trim="formData.gridId"
+                       placeholder="请选择"
+                       clearable
+                       class="cell-width-1">
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item
-            label="报事人"
-            prop="name"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="cell-width-1"
-              maxlength="10"
-              placeholder="请输入报事人姓名"
-              v-model="formData.name"
-            >
+          <el-form-item label="报事人"
+                        prop="name"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      maxlength="10"
+                      placeholder="请输入报事人姓名"
+                      v-model="formData.name">
             </el-input>
             <div>
-              <el-button
-                style="margin-top: 10px"
-                type="primary"
-                size="mini"
-                @click="handleShowPersonList"
-                >居民信息中选择</el-button
-              >
+              <el-button style="margin-top: 10px"
+                         type="primary"
+                         size="mini"
+                         @click="handleShowPersonList">居民信息中选择</el-button>
             </div>
           </el-form-item>
-          <el-form-item
-            label="手机号"
-            prop="mobile"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="cell-width-1"
-              maxlength="30"
-              placeholder="请输入手机号	"
-              v-model="formData.mobile"
-            >
+          <el-form-item label="手机号"
+                        prop="mobile"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      maxlength="30"
+                      placeholder="请输入手机号	"
+                      v-model="formData.mobile">
             </el-input>
           </el-form-item>
 
-          <el-form-item
-            label="身份证号"
-            prop="idCard"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="cell-width-1"
-              maxlength="30"
-              placeholder="请输入身份证号"
-              v-model="formData.idCard"
-            ></el-input>
+          <el-form-item label="身份证号"
+                        prop="idCard"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      maxlength="30"
+                      placeholder="请输入身份证号"
+                      v-model="formData.idCard"></el-input>
           </el-form-item>
 
-          <el-form-item label="反应渠道" label-width="150px" prop="sourceType">
-            <el-select
-              v-model="formData.sourceType"
-              placeholder="请选择"
-              size="small"
-              clearable
-              class="cell-width-1"
-            >
-              <el-option
-                v-for="item in qudaoArray"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item label="反应渠道"
+                        label-width="150px"
+                        prop="sourceType">
+            <el-select v-model="formData.sourceType"
+                       placeholder="请选择"
+                       size="small"
+                       clearable
+                       class="cell-width-1">
+              <el-option v-for="item in qudaoArray"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item
-            label="发生时间"
-            prop="happenTime"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-date-picker
-              v-model="formData.happenTime"
-              class="cell-width-1"
-              type="datetime"
-              placeholder="发生时间"
-              value-format="yyyy-MM-dd hh:mm:ss"
-            >
+          <el-form-item label="发生时间"
+                        prop="happenTime"
+                        label-width="150px"
+                        style="display: block">
+            <el-date-picker v-model="formData.happenTime"
+                            class="cell-width-1"
+                            type="datetime"
+                            placeholder="发生时间"
+                            value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </el-form-item>
 
-          <el-form-item
-            label="事件内容"
-            prop="eventContent"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="cell-width-2"
-              type="textarea"
-              maxlength="500"
-              show-word-limit
-              :rows="5"
-              placeholder="请输入事件内容，不超过500字"
-              v-model="formData.eventContent"
-            ></el-input>
+          <el-form-item label="事件内容"
+                        prop="eventContent"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-2"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :rows="5"
+                      placeholder="请输入事件内容，不超过500字"
+                      v-model="formData.eventContent"></el-input>
           </el-form-item>
         </el-form>
       </div>
       <div class="g-right">
-        <el-form
-          ref="ref_form2"
-          :inline="true"
-          :model="formData"
-          :rules="dataRule"
-          class="form"
-        >
-          <el-form-item label="图片" label-width="150px" style="display: block">
-            <el-upload
-              :headers="$getElUploadHeaders()"
-              :class="['avatar-uploader', { hide: hideUploadBtn }]"
-              ref="uploadPic"
-              :action="uploadUlr"
-              list-type="picture-card"
-              :on-exceed="exceedPic"
-              :on-remove="removePic"
-              :file-list="replayImgList"
-              :on-change="handleEditChange"
-              :on-success="handleSuccess"
-              :limit="3"
-            >
+        <el-form ref="ref_form2"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="form">
+          <el-form-item label="图片"
+                        label-width="150px"
+                        style="display: block">
+            <el-upload :headers="$getElUploadHeaders()"
+                       :class="['avatar-uploader', { hide: hideUploadBtn }]"
+                       ref="uploadPic"
+                       :action="uploadUlr"
+                       list-type="picture-card"
+                       :on-exceed="exceedPic"
+                       :on-remove="removePic"
+                       :file-list="replayImgList"
+                       :on-change="handleEditChange"
+                       :on-success="handleSuccess"
+                       :limit="3">
               <span class="font-14">选择图片</span>
-              <div slot="tip" class="upload_tip">
+              <div slot="tip"
+                   class="upload_tip">
                 最多上传3张图片，图片支持jpg、jpeg、bmp、git或png格式
               </div>
             </el-upload>
           </el-form-item>
 
-          <el-form-item
-            label="地理位置"
-            prop="address"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input class="cell-width-1" v-model="formData.address">
+          <el-form-item label="地理位置"
+                        prop="address"
+                        label-width="150px"
+                        style="display: block">
+            <el-input class="cell-width-1"
+                      v-model="formData.address">
             </el-input>
           </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">
               <div class="div_map">
                 <div id="app"></div>
                 <div class="div_searchmap">
-                  <el-input
-                    class="cell-width-map"
-                    maxlength="50"
-                    size="mini"
-                    placeholder="请输入关键字"
-                    v-model="keyWords"
-                  >
+                  <el-input class="cell-width-map"
+                            maxlength="50"
+                            size="mini"
+                            placeholder="请输入关键字"
+                            v-model="keyWords">
                   </el-input>
-                  <el-button
-                    style="margin-left: 10px"
-                    type="primary"
-                    size="mini"
-                    @click="handleSearchMap"
-                    >查询</el-button
-                  >
+                  <el-button style="margin-left: 10px"
+                             type="primary"
+                             size="mini"
+                             @click="handleSearchMap">查询</el-button>
                 </div>
               </div>
 
@@ -222,62 +180,54 @@
     </div>
 
     <!-- 新增弹出框 -->
-    <el-dialog
-      :visible.sync="personTableShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      title="选择居民"
-      width="550px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
+    <el-dialog :visible.sync="personTableShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               title="选择居民"
+               width="550px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
       <div style="padding: 10px 30px">
-        <el-form :inline="false" ref="ref_formSearch" :label-width="'90px'">
-          <el-form-item label="所属网格" label-width="150px">
-            <el-select
-              class="cell-width-1"
-              v-model.trim="selGridId"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in gridList"
-                @click.native="handleChangeGrid"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+        <el-form :inline="false"
+                 ref="ref_formSearch"
+                 :label-width="'90px'">
+          <el-form-item label="所属网格"
+                        label-width="150px">
+            <el-select class="cell-width-1"
+                       v-model.trim="selGridId"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         @click.native="handleChangeGrid"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="居民" label-width="150px" prop="selPersonIndex">
-            <el-select
-              v-model="selPersonIndex"
-              class="cell-width-1"
-              filterable
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="(item, index) in demandUserList"
-                :key="item.demandUserId"
-                :label="item.label"
-                :value="index"
-              >
+          <el-form-item label="居民"
+                        label-width="150px"
+                        prop="selPersonIndex">
+            <el-select v-model="selPersonIndex"
+                       class="cell-width-1"
+                       filterable
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="(item, index) in demandUserList"
+                         :key="item.demandUserId"
+                         :label="item.label"
+                         :value="index">
               </el-option>
             </el-select>
           </el-form-item>
         </el-form>
         <div class="div-btn">
-          <el-button
-            style="margin-left: 20px"
-            type="primary"
-            size="small"
-            @click="handleComfirmSelPerson"
-            >确定</el-button
-          >
+          <el-button style="margin-left: 20px"
+                     type="primary"
+                     size="small"
+                     @click="handleComfirmSelPerson">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -298,7 +248,7 @@ var markers;
 var infoWindowList;
 var geocoder; // 新建一个正逆地址解析类
 
-function iniFmData() {
+function iniFmData () {
   return {
     gridId: "", //所属网格
     reportUserId: "", //	报事人ID
@@ -320,7 +270,7 @@ function iniFmData() {
 }
 
 export default {
-  data() {
+  data () {
     return {
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
@@ -376,7 +326,7 @@ export default {
   },
   components: {},
   computed: {
-    dataRule() {
+    dataRule () {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
           callback(new Error("请输入身份证"));
@@ -435,7 +385,7 @@ export default {
     },
   },
 
-  async mounted() {
+  async mounted () {
     const { user } = this.$store.state;
     this.agencyId = user.agencyId;
     let { latitude, longitude } = this.$store.state.user;
@@ -453,7 +403,7 @@ export default {
   },
 
   methods: {
-    async handleShowPersonList() {
+    async handleShowPersonList () {
       if (this.formData.gridId) {
         await this.handleChangeGrid();
         this.personTableShow = true;
@@ -461,10 +411,10 @@ export default {
         this.$message.info("请先选择网格");
       }
     },
-    diaClose() {
+    diaClose () {
       this.personTableShow = false;
     },
-    handleComfirmSelPerson() {
+    handleComfirmSelPerson () {
       if (this.selPersonIndex === 0 || this.selPersonIndex) {
         let selPerson = this.demandUserList[this.selPersonIndex];
         this.formData.name = selPerson.demandUserName;
@@ -478,7 +428,7 @@ export default {
       }
     },
 
-    async handleChangeGrid() {
+    async handleChangeGrid () {
       const url = "/epmetuser/icresiuser/demandusers";
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
       let params = {
@@ -497,7 +447,7 @@ export default {
       this.tableLoading = false;
     },
 
-    async loadGrid() {
+    async loadGrid () {
       const url = "/gov/org/customergrid/gridoption";
 
       let params = {
@@ -513,7 +463,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getCategoryList() {
+    async getCategoryList () {
       const url = "/gov/issue/issueprojectcategorydict/list";
 
       let params = {};
@@ -535,7 +485,7 @@ export default {
     },
 
     //重构树，去除网格
-    filterTree(arr) {
+    filterTree (arr) {
       let childs = arr;
       for (let i = childs.length; i--; i > 0) {
         if (childs[i].subCategory) {
@@ -549,12 +499,12 @@ export default {
       return arr;
     },
 
-    handleChangeAgency(value) {
+    handleChangeAgency (value) {
       // this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label
       // this.orgId = this.selCategoryArray.length > 0 ? this.selCategoryArray[this.selCategoryArray.length - 1] : ''
     },
 
-    async getEventInfo() {
+    async getEventInfo () {
       this.okflag = false;
       this.$refs["ref_form1"].validate((valid, messageObj) => {
         if (!valid) {
@@ -592,7 +542,7 @@ export default {
       });
     },
 
-    removePic(file, fileList) {
+    removePic (file, fileList) {
       this.formData.imageList.splice(
         this.formData.imageList.findIndex((item) => item === file.url),
         1
@@ -604,19 +554,19 @@ export default {
       this.hideUploadBtn = fileList.length >= 3;
     },
     // 最多上传3张图，超过时隐藏上传按钮
-    handleEditChange(file, fileList) {
+    handleEditChange (file, fileList) {
       this.hideUploadBtn = fileList.length >= 3;
     },
-    exceedPic() {
+    exceedPic () {
       this.$message.warning("最多上传3张预览图片");
     },
-    handleSuccess(response, file, fileList) {
+    handleSuccess (response, file, fileList) {
       this.replayImgList.push(file);
       this.formData.imageList.push(response.data.url);
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap() {
+    initMap () {
       // 定义地图中心点坐标
       var center = new window.TMap.LatLng(
         this.formData.latitude,
@@ -648,7 +598,7 @@ export default {
       // this.convert()
     },
 
-    setMarker(lat, lng) {
+    setMarker (lat, lng) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -662,7 +612,7 @@ export default {
       ]);
     },
 
-    handleSearchMap() {
+    handleSearchMap () {
       infoWindowList.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -694,7 +644,7 @@ export default {
         });
     },
 
-    handleMoveCenter() {
+    handleMoveCenter () {
       //修改地图中心点
       const center = map.getCenter();
       const lat = center.getLat();
@@ -705,7 +655,7 @@ export default {
       this.convert(lat, lng);
     },
 
-    convert(lat, lng) {
+    convert (lat, lng) {
       markers.setGeometries([]);
       // var input = document.getElementById('location').value.split(',');
       let location;
@@ -739,12 +689,12 @@ export default {
         });
     },
 
-    resetData() {
+    resetData () {
       this.formData = iniFmData();
       this.replayImgList = [];
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -752,7 +702,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index 5c95edf03..71fb58766 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -1,13 +1,14 @@
 <template>
-  <div class="m-pop" ref="pop" @mousewheel="handleWheel" v-show="!hidden">
+  <div class="m-pop"
+       ref="pop"
+       @mousewheel="handleWheel"
+       v-show="!hidden">
     <div class="info">
-      <div
-        v-if="
+      <div v-if="
           placeType === 'resi' ||
           placeType === 'special_resi' ||
           placeType === 'volunteer'
-        "
-      >
+        ">
         <div class="info-title">居民信息</div>
         <div class="item">
           姓名：
@@ -52,25 +53,22 @@
           <span>{{ info.resiCategoryNames || "--" }}</span>
         </div>
 
-        <div @click="handleClickBtn('watch-resi')" class="more-btn">更多</div>
+        <div @click="handleClickBtn('watch-resi')"
+             class="more-btn">更多</div>
 
         <div class="operate">
-          <div
-            @click="handleClickBtn('create-demand')"
-            v-if="info.agencyId == $store.state.user.agencyId"
-            class="btn z-blue"
-          >
+          <div @click="handleClickBtn('create-demand')"
+               v-if="info.agencyId == $store.state.user.agencyId"
+               class="btn z-blue">
             发布需求
           </div>
 
-          <div
-            v-if="
+          <div v-if="
               info.agencyId == $store.state.user.agencyId &&
               placeType === 'volunteer'
             "
-            @click="handleClickBtn('create-service')"
-            class="btn z-yellow"
-          >
+               @click="handleClickBtn('create-service')"
+               class="btn z-yellow">
             发起服务
           </div>
         </div>
@@ -112,13 +110,11 @@
         </div>
       </div>
 
-      <div
-        v-if="
+      <div v-if="
           placeType === 'public_service' ||
           placeType === 'city_management' ||
           placeType === 'superior_resource'
-        "
-      >
+        ">
         <div class="info-title">场所信息</div>
         <div class="item">
           场所名称：
@@ -150,11 +146,9 @@
         </div>
       </div>
 
-      <div
-          v-if="
+      <div v-if="
           placeType === 'nucleic_point'
-        "
-      >
+        ">
         <div class="info-title">核酸检测点信息</div>
         <div class="item">
           检测点名称：
@@ -177,11 +171,9 @@
           <span>{{ info.address || "--" }}</span>
         </div>
       </div>
-      <div
-          v-if="
+      <div v-if="
           placeType === 'vaccine_point'
-        "
-      >
+        ">
         <div class="info-title">疫苗接种点信息</div>
         <div class="item">
           接种点名称：
@@ -221,35 +213,27 @@
           <span>{{ info.eventContent || "--" }}</span>
         </div>
 
-        <div
-          v-if="info.imageList && info.imageList.length > 0"
-          class="info-prop"
-        >
+        <div v-if="info.imageList && info.imageList.length > 0"
+             class="info-prop">
           <span>图片：</span>
           <div class="item-pics">
-            <img
-              :src="src"
-              :key="src"
-              style="width: 100px; height: 100px; padding-right: 10px"
-              v-for="src in info.imageList"
-              @click="watchImg(src)"
-            />
+            <img :src="src"
+                 :key="src"
+                 style="width: 100px; height: 100px; padding-right: 10px"
+                 v-for="src in info.imageList"
+                 @click="watchImg(src)" />
           </div>
         </div>
 
-        <div
-          v-if="info.voiceList && info.voiceList.length > 0"
-          class="info-prop"
-        >
+        <div v-if="info.voiceList && info.voiceList.length > 0"
+             class="info-prop">
           <span>音频：</span>
           <div class="item-pics">
             <audio controls>
-              <source
-                :src="item.url"
-                type=""
-                :key="item.url"
-                v-for="item in info.voiceList"
-              />
+              <source :src="item.url"
+                      type=""
+                      :key="item.url"
+                      v-for="item in info.voiceList" />
             </audio>
           </div>
         </div>
@@ -270,12 +254,13 @@
           手机号：
           <span>{{ info.mobile || "--" }}</span>
         </div>
-        <div class="item">
+        <!-- <div class="item">
           身份证号：
           <span>{{ info.idCard || "--" }}</span>
-        </div>
+        </div> -->
 
-        <div @click="handleClickBtn('watch-event')" class="more-btn">更多</div>
+        <div @click="handleClickBtn('watch-event')"
+             class="more-btn">更多</div>
       </div>
 
       <div v-if="placeType === 'community_org'">
@@ -313,11 +298,9 @@
           <span>{{ info.organizationCreatedTime || "--" }}</span>
         </div>
 
-        <div
-          v-if="info.agencyId == $store.state.user.agencyId"
-          @click="handleClickBtn('create-service')"
-          class="btn z-yellow"
-        >
+        <div v-if="info.agencyId == $store.state.user.agencyId"
+             @click="handleClickBtn('create-service')"
+             class="btn z-yellow">
           发起服务
         </div>
       </div>
@@ -354,12 +337,10 @@
         </div>
       </div>
 
-      <div
-        v-if="
+      <div v-if="
           placeType === 'enterprise_patrol' ||
           placeType === 'enterprise_patrol_unqualified'
-        "
-      >
+        ">
         <div class="info-title">企事业信息</div>
         <div class="item">
           场所类型：
@@ -390,7 +371,8 @@
           <span>{{ info.mobile || "--" }}</span>
         </div>
 
-        <div @click="handleClickBtn('watch-xuncha')" class="more-btn">更多</div>
+        <div @click="handleClickBtn('watch-xuncha')"
+             class="more-btn">更多</div>
       </div>
 
       <div v-if="placeType === 'party_unit'">
@@ -428,11 +410,9 @@
           <span>{{ info.address || "--" }}</span>
         </div>
 
-        <div
-          v-if="info.agencyId == $store.state.user.agencyId"
-          @click="handleClickBtn('create-service')"
-          class="btn z-yellow"
-        >
+        <div v-if="info.agencyId == $store.state.user.agencyId"
+             @click="handleClickBtn('create-service')"
+             class="btn z-yellow">
           发起服务
         </div>
       </div>
@@ -460,7 +440,8 @@
           <span>{{ info.centerAddress || "--" }}</span>
         </div>
         <div class="operate">
-          <div @click="handleClickBtn('create-service')" class="btn z-yellow">
+          <div @click="handleClickBtn('create-service')"
+               class="btn z-yellow">
             发起服务
           </div>
         </div>
@@ -469,18 +450,14 @@
       <div v-if="placeType === 'list'">
         <div class="info-title">列表</div>
         <div class="list">
-          <div
-            class="item"
-            @click="handleClickListItem(item)"
-            :key="'list' + item.id"
-            v-for="(item, index) in list"
-          >
+          <div class="item"
+               @click="handleClickListItem(item)"
+               :key="'list' + item.id"
+               v-for="(item, index) in list">
             <div class="item-cnt">{{ index + 1 }}、{{ item.content }}</div>
-            <img
-              src="@/assets/img/shuju/command/arrow-right-green.png"
-              alt=""
-              class="i-arrow"
-            />
+            <img src="@/assets/img/shuju/command/arrow-right-green.png"
+                 alt=""
+                 class="i-arrow" />
           </div>
         </div>
       </div>
@@ -501,7 +478,7 @@ export default {
     },
   },
 
-  data() {
+  data () {
     return {
       hidden: true,
       placeType: "",
@@ -514,16 +491,16 @@ export default {
   computed: {},
   watch: {},
 
-  mounted() {},
+  mounted () { },
 
   methods: {
-    handleWheel(e) {
+    handleWheel (e) {
       if (this.$refs.pop.clientHeight >= 321) {
         e.stopPropagation();
       }
     },
 
-    handleClickBtn(type) {
+    handleClickBtn (type) {
       this.$emit("operate", type, {
         placeType: this.placeType,
         id: this.srcItem.id,
@@ -531,12 +508,12 @@ export default {
       });
     },
 
-    handleClickListItem(item) {
+    handleClickListItem (item) {
       console.log("handleClickListItem", item);
       this.$emit("clickListItem", item);
     },
 
-    async show(item) {
+    async show (item) {
       console.log("-----------------show:", item);
       const { placeType, latitude, longitude } = item;
       if (!placeType) {
@@ -620,7 +597,7 @@ export default {
       return true;
     },
 
-    async loadResi(info) {
+    async loadResi (info) {
       const url = "/epmetuser/icresiuser/resi-brief/" + info.id;
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
 
@@ -675,7 +652,7 @@ export default {
       }
     },
 
-    async loadPublicService(info) {
+    async loadPublicService (info) {
       const url = "/gov/org/icPublicService/detail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail"
 
@@ -700,7 +677,7 @@ export default {
       }
     },
 
-    async loadEvent(info) {
+    async loadEvent (info) {
       const url = "/gov/project/icEvent/detail";
       //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
 
@@ -715,7 +692,7 @@ export default {
       }
     },
 
-    async loadDangerousChemicals(info) {
+    async loadDangerousChemicals (info) {
       const url = "/gov/org/icDangerousChemicals/detail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
 
@@ -743,7 +720,7 @@ export default {
       }
     },
 
-    async loadCityManagement(info) {
+    async loadCityManagement (info) {
       const url = "/gov/org/icCityManagement/detail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail"
 
@@ -768,7 +745,7 @@ export default {
       }
     },
 
-    async loadCommunityOrg(info) {
+    async loadCommunityOrg (info) {
       // const url = "/gov/org/icCityManagement/detail"
       const url =
         "/heart/iccommunityselforganization/community-self-org-detail/" +
@@ -794,7 +771,7 @@ export default {
       }
     },
 
-    async loadGridInfo(info) {
+    async loadGridInfo (info) {
       const url = "/gov/org/icSuperiorResource/detail";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
 
@@ -819,7 +796,7 @@ export default {
       }
     },
 
-    async loadEnterprisePartrol(info) {
+    async loadEnterprisePartrol (info) {
       const url = "/gov/org/enterprise/detail/" + info.id;
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
 
@@ -833,7 +810,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async loadVaccinePoint(info) {
+    async loadVaccinePoint (info) {
       const url = "/epmetuser/icPointVaccinesInoculation/" + info.id;
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
 
@@ -847,7 +824,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async loadHesuanPoint(info) {
+    async loadHesuanPoint (info) {
       const url = "/epmetuser/icPointNucleicMonitoring/" + info.id;
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
 
@@ -861,7 +838,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async loadGroupRent(info) {
+    async loadGroupRent (info) {
       const url = "/gov/org/ichouse/" + info.id;
 
       const { data, code, msg } = await requestGet(url);
@@ -874,7 +851,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async loadPartyUnit(info) {
+    async loadPartyUnit (info) {
       const url = "/heart/icpartyunit/detail";
       // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
       let params = {
@@ -896,7 +873,7 @@ export default {
       }
     },
 
-    async loadGridInfo(info) {
+    async loadGridInfo (info) {
       const url = "/gov/org/grid/griddetail";
 
       let params = {
@@ -920,7 +897,7 @@ export default {
       }
     },
 
-    async requestList() {
+    async requestList () {
       const url = "/data/aggregator/coverage/analysis/resourceCategories";
       let params = {
         agencyId: this.orgId,
diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
index 4b77c8d5d..f0ee36e8c 100644
--- a/src/views/modules/workSys/operAuth.vue
+++ b/src/views/modules/workSys/operAuth.vue
@@ -23,45 +23,45 @@
 
           </el-form-item>
 
-          <div>
-            <el-form-item label="姓名"
-                          prop="name">
-              <el-input v-model="formData.name"
-                        size="small"
-                        class="list_item_width_1"
-                        clearable
-                        placeholder="请输入姓名">
-              </el-input>
-
-            </el-form-item>
-
-            <el-form-item label="手机"
-                          prop="mobile">
-              <el-input v-model="formData.mobile"
-                        size="small"
-                        class="list_item_width_1"
-                        clearable
-                        placeholder="请输入手机号">
-              </el-input>
-
-            </el-form-item>
-
-            <el-button style="margin-left:30px"
-                       size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
-          </div>
+          <el-form-item label="姓名"
+                        prop="operatorName">
+            <el-input v-model="formData.operatorName"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="手机"
+                        prop="operatorMobile">
+            <el-input v-model="formData.operatorMobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入手机号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+
         </div>
       </el-form>
     </div>
     <div class="div_table">
       <div class="div_btn">
 
-        <el-button style="float:left;margin-left:10px"
+        <el-button v-if="false"
+                   style="float:left;margin-left:10px"
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
@@ -81,26 +81,26 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="name"
+        <el-table-column prop="operatorName"
                          header-align="center"
                          align="center"
                          label="姓名"
                          min-width="100">
         </el-table-column>
-        <el-table-column prop="mobile"
+        <el-table-column prop="operatorMobile"
                          header-align="center"
                          align="center"
                          label="手机号"
                          min-width="110">
         </el-table-column>
 
-        <el-table-column prop="natTime"
+        <el-table-column prop="content"
                          header-align="center"
                          align="center"
                          label="操作事项"
                          min-width="230">
         </el-table-column>
-        <el-table-column prop="natAddress"
+        <el-table-column prop="operateTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
@@ -160,20 +160,16 @@ export default {
       pageNo: 0,
       tableLoading: false,
 
-
       agencyId: '',
 
 
       timeRange: [],
       formData: {
-
-        name: '',//姓名
-        mobile: '',//手机号
-        idCard: '',//身份证号码
+        category: 'data_tm',
+        operatorName: '',//姓名
+        operatorMobile: '',//手机号
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
-
-
       },
 
       tableData: [],
@@ -206,7 +202,6 @@ export default {
   methods: {
 
     async handleSearch () {
-      this.isResiUser = this.formData.orgType === 'current'
 
       await this.loadTable()
 
@@ -219,7 +214,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/icNat/natlist"
+
+      const url = "/sys/log/operation/page"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/natlist"
       let params = {
         pageSize: this.pageSize,
@@ -272,10 +268,9 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        orgType: 'current',//当前组织:current 根组织：all
-        name: '',//姓名
-        mobile: '',//手机号
-        idCard: '',//身份证号码
+        category: 'data_tm',
+        operatorName: '',//姓名
+        operatorMobile: '',//手机号
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
       }
@@ -297,7 +292,7 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = '核酸检测信息'
+      let title = '操作记录'
 
       const url = "/epmetuser/icNat/export"
 
@@ -361,7 +356,7 @@ export default {
   computed: {
     tableHeight () {
 
-      return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
+      return this.$store.state.inIframe ? this.clientHeight - 330 + this.iframeHeight : this.clientHeight - 330
 
 
     },

From 35193f9ea9e26d3c2853d99733ea34dbc2479b4f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 18 Oct 2022 15:23:18 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=84=B1=E6=95=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/communityParty/crateForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/communityParty/crateForm.vue b/src/views/modules/visual/communityParty/crateForm.vue
index ff37c1c27..ed8beee5a 100644
--- a/src/views/modules/visual/communityParty/crateForm.vue
+++ b/src/views/modules/visual/communityParty/crateForm.vue
@@ -26,11 +26,11 @@
               </div>
               <div class="info-prop">
                 <span>手机号：</span>
-                <span>{{ form.mobile }}</span>
+                <span>{{ form.showMobile }}</span>
               </div>
               <div class="info-prop">
                 <span>身份证：</span>
-                <span>{{ form.idCard }}</span>
+                <span>{{ form.showIdCard }}</span>
               </div>
               <div class="info-prop">
                 <span>地址：</span>