diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 1e683d95a..7a60a21be 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -86,6 +86,13 @@
   background-color: #4ec591 !important;
   border-color: #4ec591 !important;
 }
+//列表上方操作按钮，其他按钮
+.diy-button--more {
+  color: #fff !important;
+  background-color: #23c1c4 !important;
+  border-color: #23c1c4 !important;
+}
+
 //table按钮样式
 
 //查看
diff --git a/src/assets/scss/modules/management/epidemic.scss b/src/assets/scss/modules/management/epidemic.scss
index 2164e4206..d5d2be8c5 100644
--- a/src/assets/scss/modules/management/epidemic.scss
+++ b/src/assets/scss/modules/management/epidemic.scss
@@ -1,20 +1,22 @@
-.item_width_1 {
-  width: 560px;
-}
-.item_width_2 {
-  width: 220px;
-}
-.item_width_3 {
-  width: 180px;
-}
+.epidemic-form {
+  .item_width_1 {
+    width: 560px;
+  }
+  .item_width_2 {
+    width: 220px;
+  }
+  .item_width_3 {
+    width: 180px;
+  }
 
-.btn-selperson {
-  margin-left: 20px;
-}
+  .btn-selperson {
+    margin-left: 20px;
+  }
 
-.form_div_btn {
-  margin-top: 20px;
-  text-align: center;
+  .form_div_btn {
+    margin-top: 20px;
+    text-align: center;
+  }
 }
 
 .main_tab {
@@ -70,3 +72,40 @@
   flex-direction: column;
   justify-content: center;
 }
+.div-mult-form {
+  margin-top: 20px;
+
+  .div_person {
+    display: flex;
+    font-size: 14px;
+    padding-bottom: 20px;
+
+    .person_title {
+      text-align: right;
+      flex: 0 0 100px;
+
+      line-height: 36px;
+      padding: 0 12px 0 0;
+    }
+
+    .tag_item {
+      margin-right: 10px;
+      margin-top: 10px;
+    }
+    .tag_tip {
+      margin-top: 10px;
+      color: #9c9c9c;
+    }
+  }
+}
+.div-mult-table {
+  padding: 0 20px;
+}
+
+.div_dialog_table {
+  padding: 10px;
+
+  .table {
+    margin-top: 20px;
+  }
+}
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index d9a21d5fb..8d1b761ee 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -1,14 +1,15 @@
 <template>
-  <div>
+  <div class="epidemic-form">
     <div class="dialog-h-content scroll-h">
       <el-form ref="ref_form"
                :inline="true"
                :model="formData"
                :rules="dataRule"
-               :disabled="formType==='look'"
+               :disabled="formType==='detail'"
                class="form">
 
-        <el-form-item label="录入方式"
+        <el-form-item v-if="formType==='add'"
+                      label="录入方式"
                       label-width="150px"
                       style="display: block">
           <el-radio-group v-model="enterType"
@@ -21,7 +22,8 @@
 
         </el-form-item>
 
-        <el-form-item label="所属网格"
+        <el-form-item v-if="formType==='add'"
+                      label="所属网格"
                       style="display: block"
                       label-width="150px">
           <el-select class="item_width_2"
@@ -37,12 +39,13 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="居民"
-                      prop="personId"
+        <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.personId"
+                     v-model.trim="formData.userId"
                      placeholder="请选择"
                      filterable
                      :disabled="!isFromResi"
@@ -70,14 +73,14 @@
         </el-form-item>
 
         <el-form-item label="手机号"
-                      prop="phone"
+                      prop="mobile"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_2"
                     placeholder="请输入手机号"
                     clearable
                     :disabled="isFromResi"
-                    v-model="formData.phone">
+                    v-model="formData.mobile">
           </el-input>
         </el-form-item>
         <el-form-item label="身份证号"
@@ -94,10 +97,10 @@
 
         <el-form-item label="检测时间"
                       style="display: block"
-                      prop="checkTime"
+                      prop="natTime"
                       label-width="150px">
           <el-date-picker class="item_width_2"
-                          v-model="formData.checkTime"
+                          v-model="formData.natTime"
                           format="yyyy-MM-dd HH:mm"
                           value-format="yyyy-MM-dd HH:mm"
                           type="datetime"
@@ -107,13 +110,13 @@
         </el-form-item>
 
         <el-form-item label="检测地点"
-                      prop="address"
+                      prop="natAddress"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
                     placeholder="请输入检测地点"
                     clearable
-                    v-model="formData.address">
+                    v-model="formData.natAddress">
           </el-input>
         </el-form-item>
 
@@ -121,10 +124,10 @@
                       prop="type"
                       label-width="150px"
                       style="display: block">
-          <el-radio-group v-model="formData.result">
+          <el-radio-group v-model="formData.natResult">
 
-            <el-radio :label="'1'">阴性</el-radio>
-            <el-radio :label="'2'">阳性</el-radio>
+            <el-radio :label="'0'">阴性</el-radio>
+            <el-radio :label="'1'">阳性</el-radio>
 
           </el-radio-group>
         </el-form-item>
@@ -132,41 +135,44 @@
         <el-form-item class="block"
                       label-width="150px"
                       style="display: block"
-                      label="添加附件"
+                      label="添加图片"
                       prop="attach">
 
-          <el-upload class="upload-demo"
-                     :action="uploadUlr"
-                     accept=".doc,.pdf,.xls,.docx,.xlsx"
+          <el-upload :action="uploadUlr"
+                     list-type="picture-card"
+                     :limit="limitNum"
+                     :class="{hide:hideUploadEdit}"
+                     accept=".jpg,.png,.gif"
+                     :on-preview="handlePictureCardPreview"
                      :on-success="handleFileSuccess"
-                     :on-remove="handleFileRemove"
-                     :on-preview="handleFileDownload"
-                     :limit="3"
+                     :on-remove="handleRemove"
                      :before-upload="beforeUpload"
+                     :on-change="handleEditChange"
                      :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>
+            <i v-if="formType!=='detail'"
+               class="el-icon-plus"></i>
+            <div v-if="formType!=='detail'"
+                 slot="tip"
+                 class="el-upload__tip">请选择1张图片，只能上传jpg、png、gif格式</div>
           </el-upload>
+
         </el-form-item>
 
         <el-form-item label="通知渠道"
-                      prop="noticeWay"
+                      prop="channel"
                       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 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 label="通知内容"
-                      prop="noticeContent"
+                      prop="content"
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
@@ -176,22 +182,31 @@
                     :autosize="{ minRows: 4, maxRows: 10 }"
                     clearable
                     placeholder="请输入通知内容"
-                    v-model="formData.noticeContent"></el-input>
+                    v-model="formData.content"></el-input>
         </el-form-item>
 
       </el-form>
     </div>
 
-    <div class="div_btn">
+    <div class="form_div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType != 'look'"
+      <el-button v-if="formType != 'detail'"
                  size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
     </div>
 
+    <el-dialog :visible.sync="dialogVisible"
+               width="550px"
+               top="5vh"
+               append-to-body>
+      <img width="100%"
+           :src="dialogImageUrl"
+           alt="">
+    </el-dialog>
+
   </div>
 </template>
 
@@ -207,6 +222,8 @@ export default {
   data () {
     return {
       formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      hideUploadEdit: false, // 隐藏'上传按钮'
+      limitNum: 1,
       enterType: '1',//录入方式1 手动输入  2  选择居民
       isFromResi: false,//是否从已有居民信息中选择
 
@@ -215,26 +232,31 @@ export default {
 
       btnDisable: false,
 
-      natId: '',
+      icNatId: '',
       formData: {
+        icNatId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
         name: '',
         idCard: '',
-        phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
-        noticeWay: [],
-        noticeContent: '',
-        attachmentList: []
+        mobile: '',
+        natTime: '',
+        natAddress: '',
+        natResult: '',
+        channel: [],
+        content: '',
+
+        fileName: '',//附件名	
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
+        attachmentUrl: '',//附件地址	
       },
 
-
       fileList: [],
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       dialogImageUrl: '',
       dialogVisible: false,
 
-
     }
   },
   components: {},
@@ -247,26 +269,30 @@ export default {
 
   methods: {
 
-    async initForm (type, natId) {
-      this.startLoading()
+    async initForm (type, icNatId) {
+
+      this.formData.agencyId = this.agencyId
+
       this.$refs['ref_form'].resetFields();
 
       this.formType = type
-      if (natId) {
-        this.natId = natId
-        this.formData.id = natId
+
+      if (icNatId) {
+        this.icNatId = icNatId
+        this.formData.icNatId = icNatId
+        this.isFromResi = false
         await this.loadFormData()
       }
-      this.endLoading()
+
 
     },
 
     handleChangeEnterType (value) {
       this.formData.name = ''
-      this.formData.phone = ''
+      this.formData.mobile = ''
       this.formData.idCard = ''
       this.formData.gridId = ''
-      this.formData.personId = ''
+      this.formData.userId = ''
       if (value === '2') {
         this.isFromResi = true
       } else {
@@ -312,96 +338,91 @@ export default {
 
     },
     async handleSelPerson (personItem) {
+      this.formData.userId = personItem.demandUserId
       this.formData.name = personItem.demandUserName
-      this.formData.phone = personItem.demandUserMobile
+      this.formData.mobile = 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'
+      // const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/detail'
+      const url = '/epmetuser/icNat/detail'
       let params = {
-        id: this.natId,
-        readFlag: '0',
+        icNatId: this.icNatId,
       }
       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
+        this.formData.icNatId = this.icNatId
+        this.fileList = []
+        if (data.fileName) {
+          let obj = {
+            name: data.fileName,
+            type: data.attachmentType,
+            url: data.attachmentUrl,
+          }
+          // data.attachmentList.forEach(element => {
+          //   element.name = element.fileName
+          //   element.type = element.attachmentType
+          //   element.size = element.attachmentSize
+          // });
+          this.fileList.push(obj)
 
         }
 
+        this.hideUploadEdit = this.fileList.length >= this.limitNum;
+
       } else {
         this.$message.error(msg)
       }
     },
 
+
     async handleComfirm () {
 
 
+      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;
+      }
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+      if (regCard.test(this.formData.idCard) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+
+      if (this.formData.channel.length > 0 && !this.formData.content) {
+        this.$message({
+          type: 'warning',
+          message: '请填写通知内容'
+        })
+        return false;
+      }
+
       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 = ''
+        url = '/epmetuser/icNat/add'
+        // url = "http://yapi.elinkservice.cn/mock/102/epmetuser/icNat/add"
+        this.formData.icNatId = ''
 
       } else {
-        url = '/gov/project/memoConcern/update'
-        // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/update"
+        url = '/epmetuser/icNat/edit'
+        // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/edit"
       }
 
 
@@ -415,8 +436,7 @@ export default {
         this.resetData()
         this.$emit('dialogOk')
         this.btnDisable = false
-        this.$store.dispatch('setTipsList')
-        this.$store.dispatch('setTipsTime')
+
       } else {
         this.btnDisable = false
         this.$message.error(msg)
@@ -425,81 +445,85 @@ export default {
     },
 
     handleCancle () {
-
       this.resetData()
       this.$emit('dialogCancle')
 
     },
 
+    handleRemove (file, fileList) {
+      this.hideUploadEdit = fileList.length >= this.limitNum;
+      this.formData.fileName = ''
+      this.formData.attachmentUrl = ''
+      this.formData.attachmentType = ''
+      this.fileList = []
+
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+
+    handleEditChange (file, fileList) {
+      this.hideUploadEdit = fileList.length >= this.limitNum;
+
+    },
+
     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文件！')
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'jpg'
+        && extension !== 'png'
+        && extension !== 'gif'
+      ) {
+        this.$message.error('只能上传jpg、png、gif文件！')
         return false
       }
-      if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 5MB!')
-      }
-      return isLt1M
+      // 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'
+        this.formData.fileName = file.name
+        this.formData.attachmentUrl = res.data.url
+        this.formData.attachmentType = 'image'
+
         file.attachmentFormat = fileType
+        file.attachmentSize = file.size
 
-        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.icNatId = ''
+      this.fileList = []
+      this.hideUploadEdit = false
 
       this.formData = {
+        icNatId: '',
+        agencyId: '',//当前网格所属组织Id	
+        userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值	
+        userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro	
         name: '',
         idCard: '',
-        phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
-        noticeWay: [],
-        noticeContent: '',
-        attachmentList: []
+        mobile: '',
+        natTime: '',
+        natAddress: '',
+        natResult: '',
+        channel: [],
+        content: '',
+
+        fileName: '',//附件名	
+        attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））	
+        attachmentUrl: '',//附件地址	
 
       }
     },
@@ -528,26 +552,26 @@ export default {
         idCard: [
           { required: true, message: '身份证号不能为空', trigger: 'blur' }
         ],
-        phone: [
+        mobile: [
           { required: true, message: '手机号不能为空', trigger: 'blur' },
         ],
-        checkTime: [
+        natTime: [
           { required: true, message: '检测时间不能为空', trigger: 'blur' },
         ],
 
-        address: [
+        natAddress: [
           { required: false },
         ],
-        result: [
+        natResult: [
           { required: true },
         ],
-        address: [
+        natAddress: [
           { required: false },
         ],
-        noticeWay: [
+        channel: [
           { required: false },
         ],
-        noticeContent: [
+        content: [
           { required: false },
         ],
 
@@ -572,4 +596,16 @@ export default {
 @import "@/assets/scss/modules/management/epidemic.scss";
 </style>
 
+<style lang='scss'>
+// 隐藏上传按钮
+.hide .el-upload--picture-card {
+  display: none;
+}
+// 添加/删除文件时去掉动画过渡
+.el-upload-list__item {
+  transition: none !important;
+}
+</style>
+
+
 
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 9d38bdb99..f81b23058 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -6,10 +6,22 @@
                ref="ref_searchform"
                :label-width="'90px'">
         <div>
+          <el-form-item label="信息范围">
+            <el-select class="list_item_width_1"
+                       size="small"
+                       v-model.trim="formData.orgType"
+                       placeholder="请选择">
+              <el-option v-for="item in orgTypeList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
 
           <el-form-item label="姓名"
-                        prop="personInCharge">
-            <el-input v-model="formData.personInCharge"
+                        prop="name">
+            <el-input v-model="formData.name"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -18,39 +30,52 @@
 
           </el-form-item>
 
-          <el-form-item label="身份证"
+          <el-form-item label="手机号"
                         prop="mobile">
             <el-input v-model="formData.mobile"
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入身份证">
+                      placeholder="请输入手机号">
             </el-input>
 
           </el-form-item>
-
-          <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 label="身份证"
+                        prop="idCard">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
 
           </el-form-item>
-
-          <el-button style="margin-left:30px"
-                     size="small"
-                     class="diy-button--search"
-                     @click="handleSearch">查询</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+          <div>
+
+            <el-form-item label="接种时间"
+                          prop="startTime">
+              <el-date-picker v-model="timeRange"
+                              size="small"
+                              type="datetimerange"
+                              @change="handleTimeChange"
+                              format="yyyy-MM-dd HH:mm"
+                              value-format="yyyy-MM-dd HH:mm"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间">
+              </el-date-picker>
+
+            </el-form-item>
+
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetSearch">重置</el-button>
+          </div>
         </div>
       </el-form>
     </div>
@@ -69,7 +94,7 @@
                    :show-file-list='false'
                    :before-upload="beforeUpload"
                    action=""
-                   accept=".xls,.xlsx"
+                   accept=".xlsx"
                    :limit="1"
                    :on-exceed="handleExceed"
                    :http-request="uploadFile">
@@ -97,11 +122,11 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="personInCharge"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
-                         width="90">
+                         width="100">
         </el-table-column>
         <el-table-column prop="mobile"
                          header-align="center"
@@ -109,31 +134,31 @@
                          label="手机号"
                          width="110">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
                          label="身份证"
-                         min-width="170">
+                         width="170">
         </el-table-column>
-        <el-table-column prop="time"
+        <el-table-column prop="natTime"
                          header-align="center"
                          align="center"
                          label="检测时间"
-                         width="120">
+                         width="170">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="natAddress"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="检测机构"
                          min-width="230">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="natResultShow"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="检测结果"
-                         min-width="80">
+                         width="100">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -148,16 +173,49 @@
                        class="div-table-button--detail"
                        size="small"
                        @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
+
+            <el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-button v-if="scope.row.userType==='resi'||scope.row.userType==='icresi'"
+                       type="text"
+                       class="div-table-button--delete "
+                       size="small"
+                       @click="handleDelete(scope.row,'delete')">删除</el-button>
+
+            <el-button v-if="scope.row.userType==='import'&&scope.row.agencyId!==agencyId"
+                       type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAttention(scope.row)">关注</el-button>
+
+            <el-button v-if="scope.row.userType==='synchro'&&scope.row.agencyId===agencyId"
+                       type="text"
+                       class="div-table-button--delete "
+                       size="small"
+                       @click="handleDelete(scope.row,'attention')">取消关注</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 "
+                       class="div-table-button--delete "
                        size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
+                       @click="handleDelete(scope.row,'delete')">删除</el-button>
 
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleAttention(scope.row)">关注</el-button>
+
+            <el-button type="text"
+                       class="div-table-button--delete "
+                       size="small"
+                       @click="handleDelete(scope.row,'attention')">取消关注</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -183,7 +241,7 @@
                class="dialog-h"
                @closed="diaClose">
       <nat-form ref="ref_form"
-                @dialogCancle="addFormCancle"
+                @dialogCancle="diaClose"
                 @dialogOk="addFormOk"></nat-form>
     </el-dialog>
 
@@ -204,19 +262,31 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: false,
 
       agencyId: '',
+      orgTypeList: [
+        {
+          value: 'current',
+          label: '本辖区居民检测记录'
+        },
+        {
+          value: 'all',
+          label: '全部检测记录'
+        },
+      ],
 
       timeRange: [],
       formData: {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        orgType: 'current',//当前组织:current 根组织：all		
+        name: '',//姓名	
+        mobile: '',//手机号	
+        idCard: '',//身份证号码	
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
+
       },
 
       tableData: [],
@@ -249,14 +319,11 @@ export default {
       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"
+      const url = "/epmetuser/icNat/natlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/natlist"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -270,10 +337,7 @@ export default {
         this.tableData = data.list
 
         this.tableData.forEach(item => {
-          if (item.time) {
-            let timeArray = item.time.split(' ')
-            item.time = timeArray[0]
-          }
+          item.natResultShow = item.natResult === '1' ? '阳性' : '阴性'
 
         });
       } else {
@@ -282,14 +346,14 @@ export default {
       this.tableLoading = false
     },
 
-    handleScheduledTimeChange (time) {
+    handleTimeChange (time) {
       if (time) {
-        this.formData.scheduledStartTime = time[0]
-        this.formData.scheduledEndTime = time[1]
+        this.formData.startTime = time[0]
+        this.formData.endTime = time[1]
 
       } else {
-        this.formData.scheduledStartTime = ''
-        this.formData.scheduledEndTime = ''
+        this.formData.startTime = ''
+        this.formData.endTime = ''
 
       }
 
@@ -298,13 +362,14 @@ export default {
     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.natId, this.agencyId)
+        this.$refs.ref_form.initForm('detail', row.icNatId)
       })
     },
 
@@ -312,7 +377,7 @@ export default {
       this.formTitle = '新增'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyId)
+        this.$refs.ref_form.initForm('add', null)
       })
     },
 
@@ -320,22 +385,20 @@ export default {
       this.formTitle = '修改'
       this.formShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.natId, this.agencyId)
+        this.$refs.ref_form.initForm('edit', row.icNatId)
       })
     },
 
-    addFormCancle () {
-      this.formShow = false
-    },
     addFormOk () {
       this.formShow = false
       this.loadTable()
 
     },
 
-    async handleDelete (row) {
+    async handleDelete (row, type) {
+      let message = type === 'delete' ? '确认删除?' : '确认取消关注？'
 
-      this.$confirm("确认删除?", "提示", {
+      this.$confirm(message, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -343,6 +406,43 @@ export default {
         .then(() => {
           this.deleteNat(row)
         })
+        .catch(err => {
+
+        });
+    },
+
+    async deleteNat (row) {
+      const url = "/epmetuser/icNat/del"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/del"
+
+      let params = {
+        icNatId: row.icNatId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.$message({
+          type: "success",
+          message: "操作成功"
+        });
+
+        this.loadTable()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleAttention (row) {
+
+      this.$confirm("确认同步该条信息?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.attentionNat(row)
+        })
         .catch(err => {
           if (err == "cancel") {
 
@@ -351,12 +451,12 @@ export default {
         });
     },
 
-    async deleteNat (row) {
-      const url = "/gov/org/placepatrolteam/del"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+    async attentionNat (row) {
+      const url = "/epmetuser/icNat/synchro"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {
-        natId: row.natId
+        icNatId: row.icNatId
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -364,7 +464,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "操作成功"
         });
 
         this.loadTable()
@@ -373,18 +473,21 @@ export default {
       }
     },
 
+
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        orgType: 'current',//当前组织:current 根组织：all		
+        name: '',//姓名	
+        mobile: '',//手机号	
+        idCard: '',//身份证号码	
+        startTime: '',//检测开始时间yyyy-MM-dd HH:mm	
+        endTime: '',//检测结束时间yyyy-MM-dd HH:mm
       }
-      this.pageSize = 10
+      this.timeRange = []
+
       this.pageNo = 0
-      this.loadTable()
+      // this.loadTable()
     },
 
 
@@ -400,22 +503,17 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—房屋列表'
+      let title = '核酸检测信息'
 
-      const url = "/gov/org/house/exporthouseinfo"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        buildingId: this.agencyObj.id
-      }
+      const url = "/epmetuser/icNat/export"
 
       app.ajax.exportFilePost(
         url,
-        params,
+        this.formData,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -451,10 +549,9 @@ export default {
     },
 
     handleExportModule () {
-      let title = ''
-      title = '房屋模板'
+      let title = '核酸检测信息导入模板'
 
-      const url = "/gov/org/house/exporttemplate"
+      const url = "/epmetuser/icNat/import-template-download"
       let params = {}
 
       app.ajax.exportFilePost(
@@ -462,7 +559,7 @@ export default {
         params,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -472,15 +569,15 @@ export default {
 
     // 上传文件之前的钩子
     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('请选择正确格式的文件')
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xlsx') {
+        this.$message.error('只能上传xlsx文件！')
         return false
       } else {
+        this.files = file;
         this.fileName = file.name;
         return true
       }
@@ -506,14 +603,11 @@ export default {
       //清空上传列表
       this.$refs['upload'].clearFiles()
 
-      var url = '/gov/org/house/houseimport'
+      var url = '/epmetuser/icNat/import'
 
       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) => {
 
@@ -528,18 +622,17 @@ export default {
             // })
             // this.$message.error(rspMsg)
           }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+
+          // this.loadTable()
+
         },
         (rspMsg, data) => {
-          this.importRoomLoading = false
+
         }, { headers: { 'Content-Type': 'multipart/form-data' } })
 
 
     },
 
-
     // 开启加载动画
     startLoading () {
       loading = Loading.service({
@@ -559,13 +652,12 @@ export default {
   computed: {
     tableHeight () {
 
-      return (this.clientHeight - 360)
+      return this.$store.state.inIframe ? this.clientHeight - 420 + this.iframeHeight : this.clientHeight - 420
+
 
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
new file mode 100644
index 000000000..ba00652e4
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -0,0 +1,699 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <el-tabs v-model="activeName"
+               type="card"
+               class="main_tab"
+               @tab-click="handleClick">
+        <el-tab-pane label="逐个添加"
+                     name="first">
+          <el-form ref="ref_form1"
+                   :inline="true"
+                   :model="formData1"
+                   :rules="dataRule1"
+                   class="form">
+
+            <el-form-item label="姓名"
+                          prop="name"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_2"
+                        placeholder="请输入姓名"
+                        clearable
+                        v-model="formData1.name">
+              </el-input>
+
+            </el-form-item>
+
+            <el-form-item label="手机号"
+                          prop="mobile"
+                          label-width="150px"
+                          style="display: block">
+              <el-input class="item_width_2"
+                        placeholder="请输入手机号"
+                        clearable
+                        v-model="formData1.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
+                        v-model="formData1.idCard">
+              </el-input>
+            </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: 2, maxRows: 5 }"
+                        clearable
+                        placeholder="请输入通知备注"
+                        v-model="formData1.remark"></el-input>
+            </el-form-item>
+
+            <el-form-item label="通知渠道"
+                          prop="channel"
+                          label-width="150px"
+                          style="display: block">
+              <el-checkbox-group v-model="formData1.channel">
+                <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="content"
+                          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="formData1.content"></el-input>
+            </el-form-item>
+
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane label="批量添加"
+                     name="second">
+
+          <div class="div-mult-table">
+            <el-form :inline="true"
+                     :model="formDataSearch"
+                     ref="ref_formSearch"
+                     :label-width="'90px'">
+              <el-form-item label="所属网格"
+                            label-width="80px">
+                <el-select class="item_width_3"
+                           v-model.trim="formDataSearch.gridId"
+                           placeholder="请选择"
+                           size="mini"
+                           clearable>
+                  <el-option v-for="item in gridList"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="疫苗接种次数小于"
+                            label-width="150px">
+                <el-input-number class="item_width_3"
+                                 v-model="formDataSearch.vaccineCount"
+                                 size="mini"
+                                 :min="0"
+                                 :max="20"
+                                 label="疫苗接种次数小于"></el-input-number>
+              </el-form-item>
+              <el-button style="margin-left:30px"
+                         size="mini"
+                         class="diy-button--search"
+                         @click="handleSearch">查询</el-button>
+              <el-button style="margin-left:10px"
+                         size="mini"
+                         class="diy-button--reset"
+                         @click="resetSearch">重置</el-button>
+            </el-form>
+            <el-table ref="ref_table"
+                      class="table"
+                      size="mini"
+                      :data="tableData"
+                      border
+                      :height="tableHeight"
+                      v-loading="tableLoading"
+                      :reserve-selection="true"
+                      :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                      @select="handleSelectTable"
+                      @select-all="handleSelAll"
+                      style="width: 100%">
+              <el-table-column type="selection"
+                               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="name"
+                               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="idCard"
+                               header-align="center"
+                               align="center"
+                               label="身份证"
+                               min-width="170">
+              </el-table-column>
+              <el-table-column prop="idCard"
+                               header-align="center"
+                               align="center"
+                               label="疫苗接种次数"
+                               min-width="100">
+              </el-table-column>
+
+            </el-table>
+            <div>
+              <el-pagination @size-change="handleSizeChange"
+                             @current-change="handleCurrentChange"
+                             :current-page.sync="pageNo"
+                             :page-sizes="[20, 50, 100, 200]"
+                             :page-size="pageSize"
+                             layout="sizes, prev, pager, next, total"
+                             :total="total">
+              </el-pagination>
+            </div>
+
+          </div>
+          <div class="div-mult-form">
+
+            <!-- <div class="div_person">
+              <div class="person_title">已选居民</div>
+              <div v-if="selectionAll.length>0">
+                <el-tag class="tag_item"
+                        v-for="(tag,index) in selectionAll"
+                        :key="index"
+                        :disable-transitions="false"
+                        @close="handleCloseTag(tag,index)"
+                        closable>
+                  {{tag.name}}
+                </el-tag>
+              </div>
+              <div v-else
+                   class="tag_tip">请从列表中选择居民</div>
+            </div> -->
+            <el-form :inline="true"
+                     :model="formData2"
+                     ref="ref_form2"
+                     :label-width="'90px'">
+              <el-form-item label="已选择人数"
+                            label-width="100px"
+                            style="display: block">
+                <span> {{selectionAll.length}}</span>
+              </el-form-item>
+              <el-form-item label="备注"
+                            prop="remark"
+                            label-width="100px"
+                            style="display: block">
+                <el-input class="item_width_1"
+                          type="textarea"
+                          maxlength="500"
+                          show-word-limit
+                          :autosize="{ minRows: 2, maxRows: 5 }"
+                          clearable
+                          placeholder="请输入通知备注"
+                          v-model="formData2.remark"></el-input>
+              </el-form-item>
+
+              <el-form-item label="通知渠道"
+                            prop="channel"
+                            label-width="100px"
+                            style="display: block">
+                <el-checkbox-group v-model="formData2.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 label="通知内容"
+                            prop="content"
+                            label-width="100px"
+                            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="formData2.content"></el-input>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+
+    </div>
+
+    <div class="form_div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button 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 { mapGetters } from 'vuex'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      activeName: "first",
+
+      gridList: [],
+
+      btnDisable: false,
+
+      formDataSearch: {
+        gridId: '',
+        vaccineCount: undefined,
+      },
+
+      formData1: {
+        attentionType: 1,
+        name: '',
+        idCard: '',
+        mobile: '',
+        remark: '',
+        channel: [],
+        content: '',
+
+      },
+
+      formData2: {
+        attentionType: 1,
+        remark: '',
+        channel: [],
+        content: '',
+      },
+      tableData: [],
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      selectionAll: [],//选中的人员
+
+    }
+  },
+  components: {},
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+  },
+
+  methods: {
+
+    async initForm () {
+
+      this.$refs['ref_form1'].resetFields();
+      this.$refs['ref_form2'].resetFields();
+
+      await this.loadTable()
+
+    },
+
+    handleSearch () {
+      this.loadTable()
+    },
+
+    async loadTable () {
+      this.tableLoading = true
+
+      // const url = "/epmetuser/epidemicPrevention/page"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/epidemicPrevention/page"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formDataSearch
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        data.list.forEach(element => {
+          element.isSel = false
+        });
+        this.tableData = data.list
+
+        this.analysisTableSelection()
+
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleSelectTable (selection, row) {
+
+      row.isSel = !row.isSel
+
+      if (row.isSel) {
+        this.selectionAll.push(row)
+      } else {
+        for (let i = 0; i < this.selectionAll.length; i++) {
+          let item = this.selectionAll[i]
+          if (item.idCard === row.idCard) {
+            this.selectionAll.splice(i, 1)
+            break
+          }
+
+        }
+      }
+
+    },
+
+    handleSelAll (selection) {
+      let selFlag = selection.length > 0//全选选中 还是 全选不选中
+      for (let i = 0; i < this.tableData.length; i++) {
+        let tableItem = this.tableData[i]
+        tableItem.isSel = selFlag
+        let isHasItem = false
+        for (let j = 0; j < this.selectionAll.length; j++) {
+          let selectionItem = this.selectionAll[j]
+          if (selectionItem.idCard === tableItem.idCard) {
+            isHasItem = true
+            if (!selFlag) {
+              this.selectionAll.splice(j, 1)
+              break
+            }
+          }
+
+        }
+
+        if (!isHasItem && selFlag) {
+          this.selectionAll.push(tableItem)
+        }
+
+      }
+
+    },
+
+    //删除标签
+    handleCloseTag (tag, index) {
+      for (let i = 0; i < this.tableData.length; i++) {
+
+        let tableItem = this.tableData[i]
+        if (tag.idCard === tableItem.idCard) {//如果表中存在这个数据
+          tableItem.isSel = false
+          this.$refs.ref_table.toggleRowSelection(tableItem);
+          break
+        }
+
+      }
+
+      for (let i = 0; i < this.selectionAll.length; i++) {
+        let item = this.selectionAll[i]
+        if (item.idCard === tag.idCard) {
+          this.selectionAll.splice(i, 1)
+          break
+        }
+
+      }
+    },
+
+    //回显列表选中的行
+    analysisTableSelection () {
+      this.$nextTick(() => {
+        this.tableData.forEach(tableItem => {
+
+
+          for (let j = 0; j < this.selectionAll.length; j++) {
+            let selectionItem = this.selectionAll[j]
+
+            if (selectionItem.idCard === tableItem.idCard) {
+              tableItem.isSel = true
+              break
+
+            }
+          }
+          if (tableItem.isSel) {
+            this.$refs.ref_table.toggleRowSelection(tableItem);
+          }
+        });
+      })
+
+
+    },
+
+    handleClick () {
+
+    },
+
+    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 handleComfirm () {
+      let list = []
+      if (this.activeName === 'first') {
+        list.push(this.formData1)
+
+        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        if (regPhone.test(this.formData1.mobile) === false) {
+          this.btnDisable = false
+          this.$message({
+            type: 'warning',
+            message: '请输入正确的手机号码'
+          })
+          return false;
+        }
+        const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
+        if (regCard.test(this.formData1.idCard) === false) {
+          this.btnDisable = false
+          this.$message({
+            type: 'warning',
+            message: '请输入正确的身份证号码'
+          })
+          return false;
+        }
+
+        if (this.formData1.channel.length > 0 && !this.formData1.content) {
+          this.$message({
+            type: 'warning',
+            message: '请填写通知内容'
+          })
+          return false;
+        }
+
+      } else {
+
+
+        if (this.selectionAll.length === 0) {
+          this.$message.info('请选择批量添加的人员')
+          return false
+        }
+
+        if (this.formData2.channel.length > 0 && !this.formData2.content) {
+          this.$message({
+            type: 'warning',
+            message: '请填写通知内容'
+          })
+          return false;
+        }
+
+        this.selectionAll.forEach(element => {
+          let obj = {
+            name: element.name,
+            idCard: element.idCard,
+            mobile: element.mobile,
+
+            ...this.formData2
+          }
+
+          list.push(obj)
+        });
+
+      }
+      console.log(list)
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+      let url = '/epmetuser/icEpidemicSpecialAttention/vaccination-add'
+      // url = "http://yapi.elinkservice.cn/mock/245/gov/project/memoConcern/save"
+
+      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)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetSearch () {
+      this.formDataSearch = {
+        gridId: '',
+        vaccineCount: undefined,
+
+
+      }
+    },
+
+    destroyed () {
+      console.log(11111111)
+    },
+
+    resetData () {
+
+      this.formData1 = {
+        name: '',
+        idCard: '',
+        mobile: '',
+        remark: '',
+        channel: [],
+        content: '',
+        attentionType: 1,
+      }
+
+      this.formData2 = {
+        attentionType: 1,
+        remark: '',
+        channel: [],
+        content: '',
+      }
+      this.formDataSearch = {
+        gridId: '',
+        vaccineCount: undefined,
+      }
+
+      this.selectionAll = []//选中的人员
+
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return 300
+
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+
+    dataRule1 () {
+
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+
+
+
+
+      }
+    },
+
+  },
+  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/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
new file mode 100644
index 000000000..19297662c
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form1"
+               :inline="true"
+               :model="formData"
+               :disabled="formType==='detail'"
+               class="form">
+
+        <el-form-item label="姓名"
+                      prop="name"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.name}}</span>
+          <!-- <el-input class="item_width_2"
+                    placeholder="请输入姓名"
+                    clearable
+
+                    v-model="formData.name">
+          </el-input> -->
+
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.mobile}}</span>
+          <!-- <el-input class="item_width_2"
+                    placeholder="请输入手机号"
+                    clearable
+                    v-model="formData.mobile">
+          </el-input> -->
+        </el-form-item>
+        <el-form-item label="身份证号"
+                      prop="idCard"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{formData.idCard}}</span>
+          <!-- <el-input class="item_width_2"
+                    placeholder="请输入身份证号"
+                    clearable
+                    v-model="formData.idCard">
+          </el-input> -->
+        </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    :disabled="formType==='detail'"
+                    maxlength="500"
+                    show-word-limit
+                    :autosize="{ minRows: 2, maxRows: 5 }"
+                    clearable
+                    placeholder="请输入通知备注"
+                    v-model="formData.remark"></el-input>
+        </el-form-item>
+        <div 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 label="通知内容"
+                        prop="content"
+                        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.content"></el-input>
+          </el-form-item>
+        </div>
+      </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">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      formType: "edit",
+
+      gridList: [],
+
+      btnDisable: false,
+
+      formData: {
+        attentionType: 1,
+        name: '',
+        idCard: '',
+        mobile: '',
+        remark: '',
+        channel: [],
+        content: '',
+      },
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (formType, row) {
+      this.formType = formType
+      this.$refs['ref_form1'].resetFields();
+      row.channel = []
+      row.content = ''
+      this.formData = JSON.parse(JSON.stringify(row))
+
+    },
+
+
+    async handleComfirm () {
+      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 = '/epmetuser/icEpidemicSpecialAttention/vaccination-update'
+
+      // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/vaccination-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)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+
+
+    resetData () {
+      this.veroId = ''
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        mobile: '',
+        remark: '',
+        channel: [],
+        content: '',
+
+      }
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return 200
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    dataRule () {
+      return {
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
+        ],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+        ],
+
+
+
+        channel: [
+          { required: false },
+        ],
+        content: [
+          { 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/veroFocusForm.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
deleted file mode 100644
index 846c26b4b..000000000
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusForm.vue
+++ /dev/null
@@ -1,594 +0,0 @@
-<template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-
-      <el-tabs v-model="activeName"
-               type="card"
-               class="main_tab"
-               @tab-click="handleClick">
-        <el-tab-pane label="逐个添加"
-                     name="first">
-          <el-form ref="ref_form"
-                   :inline="true"
-                   :model="formData"
-                   :rules="dataRule"
-                   :disabled="formType==='look'"
-                   class="form">
-
-            <el-form-item label="姓名"
-                          prop="name"
-                          label-width="150px"
-                          style="display: block">
-              <el-input class="item_width_2"
-                        placeholder="请输入姓名"
-                        clearable
-                        :disabled="isFromResi"
-                        v-model="formData1.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="formData1.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="formData1.idCard">
-              </el-input>
-            </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: 2, maxRows: 5 }"
-                        clearable
-                        placeholder="请输入通知备注"
-                        v-model="formData1.remark"></el-input>
-            </el-form-item>
-
-            <el-form-item label="通知渠道"
-                          prop="noticeWay"
-                          label-width="150px"
-                          style="display: block">
-              <el-checkbox-group v-model="formData1.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="formData1.noticeContent"></el-input>
-            </el-form-item>
-
-          </el-form>
-        </el-tab-pane>
-        <el-tab-pane label="批量添加"
-                     name="second">
-          <el-form :inline="true"
-                   :model="formData2"
-                   ref="ref_searchform"
-                   :label-width="'90px'">
-            <el-form-item label="所属网格"
-                          label-width="80px">
-              <el-select class="item_width_3"
-                         v-model.trim="selGridId"
-                         placeholder="请选择"
-                         size="mini"
-                         clearable>
-                <el-option v-for="item in gridList"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="疫苗接种次数小于"
-                          label-width="150px">
-              <el-input-number class="item_width_3"
-                               v-model="veroNum"
-                               size="mini"
-                               :min="0"
-                               :max="20"
-                               label="疫苗接种次数小于"></el-input-number>
-            </el-form-item>
-            <el-button style="margin-left:30px"
-                       size="mini"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left:10px"
-                       size="mini"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
-
-            <el-table ref="ref_table"
-                      class="table"
-                      size="mini"
-                      :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"
-                               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>
-            <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>
-
-            <el-form-item label="备注"
-                          prop="remark"
-                          label-width="100px"
-                          style="display: block">
-              <el-input class="item_width_1"
-                        type="textarea"
-                        maxlength="500"
-                        show-word-limit
-                        :autosize="{ minRows: 2, maxRows: 5 }"
-                        clearable
-                        placeholder="请输入通知备注"
-                        v-model="formData2.remark"></el-input>
-            </el-form-item>
-
-            <el-form-item label="通知渠道"
-                          prop="noticeWay"
-                          label-width="100px"
-                          style="display: block">
-              <el-checkbox-group v-model="formData2.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="100px"
-                          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="formData2.noticeContent"></el-input>
-            </el-form-item>
-          </el-form>
-
-        </el-tab-pane>
-      </el-tabs>
-
-    </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详情
-
-      activeName: "second",
-
-      gridList: [],
-      selGridId: '',
-      veroNum: null,
-
-
-      btnDisable: false,
-
-      formData1: {
-        name: '',
-        idCard: '',
-        phone: '',
-        remark: '',
-        noticeWay: [],
-        noticeContent: '',
-
-      },
-
-      formData2: {
-        personList: [],
-        remark: '',
-        noticeWay: [],
-        noticeContent: '',
-      },
-      tableData: [],
-      tableLoading: false,
-
-      selection: [],//选中的人员
-
-
-    }
-  },
-  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()
-
-    },
-
-    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
-      }
-
-    },
-
-
-    handleClick () {
-
-    },
-
-    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 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')
-
-    },
-
-
-
-    resetData () {
-      this.natId = ''
-
-      this.formData = {
-        name: '',
-        idCard: '',
-        phone: '',
-        checkTime: '',
-        address: '',
-        result: '',
-        noticeWay: [],
-        noticeContent: '',
-        attachmentList: []
-
-      }
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-
-    // 开启加载动画
-    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
index abf5c1535..f1090c1e0 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -18,8 +18,8 @@
 
           </el-form-item>
           <el-form-item label="手机号"
-                        prop="phone">
-            <el-input v-model="formData.phone"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
                       size="small"
                       class="list_item_width_1"
                       clearable
@@ -40,9 +40,9 @@
           </el-form-item>
 
           <el-form-item label="接种针次"
-                        prop="veroNum">
+                        prop="vaccinationCount">
             <el-select class="list_item_width_1"
-                       v-model.trim="formData.veroNum"
+                       v-model.trim="formData.vaccinationCount"
                        placeholder="请选择"
                        clearable>
               <el-option v-for="item in veroNumList"
@@ -69,7 +69,7 @@
       <div class="div_btn">
         <el-button class="diy-button--add"
                    size="small"
-                   @click="handleAdd">新增</el-button>
+                   @click="addFormShow=true">新增</el-button>
 
         <el-button style="float:left"
                    class="diy-button--export"
@@ -80,7 +80,7 @@
                    :show-file-list='false'
                    :before-upload="beforeUpload"
                    action=""
-                   accept=".xls,.xlsx"
+                   accept=".xlsx"
                    :limit="1"
                    :on-exceed="handleExceed"
                    :http-request="uploadFile">
@@ -93,6 +93,15 @@
                    class="diy-button--reset"
                    size="small"
                    @click="handleExport">导出</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="handleDelete">取消关注</el-button>
       </div>
 
       <el-table ref="ref_table"
@@ -102,11 +111,10 @@
                 :height="tableHeight"
                 v-loading="tableLoading"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                @select-all="selectAll"
-                @selection-change="selectionChange"
+                @select="handleSelectTable"
+                @select-all="handleSelAll"
                 style="width: 100%">
         <el-table-column type="selection"
-                         :selectable="checkSelect"
                          width="55"></el-table-column>
         <el-table-column label="序号"
                          header-align="center"
@@ -114,7 +122,7 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="personInCharge"
+        <el-table-column prop="name"
                          header-align="center"
                          align="center"
                          label="姓名"
@@ -126,31 +134,31 @@
                          label="手机号"
                          width="110">
         </el-table-column>
-        <el-table-column prop="gridNames"
+        <el-table-column prop="idCard"
                          header-align="center"
                          align="center"
                          label="身份证"
                          min-width="170">
         </el-table-column>
-        <el-table-column prop="time"
+        <el-table-column prop="vaccinationCount"
                          header-align="center"
                          align="center"
-                         label="检测时间"
-                         width="120">
+                         label="接种针次"
+                         width="100">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="remark"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测机构"
+                         label="备注"
                          min-width="230">
         </el-table-column>
-        <el-table-column prop="ninePlaceNames"
+        <el-table-column prop="lastInformTime"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="检测结果"
-                         min-width="80">
+                         label="最后一次通知时间"
+                         min-width="120">
         </el-table-column>
 
         <el-table-column label="操作"
@@ -179,20 +187,14 @@
                 <el-button type="text"
                            class="div-table-button--detail--noline"
                            size="small"
-                           @click="handleDelete(scope.row)">通知记录</el-button>
+                           @click="handleNoticeList(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>
+                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
               </div>
 
               <el-button type="text"
@@ -215,31 +217,69 @@
         </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="addFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="新增"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-add ref="ref_form_add"
+                      @dialogCancle="diaClose"
+                      @dialogOk="addFormOk"></vero-focus-add>
+    </el-dialog>
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
+    <el-dialog :visible.sync="editFormShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="修改"
+               width="1050px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <vero-focus-edit ref="ref_form_edit"
+                       @dialogCancle="diaClose"
+                       @dialogOk="addFormOk"></vero-focus-edit>
+    </el-dialog>
+    <!-- 发送通知弹出框 -->
+    <el-dialog :visible.sync="sendNoticeFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="formTitle"
+               title="发送通知"
                width="1050px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <vero-focus-form ref="ref_form"
-                       @dialogCancle="addFormCancle"
-                       @dialogOk="addFormOk"></vero-focus-form>
+      <vf-send-notice ref="ref_sendnotice"
+                      @dialogCancle="diaClose"></vf-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">
+      <vf-notice-list ref="ref_noticelist"
+                      @dialogCancle="diaClose"></vf-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">
+      <vf-visite-list ref="ref_visitelist"
+                      @dialogCancle="diaClose"></vf-visite-list>
     </el-dialog>
 
   </div>
@@ -247,7 +287,11 @@
 
 <script>
 
-import veroFocusForm from './veroFocusForm'
+import veroFocusAdd from './veroFocusAdd'
+import veroFocusEdit from './veroFocusEdit'
+import vfNoticeList from './vfNoticeList'
+import vfSendNotice from './vfSendNotice'
+import vfVisiteList from './vfVisiteList'
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -259,37 +303,44 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
-      pageNo: 0,
+      pageSize: 20,
+      pageNo: 1,
       tableLoading: false,
-      selAllFlag: false,
-      isIndeterminate: false,//复选框的不确定状态
+
       selection: [],
-      showDeletBtn: false,
 
       agencyId: '',
 
       formData: {
+        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
         name: '',
-        phone: '',
+        mobile: '',
         idCard: '',
-        veroNum: '',
+        vaccinationCount: '',
       },
       veroNumList: [],
 
       tableData: [],
+      selectionAll: [],
 
       //form相关
-      formShow: false,
-      formTitle: '新增',
+      addFormShow: false,
+      editFormShow: false,
+      sendNoticeFormShow: false,
+      noticeListFormShow: false,
+      visiteListFormShow: false,
+
 
     }
   },
   components: {
-    veroFocusForm
+    veroFocusAdd, veroFocusEdit, vfNoticeList, vfSendNotice, vfVisiteList
   },
   async created () {
 
+  },
+  activated () {
+    this.$refs['ref_table'].doLayout()
   },
   async mounted () {
     for (let i = 0; i < 11; i++) {
@@ -297,11 +348,9 @@ export default {
         value: i + '',
         label: i + '次'
       }
-
       this.veroNumList.push(obj)
     }
 
-
     await this.loadTable()
   },
 
@@ -313,8 +362,8 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/gov/org/placepatrolteam/getlist"
-      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placeorg/getlist"
+      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
@@ -327,128 +376,169 @@ export default {
         this.total = data.total
         this.tableData = data.list
 
-        this.tableData.forEach(item => {
-          if (item.time) {
-            let timeArray = item.time.split(' ')
-            item.time = timeArray[0]
-          }
+        this.analysisTableSelection()
 
-        });
+        // 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);
-          }
-        });
-      }
-    },
+    handleSelectTable (selection, row) {
 
-    selectAll (selection) {
-      this.selection = selection
+      row.isSel = !row.isSel
 
-      if (selection.length === this.validTableDataNum) {
-        this.selAllFlag = true
+      if (row.isSel) {
+        this.selectionAll.push(row)
       } else {
-        this.selAllFlag = false
-      }
+        for (let i = 0; i < this.selectionAll.length; i++) {
+          let item = this.selectionAll[i]
+          if (item.idCard === row.idCard) {
+            this.selectionAll.splice(i, 1)
+            break
+          }
 
-    },
+        }
+      }
 
-    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
+    handleSelAll (selection) {
+      let selFlag = selection.length > 0//全选选中 还是 全选不选中
+      for (let i = 0; i < this.tableData.length; i++) {
+        let tableItem = this.tableData[i]
+        tableItem.isSel = selFlag
+        let isHasItem = false
+        for (let j = 0; j < this.selectionAll.length; j++) {
+          let selectionItem = this.selectionAll[j]
+          if (selectionItem.idCard === tableItem.idCard) {
+            isHasItem = true
+            if (!selFlag) {
+              this.selectionAll.splice(j, 1)
+              break
+            }
+          }
 
-      } else {
-        this.selAllFlag = false
+        }
 
+        if (!isHasItem && selFlag) {
+          this.selectionAll.push(tableItem)
+        }
       }
-    },
 
-    //
-    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 = ''
+    //回显列表选中的行
+    analysisTableSelection () {
+      this.$nextTick(() => {
+        this.tableData.forEach(tableItem => {
+
+
+          for (let j = 0; j < this.selectionAll.length; j++) {
+            let selectionItem = this.selectionAll[j]
+
+            if (selectionItem.idCard === tableItem.idCard) {
+              tableItem.isSel = true
+              break
+
+            }
+          }
+          if (tableItem.isSel) {
+            this.$refs.ref_table.toggleRowSelection(tableItem);
+          }
+        });
+      })
 
-      }
 
     },
 
     diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
+      this.addFormShow = false
+      this.editFormShow = false
+      this.sendNoticeFormShow = false
+      this.noticeListFormShow = false
+      this.visiteListFormShow = false
+
+    },
+
+    handleAdd () {
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form_add.initForm(null, this.agencyId)
+      })
+    },
+
+    handleEdit (row) {
+      this.editFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_form_edit.initForm('edit', row)
+      })
     },
 
     handleDetail (row) {
-      this.formTitle = '详情'
-      this.formShow = true
+      this.editFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('detail', row.veroFocusId, this.agencyId)
+        this.$refs.ref_form_edit.initForm('detail', row)
       })
     },
 
