diff --git a/src/App.vue b/src/App.vue
index 5d1e546d4..f472317a4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -178,4 +178,12 @@ export default {
     // background: linear-gradient(270deg, #0063FE, #0095FF);
   }
 }
+
+/* 列表-操作栏-更多的poppover样式 */
+.el-popover.btn-popper {
+  min-width: 80px !important;
+  margin-top: 5px !important;
+  padding: 6px !important;
+  background-color: rgb(247, 250, 253);
+}
 </style>
diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 2eabacde5..1e683d95a 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -106,6 +106,27 @@
   text-decoration: underline !important;
 }
 
+//查看
+.div-table-button--detail--noline {
+  color: #3e8ef7 !important;
+}
+
+//更多
+.div-table-button--more {
+  color: #333333 !important;
+  text-decoration: underline !important;
+}
+
+//修改
+.div-table-button--edit--noline {
+  color: #00a7a9 !important;
+}
+
+//删除
+.div-table-button--delete--noline {
+  color: #d51010 !important;
+}
+
 //
 .div-table-button--qr {
   color: #4ec591 !important;
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
new file mode 100644
index 000000000..993555d66
--- /dev/null
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -0,0 +1,65 @@
+.item_width_1 {
+  width: 560px;
+}
+.item_width_2 {
+  width: 220px;
+}
+
+.btn-selperson {
+  margin-left: 20px;
+}
+
+.form_div_btn {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.div_main {
+  width: 100%;
+
+  .div_search {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 30px 20px 5px;
+    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  }
+
+  .list_item_width_1 {
+    width: 170px;
+  }
+}
+
+.div_table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 10px;
+  position: relative;
+
+  .div_btn {
+    margin-top: 10px;
+    margin-left: 10px;
+    display: flex;
+
+    .btn_upload {
+      margin-left: 10px;
+      display: flex;
+    }
+  }
+  .table {
+    margin-top: 20px;
+  }
+
+  .div_notice {
+    position: absolute;
+    left: 15px;
+    bottom: 0;
+  }
+}
+
+.more-btn {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
new file mode 100644
index 000000000..d9a21d5fb
--- /dev/null
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -0,0 +1,575 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='look'"
+               class="form">
+
+        <el-form-item 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 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 label="居民"
+                      prop="personId"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.personId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName"
+                       :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">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="phone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.phone">
+          </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="检测时间"
+                      style="display: block"
+                      prop="checkTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.checkTime"
+                          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="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入检测地点"
+                    clearable
+                    v-model="formData.address">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="检测结果"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="formData.result">
+
+            <el-radio :label="'1'">阴性</el-radio>
+            <el-radio :label="'2'">阳性</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item class="block"
+                      label-width="150px"
+                      style="display: block"
+                      label="添加附件"
+                      prop="attach">
+
+          <el-upload class="upload-demo"
+                     :action="uploadUlr"
+                     accept=".doc,.pdf,.xls,.docx,.xlsx"
+                     :on-success="handleFileSuccess"
+                     :on-remove="handleFileRemove"
+                     :on-preview="handleFileDownload"
+                     :limit="3"
+                     :before-upload="beforeUpload"
+                     :file-list="fileList">
+            <el-button size="small"
+                       :disabled="fileList.length==3"
+                       type="primary">点击上传</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">最多三个附件，只能上传word、excel、pdf文件</div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="通知渠道"
+                      prop="noticeWay"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.noticeWay">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="通知内容"
+                      prop="noticeContent"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.noticeContent"></el-input>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'look'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+
+      btnDisable: false,
+
+      natId: '',
+      formData: {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+      },
+
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      dialogImageUrl: '',
+      dialogVisible: false,
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+  },
+
+  methods: {
+
+    async initForm (type, natId) {
+      this.startLoading()
+      this.$refs['ref_form'].resetFields();
+
+      this.formType = type
+      if (natId) {
+        this.natId = natId
+        this.formData.id = natId
+        await this.loadFormData()
+      }
+      this.endLoading()
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.phone = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.personId = ''
+      if (value === '2') {
+        this.isFromResi = true
+      } else {
+        this.isFromResi = false
+      }
+
+    },
+
+    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 handleSelPerson (personItem) {
+      this.formData.name = personItem.demandUserName
+      this.formData.phone = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+
+
+    },
+
+
+    handleTime () {
+      if (!this.formData.remindTime) return
+      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
+      if (startAt < Date.now()) {
+        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
+      }
+    },
+
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
+      const url = '/gov/project/memoConcern'
+      let params = {
+        id: this.natId,
+        readFlag: '0',
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        if (data.attachmentList) {
+          data.attachmentList.forEach(element => {
+            element.name = element.fileName
+            element.type = element.attachmentType
+            element.size = element.attachmentSize
+          });
+          this.fileList = data.attachmentList
+
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+      this.$refs['ref_form'].validate(async (valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+          await this.addNat()
+        }
+
+      })
+
+    },
+    async addNat () {
+      console.log(this.formData)
+      return false
+
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }      
+
+      if (this.fileList.length > 0) {
+        this.formData.attachmentList = this.fileList
+      }
+
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/project/memoConcern/save'
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
+        this.formData.id = ''
+
+      } else {
+        url = '/gov/project/memoConcern/update'
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/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
+        this.$store.dispatch('setTipsList')
+        this.$store.dispatch('setTipsTime')
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xls'
+        && extension !== 'xlsx'
+        && extension !== 'doc'
+        && extension !== 'docx'
+        && extension !== 'pdf') {
+        this.$message.error('只能上传word、excel、pdf文件！')
+        return false
+      }
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
+
+    },
+
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+      }
+    },
+
+    handleFileSuccess (res, file) {
+
+      if (res.code === 0 && res.msg === 'success') {
+        const array = file.name.split('.')
+        const fileType = array[array.length - 1]
+
+        file.fileName = file.name
+        file.attachmentUrl = res.data.url
+        file.attachmentSize = file.size
+        file.attachmentType = 'doc'
+        file.attachmentFormat = fileType
+
+        this.fileList.push(file)
+        console.log(this.fileList)
+      } else this.$message.error(res.msg)
+    },
+
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.fileName;
+      console.log(a)
+      a.href = file.attachmentUrl;
+      a.dispatchEvent(event);
+
+
+    },
+
+    resetData () {
+      this.natId = ''
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        checkTime: [
+          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+        ],
+
+        address: [
+          { required: false },
+        ],
+        result: [
+          { required: true },
+        ],
+        address: [
+          { required: false },
+        ],
+        noticeWay: [
+          { required: false },
+        ],
+        noticeContent: [
+          { required: false },
+        ],
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 8f6c49af9..9d38bdb99 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -1,429 +1,582 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-         <el-form ref="searchForm" :inline="true" :model="fmData" class="demo-form-inline">
-           <el-form-item v-if="communityList.length > 0" label="所在社区" prop="orgId">
-            <el-select
-                  v-model.trim="fmData.orgId"
-                  placeholder="所在社区"
-                  size="small"
-                  clearable
-                  class="resi-cell-input"
-                >
-                  <el-option
-                    v-for="item in communityList"
-                    :key="item.orgId"
-                    :label="item.orgName"
-                    :value="item.orgId"
-                  >
-                  </el-option>
-                </el-select>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="personInCharge">
+            <el-input v-model="formData.personInCharge"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
           </el-form-item>
-          <el-form-item label="居住地址" prop="address">
-            <el-input
-              v-model="fmData.address"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
             </el-input>
+
           </el-form-item>
-          <el-form-item label="填写时间" prop="startTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="daterange"
-              clearable
-              size="small"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
+
+          <el-form-item label="接种时间"
+                        prop="scheduledStartTime">
+            <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-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-      
-      </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-
-        <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >导出</el-button
-        >
+
+          <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 style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
       </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="resi-table"
-        :height="maxTableHeight"
-        :span-method="arraySpanMethod"
-      >
-        <el-table-column label="序号" prop="desc" align="center" width="50" />
-        <el-table-column prop="houseHolderName" width="120" label="户主姓名" align="center" />
-        <el-table-column prop="address"  align="center" label="居住地址" :show-overflow-tooltip="true" />
-        <el-table-column prop="houseType" align="center" width="120" label="自有/租住" >
-          <template slot-scope="scope">
-            <span>
-              {{ scope.row.houseType == '1' ? '自有' : '租住' }}
-            </span>
-          </template>
+
+      <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 label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
         </el-table-column>
-        <el-table-column prop="totalResi" width="120" align="center" label="居住成员人数" />
-        <el-table-column prop="memberName" width="120" label="成员姓名" align="center" :show-overflow-tooltip="true" />
-        <el-table-column prop="memberIdNum" width="180" align="center" label="成员身份证" />
-        <el-table-column prop="memberMobile" width="140" align="center" label="成员手机号" />
-        <el-table-column prop="heSuanCount" width="140" align="center" label="参加几轮核酸检测 " />
-        <el-table-column prop="ymjz" width="140" align="center" label="疫苗接种情况">
-          <template slot-scope="scope">
-            <span v-if="scope.row.ymjz == 1">全程接种</span>
-            <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 0">未接种</span>
-          </template>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="time"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测机构"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         min-width="80">
         </el-table-column>
-        <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->
-        <!-- <el-table-column fixed="right" label="操作" align="center" width="100">
+
+        <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="handleWatch(scope.row)"
-              >查看</el-button
-            >
-
-            <el-button
-              @click="handleEdit(scope.$index)"
-              type="text"
-              size="small"
-              class="div-table-button--edit"
-              >修改</el-button
-            >
-
-            <el-popconfirm
-              title="删除之后无法回复，确认删除？"
-              @onConfirm="handleDel(scope.row, scope.$index)"
-              @confirm="handleDel(scope.row, scope.$index)"
-            >
-              <el-button
-                slot="reference"
-                type="text"
-                size="small"
-                class="div-table-button--delete"
-                style="margin-left: 10px;"
-                >删除</el-button
-              >
-            </el-popconfirm>
+
+            <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-column>
       </el-table>
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
+        <el-pagination @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>
-    </el-card>
+    </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="handleClose"
-    >
-      <!-- <edit-form
-        ref="eleEditForm"
-        @dialogCancle="handleClose"
-        @dialogOk="handleEditSuccess"
-      ></edit-form> -->
+    <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">
+      <nat-form ref="ref_form"
+                @dialogCancle="addFormCancle"
+                @dialogOk="addFormOk"></nat-form>
     </el-dialog>
+
   </div>
 </template>
 
 <script>
+
+import natForm from './natForm'
+
 import { requestPost } from "@/js/dai/request";
-import nextTick from "dai-js/tools/nextTick";
-import { mapGetters } from "vuex";
-import axios from "axios";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
 
+let loading // 加载动画
 export default {
-  data() {
+  data () {
     return {
-      openSearch: false,
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
 
-      formShow: false,
-      formTitle: "组织信息",
+      agencyId: '',
 
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
+      timeRange: [],
+      formData: {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      },
 
       tableData: [],
-      timeRange: '',
-      fmData: {
-        orgId: '',
-        startTime: "",
-        endTime: "",
-        address: ''
-      },
-      communityList: [],
-      spanIndex: [], // 合并的行
-      importBtnTitle: "导入",
-      importLoading: false,
-    };
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
   },
-  computed: {
-    maxTableHeight() {
-      return this.clientHeight - 360;
-    },
-    ...mapGetters(["clientHeight"]),
+  components: {
+    natForm
   },
-  watch: {
-    timeRange(val) {
-      if (Array.isArray(val) && val.length == 2) {
-        this.fmData.startTime = val[0];
-        this.fmData.endTime = val[1];
-      } else {
-        this.fmData.startTime = "";
-        this.fmData.endTime = "";
-      }
-    },
+  async created () {
+
   },
-  mounted() {
-    this.getcommunityList()
-    this.getTableData();
+  async mounted () {
+    //获取场所类型
+
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+
+
+    await this.loadTable()
   },
+
   methods: {
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-      // console.log('row-----r', row)
-      // console.log('column-----c', column)
-      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2 || columnIndex === 3 || columnIndex === 4) {
-        let index = this.spanIndex.findIndex(item => item.firstIndex === rowIndex)
-        if (index > -1) {
-          return {
-            rowspan: this.spanIndex[index].len,
-            colspan: 1
-          };
-        } else {
-          return {
-            rowspan: 0,
-            colspan: 0
-          };
-        }
-      }
+    handleSearch () {
+      this.loadTable()
     },
-    async handleChu() {
-      const url =
-        "/epmetuser/icresicollect/export";
-      const { pageSize, pageNo, fmData } = this;
-      axios({
-        url: window.SITE_CONFIG["apiURL"] + url,
-        method: "post",
-        data: {
-          pageSize,
-          pageNo,
-          ...fmData,
-        },
-        responseType: "blob",
-      })
-        .then((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);
-          return this.$message.error("网络错误");
+
+
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // 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
     },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-      this.pageSize = val;
-      window.localStorage.setItem("pageSize", val);
-      this.getTableData();
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-      this.pageNo = val;
-      this.getTableData();
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
     },
 
-    handleClose() {
-      this.formShow = false;
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.natId, this.agencyId)
+      })
     },
-    handleSearch(val) {
-      console.log(this.fmData);
-      this.pageNo = 1;
-      this.getTableData();
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
     },
-    resetForm(formName) {
-      this.$refs[formName].resetFields()
-      this.timeRange = ''
-      this.handleSearch()
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.natId, this.agencyId)
+      })
     },
 
