diff --git a/src/views/modules/base/epidemic/epidRisk/risk.vue b/src/views/modules/base/epidemic/epidRisk/risk.vue
new file mode 100644
index 000000000..33a159940
--- /dev/null
+++ b/src/views/modules/base/epidemic/epidRisk/risk.vue
@@ -0,0 +1,664 @@
+<template>
+  <div class="div_main">
+    <div ref="div_search"
+         class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+
+        <el-form-item label="来自地区"
+                      prop="name">
+          <el-cascader ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_2"
+                       :props="areaProps"
+                       @change="handleAreaChange"
+                       clearable></el-cascader>
+
+        </el-form-item>
+
+        <el-form-item label="风险等级"
+                      prop="dangerLevel">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.dangerLevel"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in dangerLevelList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </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-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     style="margin-left: 10px"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload>
+
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{ exportBtnTitle }}</el-button>
+
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         width="55"
+                         fixed="left">
+        </el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"
+                         fixed="left"></el-table-column>
+
+        <el-table-column prop="allName"
+                         header-align="center"
+                         align="center"
+                         label="风险地区"
+                         min-width="150"
+                         fixed="left">
+        </el-table-column>
+        <el-table-column prop="dangerLevel"
+                         header-align="center"
+                         align="center"
+                         label="风险等级"
+                         min-width="100">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <!-- <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button> -->
+
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+            <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <risk-form v-if="formShow"
+                 ref="ref_form"
+                 @dialogCancle="addFormCancle"
+                 @dialogOk="addFormOk"></risk-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">
+      <risk-detail v-if="detailShow"
+                   @dialogCancle="addFormCancle"
+                   ref="ref_detail"></risk-detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import riskForm from './riskForm'
+import riskDetail from './riskDetail'
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      exportBtn: false,
+      exportBtnTitle: '导出',
+      importBtnTitle: '导入',
+      importLoading: false,
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+
+      sHeight: 0,
+
+      dangerLevelList: [],
+      sourceAllCode: [],
+      areaProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      },
+      agencyId: '',
+
+
+      formData: {
+        name: '',//省-市-区	
+        dangerLevel: '',//风险级别
+
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      detailShow: false,
+      formTitle: '新增',
+
+
+    }
+  },
+  components: {
+    riskForm,
+    riskDetail,
+
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    console.log('user-----', user)
+    this.agencyId = user.agencyId
+
+    await this.getDangerLevel()
+    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
+  },
+
+  methods: {
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+
+    handleSearch () {
+      this.loadTable()
+    },
+
+    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 >= 2 // 3层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async getDangerLevel () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "dangerAreaLevel",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/epmetuser/icDangerArea/list"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icDangerArea/list"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+    handleAreaChange (val) {
+
+      if (val.length > 0) {
+
+        this.formData.name = val.join('-')
+      } else {
+        this.formData.name = ''
+      }
+    },
+
+    diaClose () {
+      // this.$refs.ref_form.resetData()
+      this.formShow = false
+
+    },
+
+
+    handleDetail (row) {
+      // this.formTitle = '行程详情'
+      this.detailShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', '')
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row)
+      })
+    },
+
+    addFormCancle () {
+      this.detailShow = false
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteRick(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteRick (row) {
+      const url = "/epmetuser/icDangerArea/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = [row.id]
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.sourceAllCode = []
+      this.formData.name = ''
+      this.formData.dangerLevel = ''
+      this.pageSize = 20
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        ...this.formData
+      }
+
+      await this.$http({
+        method: 'POST',
+        url: '/epmetuser/icDangerArea/export',
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    async handleExportModule () {
+
+      const url = "/epmetuser/icDangerArea/downloadTemplate"
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      await this.$http
+        .post('/epmetuser/icDangerArea/import', formData).then(res => {
+          console.log('res-up', res)
+          if (res.data.code == 0 && res.data.msg == 'success') {
+            // this.$message.success('导入成功')
+            this.loadTable()
+          } else this.$message.error(res.data.msg)
+        }).catch(err => {
+          console.log('失败', err)
+          file.onError() //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        })
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      this.importRoomLoading = true
+      window.app.ajax.post2(url, fileFormData,
+        (data, rspMsg) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+
+.item_width_2 {
+  width: 300px;
+}
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/epidRisk/riskDetail.vue b/src/views/modules/base/epidemic/epidRisk/riskDetail.vue
new file mode 100644
index 000000000..7ae53ee3d
--- /dev/null
+++ b/src/views/modules/base/epidemic/epidRisk/riskDetail.vue
@@ -0,0 +1,216 @@
+<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>
+      </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,
+
+      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/base/epidemic/epidRisk/riskForm.vue b/src/views/modules/base/epidemic/epidRisk/riskForm.vue
new file mode 100644
index 000000000..5db463533
--- /dev/null
+++ b/src/views/modules/base/epidemic/epidRisk/riskForm.vue
@@ -0,0 +1,302 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               label-width="150px"
+               class="form">
+
+        <el-form-item label="风险地区"
+                      prop="allNameCode"
+                      style="display: block">
+
+          <el-cascader v-if="formType==='add'"
+                       ref="sourceArea"
+                       v-model="sourceAllCode"
+                       class="item_width_2"
+                       :props="areaProps"
+                       @change="handleSourceArea"
+                       clearable></el-cascader>
+          <span v-else>{{ formData.allName||'--'  }}</span>
+        </el-form-item>
+
+        <el-form-item label="风险等级"
+                      prop="dangerLevel">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.dangerLevel"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in dangerLevelList"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button 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 {
+      formType: '',
+      btnDisable: false,
+
+      dangerLevelList: [],
+      sourceAllCode: [],
+      areaProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      },
+
+      formData: {
+
+        dangerLevel: '',
+        allName: '',
+        allNameCode: '',
+
+
+      },
+      dataRule: {
+        allNameCode: [
+          { required: true, message: '风险地区不能为空', trigger: 'change' }
+        ],
+
+        dangerLevel: [
+          { required: true, message: '风险等级不能为空', trigger: 'change' },
+        ],
+
+      },
+      areaProps: {
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      }
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+    await this.getDangerLevel()
+  },
+  destroyed () {
+
+  },
+  methods: {
+
+    lzayLoadArea (node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+
+    async getDangerLevel () {
+
+      const url = "/sys/dict/data/dictlist";
+
+      let params = {
+        dictType: "dangerAreaLevel",
+      };
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.dangerLevelList = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async initForm (type, row) {
+      console.log('row----', row)
+      this.formType = type
+
+      if (type === 'edit') {
+
+        this.formData = JSON.parse(JSON.stringify(row))
+        this.sourceAllCode = this.formData.allNameCode.split('-')
+
+      } else {
+        const { user } = this.$store.state
+
+        // this.sourceAllCode = user.areaCodePath
+
+      }
+      // this.$nextTick(() => {
+      //   console.log(this.$refs.sourceArea.getCheckedNodes())
+      //   const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+
+      //   this.formData.allName = labels.join('-')
+      // })
+
+      console.log('formtype', type)
+
+    },
+
+
+    handleSourceArea (val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.sourceArea.getCheckedNodes()[0].pathLabels)
+      if (val.length > 0) {
+        const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+        this.formData.allNameCode = val.join('-')
+        this.formData.allName = labels.join('-')
+
+      } else {
+        this.formData.allNameCode = ''
+        this.formData.allName = ''
+
+      }
+
+    },
+
+
+
+    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 >= 2 // 3层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    async handleComfirm (formName) {
+      this.$refs[formName].validate(async (valid) => {
+        if (valid) {
+
+
+          this.btnDisable = true
+          setTimeout(() => {
+            this.btnDisable = false
+          }, 5000)
+
+          let url = '/epmetuser/icDangerArea/add'
+
+          const { data, code, msg } = await requestPost(url, this.formData)
+
+          if (code === 0) {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.resetData()
+            this.$emit('dialogOk')
+            this.btnDisable = false
+
+          } else {
+            this.btnDisable = false
+            this.$message.error(msg)
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.$refs.ref_form.resetFields()
+      this.formData =
+      {
+        allNameCode: '',
+
+        dangerLevel: '',
+        allName: '',
+
+      }
+
+      this.sourceAllCode = []
+
+    },
+    // 开启加载动画
+    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/epidemic.scss";
+
+.epidemic-form {
+  .mw180 {
+    min-width: 260px;
+  }
+}
+
+.item_width_2 {
+  width: 400px;
+}
+</style>
+
+
+
+
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
new file mode 100644
index 000000000..bc171aab7
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshi.vue
@@ -0,0 +1,1006 @@
+<template>
+  <div class="div_main">
+    <div ref="div_search"
+         class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'110px'">
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="formData.name"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入手机号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="证件号"
+                        prop="idCard">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证号或证件号">
+            </el-input>
+
+          </el-form-item>
+
+        </div>
+        <div>
+
+          <el-form-item label="来自地区"
+                        prop="sourceAddress">
+            <el-input v-model="formData.sourceAddress"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入地区">
+            </el-input>
+            <!-- <el-cascader ref="nowArea" size="small" class="list_item_width_1" :props="areaProps"
+              v-model="searchAreacode" clearable @change="handleAreaChange"></el-cascader> -->
+          </el-form-item>
+
+          <el-form-item label="来到本地时间"
+                        prop="startDate">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd"
+                            @change="handleScheduledTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <el-button class="diy-button--add"
+                   size="small"
+                   @click="handleAdd">新增</el-button>
+
+        <el-button class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload :headers="$getElUploadHeaders()"
+                   ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     style="margin-left: 10px"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload>
+
+        <el-button style="margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   :loading="exportBtn"
+                   @click="handleExport">{{ exportBtnTitle }}</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleSendNotice">发送通知</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleAttention">加入重点人群关注</el-button>
+        <el-button style="margin-left:15px"
+                   class="diy-button--more"
+                   size="small"
+                   @click="handleDeletes">取消重点人群关注</el-button>
+      </div>
+
+      <el-table class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55"
+                         fixed="left"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"
+                         fixed="left"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="100"
+                         fixed="left">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="证件号"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="detailAddress"
+                         header-align="center"
+                         align="center"
+                         label="现居地"
+                         show-overflow-tooltip
+                         min-width="160">
+          <template slot-scope="scope">
+            {{scope.row.presentAddress + scope.row.detailAddress}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="sourceAddress"
+                         header-align="center"
+                         align="center"
+                         label="来自地区"
+                         show-overflow-tooltip
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="arriveDate"
+                         header-align="center"
+                         align="center"
+                         label="来到本地时间"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="leaveDate"
+                         header-align="center"
+                         align="center"
+                         label="离开本地时间"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="latestNoticeTime"
+                         header-align="center"
+                         align="center"
+                         label="最近一次通知时间"
+                         width="160">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="120">
+        </el-table-column>
+        <el-table-column prop="heSuanCheckDesc"
+                         header-align="center"
+                         align="center"
+                         label="重点人群关注名单"
+                         width="160">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <!-- v-if="scope.row.userType != 'resi'"  -->
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <!-- <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="click">
+              <div class="table-more-btn">
+                <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>
+              </div>
+              <div v-if="scope.row.userType != 'resi'" class="table-more-btn">
+                <el-button type="text"
+                       class="div-table-button--delete--noline "
+                       size="small"
+                       @click="handleDelete(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-popover> -->
+            <el-dropdown trigger="hover">
+              <span class="el-dropdown-link"
+                    style="margin-left:10px;">
+                <el-button type="text"
+                           size="small"
+                           class="div-table-button--more"
+                           slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-button type="text"
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleNoticeList(scope.row)">通知记录</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button type="text"
+                             class="div-table-button--detail--noline"
+                             size="small"
+                             @click="handleVisiteList(scope.row) ">随访记录</el-button>
+                </el-dropdown-item>
+                <el-dropdown-item v-if=" agencyId===scope.row.agencyId">
+                  <el-button type="text"
+                             class="div-table-button--delete--noline "
+                             size="small"
+                             @click="handleDelete(scope.row)">删除</el-button>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+    <!-- 修改弹出框 -->
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <travel-panshi-form v-if="formShow"
+                          ref="ref_form"
+                          @dialogCancle="addFormCancle"
+                          @dialogOk="addFormOk"></travel-panshi-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-panshi-detail v-if="detailShow"
+                            @dialogCancle="addFormCancle"
+                            ref="ref_detail"></travel-panshi-detail>
+    </el-dialog>
+    <!-- 发送通知弹出框 -->
+    <el-dialog :visible.sync="sendNoticeFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="发送通知"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <nf-send-notice ref="ref_sendnotice"
+                      @dialogOk="addFormOk"
+                      @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>
+    <!-- 随访记录弹出框 -->
+    <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>
+  </div>
+</template>
+
+<script>
+
+import travelPanshiForm from './travelPanshiForm'
+import travelPanshiDetail from './travelPanshiDetail'
+import nfNoticeList from './../natFocus/nfNoticeList'
+import nfSendNotice from './../natFocus/nfSendNotice'
+import nfVisiteList from './../natFocus/nfVisiteList'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      sendNoticeFormShow: false,
+      visiteListFormShow: false,
+      noticeListFormShow: false,
+      exportBtn: false,
+      exportBtnTitle: '导出',
+      importBtnTitle: '导入',
+      importLoading: false,
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 0,
+      tableLoading: false,
+      sHeight: 0,
+      searchAreacode: [],
+      agencyId: '',
+      selectionAll: [],
+      timeRange: [],
+      formData: {
+        name: '',//负责人
+        mobile: '',//联系电话
+        idCard: '',
+        sourceAddress: '',
+        sourceAddressCode: '',
+        startDate: '',
+        endDate: ''
+      },
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      detailShow: false,
+      formTitle: '新增',
+      areaProps: {
+        lazy: true,
+        checkStrictly: true,
+        lazyLoad: this.lzayLoadArea
+      }
+
+    }
+  },
+  components: {
+    travelPanshiForm,
+    travelPanshiDetail,
+    nfNoticeList,
+    nfSendNotice,
+    nfVisiteList
+  },
+  async created () {
+
+  },
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    console.log('user-----', user)
+    this.agencyId = user.agencyId
+
+
+    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
+  },
+
+  methods: {
+    lzayLoadArea (node, resolve) {
+      this.getArea(node, resolve)
+      // setTimeout(() => {
+
+      // }, 1000)
+    },
+    handleSearch () {
+      this.loadTable()
+    },
+
+    handleSelectionChange (val) {
+      console.log('val----', val)
+      this.selectionAll = val
+    },
+    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 loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/tripreport/page"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        // this.tableData.forEach(item => {
+        //   if (item.time) {
+        //     let timeArray = item.time.split(' ')
+        //     item.time = timeArray[0]
+        //   }
+
+        // });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+    handleAreaChange (val) {
+
+      if (val.length > 0) {
+        const len = val.length - 1
+        this.formData.sourceAddressCode = val[len]
+      } else this.formData.sourceAddressCode = ''
+    },
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.startDate = time[0]
+        this.formData.endDate = time[1]
+
+      } else {
+        this.formData.startDate = ''
+        this.formData.endDate = ''
+
+      }
+
+    },
+
+    diaClose () {
+      // this.$refs.ref_form.resetData()
+      this.formShow = false
+      this.sendNoticeFormShow = false
+      this.noticeListFormShow = false
+      this.visiteListFormShow = false
+    },
+    handleNoticeList (row) {
+      this.noticeListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_noticelist.initTable(row.realIdCard, '0')
+      })
+
+    },
+    handleVisiteList (row) {
+
+      this.visiteListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_visitelist.initTable(row, '0')
+
+      })
+
+    },
+    handleSendNotice () {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要通知的人员')
+        return false
+      }
+      this.sendNoticeFormShow = true
+      this.$nextTick(() => {
+        const arr = this.selectionAll.map(item => {
+
+          return {
+            userId: item.userId,
+            idCard: item.idCard,
+            realIdCard: item.realIdCard,
+            mobile: item.mobile,
+            id: item.id
+          }
+        })
+        this.$refs.ref_sendnotice.initForm(arr, '0')
+      })
+
+    },
+    handleAttention (row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要加入关注的名单')
+        return false
+      }
+      this.$confirm("确认选择的名单加入关注?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.saveFocus(row)
+        })
+        .catch(err => {
+          console.log('err-----', err)
+
+        });
+    },
+
+    async handleDeletes (row) {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要取消关注的名单')
+        return false
+      }
+      this.$confirm("确认取消关注选择的名单?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteFocus(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+    async saveFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-add"
+      // let idCards = []
+
+      // this.selectionAll.forEach(element => {
+      //   idCards.push(element.idCard)
+      // });
+      let params = {
+        list: this.selectionAll.map(item => {
+          return {
+            name: item.name,
+            mobile: item.realMobile,
+            idCard: item.realIdCard,
+            attentionType: 2
+          }
+        })
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async deleteFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      let ids = []
+
+      this.selectionAll.forEach(element => {
+        if (element.epidemicId !== '' && element.epidemicId !== null && element.epidemicId !== undefined) {
+          ids.push(element.epidemicId)
+        }
+      });
+      let params = {
+        attentionType: 2,
+        ids: ids
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleDetail (row) {
+      // this.formTitle = '行程详情'
+      this.detailShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_detail.initForm(row)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增行程'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', '')
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row)
+      })
+    },
+
+    addFormCancle () {
+      this.detailShow = false
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = false
+      this.sendNoticeFormShow = false
+      this.loadTable()
+
+    },
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/epmetuser/tripreport/delete"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = [row.id]
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.$refs.ref_searchform.resetFields()
+      this.formData.startDate = ''
+      this.formData.endDate = ''
+      this.searchAreacode = []
+      this.timeRange = []
+      this.pageSize = 20
+      this.pageNo = 1
+      this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        ...this.formData
+      }
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      // await axios({
+      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/tripreport/export',
+      //   // url: 'epmetuser/icresiuser/exportExcel',
+      //   method: 'post',
+      //   data: params,
+      //   responseType: 'blob'
+      // })
+      await this.$http({
+        method: 'POST',
+        url: '/epmetuser/tripreport/export',
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    async handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/epmetuser/tripreport/template-download"
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch(err => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+
+    // 上传文件之前的钩子
+    beforeUpload (file) {
+      this.files = file;
+
+      const isText = file.type === 'application/vnd.ms-excel'
+      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+      if (!isText && !isTextComputer) {
+        this.$message.error('请选择正确格式的文件')
+        return false
+      } else {
+        this.fileName = file.name;
+        return true
+      }
+
+    },
+    // 上传文件个数超过定义的数量
+    handleExceed (files, fileList) {
+      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      await this.$http
+        .post('/epmetuser/tripreport/import', formData).then(res => {
+          console.log('res-up', res)
+          if (res.data.code == 0 && res.data.msg == 'success') {
+            // this.$message.success('导入成功')
+            this.loadTable()
+          } else this.$message.error(res.data.msg)
+        }).catch(err => {
+          console.log('失败', err)
+          file.onError() //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        })
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+
+    async uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+
+      //清空上传列表
+      this.$refs['upload'].clearFiles()
+
+      var url = '/gov/org/house/houseimport'
+
+      let fileFormData = new FormData();
+      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+      this.importRoomLoading = true
+      window.app.ajax.post2(url, fileFormData,
+        (data, rspMsg) => {
+
+          if (data.code === 0 && data.msg == 'success') {
+            // this.$message.success('导入成功')
+          } else {
+            // this.$message({
+            //   showClose: true,
+            //   message: rspMsg,
+            //   duration: 0,
+            //   type: "error"
+            // })
+            // this.$message.error(rspMsg)
+          }
+          this.$emit('refreshTree')
+          this.loadTable()
+          this.importRoomLoading = false
+        },
+        (rspMsg, data) => {
+          this.importRoomLoading = false
+        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+    }
+  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.vue
new file mode 100644
index 000000000..f7bbe35aa
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiDetail.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/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
new file mode 100644
index 000000000..30ca0369e
--- /dev/null
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -0,0 +1,631 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='detail'"
+               class="form">
+
+        <el-form-item v-if="formType==='add'"
+                      label="录入方式"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="enterType"
+                          @change="handleChangeEnterType">
+
+            <el-radio :label="'1'">手动输入</el-radio>
+            <el-radio :label="'2'">选择居民</el-radio>
+
+          </el-radio-group>
+
+        </el-form-item>
+
+        <el-form-item v-if="formType==='add'"
+                      label="所属网格"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.gridId"
+                     placeholder="请选择"
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in gridList"
+                       @click.native="handleSelGrid(item.value)"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="formType==='add'"
+                      label="居民"
+                      prop="userId"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.userId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.label"
+                       :value="item.demandUserId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入姓名"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.name" style="margin-right:10px;">
+          </el-input>
+          <el-checkbox v-model="formData.heSuanCheck">添加到核酸检测关注名单</el-checkbox>
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.mobile">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入身份证号或证件号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.idCard">
+          </el-input>
+        </el-form-item>
+        <el-form-item
+                      label="现居地"
+                      prop="presentAddress"
+                      style="display: block"
+                      label-width="150px">
+          <el-input  v-if="formType == 'detail'" class="item_width_2"
+                    placeholder="请输入现居地"
+                    clearable
+                    :disabled="isFromResi"
+                    :style="'width: ' + computedWd(formData.presentAddress)"
+                    v-model="formData.presentAddress" />
+          <template v-else>
+            <el-input v-if="isFromResi" class="item_width_2 mw180"
+                    placeholder="请输入现居地"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.presentAddress" />
+            <el-cascader v-else ref="nowArea" class="item_width_2" :props="areaProps"
+            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          </template>
+        </el-form-item>
+        <el-form-item label="详细地址"
+                      prop="detailAddress"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入详细地址"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.detailAddress">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="来自地区" prop="sourceAddress" style="display: block" label-width="150px">
+          <el-input v-if="formType == 'detail'" class="item_width_2"
+                    placeholder=""
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.sourceAddress"
+                    :style="'width: ' + computedWd(formData.sourceAddress)">
+          </el-input>
+          <el-cascader v-else ref="sourceArea" v-model="sourceAllCode" class="item_width_2" :props="areaProps"
+            @change="handleSourceArea" clearable></el-cascader>
+        </el-form-item>
+
+        <el-form-item label="来到本地时间"
+                      style="display: block"
+                      prop="arriveDate"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.arriveDate"
+                          :picker-options="pickerOptions"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="离开本地时间"
+                      style="display: block"
+                      prop="leaveDate"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.leaveDate"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入内容"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+
+        <template v-if="formType != 'detail'">
+          <el-form-item label="通知渠道"
+                      prop="channel"
+                      label-width="150px"
+                        style="display: block">
+            <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-show="formData.channel.length > 0" 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>
+        </template>
+
+      </el-form>
+    </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('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 () {
+    let checkMObile = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不能为空'))
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error('手机号格式不正确'))
+        }
+        callback()
+      }
+    }
+    let checkIdCard = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('证件号不能为空'))
+      } else {
+        if (!isCard(value)) {
+          callback(new Error('请输入正确的身份证号或护照号'))
+        }
+        callback()
+      }
+    }
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      hideUploadEdit: false, // 隐藏'上传按钮'
+      limitNum: 1,
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        }
+      },
+      btnDisable: false,
+      sourceAllCode: [], // 来源地全 code
+      nowAllCode: [], // 现居地全 code
+      icNatId: '',
+      formData: {
+        gridId: '',
+        agencyId: '',//当前网格所属组织Id
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro
+        name: '',
+        idCard: '',
+        mobile: '',
+        heSuanCheck: false,
+        presentAddress: '',
+        presentAddressCode: '',
+        detailAddress: '',
+        sourceAddressCode: '',
+        presentAddressPathCode: '',
+        sourceAddress: '',
+        sourceAddressPathCode: '',
+        arriveDate: '',
+        remark: '',
+        leaveDate: '',
+        userType: 'input',
+        content: '',
+        channel: []
+
+      },
+      dataRule: {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, validator: checkIdCard, trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, validator: checkMObile, trigger: 'blur' },
+        ],
+        presentAddress: [
+          { required: true, message: '现居地不能为空', trigger: 'blur' },
+        ],
+        detailAddress: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' },
+        ],
+        sourceAddress: [
+          { required: true, message: '来自地区不能为空', trigger: 'blur' },
+        ],
+        arriveDate: [
+          { required: true, message: '来到本地时间不能为空', trigger: 'blur' },
+        ]
+      },
+      areaProps: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      }
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+  },
+  destroyed() {
+    this.nowAllCode = []
+  },
+  methods: {
+    computedWd(val) {
+      const len = val.length
+      const wd = len * 18
+      let w = ''
+      if (wd > 220) w = wd
+      else w = 220
+      return w + 'px'
+    },
+    lzayLoadArea(node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+    async initForm (type, row) {
+      console.log('row----', row)
+      this.formType = type
+      this.formData.agencyId = this.agencyId
+      if (type != 'add') {
+        // this.formData = { ...row, channel: [], content: '' }
+        await this.loadFormData(row.id)
+
+
+      } else {
+        const { user } = this.$store.state
+        this.nowAllCode = user.areaCodePath
+      }
+      // this.$refs['ref_form'].resetFields();
+
+      console.log('formtype', type)
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.mobile = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.userId = ''
+      this.resetData()
+      if (value === '2') {
+        this.isFromResi = true
+        this.formData.userType = 'icresi'
+      } else {
+        this.isFromResi = false
+        this.formData.userType = 'input'
+        const { user } = this.$store.state
+        this.nowAllCode = user.areaCodePath
+      }
+
+
+    },
+    handleSourceArea(val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.sourceArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.sourceArea.getCheckedNodes()[0].pathLabels
+        this.formData.sourceAddressCode = val[val.length - 1]
+        this.formData.sourceAddress = labels.join('-')
+        this.formData.sourceAddressPathCode = val.join(',')
+        this.$refs.ref_form.clearValidate('sourceAddress')
+      } else {
+        this.formData.sourceAddressCode = ''
+        this.formData.sourceAddress = ''
+        this.formData.sourceAddressPathCode = ''
+      }
+
+    },
+    handleNowArea(val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.nowArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
+        this.formData.presentAddressCode = val[val.length - 1]
+        this.formData.presentAddress = labels.join('-')
+        this.formData.presentAddressPathCode = val.join(',')
+        console.log('presentAddress', this.formData.presentAddress)
+        this.$refs.ref_form.clearValidate('presentAddress')
+      } else {
+        this.formData.presentAddressCode = ''
+        this.formData.presentAddress = ''
+        this.formData.presentAddressPathCode = ''
+      }
+    },
+    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)
+      }
+    },
+
+
+    async handleComfirm (formName) {
+      this.$refs[formName].validate(async (valid) => {
+        if (valid) {
+          if (this.formData.channel.length > 0 && !this.formData.content) {
+            this.$message({
+              type: 'warning',
+              message: '请填写通知内容'
+            })
+            return false;
+          }
+
+          this.btnDisable = true
+          setTimeout(() => {
+            this.btnDisable = false
+          }, 5000)
+
+          let url = ''
+          if (this.formType === 'add') url = '/epmetuser/tripreport/save'
+          else url = '/epmetuser/tripreport/update'
+
+          const { data, code, msg } = await requestPost(url, this.formData)
+
+          if (code === 0) {
+            this.$message({
+              type: 'success',
+              message: '操作成功'
+            })
+            this.resetData()
+            this.$emit('dialogOk')
+            this.btnDisable = false
+
+          } else {
+            this.btnDisable = false
+            this.$message.error(msg)
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.$refs.ref_form.resetFields()
+      this.formData.sourceAddressCode = ''
+      this.formData.presentAddressCode = ''
+      this.formData.sourceAddressPathCode = ''
+      this.formData.presentAddressPathCode = ''
+      this.sourceAllCode = []
+      this.nowAllCode = []
+    },
+    // 开启加载动画
+    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/epidemic.scss";
+
+.epidemic-form {
+  .mw180 {
+    min-width: 260px;
+  }
+}
+
+</style>
+
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
+