diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index a25951546..da6849f20 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -1,92 +1,120 @@
 <template>
-  <div :id="formId" class="resi-container">
-    <el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth">
+  <div :id="formId"
+       class="resi-container">
+    <el-form :ref="formId"
+             class="resi-form"
+             :model="form"
+             :rules="rulesForm"
+             :label-width="labelWidth">
       <template v-if="supportAdd">
         <el-row style="margin-bottom: 10px;">
           <el-col :span="24">
-            <el-button icon="el-icon-plus" size="small" @click="handleAddRow"></el-button>
+            <el-button icon="el-icon-plus"
+                       size="small"
+                       @click="handleAddRow"></el-button>
           </el-col>
         </el-row>
-        <edit-form v-for="(item, index) in addList" :key="index"  :ref="'baseForms' + index" :columns="3"
-        :form-list="item.itemList || formList" :form-id="'baseForms' + item.row" />
+        <edit-form v-for="(item, index) in addList"
+                   :key="index"
+                   :ref="'baseForms' + index"
+                   :columns="3"
+                   :form-list="item.itemList || formList"
+                   :form-id="'baseForms' + item.row" />
       </template>
       <template v-else>
-        <el-row v-if="fixed" class="resi-row">
+        <el-row v-if="fixed"
+                class="resi-row">
           <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
           <el-col :span="6">
-              <el-form-item prop="GRID_ID" label="所属网格">
+            <el-form-item prop="GRID_ID"
+                          label="所属网格">
               <!-- <div class="resi-cell"> -->
-                <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small"
-                  clearable class="resi-cell-select" @change="handleChangeGrid"
-                  >
-                    <el-option
-                      v-for="item in optionsG"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+                <el-select v-model.trim="form.GRID_ID"
+                           :disabled="disabled"
+                           placeholder="请选择网格"
+                           size="small"
+                           clearable
+                           class="resi-cell-select"
+                           @change="handleChangeGrid">
+                  <el-option v-for="item in optionsG"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
               <!-- </div> -->
             </el-form-item>
           </el-col>
           <el-col :span="18">
-              <el-form-item label="所属房屋" required>
-                <div class="resi-cell-value">
-                  <div class="resi-cell-col">
-                    <el-form-item prop="VILLAGE_ID">
-                      <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
-                      clearable class="resi-cell-select" :disabled="disabled" @change="handleChangeV"
-                      >
-                        <el-option
-                          v-for="item in optionsV"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="BUILD_ID">
-                      <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                      clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
-                      >
-                        <el-option
-                          v-for="item in optionsB"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="UNIT_ID">
-                      <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
-                      clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
-                      >
-                        <el-option
-                          v-for="item in optionsD"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item prop="HOME_ID">
-                      <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
-                      clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle"
-                      @change="handleChangeH"
-                      >
-                        <el-option
-                          v-for="item in optionsH"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </div>
-                  <!-- <el-col :span="6">
+            <el-form-item label="所属房屋"
+                          required>
+              <div class="resi-cell-value">
+                <div class="resi-cell-col">
+                  <el-form-item prop="VILLAGE_ID">
+                    <el-select v-model.trim="form.VILLAGE_ID"
+                               placeholder="请选择小区"
+                               size="small"
+                               clearable
+                               class="resi-cell-select"
+                               :disabled="disabled"
+                               @change="handleChangeV">
+                      <el-option v-for="item in optionsV"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="BUILD_ID">
+                    <el-select v-model.trim="form.BUILD_ID"
+                               placeholder="请选择楼号"
+                               size="small"
+                               clearable
+                               :disabled="disabled"
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeB">
+                      <el-option v-for="item in optionsB"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="UNIT_ID">
+                    <el-select v-model.trim="form.UNIT_ID"
+                               placeholder="请选择单元"
+                               size="small"
+                               clearable
+                               :disabled="disabled"
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeD">
+                      <el-option v-for="item in optionsD"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item prop="HOME_ID">
+                    <el-select v-model.trim="form.HOME_ID"
+                               placeholder="请选择房号"
+                               size="small"
+                               clearable
+                               :disabled="disabled"
+                               class="resi-cell-select resi-cell-select-middle"
+                               @change="handleChangeH">
+                      <el-option v-for="item in optionsH"
+                                 :key="item.value"
+                                 :label="item.label"
+                                 :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </div>
+                <!-- <el-col :span="6">
 
                   </el-col>
                   <el-col :span="6">
@@ -98,7 +126,7 @@
                   <el-col :span="6">
 
                   </el-col> -->
-                </div>
+              </div>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -134,37 +162,49 @@
             </el-form-item>
           </el-col> -->
         </el-row>
-        <el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row">
-            <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
-            <el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)"
-            :style="n.itemType === 'divider' && 'display: none;'">
-              <el-form-item :prop="n.columnName" :label="n.label">
-                <!-- <div class="resi-cell"> -->
-                  <!-- <div class="resi-cell-label">{{n.label}}</div> -->
-                  <div class="resi-cell-value">
-                    <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
-                      <el-input
-                        v-if="n.validType"
-                        v-model.trim="form[n.columnName]"
-                        :disabled="disabled"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        >
-                      </el-input>
-                      <el-input
-                        v-else
-                        v-model.trim="form[n.columnName]"
-                        :disabled="disabled"
-                        class="resi-cell-input"
-                        size="small"
-                        clearable
-                        placeholder="请输入内容"
-                        >
-                      </el-input>
-                    </template>
-                    <!-- <template v-if="n.itemType === 'textarea'">
+        <el-row v-for="(item, index) in sliceList(formList, columns)"
+                :key="index"
+                class="resi-row">
+          <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
+          <el-col v-for="n in item"
+                  :key="n.itemId"
+                  :span="item.length === 1 ? 24 : (24/columns)"
+                  :style="n.itemType === 'divider' && 'display: none;'">
+            <el-form-item :prop="n.columnName"
+                          :label="n.label">
+              <!-- <div class="resi-cell"> -->
+              <!-- <div class="resi-cell-label">{{n.label}}</div> -->
+              <div class="resi-cell-value">
+
+                <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
+                  <!-- <span v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'">{{ form[n.columnName]||'--'}}</span> -->
+                  <el-input v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'"
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+
+                  <el-input v-else-if="n.validType"
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                  <el-input v-else
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            class="resi-cell-input"
+                            size="small"
+                            clearable
+                            placeholder="请输入内容">
+                  </el-input>
+                </template>
+                <!-- <template v-if="n.itemType === 'textarea'">
                       <el-input
                         v-model.trim="form[n.columnName]"
                         class="resi-cell-textarea"
@@ -175,89 +215,92 @@
                         >
                       </el-input>
                     </template> -->
-                    <el-date-picker
-                      v-else-if="n.itemType === 'datepicker'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      class="resi-cell-input"
-                      type="date"
-                      size="small"
-                      clearable
-                      placeholder="选择日期"
-                      format="yyyy 年 MM 月 dd 日"
-                      value-format="yyyy-MM-dd">
-                    </el-date-picker>
-                    <el-date-picker
-                      v-else-if="n.itemType === 'daterange'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      type="daterange"
-                      align="right"
-                      unlink-panels
-                      value-format="yyyy-MM-dd"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                      >
-                    </el-date-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timepicker'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      placeholder="任意时间点">
-                    </el-time-picker>
-                    <el-time-picker
-                      v-else-if="n.itemType === 'timerange'"
-                      v-model.trim="form[n.columnName]"
-                      :disabled="disabled"
-                      is-range
-                      range-separator="至"
-                      start-placeholder="开始时间"
-                      end-placeholder="结束时间"
-                      placeholder="选择时间范围">
-                    </el-time-picker>
-                    <el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]"
-                    :multiple="n.multiSelect"
-                    :disabled="disabled"
-                    placeholder="请选择" size="small" clearable class="resi-cell-select">
-                      <el-option
-                        v-for="item in n.options || options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                    <!-- <el-cascader
+                <el-date-picker v-else-if="n.itemType === 'datepicker'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                class="resi-cell-input"
+                                type="date"
+                                size="small"
+                                clearable
+                                placeholder="选择日期"
+                                format="yyyy 年 MM 月 dd 日"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+                <el-date-picker v-else-if="n.itemType === 'daterange'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                type="daterange"
+                                align="right"
+                                unlink-panels
+                                value-format="yyyy-MM-dd"
+                                range-separator="至"
+                                start-placeholder="开始日期"
+                                end-placeholder="结束日期">
+                </el-date-picker>
+                <el-time-picker v-else-if="n.itemType === 'timepicker'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                placeholder="任意时间点">
+                </el-time-picker>
+                <el-time-picker v-else-if="n.itemType === 'timerange'"
+                                v-model.trim="form[n.columnName]"
+                                :disabled="disabled"
+                                is-range
+                                range-separator="至"
+                                start-placeholder="开始时间"
+                                end-placeholder="结束时间"
+                                placeholder="选择时间范围">
+                </el-time-picker>
+                <el-select v-else-if="n.itemType === 'select'"
+                           v-model.trim="form[n.columnName]"
+                           :multiple="n.multiSelect"
+                           :disabled="disabled"
+                           placeholder="请选择"
+                           size="small"
+                           clearable
+                           class="resi-cell-select">
+                  <el-option v-for="item in n.options || options"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <!-- <el-cascader
                       :options="options"
                       :props="{ checkStrictly: true }"
                       clearable></el-cascader> -->