-    async handleWatch(rowIndex) {
-      this.formShow = true;
-      await nextTick();
-      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    addFormCancle () {
+      this.formShow = false
     },
+    addFormOk () {
+      this.formShow = false
+      this.loadTable()
 
-    async handleEdit(rowIndex) {
-      this.formShow = true;
-      await nextTick();
-      this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess() {
-      this.handleClose();
-      this.getTableData();
+
+    async handleDelete (row) {
+
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.deleteNat(row)
+        })
+        .catch(err => {
+          if (err == "cancel") {
+
+          }
+
+        });
     },
 
-    async handleDel(rowData, rowIndex) {
-      console.log(rowData, rowIndex);
-      const url =
-        "/heart/iccommunityselforganization/delcommunityselforganization";
-      const { tableData } = this;
+    async deleteNat (row) {
+      const url = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
 
-      const { data, code, msg } = await requestPost(url, {
-        orgId: tableData[rowIndex].orgId,
-      });
+      let params = {
+        natId: row.natId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message.success("删除成功！");
-        this.getTableData();
+        this.$message({
+          type: "success",
+          message: "删除成功"
+        });
+
+        this.loadTable()
       } else {
-        this.$message.success("操作失败！");
+        this.$message.error(msg)
       }
     },
-    async getcommunityList() {
-      const url =
-        "/gov/org/agency/community-list";
-      const { data, code, msg } = await requestPost(url);
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.communityList = data
-      } else {
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
       }
+      this.pageSize = 10
+      this.pageNo = 0
+      this.loadTable()
     },
-    async getTableData() {
-      const url =
-        "/epmetuser/icresicollect/list";
-      const { pageSize, pageNo, fmData } = this;
-      const { data, code, msg } = await requestPost(url, {
-        pageSize,
-        pageNo,
-        ...fmData,
-      });
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.total = data.total || 0;
-        let _i = 0
-        let arr = []
-        this.spanIndex = data.list && data.list.map((item, index) => {
-         if (index == 0) _i = 0
-         else _i = _i + data.list[index - 1].list.length
-          arr.push(_i)
-          console.log('_i-----', _i, arr)
-          // if (index === data.list.length - 1) firstIndex = _i - item.list.length
-          return {
-            firstIndex: _i,
-            len: item.list.length
-          }
-        })
-        this.tableData = data.list && this.formatArr(data.list)
-        console.log('tableData----0', this.spanIndex)
-      } else {
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—房屋列表'
+
+      const url = "/gov/org/house/exporthouseinfo"
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        buildingId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
       }
+
     },
-    // 数组扁平化
-    formatArr(arr) {
-      let res = []
-      let arr1 = arr.map((n, index) => {
-        return {
-          ...n,
-          list: n.list.length> 0 ? n.list.map(i => {
-            return {
-              
-              ...n,
-              ...i,
-              desc: index + 1,
-              list: []
-            }
-          }) : []
+
+    handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/gov/org/house/exporttemplate"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
         }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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 uploadFile () {
+      if (this.fileName == "") {
+        this.$message.warning('请选择要上传的文件！')
+        return false
+      }
+
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
       })
-      arr1.forEach(item => {
-        if (item.list && item.list.length > 0) {
-          res = res.concat(this.formatArr(item.list))
-        } else res.push(item)
+
+      //清空上传列表
+      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' } })
+
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
       })
-      return res
     },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
   },
-};
-</script>
+  computed: {
+    tableHeight () {
 
-<style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
+      return (this.clientHeight - 360)
 
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
 
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
+  },
+  props: {
 
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
+  }
 }