-    handleAdd () {
-      this.formTitle = '新增'
-      this.formShow = true
+    handleSendNotice () {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要通知的人员')
+        return false
+      }
+      this.sendNoticeFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('add', null, this.agencyId)
+        this.$refs.ref_sendnotice.initForm(this.selectionAll)
       })
+
     },
 
-    handleEdit (row) {
-      this.formTitle = '修改'
-      this.formShow = true
+    handleNoticeList (row) {
+      this.noticeListFormShow = true
       this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row.veroFocusId, this.agencyId)
+        this.$refs.ref_noticelist.initTable(row.idCard)
       })
+
     },
+    handleVisiteList (row) {
+
+      this.visiteListFormShow = true
+      this.$nextTick(() => {
+        this.$refs.ref_visitelist.initTable(row)
+
+      })
 
-    addFormCancle () {
-      this.formShow = false
     },
+
+
     addFormOk () {
-      this.formShow = false
+      this.addFormShow = false
+      this.editFormShow = false
       this.loadTable()
 
     },
 
     async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
+      if (this.selectionAll.length === 0) {
+        this.$message.info('请选择要取消关注的名单')
+        return false
+      }
+      this.$confirm("确认取消关注选择的名单?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.deleteNat(row)
+          this.deleteFocus(row)
         })
         .catch(err => {
           if (err == "cancel") {
@@ -458,12 +548,17 @@ export default {
         });
     },
 
-    async deleteNat (row) {
-      const url = "/gov/org/placepatrolteam/del"
+    async deleteFocus (row) {
+      const url = "/epmetuser/icEpidemicSpecialAttention/cancel-attention"
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/del"
+      let idCards = []
 
+      this.selectionAll.forEach(element => {
+        idCards.push(element.idCard)
+      });
       let params = {
-        veroFocusId: row.veroFocusId
+        attentionType: 1,
+        idCards: idCards
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -471,7 +566,7 @@ export default {
       if (code === 0) {
         this.$message({
           type: "success",
-          message: "删除成功"
+          message: "操作成功"
         });
 
         this.loadTable()
@@ -483,15 +578,15 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        personInCharge: '',//负责人		
-        mobile: '',//联系电话	
-        gridId: '',//负责区域【网格Id】	
-        ninePlaceVal: '',//场所类型【九小场所Value值】	
-        isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是	
+        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
+        name: '',
+        mobile: '',
+        idCard: '',
+        vaccinationCount: '',
       }
-      this.pageSize = 10
-      this.pageNo = 0
-      this.loadTable()
+
+      this.pageNo = 1
+      // this.loadTable()
     },
 
 
@@ -522,7 +617,7 @@ export default {
         params,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -558,8 +653,7 @@ export default {
     },
 
     handleExportModule () {
-      let title = ''
-      title = '房屋模板'
+      let title = '疫苗接种关注名单'
 
       const url = "/gov/org/house/exporttemplate"
       let params = {}
@@ -569,7 +663,7 @@ export default {
         params,
         (data, rspMsg) => {
 
-          this.download(data, title + '.xls')
+          this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg);
@@ -577,17 +671,18 @@ export default {
       );
     },
 
+
     // 上传文件之前的钩子
     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('请选择正确格式的文件')
+      const array = file.name.split('.')
+      const extension = array[array.length - 1]
+      // const isLt1M = (file.size / 1024 / 1024) < 5
+      if (extension !== 'xlsx') {
+        this.$message.error('只能上传xlsx文件！')
         return false
       } else {
+        this.files = file;
         this.fileName = file.name;
         return true
       }
@@ -620,7 +715,7 @@ export default {
       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) => {
 
@@ -635,12 +730,12 @@ export default {
             // })
             // this.$message.error(rspMsg)
           }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+
+          // this.loadTable()
+
         },
         (rspMsg, data) => {
-          this.importRoomLoading = false
+
         }, { headers: { 'Content-Type': 'multipart/form-data' } })
 
 
@@ -665,12 +760,11 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 360)
+      return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360
 
     },
 
-    ...mapGetters(['clientHeight', ''])
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
new file mode 100644
index 000000000..7b7fb33ca
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfNoticeList.vue
@@ -0,0 +1,171 @@
+<template>
+  <div class="dialog-h-content scroll-h ">
+    <div class="div_dialog_table">
+
+      <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="createdTime"
+                         header-align="center"
+                         align="center"
+                         label="通知时间"
+                         width="150">
+
+        </el-table-column>
+        <el-table-column prop="channel"
+                         header-align="center"
+                         align="center"
+                         label="渠道"
+                         width="180">
+
+        </el-table-column>
+
+        <el-table-column prop="content"
+                         header-align="center"
+                         align="center"
+                         label="内容"
+                         min-width="380">
+
+        </el-table-column>
+
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+      total: 0,
+      idCard: '',
+      tableData: [],
+      pageSize: 20,
+      pageNo: 1,
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (idCard) {
+      this.idCard = idCard
+      await this.loadTable()
+
+    },
+
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      // const url = "/epmetuser/icNotice/page"
+      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page"
+      let params = {
+        idCard: this.idCard,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        origin: '1'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        // data.list.forEach(item => {
+        //   item.isEdit = false
+        //   item.isNew = false
+        //   let arrayInspectors = item.inspectors.split(',')
+        //   item.inspectorArray = [...arrayInspectors]
+
+        //   let arrayReviewTime = item.reviewTime.split(' ')
+        //   item.reviewTime = arrayReviewTime[0]
+        // });
+
+        // this.tableData = [...data.list]
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    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 - 460)
+
+    },
+
+    ...mapGetters(['clientHeight'])
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
new file mode 100644
index 000000000..e341a6d52
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -0,0 +1,220 @@
+<template>
+  <div class="epidemic-form">
+    <div class="dialog-h-content scroll-h">
+
+      <el-form ref="ref_form1"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="form">
+
+        <el-form-item label="通知渠道"
+                      prop="channel"
+                      label-width="150px"
+                      style="display: block">
+          <el-checkbox-group v-model="formData.channel">
+            <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="content"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    type="textarea"
+                    maxlength="1000"
+                    show-word-limit
+                    :autosize="{ minRows: 10, maxRows: 15 }"
+                    clearable
+                    placeholder="请输入通知内容"
+                    v-model="formData.content"></el-input>
+        </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">确 定</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      activeName: "second",
+
+      gridList: [],
+
+      btnDisable: false,
+
+      formData: {
+        origin: '1',
+        channel: [],
+        content: '',
+        userList: [],
+        orgName
+
+      },
+      selectionAll: []
+
+    }
+  },
+  components: {},
+  async mounted () {
+
+  },
+
+  methods: {
+
+    async initForm (selectionAll) {
+
+      this.$refs['ref_form1'].resetFields();
+      this.formData.userList = selectionAll
+
+    },
+
+
+    async handleComfirm () {
+
+
+      console.log(this.formData)
+      return false
+
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 5000)
+
+      let url = ''
+
+      url = '/epmetuser/icNotice/batchnotice'
+      // url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/batchnotice"
+
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogCancle')
+        this.btnDisable = false
+
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+
+
+    resetData () {
+
+
+      this.formData = {
+        name: '',
+        idCard: '',
+        phone: '',
+        remark: '',
+        channel: [],
+        content: '',
+
+      }
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return 200
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    dataRule () {
+      return {
+        channel: [
+          { required: true, message: '通知渠道不能为空', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '通知内容不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+  },
+  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/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
new file mode 100644
index 000000000..524cc20b4
--- /dev/null
+++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
@@ -0,0 +1,308 @@
+<template>
+  <div class="dialog-h-content scroll-h">
+    <div class="div_dialog_table">
+      <el-button size="small"
+                 class="diy-button--add"
+                 @click="handleAdd">新增</el-button>
+      <el-button size="small"
+                 class="diy-button--reset"
+                 @click="handleExport">导出</el-button>
+
+      <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="visitTime"
+                         header-align="center"
+                         align="center"
+                         label="随访时间"
+                         width="150">
+
+        </el-table-column>
+        <el-table-column prop="content"
+                         header-align="center"
+                         align="center"
+                         label="随访内容"
+                         min-width="280">
+
+        </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="dialogVisible"
+               width="850px"
+               top="5vh"
+               title="新增"
+               append-to-body
+               @closed="handleCancle">
+      <div class="epidemic-form">
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="form">
+
+          <el-form-item label="随访时间"
+                        style="display: block"
+                        prop="visitTime"
+                        label-width="150px">
+            <el-date-picker class="item_width_2"
+                            v-model="formData.visitTime"
+                            format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetime"
+                            clearable
+                            placeholder="选择时间">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="随访内容"
+                        prop="content"
+                        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.content"></el-input>
+          </el-form-item>
+
+        </el-form>
+
+        <div class="form_div_btn">
+          <el-button size="small"
+                     @click="handleCancle">取 消</el-button>
+          <el-button size="small"
+                     type="primary"
+                     @click="handleComfirm">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      tableLoading: false,
+
+      tableData: [],
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+
+      formData: {
+        visitTime: '',//随访时间
+        content: '',//内容
+        idCard: '',
+        name: '',
+        mobile: '',
+        origin: '1'
+      },
+
+      dialogVisible: false,
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+
+  methods: {
+
+    async initTable (row) {
+
+      this.formData.idCard = row.idCard
+      this.formData.name = row.name
+      this.formData.mobile = row.mobile
+
+      await this.loadTable()
+
+    },
+
+    //加载form
+    async loadTable () {
+      this.tableLoading = true
+      // const url = '/epmetuser/followup/page'
+      const url = 'http://yapi.elinkservice.cn/mock/245/epmetuser/followup/page'
+      let params = {
+        idCard: this.formData.idCard,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        origin: '1'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+      this.tableLoading = false
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleAdd () {
+      this.dialogVisible = true
+    },
+
+
+    async handleComfirm () {
+
+      // let url = "/epmetuser/followup/save"
+      let url = "http://yapi.elinkservice.cn/mock/245/epmetuser/followup/save"
+
+      const { data, code, msg } = await requestPost(url, this.formData)
+
+      if (code === 0) {
+        this.loadTable()
+        this.handleCancle()
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.dialogVisible = false
+
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = this.formData.name + '—随访记录'
+
+      const url = "/epmetuser/followup/export"
+      let params = {
+        idCard: this.formData.idCard,
+
+      }
+
+      app.ajax.exportFilePost(
+        url,
+        params,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xlsx')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    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)
+    },
+
+    ...mapGetters(['clientHeight']),
+    dataRule () {
+      return {
+        visitTime: [
+          { required: true, message: '随访时间不能为空', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '随访内容不能为空', trigger: 'blur' }
+        ],
+      }
+    }
+
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index a556aedc8..ec45e380c 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="dialog-h-content scroll-h">
     <div class="div_table">
-      <el-button type="green"
-                 size="small"
+      <el-button size="small"
+                 class="diy-button--add"
                  @click="handleAdd">新增</el-button>
 
       <el-table class="table"