-                    <el-cascader
-                      v-else-if="n.itemType === 'cascader'"
-                      v-model.trim="form[n.columnName]"
-                      :options="n.options"
-                      :disabled="disabled"
-                      :props="{ emitPath: false }"
-                      clearable
-                      size="small"
-                      class="resi-cell-select">
-                    </el-cascader>
-                    <template v-else-if="n.itemType === 'radio'">
-                      <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]" :disabled="disabled"
-                      :label="ns.value">
-                        {{ ns.label }}
-                      </el-radio>
-                      <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
-                    </template>
-                    <template v-else-if="n.itemType === 'checkbox'">
-                      <el-checkbox-group v-model.trim="form[n.columnName]">
-                        <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value" :disabled="disabled">{{ns.label}}</el-checkbox>
-                        <!-- <el-checkbox label="n.la"></el-checkbox> -->
-                      </el-checkbox-group>
-                    </template>
-                  </div>
-                <!-- </div> -->
-              </el-form-item>
-            </el-col>
+                <el-cascader v-else-if="n.itemType === 'cascader'"
+                             v-model.trim="form[n.columnName]"
+                             :options="n.options"
+                             :disabled="disabled"
+                             :props="{ emitPath: false }"
+                             clearable
+                             size="small"
+                             class="resi-cell-select">
+                </el-cascader>
+                <template v-else-if="n.itemType === 'radio'">
+                  <el-radio v-for="ns in n.options"
+                            :key="ns.value"
+                            v-model.trim="form[n.columnName]"
+                            :disabled="disabled"
+                            :label="ns.value">
+                    {{ ns.label }}
+                  </el-radio>
+                  <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
+                </template>
+                <template v-else-if="n.itemType === 'checkbox'">
+                  <el-checkbox-group v-model.trim="form[n.columnName]">
+                    <el-checkbox v-for="ns in n.options"
+                                 :key="ns.value"
+                                 :label="ns.value"
+                                 :disabled="disabled">{{ns.label}}</el-checkbox>
+                    <!-- <el-checkbox label="n.la"></el-checkbox> -->
+                  </el-checkbox-group>
+                </template>
+              </div>
+              <!-- </div> -->
+            </el-form-item>
+          </el-col>
         </el-row>
       </template>
     </el-form>
@@ -266,10 +309,15 @@
 
 <script>
 import { isCard, isMobile } from '@/utils/validate'
