diff --git a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
index 78b2c96e8..9be0bccf6 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
@@ -202,7 +202,7 @@
                           prop="remark"
                           label-width="220px"
                           style="display: block">
-              <el-input class="item_width_1"
+              <el-input class="item_width_4"
                         type="textarea"
                         maxlength="500"
                         show-word-limit
@@ -633,7 +633,7 @@
                             prop="remark"
                             label-width="220px"
                             style="display: block">
-                <el-input class="item_width_1"
+                <el-input class="item_width_4"
                           type="textarea"
                           maxlength="500"
                           show-word-limit
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
index 765fe6fef..08ae1690e 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
@@ -7,249 +7,251 @@
                    class="diy-button--search"
                    @click="handleTuomin">显示脱敏信息</el-button>
       </div>
-      <el-form v-if="formType !== 'detail'"
-               ref="ref_form1"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               class="form">
-        <el-form-item label="姓名"
-                      prop="name"
-                      label-width="220px"
-                      style="display: block">
-          <span>{{ formData.name }}</span>
-          <!-- <el-input class="item_width_2"
+      <div class="epidemic-form">
+        <el-form v-if="formType !== 'detail'"
+                 ref="ref_form1"
+                 :inline="true"
+                 :model="formData"
+                 :rules="dataRule"
+                 class="form">
+          <el-form-item label="姓名"
+                        prop="name"
+                        label-width="220px"
+                        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="220px"
-                      style="display: block">
-          <span>{{ formData.mobile }}</span>
-          <!-- <el-input class="item_width_2"
+          </el-form-item>
+
+          <el-form-item label="手机号"
+                        prop="mobile"
+                        label-width="220px"
+                        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="220px"
-                      style="display: block">
-          <span>{{ formData.idCard }}</span>
-          <!-- <el-input class="item_width_2"
+          </el-form-item>
+          <el-form-item label="证件号"
+                        prop="idCard"
+                        label-width="220px"
+                        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="reason"
-                      label-width="220px"
-                      style="display: block">
-          <el-input class="item_width_4"
-                    placeholder="请输入关注原因"
-                    clearable
-                    v-model="formData.reason">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="隔离状态"
-                      prop="isolatedState"
-                      label-width="220px"
-                      style="display: block">
-          <el-select v-model="formData.isolatedState"
-                     class="item_width_4"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in options.isolatedState"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <div v-if="isPanshi">
-          <el-form-item label="管控时间"
-                        prop="gkStartTime"
-                        label-width="220px"
-                        style="display: block">
-            <el-date-picker v-model="gkTimeRange"
-                            size="small"
-                            type="daterange"
-                            @change="handleGkTimeChange"
-                            format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd"
-                            range-separator="至"
-                            start-placeholder="开始时间"
-                            end-placeholder="结束时间">
-
-            </el-date-picker>
-          </el-form-item>
-
-          <el-form-item label="镇（街）干部"
-                        prop="gbName"
-                        label-width="220px"
-                        style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入镇（街）干部"
-                      clearable
-                      v-model="formData.gbName">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="镇（街）干部联系方式"
-                        prop="gbMobile"
-                        label-width="220px"
-                        style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入镇（街）干部联系方式"
-                      clearable
-                      v-model="formData.gbMobile">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="村（社区）网格管理员"
-                        prop="gridManager"
-                        label-width="220px"
-                        style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入村（社区）网格管理员"
-                      clearable
-                      v-model="formData.gridManager">
-            </el-input>
           </el-form-item>
-
-          <el-form-item label="村（社区）网格管理员联系方式"
-                        prop="gridManagerMobile"
+          <el-form-item label="关注原因"
+                        prop="reason"
                         label-width="220px"
                         style="display: block">
             <el-input class="item_width_4"
-                      placeholder="请输入村（社区）网格管理员联系方式"
+                      placeholder="请输入关注原因"
                       clearable
-                      v-model="formData.gridManagerMobile">
+                      v-model="formData.reason">
             </el-input>
           </el-form-item>
-
-          <el-form-item label="基层医务工作者"
-                        prop="healthWorker"
+          <el-form-item label="隔离状态"
+                        prop="isolatedState"
                         label-width="220px"
                         style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入基层医务工作者"
-                      clearable
-                      v-model="formData.healthWorker">
-            </el-input>
+            <el-select v-model="formData.isolatedState"
+                       class="item_width_4"
+                       placeholder="请选择"
+                       clearable>
+              <el-option v-for="item in options.isolatedState"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
 
