diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 49d2df70..390d0cb5 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -46,6 +46,17 @@
                         v-model="formData1.idCard">
               </el-input>
             </el-form-item>
+            <el-form-item label="关注原因"
+                          prop="reason"
+                          label-width="150px"
+                          style="display: block">
+
+              <el-input class="item_width_1"
+                        placeholder="请输入关注原因"
+                        clearable
+                        v-model="formData1.reason">
+              </el-input>
+            </el-form-item>
             <el-form-item label="备注"
                           prop="remark"
                           label-width="150px"
@@ -60,7 +71,8 @@
                         v-model="formData1.remark"></el-input>
             </el-form-item>
 
-            <el-form-item label="通知渠道"
+            <el-form-item v-if="false"
+                          label="通知渠道"
                           prop="channel"
                           label-width="150px"
                           style="display: block">
@@ -76,7 +88,8 @@
               </el-checkbox-group> -->
             </el-form-item>
 
-            <el-form-item label="通知内容"
+            <el-form-item v-if="false"
+                          label="通知内容"
                           prop="content"
                           label-width="150px"
                           style="display: block">
@@ -216,6 +229,17 @@
                             style="display: block">
                 <span> {{selectionAll.length}}</span>
               </el-form-item>
+              <el-form-item label="关注原因"
+                            prop="reason"
+                            label-width="100px"
+                            style="display: block">
+
+                <el-input class="item_width_1"
+                          placeholder="请输入关注原因"
+                          clearable
+                          v-model="formData2.reason">
+                </el-input>
+              </el-form-item>
               <el-form-item label="备注"
                             prop="remark"
                             label-width="100px"
@@ -230,7 +254,8 @@
                           v-model="formData2.remark"></el-input>
               </el-form-item>
 
-              <el-form-item label="通知渠道"
+              <el-form-item v-if="false"
+                            label="通知渠道"
                             prop="channel"
                             label-width="100px"
                             style="display: block">
@@ -246,7 +271,8 @@
                 </el-checkbox-group> -->
               </el-form-item>
 
-              <el-form-item label="通知内容"
+              <el-form-item v-if="false"
+                            label="通知内容"
                             prop="content"
                             label-width="100px"
                             style="display: block">
