diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index 1b454dab2..c225c8e5e 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -1,20 +1,16 @@
 <template>
-  <div class="epidemic-form">
+  <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form1"
-        :inline="true"
-        :model="formData"
-        :disabled="formType === 'detail'"
-        :rules="dataRule"
-        class="form"
-      >
-        <el-form-item
-          label="姓名"
-          prop="name"
-          label-width="150px"
-          style="display: block"
-        >
+      <el-form v-if="formType !== 'detail'"
+               ref="ref_form1"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="form">
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
           <span>{{ formData.name }}</span>
           <!-- <el-input class="item_width_2"
                     placeholder="请输入姓名"
@@ -24,12 +20,10 @@
           </el-input> -->
         </el-form-item>
 
-        <el-form-item
-          label="手机号"
-          prop="mobile"
-          label-width="150px"
-          style="display: block"
-        >
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
           <span>{{ formData.mobile }}</span>
           <!-- <el-input class="item_width_2"
                     placeholder="请输入手机号"
@@ -37,12 +31,10 @@
                     v-model="formData.mobile">
           </el-input> -->
         </el-form-item>
-        <el-form-item
-          label="证件号"
-          prop="idCard"
-          label-width="150px"
-          style="display: block"
-        >
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
           <span>{{ formData.idCard }}</span>
           <!-- <el-input class="item_width_2"
                     placeholder="请输入身份证号"
@@ -50,113 +42,124 @@
                     v-model="formData.idCard">
           </el-input> -->
         </el-form-item>
-        <el-form-item
-          label="关注原因"
-          prop="reason"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            placeholder="请输入关注原因"
-            clearable
-            v-model="formData.reason"
-          >
+        <el-form-item label="关注原因"
+                      prop="reason"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入关注原因"
+                    clearable
+                    v-model="formData.reason">
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="隔离状态"
-          prop="isolatedState"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model="formData.isolatedState"
-            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"
+                      label-width="150px"
+                      style="display: block">
+          <el-select v-model="formData.isolatedState"
+                     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"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            :disabled="formType === 'detail'"
-            maxlength="500"
-            show-word-limit
-            :autosize="{ minRows: 2, maxRows: 5 }"
-            clearable
-            placeholder="请输入通知备注"
-            v-model="formData.remark"
-          ></el-input>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 2, maxRows: 5 }"
+                    clearable
+                    placeholder="请输入通知备注"
+                    v-model="formData.remark"></el-input>
         </el-form-item>
-        <div v-if="formType !== 'detail'">
-          <el-form-item
-            label="通知渠道"
-            prop="channel"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-checkbox
-              v-model="formData.isSelChannel"
-              @change="handleChannelChange"
-              key="0"
-              label="0"
-              >小程序通知</el-checkbox
-            >
-            <!-- <el-checkbox-group v-model="formData.channel">
+
+        <el-form-item label="通知渠道"
+                      prop="channel"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox v-model="formData.isSelChannel"
+                       @change="handleChannelChange"
+                       key="0"
+                       label="0">小程序通知</el-checkbox>
+          <!-- <el-checkbox-group v-model="formData.channel">
               <el-checkbox key="0"
                            label="0">小程序通知</el-checkbox>
               <el-checkbox key="1"
                            label="1">短信通知</el-checkbox>
 
             </el-checkbox-group> -->
-          </el-form-item>
-
-          <el-form-item
-            v-if="formData.isSelChannel"
-            label="通知内容"
-            prop="content"
-            label-width="150px"
-            style="display: block"
-          >
-            <el-input
-              class="item_width_1"
-              type="textarea"
-              maxlength="500"
-              show-word-limit
-              :autosize="{ minRows: 4, maxRows: 10 }"
-              clearable
-              placeholder="请输入通知内容"
-              v-model="formData.content"
-            ></el-input>
-          </el-form-item>
-        </div>
+        </el-form-item>
+
+        <el-form-item v-if="formData.isSelChannel"
+                      label="通知内容"
+                      prop="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.content"></el-input>
+        </el-form-item>
+
       </el-form>