-          <el-form-item label="基层医务工作者联系方式"
-                        prop="healthWorkerMobile"
-                        label-width="220px"
-                        style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入基层医务工作者联系方式"
-                      clearable
-                      v-model="formData.healthWorkerMobile">
-            </el-input>
-          </el-form-item>
+          <div v-if="isPanshi">
+            <el-form-item label="管控时间"
+                          prop="gkStartTime"
+                          label-width="220px"
+                          style="display: block">
+              <el-date-picker v-model="gkTimeRange"
+                              size="small"
+                              type="daterange"
+                              @change="handleGkTimeChange"
+                              format="yyyy-MM-dd"
+                              value-format="yyyy-MM-dd"
+                              range-separator="至"
+                              start-placeholder="开始时间"
+                              end-placeholder="结束时间">
+
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="镇（街）干部"
+                          prop="gbName"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入镇（街）干部"
+                        clearable
+                        v-model="formData.gbName">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="镇（街）干部联系方式"
+                          prop="gbMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入镇（街）干部联系方式"
+                        clearable
+                        v-model="formData.gbMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="村（社区）网格管理员"
+                          prop="gridManager"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入村（社区）网格管理员"
+                        clearable
+                        v-model="formData.gridManager">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="村（社区）网格管理员联系方式"
+                          prop="gridManagerMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入村（社区）网格管理员联系方式"
+                        clearable
+                        v-model="formData.gridManagerMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="基层医务工作者"
+                          prop="healthWorker"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入基层医务工作者"
+                        clearable
+                        v-model="formData.healthWorker">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="基层医务工作者联系方式"
+                          prop="healthWorkerMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入基层医务工作者联系方式"
+                        clearable
+                        v-model="formData.healthWorkerMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="民警"
+                          prop="policeName"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入民警"
+                        clearable
+                        v-model="formData.policeName">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="民警及联系方式"
+                          prop="policeMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入民警及联系方式"
+                        clearable
+                        v-model="formData.policeMobile">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="志愿者"
+                          prop="volunteerName"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入志愿者"
+                        clearable
+                        v-model="formData.volunteerName">
+              </el-input>
+            </el-form-item>
+
+            <el-form-item label="志愿者联系方式"
+                          prop="volunteerMobile"
+                          label-width="220px"
+                          style="display: block">
+              <el-input class="item_width_4"
+                        placeholder="请输入志愿者联系方式"
+                        clearable
+                        v-model="formData.volunteerMobile">
+              </el-input>
+            </el-form-item>
+          </div>
 
-          <el-form-item label="民警"
-                        prop="policeName"
+          <el-form-item label="备注"
+                        prop="remark"
                         label-width="220px"
                         style="display: block">
             <el-input class="item_width_4"
-                      placeholder="请输入民警"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :autosize="{ minRows: 2, maxRows: 5 }"
                       clearable
-                      v-model="formData.policeName">
-            </el-input>
+                      placeholder="请输入通知备注"
+                      v-model="formData.remark"></el-input>
           </el-form-item>
 
-          <el-form-item label="民警及联系方式"
-                        prop="policeMobile"
+          <el-form-item label="通知渠道"
+                        prop="channel"
                         label-width="220px"
                         style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入民警及联系方式"
-                      clearable
-                      v-model="formData.policeMobile">
-            </el-input>
-          </el-form-item>
+            <el-checkbox v-model="formData.isSelChannel"
+                         @change="handleChannelChange"
+                         key="0"
+                         label="0">小程序通知</el-checkbox>
+            <!-- <el-checkbox-group v-model="formData.channel">
+              <el-checkbox key="0"
+                           label="0">小程序通知</el-checkbox>
+              <el-checkbox key="1"
+                           label="1">短信通知</el-checkbox>
 
-          <el-form-item label="志愿者"
-                        prop="volunteerName"
-                        label-width="220px"
-                        style="display: block">
-            <el-input class="item_width_4"
-                      placeholder="请输入志愿者"
-                      clearable
-                      v-model="formData.volunteerName">
-            </el-input>
+            </el-checkbox-group> -->
           </el-form-item>
 
-          <el-form-item label="志愿者联系方式"
-                        prop="volunteerMobile"
+          <el-form-item v-if="formData.isSelChannel"
+                        label="通知内容"
+                        prop="content"
                         label-width="220px"
                         style="display: block">
             <el-input class="item_width_4"
-                      placeholder="请输入志愿者联系方式"
+                      type="textarea"
+                      maxlength="500"
+                      show-word-limit
+                      :autosize="{ minRows: 4, maxRows: 10 }"
                       clearable
-                      v-model="formData.volunteerMobile">
-            </el-input>
+                      placeholder="请输入通知内容"
+                      v-model="formData.content"></el-input>
           </el-form-item>
-        </div>
-
-        <el-form-item label="备注"
-                      prop="remark"
-                      label-width="220px"
-                      style="display: block">
-          <el-input class="item_width_4"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :autosize="{ minRows: 2, maxRows: 5 }"
-                    clearable
-                    placeholder="请输入通知备注"
-                    v-model="formData.remark"></el-input>
-        </el-form-item>
-
-        <el-form-item label="通知渠道"
-                      prop="channel"
-                      label-width="220px"
-                      style="display: block">
-          <el-checkbox v-model="formData.isSelChannel"
-                       @change="handleChannelChange"
-                       key="0"
-                       label="0">小程序通知</el-checkbox>
-          <!-- <el-checkbox-group v-model="formData.channel">
-              <el-checkbox key="0"
-                           label="0">小程序通知</el-checkbox>
-              <el-checkbox key="1"
-                           label="1">短信通知</el-checkbox>
 