+import { requestPost } from "@/js/dai/request";
 
 export default {
   name: 'editForm',
   props: {
+    editUserId: {
+      type: String,
+      default: ''
+    },
     fixed: {
       type: Boolean,
       default: false
@@ -381,7 +429,7 @@ export default {
     }
     let form = initForm(this.formInfo, this.formList)
     let rules = initRules(this.formList)
-    let tempFormList = [ ...this.formList ]
+    let tempFormList = [...this.formList]
     let constForm = {
       ...form
     }
@@ -504,6 +552,7 @@ export default {
   created () {
     this.initForm()
     console.log('formInfo---gggreg', this.rulesForm)
+    console.log('formList', this.formList)
     if (this.supportAdd) {
       this.addList = [...this.mutiList]
       // console.log('addList----111', this.addList)
@@ -515,8 +564,34 @@ export default {
       this.getUniList()
       this.getHouseList()
     }
+
+  },
+  mounted () {
+    console.log('this.editUserId', this.editUserId)
+    if (this.editUserId) {
+      this.handleTuomin()
+    }
+
   },
   methods: {
+    async handleTuomin () {
+
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.editUserId,
+        type: "checkIcResiUser",
+      });
+
+      if (code === 0) {
+        this.$set(this.form, 'MOBILE', data.mobile)
+        this.$set(this.form, 'ID_CARD', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
     initForm () {
       this.formList.forEach(async item => {
         if (item.optionSourceType === 'remote') {
@@ -526,13 +601,13 @@ export default {
         }
       })
     },
-    getTreeData(data){
+    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)}
+          else _item = { ...item, children: this.getTreeData(item.children) }
         } else {
           _item = { ...item }
         }
@@ -614,9 +689,9 @@ export default {
       this.getHouseList()
     },
     // 为了实现根据房屋类型改版是否租户的需求
-    handleChangeH(val){
+    handleChangeH (val) {
       let item = this.optionsH.find(item => item.value === val);
-      if(item && item.type == '1'){
+      if (item && item.type == '1') {
         this.form.IS_TENANT = '1'
         console.log('item-----', item)
       } else this.form.IS_TENANT = '0'
@@ -625,7 +700,7 @@ export default {
       let arr = []
       this.addList.forEach(item => {
         // console.log('handlerMuscForm----000', this.$refs['baseForms' + item.row || item][0].handleForm())
-        arr.push([ ...this.$refs['baseForms' + item.row][0].handleForm() ])
+        arr.push([...this.$refs['baseForms' + item.row][0].handleForm()])
       })
       if (arr.length === 0) return arr
       let arr2 = arr.reduce(function (a, b) { return a.concat(b) })
@@ -808,17 +883,16 @@ export default {
 
 <style lang="scss" scoped>
 .resi-form {
-  :deep .el-date-editor.el-input, .el-date-editor.el-input__inner {
+  :deep .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
     width: 100% !important;
   }
 }
 .resi-cell-value .resi-cell-input {
-    width: 190px;
+  width: 190px;
 }
-
 </style>
 <style lang="scss" scoped>
-
 .resi-form .resi-row {
   margin-bottom: 0;
 }
@@ -826,43 +900,43 @@ export default {
 // .resi-form .resi-cell {
 //   display: flex;
 //   align-items: center;
-  // .resi-cell-label {
-  //   width: 70px;
-  //   box-sizing: border-box;
-  //   margin-right: 15px;
-  //   text-align: right;
-  // }
-  // .resi-cell-value-radio {
-  //   display: flex;
-  //   align-items: center;
-  //   min-height: 36px;
-  // }
-  //  .resi-cell-value .resi-cell-input {
-  //   width: 180px;
-  // }
+// .resi-cell-label {
+//   width: 70px;
+//   box-sizing: border-box;
+//   margin-right: 15px;
+//   text-align: right;
+// }
+// .resi-cell-value-radio {
+//   display: flex;
+//   align-items: center;
+//   min-height: 36px;
+// }
+//  .resi-cell-value .resi-cell-input {
+//   width: 180px;
+// }
 
-  .resi-cell-value .resi-cell-textarea {
-    width: 300px;
-  }
-  .resi-cell-col {
-    display: flex;
-    .el-form-item {
-      margin-right: 10px;
-    }
-  }
-  .resi-cell-select {
-    width: 190px;
-    box-sizing: border-box;
+.resi-cell-value .resi-cell-textarea {
+  width: 300px;
+}
+.resi-cell-col {
+  display: flex;
+  .el-form-item {
     margin-right: 10px;
-    &-middle {
-      width: 130px;
-    }
-    &-small {
-      width: 88px;
-    }
   }
-  .resi-cell-select:last-child {
-    margin-right: 0;
+}
+.resi-cell-select {
+  width: 190px;
+  box-sizing: border-box;
+  margin-right: 10px;
+  &-middle {
+    width: 130px;
+  }
+  &-small {
+    width: 88px;
   }
+}
+.resi-cell-select:last-child {
+  margin-right: 0;
+}
 // }
 </style>
diff --git a/src/views/modules/base/community/roomDetail.vue b/src/views/modules/base/community/roomDetail.vue
index 5570d3d7c..f1b066107 100644
--- a/src/views/modules/base/community/roomDetail.vue
+++ b/src/views/modules/base/community/roomDetail.vue
@@ -170,11 +170,11 @@ export default {
     },
 
     async handleTuomin () {
-      const url = "/gov/org/ichouse/detailByType";
+      const url = "/data/aggregator/epmetuser/detailByType";
 
       const { data, code, msg } = await requestPost(url, {
         id: this.houseId,
-        type: "house",
+        type: "checkHouse",
       });
 
       if (code === 0) {
@@ -184,7 +184,6 @@ export default {
         this.$message.error(msg);
       }
 
-
     },
 
     async loadHouseInfo () {
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 2d6bfc00c..496095faa 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -1,12 +1,7 @@
 <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"
@@ -263,23 +258,6 @@ 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 () {
 
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 34db813b7..8fed44547 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -227,7 +227,8 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
+            <el-button v-if="btnAuths.epidemic_prevention_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
@@ -266,6 +267,14 @@
                class="dialog-h"
                @closed="handleCnalceForm">
       <div class="dialog-h-content scroll-h">
+
+        <div v-if="btnAuths.epidemic_prevention_view_real_data"
+             class="div_tuomin">
+          <el-button size="mini"
+                     class="diy-button--search"
+                     @click="handleTuomin">显示脱敏信息</el-button>
+        </div>
+
         <div class="m-row">
           <div class="m-row-info">
 
@@ -287,11 +296,11 @@
           <div class="m-row-info">
             <div class="info-prop">
               <span class="info-title-2">手机号：</span>
-              <span>{{ formDetail.mobile||'--'  }}</span>
+              <span>{{ formDetail.showMobile||'--'  }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">证件号：</span>
-              <span>{{ formDetail.idCard||'--'  }}</span>
+              <span>{{ formDetail.showIdCard||'--'  }}</span>
             </div>
             <div class="info-prop">
               <span class="info-title-2">疫苗接种针次：</span>
@@ -480,6 +489,8 @@ export default {
         houseName: '',
         mobile: '',
         idCard: '',
+        showMobile: '',
+        showIdCard: '',
         vaccineCount: '',
         natCount: ''
       },
@@ -497,6 +508,13 @@ export default {
       //form相关
       formShow: false,
       formTitle: '新增',
+      selRowId: '',
+
+      btnAuths: {
+        epidemic_prevention_view: false, //查看
+        epidemic_prevention_view_real_data: false, //显示脱敏信息
+
+      },
 
     }
   },
@@ -507,8 +525,7 @@ export default {
 
   },
   async mounted () {
-    //获取场所类型
-
+    this.updateBtnAuths();
 
     const { user } = this.$store.state
     this.agencyId = user.agencyId
@@ -523,6 +540,33 @@ export default {
   },
 
   methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        console.log('btns', rot.meta.btns)
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.selRowId,
+        type: "JMFYXX",
+      });
+
+      if (code === 0) {
+        this.$set(this.formDetail, 'showMobile', data.mobile)
+        this.$set(this.formDetail, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
+
     handleAgeChange (val) {
       console.log('val----age---', val)
       if (val.start) {
@@ -615,7 +659,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
             this.optionsG = res.data
           }
         })
@@ -635,7 +679,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
             this.optionsV = res.data
           }
         })
@@ -652,7 +696,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
             this.optionsB = res.data
           }
         })
@@ -669,7 +713,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
             this.optionsD = res.data
           }
         })
@@ -684,7 +728,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
             this.optionsH = res.data
           }
         })
@@ -762,7 +806,7 @@ export default {
 
 
     async handleDetail (row) {
-
+      this.selRowId = row.id
       await this.getDetailInfo(row.id)
       await this.getDetailList(row.id)
       this.formTitle = '详情'
@@ -861,7 +905,10 @@ export default {
 
   },
   props: {
-
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
   }
 }
 </script>
@@ -885,6 +932,13 @@ export default {
 .min-w180 {
   min-width: 170px;
 }
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index c225c8e5e..c80f883ed 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -1,6 +1,12 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
+      <div v-if="formType==='detail' && view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <el-form v-if="formType !== 'detail'"
                ref="ref_form1"
                :inline="true"
@@ -124,12 +130,12 @@
 
           <div class="info-prop">
             <span class="info-title-2">手机号：</span>
-            <span>{{ formData.mobile||'--' }}</span>
+            <span>{{ formData.showMobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">证件号：</span>
-            <span>{{ formData.idCard||'--'  }}</span>
+            <span>{{ formData.showIdCard||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -176,6 +182,8 @@ function iniGetFmData () {
     name: "",
     idCard: "",
     mobile: "",
+    showIdCard: '',
+    showMobile: '',
     reason: "",
     remark: "",
     isSelChannel: false,
@@ -190,7 +198,7 @@ export default {
   data () {
     return {
       formType: "edit",
-
+      veroId: '',
       gridList: [],
 
       btnDisable: false,
@@ -214,19 +222,38 @@ export default {
   destroyed () { },
 
   methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.veroId,
+        type: this.fromSource,
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
     handleChannelChange (val) {
       this.formData.content = "";
     },
 
     async initForm (formType, row) {
       this.formType = formType;
-      this.$refs["ref_form1"].resetFields();
+      if (this.formType === 'edit') {
+        this.$refs["ref_form1"].resetFields();
+      }
+
       row.channel = [];
       row.content = "";
       row.attentionType = 2;
       row.isSelChannel = false;
       this.formData = JSON.parse(JSON.stringify(row));
-
+      this.veroId = row.id
       this.options.isolatedState.forEach(element => {
         if (this.formData.isolatedState === element.value) {
           this.formData.isolatedStateShow = element.label
@@ -354,10 +381,14 @@ export default {
     },
   },
   props: {
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    },
+    fromSource: {//显示【显示脱敏信息】按钮
+      type: String,
+      default: '',
+    },
   },
 };
 </script>
@@ -366,6 +397,13 @@ export default {
 </style>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
 </style>
 
 
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 527e2d4ef..5bf73b2ca 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -147,14 +147,17 @@
 
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add"
+        <el-button v-if="btnAuths.focus_groups_add"
+                   class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
-        <el-button style="float: left"
+        <el-button v-if="btnAuths.focus_groups_import"
+                   style="float: left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
+        <el-upload v-if="btnAuths.focus_groups_import"
+                   :headers="$getElUploadHeaders()"
                    ref="upload"
                    :multiple="false"
                    :show-file-list="false"
@@ -169,7 +172,8 @@
                      class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button style="float: left; margin-left: 10px"
+        <el-button v-if="btnAuths.focus_groups_export"
+                   style="float: left; margin-left: 10px"
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
@@ -277,11 +281,13 @@
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+            <el-button v-if="btnAuths.focus_groups_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="btnAuths.focus_groups_update"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -349,6 +355,8 @@
                class="dialog-h"
                @closed="diaClose">
       <nat-focus-edit ref="ref_form_edit"
+                      :fromSource="'focusGroupSpecialAttentionQuarantine'"
+                      :view_real_data="btnAuths.focus_groups_view_real_data"
                       @dialogCancle="diaClose"
                       @dialogOk="addFormOk"></nat-focus-edit>
     </el-dialog>
@@ -468,6 +476,15 @@ export default {
       showedPeopleMoreInfo: false,
       currentPepeleId: "",
       currentPepeleGridName: "",
+
+      btnAuths: {
+        focus_groups_add: false, //新增
+        focus_groups_import: false, //导入
+        focus_groups_export: false, //导出
+        focus_groups_view: false, //查看
+        focus_groups_update: false, //修改
+        focus_groups_view_real_data: false, //显示脱敏信息
+      },
     };
   },
   components: {
@@ -484,6 +501,8 @@ export default {
   },
 
   async mounted () {
+    this.updateBtnAuths();
+
     for (let i = 0; i < 11; i++) {
       let obj = {
         value: i + "",
@@ -502,6 +521,16 @@ export default {
   },
 
   methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
     async handleWatchPeopleInfo (rowIndex) {
       let item = this.tableData[rowIndex];
       this.currentPepeleId = item.userId;
@@ -775,6 +804,8 @@ export default {
       if (code === 0) {
         row.mobile = data.mobile;
         row.idCard = data.idCard;
+        row.showMobile = data.showMobile;
+        row.showIdCard = data.showIdCard;
       }
       return row;
     },
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index c304582fc..6474e636e 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -1,79 +1,69 @@
 <template>
   <div class="div_main">
     <div class="div_search">
-      <el-form
-        :inline="true"
-        :model="formData"
-        ref="ref_searchform"
-        :label-width="'90px'"
-      >
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
         <div>
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="formData.name"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入姓名"
-            >
+          <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-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-form-item label="证件号" prop="mobile">
-            <el-input
-              v-model="formData.idCard"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入身份证号或护照号"
-            >
+          <el-form-item label="证件号"
+                        prop="mobile">
+            <el-input v-model="formData.idCard"
+                      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.reason"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入关注原因"
-            >
+          <el-form-item label="关注原因"
+                        prop="mobile">
+            <el-input v-model="formData.reason"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入关注原因">
             </el-input>
           </el-form-item>
-          <el-form-item label="隔离状态" prop="isolatedState">
-            <el-select
-              v-model="formData.isolatedState"
-              size="small"
-              class="list_item_width_1"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in options.isolatedState"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+          <el-form-item label="隔离状态"
+                        prop="isolatedState">
+            <el-select v-model="formData.isolatedState"
+                       size="small"
+                       class="list_item_width_1"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in options.isolatedState"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="备注" prop="remark">
-            <el-input
-              v-model="formData.remark"
-              size="small"
-              class="list_item_width_1"
-              clearable
-              placeholder="请输入备注"
-            >
+          <el-form-item label="备注"
+                        prop="remark">
+            <el-input v-model="formData.remark"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入备注">
             </el-input>
           </el-form-item>
         </div>
@@ -83,135 +73,104 @@
             <div class="resi-cell-value">
               <div class="resi-cell-col">
                 <el-form-item prop="villageId">
-                  <el-select
-                    v-model.trim="formData.villageId"
-                    placeholder="小区"
-                    size="small"
-                    clearable
-                    class="resi-cell-select"
-                    @change="handleChangeV"
-                  >
-                    <el-option
-                      v-for="item in optionsV"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                  <el-select v-model.trim="formData.villageId"
+                             placeholder="小区"
+                             size="small"
+                             clearable
+                             class="resi-cell-select"
+                             @change="handleChangeV">
+                    <el-option v-for="item in optionsV"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="buildId">
-                  <el-select
-                    v-model.trim="formData.buildId"
-                    placeholder="楼号"
-                    :disabled="!this.formData.villageId"
-                    size="small"
-                    clearable
-                    class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                    @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                  <el-select v-model.trim="formData.buildId"
+                             placeholder="楼号"
+                             :disabled="!this.formData.villageId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @change="handleChangeB">
+                    <el-option v-for="item in optionsB"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="unitId">
-                  <el-select
-                    v-model.trim="formData.unitId"
-                    placeholder="单元"
-                    size="small"
-                    :disabled="!this.formData.buildId"
-                    clearable
-                    class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                    @change="handleChangeD"
-                  >
-                    <el-option
-                      v-for="item in optionsD"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                  <el-select v-model.trim="formData.unitId"
+                             placeholder="单元"
+                             size="small"
+                             :disabled="!this.formData.buildId"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @change="handleChangeD">
+                    <el-option v-for="item in optionsD"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="homeId">
-                  <el-select
-                    v-model.trim="formData.homeId"
-                    placeholder="房号"
-                    :disabled="!this.formData.unitId"
-                    size="small"
-                    clearable
-                    class="resi-cell-select resi-cell-select-middle list_item_width_1"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
+                  <el-select v-model.trim="formData.homeId"
+                             placeholder="房号"
+                             :disabled="!this.formData.unitId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                    <el-option v-for="item in optionsH"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </div>
             </div>
           </el-form-item>
-          <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
-          >
+          <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">
-      <el-table
-        ref="ref_table"
-        class="table"
-        :data="tableData"
-        border
-        :height="tableHeight"
-        v-loading="tableLoading"
-        :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
-        @select="handleSelectTable"
-        @select-all="handleSelAll"
-        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="姓名"
-          width="90"
-        >
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                @select="handleSelectTable"
+                @select-all="handleSelAll"
+                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="姓名"
+                         width="90">
           <template slot-scope="scope">
-            <a
-              style="cursor: pointer"
-              v-if="scope.row.userId"
-              @click="handleWatchPeopleInfo(scope.$index)"
-              >{{ scope.row.name }}</a
-            >
+            <a style="cursor: pointer"
+               v-if="scope.row.userId"
+               @click="handleWatchPeopleInfo(scope.$index)">{{ scope.row.name }}</a>
             <span v-else>{{ scope.row.name }}</span>
           </template>
         </el-table-column>
@@ -233,214 +192,167 @@
           >
           </el-table-column> -->
 
-        <el-table-column
-          prop="allName"
-          header-align="center"
-          align="center"
-          label="所属房屋"
-          min-width="200"
-        >
+        <el-table-column prop="allName"
+                         header-align="center"
+                         align="center"
+                         label="所属房屋"
+                         min-width="200">
         </el-table-column>
-        <el-table-column
-          prop="reason"
-          header-align="center"
-          align="center"
-          label="关注原因"
-          width="180"
-        >
+        <el-table-column prop="reason"
+                         header-align="center"
+                         align="center"
+                         label="关注原因"
+                         width="180">
         </el-table-column>
-        <el-table-column
-          prop="isolatedState"
-          header-align="center"
-          align="center"
-          label="隔离状态"
-          width="180"
-        >
+        <el-table-column prop="isolatedState"
+                         header-align="center"
+                         align="center"
+                         label="隔离状态"
+                         width="180">
           <template slot-scope="scope">
             {{ optionsDict.isolatedState[scope.row.isolatedState] || "--" }}
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="lastNatTime"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="最后一次核酸时间"
-          width="170"
-        >
+        <el-table-column prop="lastNatTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="最后一次核酸时间"
+                         width="170">
         </el-table-column>
 
-        <el-table-column
-          prop="remark"
-          header-align="center"
-          align="center"
-          show-overflow-tooltip
-          label="备注"
-          min-width="180"
-        >
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="180">
         </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-popover
-              popper-class="btn-popper"
-              placement="bottom"
-              style="margin-left: 10px"
-              width="20"
-              trigger="hover"
-            >
+            <el-button v-if="btnAuths.focus_groups_his_view"
+                       type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+
+            <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left: 10px"
+                        width="20"
+                        trigger="hover">
               <div class="table-more-btn">
-                <el-button
-                  type="text"
-                  class="div-table-button--detail--noline"
-                  size="small"
-                  @click="handleNoticeList(scope.row)"
-                  >通知记录</el-button
-                >
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleNoticeList(scope.row)">通知记录</el-button>
               </div>
 
               <div class="table-more-btn">
-                <el-button
-                  type="text"
-                  class="div-table-button--detail--noline"
-                  size="small"
-                  @click="handleVisiteList(scope.row)"
-                  >随访记录</el-button
-                >
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleVisiteList(scope.row)">随访记录</el-button>
               </div>
 
-              <el-button
-                type="text"
-                size="small"
-                class="div-table-button--more"
-                slot="reference"
-                >更多<i class="el-icon-caret-bottom"></i
-              ></el-button>
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
             </el-popover>
           </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="addFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      title="新增核酸检测关注名单"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <nat-focus-add
-        ref="ref_form_add"
-        @dialogCancle="diaClose"
-        @dialogOk="addFormOk"
-      ></nat-focus-add>
+    <el-dialog :visible.sync="addFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :destroy-on-close="true"
+               title="新增核酸检测关注名单"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nat-focus-add ref="ref_form_add"
+                     @dialogCancle="diaClose"
+                     @dialogOk="addFormOk"></nat-focus-add>
     </el-dialog>
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="editFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="editFormTitle"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <nat-focus-edit
-        ref="ref_form_edit"
-        @dialogCancle="diaClose"
-        @dialogOk="addFormOk"
-      ></nat-focus-edit>
+    <el-dialog :visible.sync="editFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="editFormTitle"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nat-focus-edit ref="ref_form_edit"
+                      :fromSource="'focusGroupSpecialAttentionHistory'"
+                      :view_real_data="btnAuths.focus_groups_his_view_real_data"
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></nat-focus-edit>
     </el-dialog>
     <!-- 发送通知弹出框 -->
-    <el-dialog
-      :visible.sync="sendNoticeFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="发送通知"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <nf-send-notice
-        ref="ref_sendnotice"
-        @dialogOk="sendNoticeOk"
-        @dialogCancle="diaClose"
-      ></nf-send-notice>
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-send-notice ref="ref_sendnotice"
+                      @dialogOk="sendNoticeOk"
+                      @dialogCancle="diaClose"></nf-send-notice>
     </el-dialog>
     <!-- 通知记录弹出框 -->
-    <el-dialog
-      :visible.sync="noticeListFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="通知记录"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <nf-notice-list
-        ref="ref_noticelist"
-        @dialogCancle="diaClose"
-      ></nf-notice-list>
+    <el-dialog :visible.sync="noticeListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="通知记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-notice-list ref="ref_noticelist"
+                      @dialogCancle="diaClose"></nf-notice-list>
     </el-dialog>
     <!-- 随访记录弹出框 -->
-    <el-dialog
-      :visible.sync="visiteListFormShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="随访记录"
-      width="1050px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaClose"
-    >
-      <nf-visite-list
-        ref="ref_visitelist"
-        @dialogCancle="diaClose"
-      ></nf-visite-list>
+    <el-dialog :visible.sync="visiteListFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="随访记录"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-visite-list ref="ref_visitelist"
+                      @dialogCancle="diaClose"></nf-visite-list>
     </el-dialog>
 
-    <people-more
-      v-if="showedPeopleMoreInfo && currentPepeleId"
-      :userId="currentPepeleId"
-      :gridName="currentPepeleGridName"
-      @close="showedPeopleMoreInfo = false"
-    />
+    <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
+                 :userId="currentPepeleId"
+                 :gridName="currentPepeleGridName"
+                 @close="showedPeopleMoreInfo = false" />
   </div>
 </template>
 
@@ -459,7 +371,7 @@ import peopleMore from "@/views/modules/shequ/cpts/people-more";
 let loading; // 加载动画
 
 export default {
-  data() {
+  data () {
     return {
       loading: false,
       total: 0,
@@ -515,6 +427,12 @@ export default {
       showedPeopleMoreInfo: false,
       currentPepeleId: "",
       currentPepeleGridName: "",
+
+      btnAuths: {
+
+        focus_groups_his_view: false, //查看
+        focus_groups_his_view_real_data: false, //显示脱敏信息
+      },
     };
   },
   components: {
@@ -526,11 +444,13 @@ export default {
     peopleMore,
   },
 
-  activated() {
+  activated () {
     this.$refs["ref_table"].doLayout();
   },
 
-  async mounted() {
+  async mounted () {
+    this.updateBtnAuths();
+
     for (let i = 0; i < 11; i++) {
       let obj = {
         value: i + "",
@@ -549,7 +469,17 @@ export default {
   },
 
   methods: {
-    async handleWatchPeopleInfo(rowIndex) {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
+    async handleWatchPeopleInfo (rowIndex) {
       let item = this.tableData[rowIndex];
       this.currentPepeleId = item.userId;
       this.currentPepeleGridName = item.gridName;
@@ -557,7 +487,7 @@ export default {
       this.showedPeopleMoreInfo = true;
     },
 
-    async getFmOptions(field, url, params, cookFn) {
+    async getFmOptions (field, url, params, cookFn) {
       const { data, code, msg } = await requestPost(url, {
         ...params,
       });
@@ -574,12 +504,12 @@ export default {
       }
     },
 
-    handleSearch() {
+    handleSearch () {
       this.selectionAll = [];
       this.loadTable();
     },
 
-    async loadTable() {
+    async loadTable () {
       this.tableLoading = true;
 
       const url = "/epmetuser/icEpidemicSpecialAttention/historyList";
@@ -630,7 +560,7 @@ export default {
       this.tableLoading = false;
     },
 
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log("val", val);
       this.formData.buildId = "";
       this.formData.unitId = "";
@@ -639,19 +569,19 @@ export default {
       this.getUniList();
       this.getHouseList();
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log("val", val);
       this.formData.unitId = "";
       this.formData.homeId = "";
       this.getUniList();
       this.getHouseList();
     },
-    handleChangeD() {
+    handleChangeD () {
       this.formData.homeId = "";
       this.getHouseList();
     },
 
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/icneighborhood/neighborhoodoption", {
@@ -671,7 +601,7 @@ export default {
         });
     },
 
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post("/gov/org/icbuilding/buildingoption", {
           neighborHoodId: this.formData.villageId,
@@ -688,7 +618,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post("/gov/org/icbuildingunit/unitoption", {
           buildingId: this.formData.buildId,
@@ -705,7 +635,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post("/gov/org/ichouse/houseoption", { unitId: this.formData.unitId })
         .then(({ data: res }) => {
@@ -721,7 +651,7 @@ export default {
         });
     },
 
-    handleSelectTable(selection, row) {
+    handleSelectTable (selection, row) {
       row.isSel = !row.isSel;
 
       if (row.isSel) {
@@ -737,7 +667,7 @@ export default {
       }
     },
 
-    handleSelAll(selection) {
+    handleSelAll (selection) {
       let selFlag = selection.length > 0; //全选选中 还是 全选不选中
       for (let i = 0; i < this.tableData.length; i++) {
         let tableItem = this.tableData[i];
@@ -761,7 +691,7 @@ export default {
     },
 
     //回显列表选中的行
-    analysisTableSelection() {
+    analysisTableSelection () {
       this.$nextTick(() => {
         this.tableData.forEach((tableItem) => {
           for (let j = 0; j < this.selectionAll.length; j++) {
@@ -779,7 +709,7 @@ export default {
       });
     },
 
-    diaClose() {
+    diaClose () {
       this.addFormShow = false;
       this.editFormShow = false;
       this.sendNoticeFormShow = false;
@@ -787,14 +717,14 @@ export default {
       this.visiteListFormShow = false;
     },
 
-    handleAdd() {
+    handleAdd () {
       this.addFormShow = true;
       this.$nextTick(() => {
         this.$refs.ref_form_add.initForm(null, this.agencyId);
       });
     },
 
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.editFormTitle = "修改核酸检测关注名单";
       this.editFormShow = true;
       const row1 = { ...row };
@@ -802,7 +732,7 @@ export default {
       this.$refs.ref_form_edit.initForm("edit", row2);
     },
 
-    async handleDetail(row) {
+    async handleDetail (row) {
       this.editFormTitle = "查看核酸检测关注名单";
       this.editFormShow = true;
       const row1 = { ...row };
@@ -810,7 +740,7 @@ export default {
       this.$refs.ref_form_edit.initForm("detail", row2);
     },
 
-    async getInfo(row) {
+    async getInfo (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/detail";
 
       let params = {
@@ -822,11 +752,13 @@ export default {
       if (code === 0) {
         row.mobile = data.mobile;
         row.idCard = data.idCard;
+        row.showMobile = data.showMobile;
+        row.showIdCard = data.showIdCard;
       }
       return row;
     },
 
-    handleSendNotice() {
+    handleSendNotice () {
       if (this.selectionAll.length === 0) {
         this.$message.info("请选择要通知的人员");
         return false;
@@ -837,32 +769,32 @@ export default {
       });
     },
 
-    handleNoticeList(row) {
+    handleNoticeList (row) {
       this.noticeListFormShow = true;
       this.$nextTick(() => {
         this.$refs.ref_noticelist.initTable(row.realIdCard, "2");
       });
     },
-    handleVisiteList(row) {
+    handleVisiteList (row) {
       this.visiteListFormShow = true;
       this.$nextTick(() => {
         this.$refs.ref_visitelist.initTable(row, "2");
       });
     },
 
-    addFormOk() {
+    addFormOk () {
       this.addFormShow = false;
       this.editFormShow = false;
 
       this.loadTable();
     },
-    sendNoticeOk() {
+    sendNoticeOk () {
       this.sendNoticeFormShow = false;
       this.selectionAll = [];
       this.loadTable();
     },
 
-    async handleDelete(row) {
+    async handleDelete (row) {
       if (this.selectionAll.length === 0) {
         this.$message.info("请选择要取消关注的名单");
         return false;
@@ -881,7 +813,7 @@ export default {
         });
     },
 
-    async deleteFocus(row) {
+    async deleteFocus (row) {
       const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention";
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
       let idCards = [];
@@ -909,7 +841,7 @@ export default {
     },
 
     //重置搜索条件
-    resetSearch() {
+    resetSearch () {
       this.formData = {
         attentionType: 2, //关注类型，核酸检测：2，疫苗接种：1
         name: "",
@@ -922,18 +854,18 @@ export default {
       // this.loadTable()
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     //导出表格
-    async handleExport() {
+    async handleExport () {
       let title = "核酸检测关注名单";
 
       const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export";
@@ -951,7 +883,7 @@ export default {
     },
 
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       if (!data) {
         return;
       }
@@ -975,7 +907,7 @@ export default {
       }
     },
 
-    handleExportModule() {
+    handleExportModule () {
       let title = "核酸检测关注名单模板";
 
       const url = "/epmetuser/icEpidemicSpecialAttention/export-template";
@@ -996,7 +928,7 @@ export default {
     },
 
     // 上传文件之前的钩子
-    beforeUpload(file) {
+    beforeUpload (file) {
       const array = file.name.split(".");
       const extension = array[array.length - 1];
       // const isLt1M = (file.size / 1024 / 1024) < 5
@@ -1010,11 +942,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;
@@ -1053,13 +985,13 @@ export default {
 
           // this.loadTable()
         },
-        (rspMsg, data) => {},
+        (rspMsg, data) => { },
         { headers: { "Content-Type": "multipart/form-data" } }
       );
     },
 
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -1067,7 +999,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -1075,7 +1007,7 @@ export default {
     },
   },
   computed: {
-    tableHeight() {
+    tableHeight () {
       return this.$store.state.inIframe
         ? this.clientHeight - 415 + this.iframeHeight
         : this.clientHeight - 415;
diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue
index 65498f1ff..a644af8bb 100644
--- a/src/views/modules/base/epidemic/natInfo/natDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
+
+      <div v-if="view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <div v-if="initLoading"
            class="m-row">
         <div class="m-info">
@@ -11,12 +18,12 @@
 
           <div class="info-prop">
             <span class="info-title-2">手机号：</span>
-            <span>{{ formData.mobile||'--' }}</span>
+            <span>{{ formData.showMobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">证件号：</span>
-            <span>{{ formData.idCard||'--'  }}</span>
+            <span>{{ formData.showIdCard||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -90,7 +97,22 @@ export default {
   },
 
   methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.icNatId,
+        type: "natRecord",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
 
+    },
 
     async initForm (icNatId) {
       this.startLoading()
@@ -178,17 +200,24 @@ export default {
 
   },
   props: {
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
-  }
+    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/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index e9dce9fd9..fc8d9a523 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -111,15 +111,18 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add"
+        <el-button v-if="btnAuths.ic_nat_add"
+                   class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button style="float:left"
+        <el-button v-if="btnAuths.ic_nat_import"
+                   style="float:left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
+        <el-upload v-if="btnAuths.ic_nat_import"
+                   :headers="$getElUploadHeaders()"
                    ref="upload"
                    :multiple='false'
                    :show-file-list='false'
@@ -134,10 +137,16 @@
                      class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button style="float:left;margin-left:10px"
+        <el-button v-if="btnAuths.ic_nat_export"
+                   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--export"
+                   size="small"
+                   @click="handleTiming()">定时</el-button>
       </div>
 
       <el-table class="table"
@@ -216,14 +225,11 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
+            <el-button v-if="btnAuths.ic_nat_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleTiming(scope.row)">定时</el-button>
 
             <el-button v-if="!isResiUser"
                        type="text"
@@ -231,13 +237,13 @@
                        size="small"
                        @click="handleAttention(scope.row)">同步</el-button>
 
-            <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+            <el-button v-if="btnAuths.ic_nat_update&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+            <el-button v-if="btnAuths.ic_nat_del&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--delete "
                        size="small"
@@ -277,7 +283,7 @@
                 @dialogCancle="diaClose"
                 @dialogOk="addFormOk"></nat-form>
     </el-dialog>
-    <!-- 修改弹出框 -->
+    <!-- 详情弹出框 -->
     <el-dialog :visible.sync="detailShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
@@ -287,6 +293,7 @@
                class="dialog-h"
                @closed="diaDetailClose">
       <nat-detail ref="ref_detail"
+                  :view_real_data="btnAuths.ic_nat_view_real_data"
                   @dialogCancle="diaDetailClose"></nat-detail>
     </el-dialog>
 
@@ -357,6 +364,16 @@ export default {
       detailShow: false,
       formTitle: '新增',
 
+      btnAuths: {
+        ic_nat_add: false, //新增
+        ic_nat_import: false, //导入
+        ic_nat_export: false, //导出
+        ic_nat_del: false, //删除
+        ic_nat_view: false, //查看
+        ic_nat_update: false, //修改
+        ic_nat_view_real_data: false, //显示脱敏信息
+      },
+
     }
   },
   components: {
@@ -366,8 +383,7 @@ export default {
 
   },
   async mounted () {
-    //获取场所类型
-
+    this.updateBtnAuths();
 
     const { user } = this.$store.state
     this.agencyId = user.agencyId
@@ -381,7 +397,15 @@ export default {
   },
 
   methods: {
-
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
     async handleSearch () {
       this.isResiUser = this.formData.orgType === 'current'
 
diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index cf1a7df17..6f5160611 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
+
+      <div v-if="view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <div v-if="initLoading"
            class="m-row">
         <div class="m-info">
@@ -11,12 +18,12 @@
 
           <div class="info-prop">
             <span class="info-title-2">联系方式：</span>
-            <span>{{ formData.realMobile||'--' }}</span>
+            <span>{{ formData.mobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">证件号：</span>
-            <span>{{ formData.realIdCard||'--'  }}</span>
+            <span>{{ formData.idCard||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -79,8 +86,6 @@ export default {
       icNatId: '',
       formData: {},
 
-
-
     }
   },
   components: {},
@@ -91,16 +96,29 @@ export default {
   },
 
   methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.icNatId,
+        type: "noNatCompare",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'mobile', data.mobile)
+        this.$set(this.formData, 'idCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
 
+    },
 
     async initForm (row) {
       this.startLoading()
       // this.formData.agencyId = this.agencyId
       this.formData = JSON.parse(JSON.stringify(row))
-      // this.icNatId = icNatId
-      // this.formData.icNatId = icNatId
+      this.icNatId = row.recordId
 
-      // await this.loadFormData()
       this.initLoading = true
       this.endLoading()
 
@@ -163,17 +181,24 @@ export default {
 
   },
   props: {
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
-  }
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: true,
+    }
+  },
 }
 </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/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue
index dd712b1de..33ccfc846 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatList.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue
@@ -83,11 +83,13 @@
                    size="small"
                    @click="handleAdd">新增</el-button> -->
 
-        <el-button style="float:left"
+        <el-button v-if="btnAuths.nat_compare_rec_import"
+                   style="float:left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
+        <el-upload v-if="btnAuths.nat_compare_rec_import"
+                   :headers="$getElUploadHeaders()"
                    ref="upload"
                    :multiple='false'
                    :show-file-list='false'
@@ -102,7 +104,8 @@
                      class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button style="float:left;margin-left:10px"
+        <el-button v-if="btnAuths.nat_compare_rec_export"
+                   style="float:left;margin-left:10px"
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
@@ -190,7 +193,8 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
+            <el-button v-if="btnAuths.nat_compare_rec_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
@@ -223,7 +227,7 @@
                 @dialogCancle="diaClose"
                 @dialogOk="addFormOk"></nat-form>
     </el-dialog>
-    <!-- 修改弹出框 -->
+    <!-- 详情弹出框 -->
     <el-dialog :visible.sync="detailShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
@@ -233,6 +237,7 @@
                class="dialog-h"
                @closed="diaDetailClose">
       <no-nat-detail ref="ref_detail"
+                     :view_real_data="btnAuths.nat_compare_rec_view_real_data"
                      @dialogCancle="diaDetailClose"></no-nat-detail>
     </el-dialog>
 
@@ -287,7 +292,14 @@ export default {
       detailShow: false,
       formTitle: '新增',
 
-      sHeight: 0
+      sHeight: 0,
+
+      btnAuths: {
+        nat_compare_rec_import: false, //导入
+        nat_compare_rec_export: false, //导出
+        nat_compare_rec_view: false, //查看
+        nat_compare_rec_view_real_data: false, //显示脱敏信息
+      },
 
     }
   },
@@ -298,7 +310,8 @@ export default {
 
   },
   async mounted () {
-    //获取场所类型
+    this.updateBtnAuths();
+
     const { user } = this.$store.state
     this.agencyId = user.agencyId
 
@@ -311,7 +324,15 @@ export default {
   },
 
   methods: {
-
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
     async handleSearch () {
 
       await this.loadTable()
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index f7fda935a..f72771098 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -82,14 +82,17 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add"
+        <el-button v-if="btnAuths.tripreport_add"
+                   class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button class="diy-button--export"
+        <el-button v-if="btnAuths.tripreport_import"
+                   class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
+        <el-upload v-if="btnAuths.tripreport_import"
+                   :headers="$getElUploadHeaders()"
                    ref="upload"
                    :multiple='false'
                    :show-file-list='false'
@@ -105,7 +108,8 @@
                      :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
 
-        <el-button style="margin-left:10px"
+        <el-button v-if="btnAuths.tripreport_export"
+                   style="margin-left:10px"
                    class="diy-button--reset"
                    size="small"
                    :loading="exportBtn"
@@ -218,12 +222,14 @@
                          class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text"
+            <el-button v-if="btnAuths.tripreport_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
             <!-- v-if="scope.row.userType != 'resi'"  -->
-            <el-button type="text"
+            <el-button v-if="btnAuths.tripreport_update"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -280,7 +286,8 @@
                              @click="handleVisiteList(scope.row) ">随访记录</el-button>
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-button type="text"
+                  <el-button v-if="btnAuths.tripreport_del"
+                             type="text"
                              class="div-table-button--delete--noline "
                              size="small"
                              @click="handleDelete(scope.row)">删除</el-button>
@@ -327,6 +334,7 @@
                class="dialog-h"
                @closed="diaClose">
       <travel-detail v-if="detailShow"
+                     :view_real_data="btnAuths.tripreport_view_real_data"
                      @dialogCancle="addFormCancle"
                      ref="ref_detail"></travel-detail>
     </el-dialog>
@@ -422,7 +430,17 @@ export default {
         lazy: true,
         checkStrictly: true,
         lazyLoad: this.lzayLoadArea
-      }
+      },
+
+      btnAuths: {
+        tripreport_add: false, //新增
+        tripreport_import: false, //导入
+        tripreport_export: false, //导出
+        tripreport_del: false, //删除
+        tripreport_view: false, //查看
+        tripreport_update: false, //修改
+        tripreport_view_real_data: false, //显示脱敏信息
+      },
 
     }
   },
@@ -437,8 +455,7 @@ export default {
 
   },
   async mounted () {
-    //获取场所类型
-
+    this.updateBtnAuths();
 
     const { user } = this.$store.state
     console.log('user-----', user)
@@ -450,6 +467,16 @@ export default {
   },
 
   methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
     lzayLoadArea (node, resolve) {
       this.getArea(node, resolve)
       // setTimeout(() => {
diff --git a/src/views/modules/base/epidemic/travelDetail.vue b/src/views/modules/base/epidemic/travelDetail.vue
index f7bbe35aa..ed1ad8baf 100644
--- a/src/views/modules/base/epidemic/travelDetail.vue
+++ b/src/views/modules/base/epidemic/travelDetail.vue
@@ -2,6 +2,12 @@
   <div>
     <div class="dialog-h-content scroll-h">
 
+      <div v-if="view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <div v-if="initLoading"
            class="m-row">
         <div class="m-info">
@@ -12,12 +18,12 @@
 
           <div class="info-prop">
             <span class="info-title-4">手机号：</span>
-            <span>{{ formData.mobile||'--' }}</span>
+            <span>{{ formData.showMobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-4">证件号：</span>
-            <span>{{ formData.idCard||'--' }}</span>
+            <span>{{ formData.showIdCard||'--' }}</span>
           </div>
 
           <div class="info-prop">
@@ -92,13 +98,35 @@ export default {
   destroyed () {
     this.nowAllCode = []
   },
+  props: {
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  },
   methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.icNatId,
+        type: "routeFollow",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
 
     async initForm (row) {
       console.log('row----', row)
 
       this.formData.agencyId = this.agencyId
-
+      this.icNatId = row.id
       await this.loadFormData(row.id)
 
       this.initLoading = true
@@ -184,13 +212,7 @@ export default {
       }
 
     },
-    async handleSelPerson (personItem) {
-      this.formData.userId = personItem.demandUserId
-      this.formData.name = personItem.demandUserName
-      this.formData.mobile = personItem.demandUserMobile
-      this.formData.idCard = personItem.idCard
-      this.handleSelAddress(personItem.houseId)
-    },
+
 
     async loadFormData (id) {
 
@@ -242,6 +264,13 @@ export default {
 
 <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/epidemic/vaccin.vue b/src/views/modules/base/epidemic/vaccin.vue
index f2e2874d7..488e094a0 100644
--- a/src/views/modules/base/epidemic/vaccin.vue
+++ b/src/views/modules/base/epidemic/vaccin.vue
@@ -92,15 +92,18 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add"
+        <el-button v-if="btnAuths.vaccine_add"
+                   class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button style="float: left"
+        <el-button v-if="btnAuths.vaccine_import"
+                   style="float: left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
+        <el-upload v-if="btnAuths.vaccine_import"
+                   :headers="$getElUploadHeaders()"
                    ref="upload"
                    :multiple="false"
                    :show-file-list="false"
@@ -115,7 +118,8 @@
                      class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button style="float: left; margin-left: 10px"
+        <el-button v-if="btnAuths.vaccine_export"
+                   style="float: left; margin-left: 10px"
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
@@ -189,7 +193,8 @@
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+            <el-button v-if="btnAuths.vaccine_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
@@ -199,13 +204,13 @@
                        class="div-table-button--edit"
                        size="small"
                        @click="handleAttention(scope.row)">同步</el-button>
-            <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+            <el-button v-if="btnAuths.vaccine_update&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
 
-            <el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
+            <el-button v-if="btnAuths.vaccine_del&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
                        type="text"
                        class="div-table-button--delete "
                        size="small"
@@ -244,6 +249,7 @@
                class="dialog-h"
                @closed="diaClose">
       <vaccinForm ref="ref_form"
+                  :view_real_data="btnAuths.vaccine_view_real_data"
                   @dialogCancle="diaClose"></vaccinForm>
     </el-dialog>
     <el-dialog :visible.sync="addFormShow"
@@ -321,6 +327,15 @@ export default {
       formTitle: "新增",
 
       addFormShow: false,
+      btnAuths: {
+        vaccine_add: false, //新增
+        vaccine_import: false, //导入
+        vaccine_export: false, //导出
+        vaccine_del: false, //删除
+        vaccine_view: false, //查看
+        vaccine_update: false, //修改
+        vaccine_view_real_data: false, //显示脱敏信息
+      },
     };
   },
   components: {
@@ -330,7 +345,7 @@ export default {
   },
   async created () { },
   async mounted () {
-    //获取场所类型
+    this.updateBtnAuths();
 
     const { user } = this.$store.state;
     this.agencyId = user.agencyId;
@@ -342,6 +357,15 @@ export default {
   },
 
   methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
     async handleSearch () {
       this.isResiUser = this.formData.searchType === "current";
 
@@ -447,6 +471,8 @@ export default {
       if (code === 0) {
         row.mobile = data.mobile;
         row.idCard = data.idCard;
+        row.showMobile = data.showMobile;
+        row.showIdCard = data.showIdCard;
         row.isResiUser = data.isResiUser
       }
       return row;
diff --git a/src/views/modules/base/epidemic/vaccinForm.vue b/src/views/modules/base/epidemic/vaccinForm.vue
index d001871fe..a634c158a 100644
--- a/src/views/modules/base/epidemic/vaccinForm.vue
+++ b/src/views/modules/base/epidemic/vaccinForm.vue
@@ -1,6 +1,13 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
+
+      <div v-if="view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <div v-if="initLoading"
            class="m-row">
         <div class="m-info">
@@ -11,12 +18,12 @@
 
           <div class="info-prop">
             <span class="info-title-2">手机号：</span>
-            <span>{{ formData.mobile||'--' }}</span>
+            <span>{{ formData.showMobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">证件号：</span>
-            <span>{{ formData.idCard||'--' }}</span>
+            <span>{{ formData.showIdCard||'--' }}</span>
           </div>
 
           <div class="info-prop">
@@ -57,6 +64,7 @@ export default {
   data () {
     return {
       initLoading: false,
+      vaccineId: '',
       formData: {
         agencyId: '',//当前网格所属组织Id
         userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
@@ -64,13 +72,13 @@ export default {
         name: '',
         idCard: '',
         mobile: '',
+        showIdCard: '',
+        showMobile: '',
         inoculateTime: '',
         inoculateAddress: '',
         manufacturer: ''
       },
 
-
-
     }
   },
   components: {},
@@ -81,6 +89,22 @@ export default {
   },
 
   methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.vaccineId,
+        type: "vaccinationRecord",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
     handleChannelChange (val) {
       this.formData.content = ''
     },
@@ -89,6 +113,7 @@ export default {
 
 
       this.formData = { ...row }
+      this.vaccineId = row.vaccineId
       // this.endLoading()
       console.log('formData----', this.formData)
       this.initLoading = true
@@ -166,6 +191,8 @@ export default {
         name: '',
         idCard: '',
         mobile: '',
+        showIdCard: '',
+        showMobile: '',
         natTime: '',
         natAddress: '',
         natResult: '',
@@ -199,20 +226,24 @@ export default {
 
   },
   props: {
-
-
-
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
-  }
+    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/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
index 84560a1a0..512451bcc 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -2,6 +2,12 @@
   <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
 
+      <div v-if="formType==='detail' && view_real_data"
+           class="div_tuomin">
+        <el-button size="mini"
+                   class="diy-button--search"
+                   @click="handleTuomin">显示脱敏信息</el-button>
+      </div>
       <el-form v-if="formType !== 'detail'"
                ref="ref_form1"
                :inline="true"
@@ -113,12 +119,12 @@
 
           <div class="info-prop">
             <span class="info-title-2">手机号：</span>
-            <span>{{ formData.mobile||'--' }}</span>
+            <span>{{ formData.showMobile||'--' }}</span>
           </div>
 
           <div class="info-prop">
             <span class="info-title-2">证件号：</span>
-            <span>{{ formData.idCard||'--'  }}</span>
+            <span>{{ formData.showIdCard||'--'  }}</span>
           </div>
 
           <div class="info-prop">
@@ -162,7 +168,7 @@ export default {
     return {
 
       formType: "edit",
-
+      veroId: '',
       gridList: [],
 
       btnDisable: false,
@@ -172,6 +178,8 @@ export default {
         name: '',
         idCard: '',
         mobile: '',
+        showIdCard: '',
+        showMobile: '',
         remark: '',
         isSelChannel: false,
         channel: [],
@@ -187,6 +195,22 @@ export default {
   },
 
   methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.veroId,
+        type: "vaccineSpecialAttention",
+      });
+
+      if (code === 0) {
+        this.$set(this.formData, 'showMobile', data.mobile)
+        this.$set(this.formData, 'showIdCard', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+    },
     handleChannelChange (val) {
       this.formData.content = ''
     },
@@ -199,7 +223,7 @@ export default {
       row.attentionType = 1
       row.isSelChannel = false
       this.formData = JSON.parse(JSON.stringify(row))
-
+      this.veroId = row.id
     },
 
 
@@ -261,6 +285,8 @@ export default {
         name: '',
         idCard: '',
         mobile: '',
+        showIdCard: '',
+        showMobile: '',
         remark: '',
         isSelChannel: false,
         channel: [],
@@ -330,14 +356,11 @@ export default {
 
   },
   props: {
-
-
-
-    // serviceList: {
-    //   type: Array,
-    //   default: []
-    // },
-  }
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -346,6 +369,13 @@ export default {
 
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/epidemic.scss";
+
+.div_tuomin {
+  position: absolute;
+  top: 0;
+  right: 40px;
+  z-index: 1000;
+}
 </style>
 
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 1d65481d4..d154a53ee 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -136,15 +136,18 @@
     </div>
     <div class="div_table">
       <div class="div_btn">
-        <el-button class="diy-button--add"
+        <el-button v-if="btnAuths.special_attention_add"
+                   class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
 
-        <el-button style="float: left"
+        <el-button v-if="btnAuths.special_attention_import"
+                   style="float: left"
                    class="diy-button--export"
                    size="small"
                    @click="handleExportModule">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
+        <el-upload v-if="btnAuths.special_attention_import"
+                   :headers="$getElUploadHeaders()"
                    ref="upload"
                    :multiple="false"
                    :show-file-list="false"
@@ -159,7 +162,8 @@
                      class="diy-button--delete">导入</el-button>
         </el-upload>
 
-        <el-button style="float: left; margin-left: 10px"
+        <el-button v-if="btnAuths.special_attention_export"
+                   style="float: left; margin-left: 10px"
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</el-button>
@@ -251,11 +255,13 @@
                          align="center"
                          class="operate">
           <template slot-scope="scope">
-            <el-button type="text"
+            <el-button v-if="btnAuths.special_attention_view"
+                       type="text"
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+            <el-button v-if="btnAuths.special_attention_update"
+                       type="text"
                        class="div-table-button--edit"
                        size="small"
                        @click="handleEdit(scope.row)">修改</el-button>
@@ -323,6 +329,7 @@
                class="dialog-h"
                @closed="diaClose">
       <vero-focus-edit ref="ref_form_edit"
+                       :view_real_data="btnAuths.special_attention_view_real_data"
                        @dialogCancle="diaClose"
                        @dialogOk="addFormOk"></vero-focus-edit>
     </el-dialog>
@@ -419,6 +426,15 @@ export default {
       noticeListFormShow: false,
       visiteListFormShow: false,
       editFormTitle: "修改疫苗接种关注名单",
+
+      btnAuths: {
+        special_attention_add: false, //新增
+        special_attention_import: false, //导入
+        special_attention_export: false, //导出
+        special_attention_view: false, //查看
+        special_attention_update: false, //修改
+        special_attention_view_real_data: false, //显示脱敏信息
+      },
     };
   },
   components: {
@@ -433,6 +449,8 @@ export default {
     this.$refs["ref_table"].doLayout();
   },
   async mounted () {
+    this.updateBtnAuths();
+
     const { user } = this.$store.state;
     this.agencyId = user.agencyId;
     for (let i = 0; i < 11; i++) {
@@ -447,6 +465,16 @@ export default {
   },
 
   methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+
     handleSearch () {
       this.selectionAll = [];
       this.loadTable();
@@ -696,6 +724,8 @@ export default {
       if (code === 0) {
         row.mobile = data.mobile;
         row.idCard = data.idCard;
+        row.showMobile = data.showMobile;
+        row.showIdCard = data.showIdCard;
       }
       return row;
     },
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 09456c5e8..63d9fb32e 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,173 +1,142 @@
 <template>
   <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"
-        >
+      <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 == '基础信息'"
-          />
+          <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-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">
-        <img v-if="openSearch" src="../../../assets/img/arrow-up.png" />
-        <img v-else src="../../../assets/img/arrow-down.png" />
+      <div class="resi-down"
+           @click="handleOpenSearch">
+        <img v-if="openSearch"
+             src="../../../assets/img/arrow-up.png" />
+        <img v-else
+             src="../../../assets/img/arrow-down.png" />
       </div>
     </el-card>
     <el-card class="resi-card-table">
       <div class="resi-row-btn">
-        <el-button
-          v-if="btnAuths.ic_resi_add"
-          size="small"
-          class="diy-button--add"
-          @click="handleAdd"
-          >新增</el-button
-        >
-        <el-button
-          v-if="btnAuths.ic_resi_import"
-          class="diy-button--export"
-          size="small"
-          @click="handleExportModule('room')"
-          >下载模板</el-button
-        >
-        <el-upload
-          v-if="btnAuths.ic_resi_import"
-          :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 v-if="btnAuths.ic_resi_add"
+                   size="small"
+                   class="diy-button--add"
+                   @click="handleAdd">新增</el-button>
+        <el-button v-if="btnAuths.ic_resi_import"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
+        <el-upload v-if="btnAuths.ic_resi_import"
+                   :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
-          v-if="btnAuths.ic_resi_export"
-          class="diy-button--reset"
-          size="small"
-          @click="diyExport"
-          >导出</el-button
-        >
-        <el-button
-          v-if="btnAuths.ic_resi_batch_del"
-          class="diy-button--add"
-          size="small"
-          @click="deleteBatch"
-          >批量删除</el-button
-        >
+        <el-button v-if="btnAuths.ic_resi_export"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="diyExport">导出</el-button>
+        <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="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
-          class="diy-button--add"
-          @click="reportForm"
-          >智能填报</el-button
-        >
+        <el-button size="small"
+                   v-if="btnAuths.ic_resi_smart_import && 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)"
-        >
+        <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' && btnAuths.ic_resi_view"
-              class="name-a"
-              @click="handleLook(scope.row)"
-            >
+            <a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
+               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"
@@ -177,28 +146,20 @@
                        type="text"
                        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"
-              class="div-table-button--detail"
-              >变更记录</el-button
-            >
+            <el-button v-if="btnAuths.ic_resi_change_rec"
+                       @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
-                v-if="btnAuths.ic_resi_update"
-                @click="handleEdit(scope.row)"
-                type="text"
-                size="small"
-                class="div-table-button--edit"
-                >修改</el-button
-              >
-              <el-popconfirm
-                v-if="btnAuths.ic_resi_del"
-                title="删除之后无法回复，确认删除？"
-                @onConfirm="handleDel(scope.row)"
-              >
+              <el-button v-if="btnAuths.ic_resi_update"
+                         @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">修改</el-button>
+              <el-popconfirm v-if="btnAuths.ic_resi_del"
+                             title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row)">
                 <!-- <el-button slot="reference"
                            type="text"
                            size="small"
@@ -221,56 +182,48 @@
                      @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>
@@ -278,134 +231,113 @@
       </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"
+                   :editUserId="editUserId"
+                   :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="{
+    <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>
+                @close="handleDiyClose"></diy-info>
     </el-dialog>
-    <people-more
-      v-if="showedPeopleMoreInfo && lookInfo.userId"
-      :view_real_data="btnAuths.ic_resi_view_real_data"
-      :userId="lookInfo.userId"
-      :gridName="lookInfo.gridName"
-      @close="handleCancleLook"
-    />
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :view_real_data="btnAuths.ic_resi_view_real_data"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="handleCancleLook" />
     <baobiao ref="baobiao" />
   </div>
 </template>
@@ -435,7 +367,7 @@ export default {
     peopleMore,
     diyInfo,
   },
-  data() {
+  data () {
     return {
       activeNames: [],
       diyDialog: false,
@@ -489,6 +421,7 @@ export default {
         userId: "",
         gridName: "",
       },
+      editUserId: '',
 
       displayedBaobiaoBtn: false,
 
@@ -507,7 +440,7 @@ export default {
     };
   },
   props: {},
-  async activated() {
+  async activated () {
     console.log("this.$route.query---", this.$route.query);
     if (this.$route.query && this.$route.query.columnName) {
       this.searchList = [];
@@ -520,13 +453,13 @@ export default {
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    tableHeight() {
+    tableHeight () {
       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 () {
     this.updateBtnAuths();
 
     if (this.$route.query) {
@@ -547,7 +480,7 @@ export default {
     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'
     // })
@@ -564,7 +497,7 @@ export default {
   },
   methods: {
     // 更新按钮权限
-    updateBtnAuths() {
+    updateBtnAuths () {
       let rot = this.$route;
       if (Array.isArray(rot.meta.btns)) {
         rot.meta.btns.forEach((item) => {
@@ -572,7 +505,7 @@ export default {
         });
       }
     },
-    reportForm() {
+    reportForm () {
       this.$refs.baobiao.init({
         elseParams: {
           categoryKeys: ["resi_info"],
@@ -588,11 +521,11 @@ export default {
         },
       });
     },
-    checkSelect(row, index) {
+    checkSelect (row, index) {
       return row.isChecked;
     },
     //调动
-    async handleTransfer(row) {
+    async handleTransfer (row) {
       this.tranferShow = true;
 
       await nextTick(200);
@@ -600,7 +533,7 @@ export default {
       this.$refs.ref_transfer.initForm(row);
     },
     //变更记录
-    async handleChangeRecord(row) {
+    async handleChangeRecord (row) {
       this.changeRecordShow = true;
 
       await nextTick(200);
@@ -608,37 +541,37 @@ export default {
       this.$refs.ref_changerecord.initForm(row);
     },
 
-    diaClose() {
+    diaClose () {
       this.tranferShow = false;
       this.changeRecordShow = false;
     },
 
-    transferClose() {
+    transferClose () {
       this.tranferShow = false;
       this.getTableData();
     },
-    handleDiyClose() {
+    handleDiyClose () {
       this.diyDialog = false;
     },
-    handleOpenSearch() {
+    handleOpenSearch () {
       if (!this.openSearch) this.activeNames = [this.searchList[0].itemGroupId];
       this.openSearch = !this.openSearch;
     },
-    async diyExport() {
+    async diyExport () {
       await this.getExportList();
     },
-    computedWidth(label, type) {
+    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) {
+    filterEdit (id) {
       const { user } = this.$store.state;
       return id === user.agencyId;
     },
-    selectionChange(selection) {
+    selectionChange (selection) {
       this.selection = selection;
 
       if (selection.length === this.tableData.length) {
@@ -652,7 +585,7 @@ export default {
         this.isIndeterminate = false;
       }
     },
-    handleSelectAll(selectAllFlag) {
+    handleSelectAll (selectAllFlag) {
       // if (this.tableData.length == 0) {
       //   this.selAllFlag = false
       //   return
@@ -667,7 +600,7 @@ export default {
         });
       }
     },
-    selectAll(selection) {
+    selectAll (selection) {
       this.selection = selection;
 
       if (selection.length > 0) {
@@ -676,7 +609,7 @@ export default {
         this.selAllFlag = false;
       }
     },
-    deleteBatch() {
+    deleteBatch () {
       if (this.selection.length > 0) {
         this.$confirm("删除之后无法恢复，确认删除？", "提示", {
           confirmButtonText: "确定",
@@ -698,17 +631,17 @@ export default {
         this.$message.warning("请先选择要删除的居民");
       }
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       this.getTableData();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`);
       this.currentPage = val;
       this.getTableData();
     },
-    handleFilterSpan(row, item) {
+    handleFilterSpan (row, item) {
       let _val = "";
       if (item.itemType === "radio" && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -719,7 +652,7 @@ export default {
 
       return _val || row[item.columnName];
     },
-    handleSearchFrom() {
+    handleSearchFrom () {
       let arr = [];
       this.searchList.forEach((item) => {
         const arr1 =
@@ -734,13 +667,13 @@ export default {
       this.conditions = arr;
       this.getTableData();
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log("searchhh--", val);
       this.currentPage = 1;
       this.conditions = val;
       this.getTableData();
     },
-    resetSearchForm(formName) {
+    resetSearchForm (formName) {
       // for(const n in this.form) {
       //   this.form[n] = ''
       // }
@@ -753,7 +686,7 @@ export default {
       this.conditions = [];
       this.getTableData();
     },
-    async handleExportModule() {
+    async handleExportModule () {
       let url = "/epmetuser/icresiuser/import/download-template";
 
       let params = {};
@@ -791,7 +724,7 @@ export default {
         });
     },
     // 下载文件
-    download(data, fileName) {
+    download (data, fileName) {
       console.log("data", data);
       if (!data) {
         return;
@@ -815,7 +748,7 @@ export default {
         window.URL.revokeObjectURL(url);
       }
     },
-    async handleExport() {
+    async handleExport () {
       this.exportBtn = true;
       this.exportBtnTitle = "正在导出...";
       let params = {
@@ -856,18 +789,18 @@ export default {
       this.exportBtn = false;
     },
     // 上传大图标成功
-    handleExcelSuccess(res, file) {
+    handleExcelSuccess (res, file) {
       if (res.code === 0 && res.msg === "success") {
         console.log("resss---ppp", res);
       } else {
         this.$message.error(res.msg);
       }
     },
-    handleProgress(event, file, fileList) {
+    handleProgress (event, file, fileList) {
       console.log("percentage", file.percentage);
     },
 
-    beforeExcelUpload(file) {
+    beforeExcelUpload (file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
@@ -884,7 +817,7 @@ export default {
       }
       return fileType && isLt1M;
     },
-    async uploadHttpRequest(file) {
+    async uploadHttpRequest (file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
@@ -943,10 +876,10 @@ export default {
       this.importBtnTitle = "导入";
       this.$refs.upload.clearFiles();
     },
-    handleClick(tab, event) {
+    handleClick (tab, event) {
       console.log(tab, event);
     },
-    async handleLook(row) {
+    async handleLook (row) {
       this.lookInfo.userId = row.icResiUserId;
       this.lookInfo.gridName = row.GRID_ID;
       this.showedPeopleMoreInfo = true;
@@ -955,22 +888,23 @@ export default {
       // await this.getFormList('edit')
       // this.getrowInfo(row.icResiUserId)
     },
-    handleCancleLook() {
+    handleCancleLook () {
       this.lookInfo.userId = "";
       this.lookInfo.gridName = "";
       this.showedPeopleMoreInfo = false;
     },
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.disabled = false;
       this.editAgencyId = row.ORG_ID;
+      this.editUserId = row.icResiUserId
       await this.getFormList("edit");
       await this.getrowInfo(row.icResiUserId);
     },
-    async handleAdd() {
+    async handleAdd () {
       await this.getFormList();
       this.dialogVisible = true;
     },
-    async handleChangeGroup(val) {
+    async handleChangeGroup (val) {
       console.log("changeguoprrrrr----", val);
       let { childGroup, value, partyInfo } = val;
 
@@ -1008,7 +942,7 @@ export default {
       }
       this.tabsList = [...list];
     },
-    formetForm() {
+    formetForm () {
       const _baseForm = this.$refs.baseForm.handleForm();
       let arr = [];
       if (_baseForm.length === 0) return false;
@@ -1064,15 +998,15 @@ export default {
       console.log("finalArr", finalArr);
       return finalArr;
     },
-    async handleEditSUbmit() {
+    async handleEditSUbmit () {
       const arr = await this.formetForm();
       if (arr) this.submitEdit(arr);
     },
-    async handleSUbmit() {
+    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],
@@ -1095,24 +1029,24 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleFormatUrl(url) {
+    handleFormatUrl (url) {
       return url.includes("?");
     },
-    handlerEditCancle() {
+    handlerEditCancle () {
       this.$refs.baseForm.resetForm();
       this.tabsList.forEach((item) => {
         this.$refs["group" + item.groupId][0].resetForm();
       });
       this.dialogEditVisible = false;
     },
-    handlerCancle() {
+    handlerCancle () {
       this.$refs.baseForm.resetForm();
       this.tabsList.forEach((item) => {
         this.$refs["group" + item.groupId][0].resetForm();
       });
       this.dialogVisible = false;
     },
-    async submitAdd(arr) {
+    async submitAdd (arr) {
       this.btnLoading = true;
       await this.$http
         .post("/epmetuser/icresiuser/add", arr)
@@ -1135,7 +1069,7 @@ export default {
         });
       this.btnLoading = false;
     },
-    async submitEdit(arr) {
+    async submitEdit (arr) {
       this.btnLoading = true;
       await this.$http
         .post("/epmetuser/icresiuser/edit", arr)
@@ -1158,7 +1092,7 @@ export default {
         });
       this.btnLoading = false;
     },
-    async getTableHeader() {
+    async getTableHeader () {
       await this.$http
         .post("/oper/customize/icform/tableheaders", {
           formCode: "resi_base_info",
@@ -1174,7 +1108,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getTableData() {
+    async getTableData () {
       this.tableLoading = true;
       let params = {
         formCode: "resi_base_info",
@@ -1207,7 +1141,7 @@ export default {
         });
       this.tableLoading = false;
     },
-    getrowInfo(id) {
+    getrowInfo (id) {
       let params = {
         formCode: "resi_base_info",
         icResiUserId: id,
@@ -1283,7 +1217,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getOptionsList(url) {
+    async getOptionsList (url) {
       let options = [];
       // console.log('getOptionsList----', url)
       await this.$http
@@ -1300,7 +1234,7 @@ export default {
         });
       return options;
     },
-    async getSearchList() {
+    async getSearchList () {
       //  /oper/customize/icform/conditionlist
       await this.$http
         .post("/oper/customize/icform/conditionlist-bygroup", {
@@ -1341,7 +1275,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getTreeData(data) {
+    getTreeData (data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -1356,7 +1290,7 @@ export default {
       });
       return arr;
     },
-    async getFormList(type) {
+    async getFormList (type) {
       await this.$http
         .post("/oper/customize/icform/getcustomerform", {
           formCode: "resi_base_info",
@@ -1400,7 +1334,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    async getExportList(type) {
+    async getExportList (type) {
       const url = "/oper/customize//icformitemgroup/list";
       let params = {
         formCode: "resi_base_info",
@@ -1424,7 +1358,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async getExportChildList(groupId) {
+    async getExportChildList (groupId) {
       const url = `/oper/customize/icformitem/getItemList/${groupId}`;
       let params = {};
 
@@ -1436,7 +1370,7 @@ export default {
         this.$message.error(msg);
       }
     },
-    async deleteresiBatch() {
+    async deleteresiBatch () {
       if (this.selection.length === 0)
         return this.$message.error("请选择之后进行操作");
       let userIds = this.selection.map((item) => item.icResiUserId);
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index f5805bf3f..8e20b49ef 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -410,11 +410,11 @@ export default {
 
   methods: {
     async handleTuomin () {
-      const url = "/gov/org/ichouse/detailByType";
+      const url = "/data/aggregator/epmetuser/detailByType";
 
       const { data, code, msg } = await requestPost(url, {
         id: this.userId,
-        type: "icResiUser",
+        type: "checkIcResiUser",
       });
 
       if (code === 0) {