+
+      <div v-if="formType === 'detail'"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-2">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">手机号：</span>
+            <span>{{ formData.mobile||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">证件号：</span>
+            <span>{{ formData.idCard||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">关注原因：</span>
+            <span>{{ formData.reason||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">隔离状态：</span>
+            <span>{{ formData.isolatedStateShow||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-2">备注：</span>
+            <span>{{ formData.remark||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
     </div>
 
-    <div class="form_div_btn">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType !== 'detail'"
-        size="small"
-        type="primary"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">{{formType==='detail'?'关 闭':'取 消'}}</el-button>
+
+      <el-button v-if="formType!=='detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
     </div>
   </div>
 </template>
@@ -167,7 +170,7 @@ import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 
 let loading; // 加载动画
-function iniGetFmData() {
+function iniGetFmData () {
   return {
     attentionType: 2,
     name: "",
@@ -184,7 +187,7 @@ function iniGetFmData() {
 }
 
 export default {
-  data() {
+  data () {
     return {
       formType: "edit",
 
@@ -202,20 +205,20 @@ export default {
 
   components: {},
 
-  async mounted() {
-    this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
+  async mounted () {
+    await this.getFmOptions("isolatedState", "/sys/dict/data/dictlist", {
       dictType: "isolatedState",
     });
   },
 
-  destroyed() {},
+  destroyed () { },
 
   methods: {
-    handleChannelChange(val) {
+    handleChannelChange (val) {
       this.formData.content = "";
     },
 
-    async initForm(formType, row) {
+    async initForm (formType, row) {
       this.formType = formType;
       this.$refs["ref_form1"].resetFields();
       row.channel = [];
@@ -223,9 +226,18 @@ export default {
       row.attentionType = 2;
       row.isSelChannel = false;
       this.formData = JSON.parse(JSON.stringify(row));
+
+      this.options.isolatedState.forEach(element => {
+        if (this.formData.isolatedState === element.value) {
+          this.formData.isolatedStateShow = element.label
+        }
+      });
+
     },
 
-    handleComfirm() {
+
+
+    handleComfirm () {
       this.$refs["ref_form1"].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj);
@@ -235,7 +247,7 @@ export default {
       });
     },
 
-    async submit() {
+    async submit () {
       if (this.formData.isSelChannel) {
         if (!this.formData.content) {
           this.$message({
@@ -274,12 +286,12 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.resetData();
       this.$emit("dialogCancle");
     },
 
-    async getFmOptions(field, url, params, cookFn) {
+    async getFmOptions (field, url, params, cookFn) {
       const { data, code, msg } = await requestPost(url, {
         ...params,
       });
@@ -292,24 +304,24 @@ export default {
       }
     },
 
-    resetData() {
+    resetData () {
       this.veroId = "";
 
       this.formData = iniGetFmData();
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       this.pageSize = val;
       this.pageNo = 1;
       this.loadTable();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       this.pageNo = val;
       this.loadTable();
     },
 
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -317,7 +329,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -325,12 +337,12 @@ export default {
     },
   },
   computed: {
-    tableHeight() {
+    tableHeight () {
       return 200;
     },
 
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    dataRule() {
+    dataRule () {
       return {
         isolatedState: [
           { required: true, message: "隔离状态必填", trigger: "blur" },
@@ -349,7 +361,11 @@ export default {
   },
 };
 </script>
-
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
+
+
diff --git a/src/views/modules/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue
index b6db0d56e..f7fda935a 100644
--- a/src/views/modules/base/epidemic/travel.vue
+++ b/src/views/modules/base/epidemic/travel.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
-               :label-width="'100px'">
+               :label-width="'110px'">
         <div>
 
           <el-form-item label="姓名"
@@ -317,6 +317,19 @@
                    @dialogCancle="addFormCancle"
                    @dialogOk="addFormOk"></travel-form>
     </el-dialog>
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <travel-detail v-if="detailShow"
+                     @dialogCancle="addFormCancle"
+                     ref="ref_detail"></travel-detail>
+    </el-dialog>
     <!-- 发送通知弹出框 -->
     <el-dialog :visible.sync="sendNoticeFormShow"
                :close-on-click-modal="false"
@@ -360,6 +373,7 @@
 <script>
 
 import travelForm from './travelForm'
+import travelDetail from './travelDetail'
 import nfNoticeList from './natFocus/nfNoticeList'
 import nfSendNotice from './natFocus/nfSendNotice'
 import nfVisiteList from './natFocus/nfVisiteList'
@@ -402,6 +416,7 @@ export default {
 
       //form相关
       formShow: false,
+      detailShow: false,
       formTitle: '新增',
       areaProps: {
         lazy: true,
@@ -413,6 +428,7 @@ export default {
   },
   components: {
     travelForm,
+    travelDetail,
     nfNoticeList,
     nfSendNotice,
     nfVisiteList
@@ -666,10 +682,10 @@ export default {
     },
 
     handleDetail (row) {
-      this.formTitle = '行程详情'
-      this.formShow = true
+      // this.formTitle = '行程详情'
+      this.detailShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row)
+        this.$refs.ref_detail.initForm(row)
       })
     },
 
@@ -690,6 +706,7 @@ export default {
     },
 
     addFormCancle () {
+      this.detailShow = false
       this.formShow = false
     },
     addFormOk () {
diff --git a/src/views/modules/base/epidemic/travelDetail.vue b/src/views/modules/base/epidemic/travelDetail.vue
new file mode 100644
index 000000000..f7bbe35aa
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelDetail.vue
@@ -0,0 +1,247 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-4">姓名：</span>
+            <span>{{ formData.name||'--'  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">手机号：</span>
+            <span>{{ formData.mobile||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">证件号：</span>
+            <span>{{ formData.idCard||'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-4">现居地：</span>
+            <span>{{ formData.presentAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">详细地址：</span>
+            <span>{{ formData.detailAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">来自地区：</span>
+            <span>{{ formData.sourceAddress||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">来到本地时间：</span>
+            <span>{{ formData.arriveDate||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">离开本地时间：</span>
+            <span>{{ formData.leaveDate||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-4">备注：</span>
+            <span>{{ formData.remark||'--'  }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+    <div class="div-btn">
+      <el-button size="small"
+                 @click="handleCancle">关 闭</el-button>
+      <!-- <el-button v-if="formType != 'detail'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm('ref_form')">确 定</el-button> -->
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+let loading // 加载动画
+export default {
+  data () {
+
+    return {
+
+      initLoading: false,
+
+      icNatId: '',
+      formData: {},
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    // await this.loadGrid()
+  },
+  destroyed () {
+    this.nowAllCode = []
+  },
+  methods: {
+
+    async initForm (row) {
+      console.log('row----', row)
+
+      this.formData.agencyId = this.agencyId
+
+      await this.loadFormData(row.id)
+
+      this.initLoading = true
+      console.log('formtype', type)
+
+    },
+
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelGrid (value) {
+
+      const url = "/epmetuser/icresiuser/demandusers"
+
+      let params = {
+        agencyId: this.agencyId,
+        gridId: value
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.personList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, //
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async handleSelAddress (value) {
+
+      const url = "/gov/org/house/gethouseinfo/" + value
+
+      const { data, code, msg } = await requestPost(url)
+
+      if (code === 0) {
+        this.formData.presentAddress = data.agencyPathName
+        this.formData.presentAddressCode = data.areaCode
+        this.formData.detailAddress = data.allName
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    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) {
+
+      const url = '/epmetuser/tripreport/detail'
+      let params = {
+        id,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        console.log('deda-------', data)
+        this.formData = { ...data, channel: [], content: '' }
+        this.sourceAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+
+        if (data.userType == 'icresi') this.isFromResi = true
+        else this.nowAllCode = data.presentAddressPathCode && data.presentAddressPathCode.split(',')
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      // this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
+
diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue
index 799611075..809af3be9 100644
--- a/src/views/modules/communityParty/members/cpts/record.vue
+++ b/src/views/modules/communityParty/members/cpts/record.vue
@@ -1,8 +1,7 @@
 <template>
   <div style="padding-right: 20px;">
     <div class="mt10">
-      <el-button v-if="btnDisabled"
-                 size="small"
+      <el-button size="small"
                  class="diy-button--add"
                  :disabled="btnDisabled || disabled"
                  @click="handleAdd">新增</el-button>