-            </el-checkbox-group> -->
-        </el-form-item>
-
-        <el-form-item v-if="formData.isSelChannel"
-                      label="通知内容"
-                      prop="content"
-                      label-width="220px"
-                      style="display: block">
-          <el-input class="item_width_4"
-                    type="textarea"
-                    maxlength="500"
-                    show-word-limit
-                    :autosize="{ minRows: 4, maxRows: 10 }"
-                    clearable
-                    placeholder="请输入通知内容"
-                    v-model="formData.content"></el-input>
-        </el-form-item>
-
-      </el-form>
+        </el-form>
+      </div>
 
       <div v-if="formType === 'detail'"
            class="m-row">
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
index 1d8eba830..72d6abd1c 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue
@@ -265,15 +265,6 @@
                          label="最后一次核酸时间"
                          width="170">
         </el-table-column>
-
-        <el-table-column prop="remark"
-                         header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                         label="备注"
-                         min-width="180">
-        </el-table-column>
-
         <template v-if="isPanshi">
           <el-table-column prop="gkTime"
                            header-align="center"
@@ -319,6 +310,14 @@
           </el-table-column>
         </template>
 
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="180">
+        </el-table-column>
+
         <el-table-column label="操作"
                          fixed="right"
                          width="140"
diff --git a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
index 6474e636e..8fb618fde 100644
--- a/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
+++ b/src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
@@ -222,6 +222,51 @@
                          width="170">
         </el-table-column>
 
+        <template v-if="isPanshi">
+          <el-table-column prop="gkTime"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="管控时间"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="gb"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="镇（街）干部"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="gridManagerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="村（社区）网格管理员"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="healthWorkerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="基层医务工作者"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="policeShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="民警"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="volunteerShow"
+                           header-align="center"
+                           align="center"
+                           show-overflow-tooltip
+                           label="志愿者"
+                           min-width="180">
+          </el-table-column>
+        </template>
+
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"
@@ -308,6 +353,7 @@
       <nat-focus-edit ref="ref_form_edit"
                       :fromSource="'focusGroupSpecialAttentionHistory'"
                       :view_real_data="btnAuths.focus_groups_his_view_real_data"
+                      :isPanshi="isPanshi"
                       @dialogCancle="diaClose"
                       @dialogOk="addFormOk"></nat-focus-edit>
     </el-dialog>
@@ -378,6 +424,8 @@ export default {
       pageSize: 20,
       pageNo: 1,
       tableLoading: false,
+      customerId: '',
+      isPanshi: false,
 
       selection: [],
 
@@ -449,6 +497,12 @@ export default {
   },
 
   async mounted () {
+    //磐石街道：1580460084738760705
+    this.customerId = localStorage.getItem("customerId");
+    this.isPanshi = true
+    if (this.customerId === '1580460084738760705') {
+      this.isPanshi = true
+    }
     this.updateBtnAuths();
 
     for (let i = 0; i < 11; i++) {
diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index 6f5160611..54c714ea2 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -26,6 +26,10 @@
             <span>{{ formData.idCard||'--'  }}</span>
           </div>
 
+          <div class="info-prop">
+            <span class="info-title-2">采样时间：</span>
+            <span>{{ formData.latestCyTime||'--'  }}</span>
+          </div>
           <div class="info-prop">
             <span class="info-title-2">检测时间：</span>
             <span>{{ formData.latestNatTime||'--'  }}</span>
diff --git a/src/views/modules/base/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue
index 30e32cd7f..06684267c 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatList.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue
@@ -75,6 +75,17 @@
                             placeholder="选择时间">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="采样日期">
+            <el-date-picker class="list_item_width_1"
+                            v-model="formData.cyDate"
+                            format="yyyy-MM-dd"
+                            value-format="yyyyMMdd"
+                            type="date"
+                            size="small"
+                            clearable
+                            placeholder="选择时间">
+            </el-date-picker>
+          </el-form-item>
 
           <el-form-item label="检测状态">
             <el-select class="list_item_width_1"
@@ -168,6 +179,12 @@
                          label="证件号"
                          min-width="170">
         </el-table-column>
+        <el-table-column prop="latestCyTime"
+                         header-align="center"
+                         align="center"
+                         label="采样时间"
+                         min-width="150">
+        </el-table-column>
         <el-table-column prop="latestNatTime"
                          header-align="center"
                          align="center"
@@ -318,7 +335,8 @@ export default {
         idCard: '',//身份证号码
         isResiUser: '',//是否客户下居民(0:否  1:是)	
         status: '',//1已检测；0未检测
-        natDate: ''
+        natDate: '',
+        cyDate: '',
 
       },
 
@@ -583,7 +601,8 @@ export default {
         idCard: '',//身份证号码
         importDate: '',
         status: '',//1已检测；0未检测
-        natDate: ''
+        natDate: '',
+        cyDate: '',
       }