-
+</script>
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
 </style>
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
new file mode 100644
index 000000000..64fa94c48
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
@@ -0,0 +1,575 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               :disabled="formType==='look'"
+               class="form">
+
+        <el-form-item 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 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 label="居民"
+                      prop="personId"
+                      style="display: block"
+                      label-width="150px">
+          <el-select class="item_width_2"
+                     v-model.trim="formData.personId"
+                     placeholder="请选择"
+                     filterable
+                     :disabled="!isFromResi"
+                     clearable>
+            <el-option v-for="item in personList"
+                       @click.native="handleSelPerson(item)"
+                       :key="item.demandUserId"
+                       :label="item.demandUserName"
+                       :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">
+          </el-input>
+
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="phone"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    :disabled="isFromResi"
+                    v-model="formData.phone">
+          </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="检测时间"
+                      style="display: block"
+                      prop="checkTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.checkTime"
+                          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="address"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入检测地点"
+                    clearable
+                    v-model="formData.address">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="检测结果"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="formData.result">
+
+            <el-radio :label="'1'">阴性</el-radio>
+            <el-radio :label="'2'">阳性</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item class="block"
+                      label-width="150px"
+                      style="display: block"
+                      label="添加附件"
+                      prop="attach">
+
+          <el-upload class="upload-demo"
+                     :action="uploadUlr"
+                     accept=".doc,.pdf,.xls,.docx,.xlsx"
+                     :on-success="handleFileSuccess"
+                     :on-remove="handleFileRemove"
+                     :on-preview="handleFileDownload"
+                     :limit="3"
+                     :before-upload="beforeUpload"
+                     :file-list="fileList">
+            <el-button size="small"
+                       :disabled="fileList.length==3"
+                       type="primary">点击上传</el-button>
+            <div slot="tip"
+                 class="el-upload__tip">最多三个附件，只能上传word、excel、pdf文件</div>
+          </el-upload>
+        </el-form-item>
+
+        <el-form-item label="通知渠道"
+                      prop="noticeWay"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.noticeWay">
+            <el-checkbox key="1"
+                         label="1">小程序通知</el-checkbox>
+            <el-checkbox key="2"
+                         label="2">短信通知</el-checkbox>
+
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item label="通知内容"
+                      prop="noticeContent"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 4, maxRows: 10 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.noticeContent"></el-input>
+        </el-form-item>
+
+      </el-form>
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button v-if="formType != 'look'"
+                 size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { dateFormats } from '@/utils/index'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      enterType: '1',//录入方式1 手动输入  2  选择居民
+      isFromResi: false,//是否从已有居民信息中选择
+
+      gridList: [],
+      personList: [],
+
+      btnDisable: false,
+
+      natId: '',
+      formData: {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+      },
+
+
+      fileList: [],
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      dialogImageUrl: '',
+      dialogVisible: false,
+
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+  },
+
+  methods: {
+
+    async initForm (type, natId) {
+      this.startLoading()
+      this.$refs['ref_form'].resetFields();
+
+      this.formType = type
+      if (natId) {
+        this.natId = natId
+        this.formData.id = natId
+        await this.loadFormData()
+      }
+      this.endLoading()
+
+    },
+
+    handleChangeEnterType (value) {
+      this.formData.name = ''
+      this.formData.phone = ''
+      this.formData.idCard = ''
+      this.formData.gridId = ''
+      this.formData.personId = ''
+      if (value === '2') {
+        this.isFromResi = true
+      } else {
+        this.isFromResi = false
+      }
+
+    },
+
+    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 handleSelPerson (personItem) {
+      this.formData.name = personItem.demandUserName
+      this.formData.phone = personItem.demandUserMobile
+      this.formData.idCard = personItem.idCard
+
+
+    },
+
+
+    handleTime () {
+      if (!this.formData.remindTime) return
+      var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
+      if (startAt < Date.now()) {
+        this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());
+      }
+    },
+
+
+    async loadFormData () {
+
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern'
+      const url = '/gov/project/memoConcern'
+      let params = {
+        id: this.natId,
+        readFlag: '0',
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.formData = data
+
+        if (data.attachmentList) {
+          data.attachmentList.forEach(element => {
+            element.name = element.fileName
+            element.type = element.attachmentType
+            element.size = element.attachmentSize
+          });
+          this.fileList = data.attachmentList
+
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+      this.$refs['ref_form'].validate(async (valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+
+          await this.addNat()
+        }
+
+      })
+
+    },
+    async addNat () {
+      console.log(this.formData)
+      return false
+
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // if (regPhone.test(this.formData.mobile) === false) {
+      //   this.btnDisable = false
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '请输入正确的手机号码'
+      //   })
+      //   return false;
+      // }      
+
+      if (this.fileList.length > 0) {
+        this.formData.attachmentList = this.fileList
+      }
+
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/gov/project/memoConcern/save'
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
+        this.formData.id = ''
+
+      } else {
+        url = '/gov/project/memoConcern/update'
+        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/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
+        this.$store.dispatch('setTipsList')
+        this.$store.dispatch('setTipsTime')
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    beforeUpload (file) {
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xls'
+        && extension !== 'xlsx'
+        && extension !== 'doc'
+        && extension !== 'docx'
+        && extension !== 'pdf') {
+        this.$message.error('只能上传word、excel、pdf文件！')
+        return false
+      }
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 5MB!')
+      }
+      return isLt1M
+
+    },
+
+    handleFileRemove (file) {
+
+      if (file && file.status === "success") {
+        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+      }
+    },
+
+    handleFileSuccess (res, file) {
+
+      if (res.code === 0 && res.msg === 'success') {
+        const array = file.name.split('.')
+        const fileType = array[array.length - 1]
+
+        file.fileName = file.name
+        file.attachmentUrl = res.data.url
+        file.attachmentSize = file.size
+        file.attachmentType = 'doc'
+        file.attachmentFormat = fileType
+
+        this.fileList.push(file)
+        console.log(this.fileList)
+      } else this.$message.error(res.msg)
+    },
+
+    //下载
+    handleFileDownload (file) {
+
+      var a = document.createElement('a');
+      var event = new MouseEvent('click');
+      a.download = file.fileName;
+      console.log(a)
+      a.href = file.attachmentUrl;
+      a.dispatchEvent(event);
+
+
+    },
+
+    resetData () {
+      this.natId = ''
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        checkTime: '',
+        address: '',
+        result: '',
+        noticeWay: [],
+        noticeContent: '',
+        attachmentList: []
+
+      }
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        phone: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+        checkTime: [
+          { required: true, message: '检测时间不能为空', trigger: 'blur' },
+        ],
+
+        address: [
+          { required: false },
+        ],
+        result: [
+          { required: true },
+        ],
+        address: [
+          { required: false },
+        ],
+        noticeWay: [
+          { required: false },
+        ],
+        noticeContent: [
+          { required: false },
+        ],
+
+      }
+    },
+
+  },
+  props: {
+
+
+
+    // serviceList: {
+    //   type: Array,
+    //   default: []
+    // },
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
new file mode 100644
index 000000000..49897bb18
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -0,0 +1,691 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="formData.name"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="phone">
+            <el-input v-model="formData.phone"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入手机号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="接种针次"
+                        prop="veroNum">
+            <el-select class="list_item_width_1"
+                       v-model.trim="formData.veroNum"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in veroNumList"
+                         :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>
+        </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 style="float:left"
+                   class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule">下载模板</el-button>
+        <el-upload ref="upload"
+                   :multiple='false'
+                   :show-file-list='false'
+                   :before-upload="beforeUpload"
+                   action=""
+                   accept=".xls,.xlsx"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :http-request="uploadFile">
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--delete">导入</el-button>
+        </el-upload>
+
+        <el-button style="float:left;margin-left:10px"
+                   class="diy-button--reset"
+                   size="small"
+                   @click="handleExport">导出</el-button>
+      </div>
+
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                @select-all="selectAll"
+                @selection-change="selectionChange"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         :selectable="checkSelect"
+                         width="55"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="personInCharge"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="gridNames"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         min-width="170">
+        </el-table-column>
+        <el-table-column prop="time"
+                         header-align="center"
+                         align="center"
+                         label="检测时间"
+                         width="120">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测机构"
+                         min-width="230">
+        </el-table-column>
+        <el-table-column prop="ninePlaceNames"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="检测结果"
+                         min-width="80">
+        </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-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="click">
+              <div class="more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleDelete(scope.row)">通知记录</el-button>
+              </div>
+
+              <div class="more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleDelete(scope.row) ">随访记录</el-button>
+              </div>
+              <div class="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>
+
+          </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 v-if="tableData.length>0"
+           class="div_notice">
+        <el-checkbox style="height:32px"
+                     :indeterminate="isIndeterminate"
+                     v-model="selAllFlag"
+                     @change="handleSelectAll">全选</el-checkbox>
+        <el-button style="margin-left:15px"
+                   type="red"
+                   size="small"
+                   @click="handleSendNotice">发送通知</el-button>
+      </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">
+      <vero-focus-form ref="ref_form"
+                       @dialogCancle="addFormCancle"
+                       @dialogOk="addFormOk"></vero-focus-form>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+
+import veroFocusForm from './veroFocusForm'
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
+      tableLoading: false,
+      selAllFlag: false,
+      isIndeterminate: false,//复选框的不确定状态
+      selection: [],
+      showDeletBtn: false,
+
+      agencyId: '',
+
+      formData: {
+        name: '',
+        phone: '',
+        idCard: '',
+        veroNum: '',
+      },
+      veroNumList: [],
+
+      tableData: [],
+
+      //form相关
+      formShow: false,
+      formTitle: '新增',
+
+    }
+  },
+  components: {
+    veroFocusForm
+  },
+  async created () {
+
+  },
+  async mounted () {
+    for (let i = 0; i < 11; i++) {
+      let obj = {
+        value: i + '',
+        label: i + '次'
+      }
+
+      this.veroNumList.push(obj)
+    }
+
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/gov/org/placepatrolteam/getlist"
+      // 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
+    },
+
+    handleSelectAll (selectAllFlag) {
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          if (row.showBtn) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length === this.validTableDataNum) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+
+    checkSelect (row, index) {
+      let isChecked = true;
+      // if (row.showBtn) { // 判断里面是否存在某个参数
+      //   isChecked = true
+      // } else {
+      //   isChecked = false
+      // }
+      return isChecked
+    },
+
+    selectionChange (selection) {
+      this.selection = selection
+      this.isIndeterminate = false
+      if (selection.length === this.validTableDataNum) {
+        this.selAllFlag = true
+
+      } else {
+        this.selAllFlag = false
+
+      }
+    },
+
+    //
+    handleSendNotice () {
+      console.log(this.selection)
+    },
+
+    handleScheduledTimeChange (time) {
+      if (time) {
+        this.formData.scheduledStartTime = time[0]
+        this.formData.scheduledEndTime = time[1]
+
+      } else {
+        this.formData.scheduledStartTime = ''
+        this.formData.scheduledEndTime = ''
+
+      }
+
+    },
+
+    diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+    },
+
+    handleDetail (row) {
+      this.formTitle = '详情'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('detail', row.veroFocusId, this.agencyId)
+      })
+    },
+
+    handleAdd () {
+      this.formTitle = '新增'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('add', null, this.agencyId)
+      })
+    },
+
+    handleEdit (row) {
+      this.formTitle = '修改'
+      this.formShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form.initForm('edit', row.veroFocusId, this.agencyId)
+      })
+    },
+
+    addFormCancle () {
+      this.formShow = false
+    },
+    addFormOk () {
+      this.formShow = 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 = "/gov/org/placepatrolteam/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+
+      let params = {
+        veroFocusId: row.veroFocusId
+      }
+
+      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.formData = {
+        personInCharge: '',//负责人		
+        mobile: '',//联系电话	
+        gridId: '',//负责区域【网格Id】	
+        ninePlaceVal: '',//场所类型【九小场所Value值】	
+        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+      }
+      this.pageSize = 10
+      this.pageNo = 0
+      this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.agencyObj.label
+      title = title + '—房屋列表'
+
+      const url = "/gov/org/house/exporthouseinfo"
+      let params = {
+        ownerName: this.ownerName,
+        ownerPhone: this.ownerPhone,
+        buildingId: this.agencyObj.id
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleExportModule () {
+      let title = ''
+      title = '房屋模板'
+
+      const url = "/gov/org/house/exporttemplate"
+      let params = {}
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xls')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+    },
+
+    // 上传文件之前的钩子
+    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 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' } })
+
+
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+
+      return (this.clientHeight - 360)
+
+    },
+    rowHeight () {
+      return (this.clientHeight - 200) + 'px'
+    },
+    ...mapGetters(['clientHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
+