@@ -302,10 +328,11 @@ export default {
       },
 
       formData1: {
-        attentionType: 1,
+        attentionType: 2,
         name: '',
         idCard: '',
         mobile: '',
+        reason: '',
         remark: '',
         isSelChannel: false,
         channel: [],
@@ -314,7 +341,8 @@ export default {
       },
 
       formData2: {
-        attentionType: 1,
+        attentionType: 2,
+        reason: '',
         remark: '',
         isSelChannel: false,
         channel: [],
@@ -644,15 +672,17 @@ export default {
         name: '',
         idCard: '',
         mobile: '',
+        reason: '',
         remark: '',
         isSelChannel: false,
         channel: [],
         content: '',
-        attentionType: 1,
+        attentionType: 2,
       }
 
       this.formData2 = {
-        attentionType: 1,
+        attentionType: 2,
+        reason: '',
         remark: '',
         isSelChannel: false,
         channel: [],
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index 0c12d5e0..56962ffb 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -44,6 +44,17 @@
                     v-model="formData.idCard">
           </el-input> -->
         </el-form-item>
+        <el-form-item label="关注原因"
+                      prop="reason"
+                      label-width="150px"
+                      style="display: block">
+
+          <el-input class="item_width_1"
+                    placeholder="请输入关注原因"
+                    clearable
+                    v-model="formData.reason">
+          </el-input>
+        </el-form-item>
         <el-form-item label="备注"
                       prop="remark"
                       label-width="150px"
@@ -59,7 +70,8 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
         <div v-if=" formType!=='detail'">
-          <el-form-item label="通知渠道"
+          <el-form-item v-if="false"
+                        label="通知渠道"
                         prop="channel"
                         label-width="150px"
                         style="display: block">
@@ -75,7 +87,8 @@
             </el-checkbox-group> -->
           </el-form-item>
 
-          <el-form-item label="通知内容"
+          <el-form-item v-if="false"
+                        label="通知内容"
                         prop="content"
                         label-width="150px"
                         style="display: block">
@@ -125,10 +138,11 @@ export default {
       btnDisable: false,
 
       formData: {
-        attentionType: 1,
+        attentionType: 2,
         name: '',
         idCard: '',
         mobile: '',
+        reason: '',
         remark: '',
         isSelChannel: false,
         channel: [],
@@ -142,6 +156,10 @@ export default {
 
   },
 
+  destroyed () {
+
+  },
+
   methods: {
 
     async initForm (formType, row) {
@@ -149,6 +167,7 @@ export default {
       this.$refs['ref_form1'].resetFields();
       row.channel = []
       row.content = ''
+      row.attentionType = 2
       row.isSelChannel = false
       this.formData = JSON.parse(JSON.stringify(row))
 
@@ -210,9 +229,11 @@ export default {
       this.veroId = ''
 
       this.formData = {
+        attentionType: 2,
         name: '',
         idCard: '',
         mobile: '',
+        reason: '',
         remark: '',
         isSelChannel: false,
         channel: [],
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 087c6fe7..8e4f7f67 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -38,19 +38,24 @@
             </el-input>
 
           </el-form-item>
+          <el-form-item label="关注原因"
+                        prop="mobile">
+            <el-input v-model="formData.reason"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入关注原因">
+            </el-input>
 
-          <el-form-item label="接种针次"
-                        prop="vaccinationCount">
-            <el-select class="list_item_width_1"
-                       v-model.trim="formData.vaccinationCount"
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in natNumList"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
+          </el-form-item>
+          <el-form-item label="备注"
+                        prop="remark">
+            <el-input v-model="formData.remark"
+                      size="small"
+                      class="list_item_width_1"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
 
           </el-form-item>
 
@@ -94,7 +99,8 @@
                    size="small"
                    @click="handleExport">导出</el-button>
 
-        <el-button style="margin-left:15px"
+        <el-button v-if="false"
+                   style="margin-left:15px"
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
@@ -140,10 +146,10 @@
                          label="身份证"
                          min-width="170">
         </el-table-column>
-        <el-table-column prop="vaccinationCount"
+        <el-table-column prop="reason"
                          header-align="center"
                          align="center"
-                         label="接种针次"
+                         label="关注原因"
                          width="100">
         </el-table-column>
         <el-table-column prop="remark"
@@ -223,6 +229,7 @@
     <el-dialog :visible.sync="addFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
+               :destroy-on-close="true"
                title="新增"
                width="1050px"
                top="5vh"
@@ -312,11 +319,12 @@ export default {
       agencyId: '',
 
       formData: {
-        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
+        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
         name: '',
         mobile: '',
         idCard: '',
-        vaccinationCount: '',
+        remark: '',
+        reason: '',
       },
       natNumList: [],
 
@@ -557,7 +565,7 @@ export default {
         idCards.push(element.idCard)
       });
       let params = {
-        attentionType: 1,
+        attentionType: 2,
         idCards: idCards
       }
 
@@ -578,7 +586,7 @@ export default {
     //重置搜索条件
     resetSearch () {
       this.formData = {
-        attentionType: 1,//关注类型，核酸检测：2，疫苗接种：1		
+        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
         name: '',
         mobile: '',
         idCard: '',
diff --git a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
index 7b7fb33c..664e3ab6 100644
--- a/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfNoticeList.vue
@@ -89,13 +89,13 @@ export default {
     //加载form
     async loadTable () {
       this.tableLoading = true
-      // const url = "/epmetuser/icNotice/page"
-      const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNotice/page"
+      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'
+        origin: '2'
       }
 
       const { data, code, msg } = await requestPost(url, params)
diff --git a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
index 9274d928..beec2e63 100644
--- a/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfSendNotice.vue
@@ -8,7 +8,8 @@
                :rules="dataRule"
                class="form">
 
-        <el-form-item label="通知渠道"
+        <el-form-item v-if="false"
+                      label="通知渠道"
                       prop="channel"
                       label-width="150px"
                       style="display: block">
@@ -24,7 +25,8 @@
           </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item label="通知内容"
+        <el-form-item v-if="false"
+                      label="通知内容"
                       prop="content"
                       label-width="150px"
                       style="display: block">
diff --git a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
index 67448435..b8e765f0 100644
--- a/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
+++ b/src/views/modules/base/epidemic/natFocus/nfVisiteList.vue
@@ -133,7 +133,7 @@ export default {
         idCard: '',
         name: '',
         mobile: '',
-        origin: '1'
+        origin: '2'
       },
 
       dialogVisible: false,
@@ -168,7 +168,7 @@ export default {
         idCard: this.formData.idCard,
         pageNo: this.pageNo,
         pageSize: this.pageSize,
-        origin: '1'
+        origin: '2'
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -223,7 +223,7 @@ export default {
       let params = {
         idCard: this.formData.idCard,
         name: this.formData.name,
-
+        origin: '2'
       }
 
       app.ajax.exportFilePost(
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index 4307a74e..c5e6878a 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -123,7 +123,7 @@
         </el-form-item>
 
         <el-form-item label="检测结果"
-                      prop="type"
+                      prop="natResult"
                       label-width="150px"
                       style="display: block">
           <el-radio-group v-model="formData.natResult">
@@ -160,7 +160,8 @@
 
         </el-form-item>
 
-        <el-form-item label="通知渠道"
+        <el-form-item v-if="false"
+                      label="通知渠道"
                       prop="channel"
                       label-width="150px"
                       style="display: block">
@@ -168,16 +169,17 @@
           <el-checkbox v-model="formData.isSelChannel"
                        key="0"
                        label="0">小程序通知</el-checkbox>
-          <!-- <el-checkbox-group v-model="formData.channel">
+          <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-checkbox-group>
         </el-form-item>
 
-        <el-form-item label="通知内容"
+        <el-form-item v-if="false"
+                      label="通知内容"
                       prop="content"
                       label-width="150px"
                       style="display: block">
@@ -607,7 +609,7 @@ export default {
           { required: false },
         ],
         natResult: [
-          { required: true },
+          { required: true, message: '检测结果不能为空', trigger: 'blur' },
         ],
 
         channel: [
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 1c53f8e1..136f7061 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -60,7 +60,8 @@
                         v-model="formData1.remark"></el-input>
             </el-form-item>
 
-            <el-form-item label="通知渠道"
+            <el-form-item v-if="false"
+                          label="通知渠道"
                           prop="channel"
                           label-width="150px"
                           style="display: block">
@@ -76,7 +77,8 @@
               </el-checkbox-group> -->
             </el-form-item>
 
-            <el-form-item label="通知内容"
+            <el-form-item v-if="false"
+                          label="通知内容"
                           prop="content"
                           label-width="150px"
                           style="display: block">
@@ -230,7 +232,8 @@
                           v-model="formData2.remark"></el-input>
               </el-form-item>
 
-              <el-form-item label="通知渠道"
+              <el-form-item v-if="false"
+                            label="通知渠道"
                             prop="channel"
                             label-width="100px"
                             style="display: block">
@@ -246,7 +249,8 @@
                 </el-checkbox-group> -->
               </el-form-item>
 
-              <el-form-item label="通知内容"
+              <el-form-item v-if="false"
+                            label="通知内容"
                             prop="content"
                             label-width="100px"
                             style="display: block">
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
index 2fe5f77d..03cb831e 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
@@ -59,7 +59,8 @@
                     v-model="formData.remark"></el-input>
         </el-form-item>
         <div v-if=" formType!=='detail'">
-          <el-form-item label="通知渠道"
+          <el-form-item v-if="false"
+                        label="通知渠道"
                         prop="channel"
                         label-width="150px"
                         style="display: block">
@@ -149,7 +150,7 @@ export default {
       this.$refs['ref_form1'].resetFields();
       row.channel = []
       row.content = ''
-      row.attentionType = '1'
+      row.attentionType = 1
       row.isSelChannel = false
       this.formData = JSON.parse(JSON.stringify(row))
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
index 3150e874..5fd827d0 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
@@ -94,7 +94,8 @@
                    size="small"
                    @click="handleExport">导出</el-button>
 
-        <el-button style="margin-left:15px"
+        <el-button v-if="false"
+                   style="margin-left:15px"
                    class="diy-button--more"
                    size="small"
                    @click="handleSendNotice">发送通知</el-button>
@@ -210,7 +211,7 @@
         <el-pagination @size-change="handleSizeChange"
                        @current-change="handleCurrentChange"
                        :current-page.sync="pageNo"
-                       :page-sizes="[5, 50, 100, 200]"
+                       :page-sizes="[20, 50, 100, 200]"
                        :page-size="pageSize"
                        layout="sizes, prev, pager, next, total"
                        :total="total">
@@ -223,6 +224,7 @@
     <el-dialog :visible.sync="addFormShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
+               :destroy-on-close="true"
                title="新增"
                width="1050px"
                top="5vh"
@@ -303,7 +305,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 5,
+      pageSize: 20,
       pageNo: 1,
       tableLoading: false,
 
diff --git a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
index c90b525e..cfccb926 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfSendNotice.vue
@@ -8,7 +8,8 @@
                :rules="dataRule"
                class="form">
 
-        <el-form-item label="通知渠道"
+        <el-form-item v-if="false"
+                      label="通知渠道"
                       prop="channel"
                       label-width="150px"
                       style="display: block">
@@ -24,7 +25,8 @@
           </el-checkbox-group> -->
         </el-form-item>
 
-        <el-form-item label="通知内容"
+        <el-form-item v-if="false"
+                      label="通知内容"
                       prop="content"
                       label-width="150px"
                       style="display: block">
@@ -73,7 +75,7 @@ export default {
       btnDisable: false,
 
       formData: {
-        origin: '1',
+        origin: '2',
         isSelChannel: false,
         channel: [],
         content: '',