重点人群关注、未做核酸对比

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

src/views/modules/base/epidemic/natFocus/natFocusEdit.vue

@@ -7,6 +7,7 @@
                    class="diy-button--search"
                    @click="handleTuomin">显示脱敏信息</el-button>
       </div>
+      <div class="epidemic-form">
         <el-form v-if="formType !== 'detail'"
                  ref="ref_form1"
                  :inline="true"
@@ -250,6 +251,7 @@
           </el-form-item>
 
         </el-form>
+      </div>
 
       <div v-if="formType === 'detail'"
            class="m-row">

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"

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++) {

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>

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: '',
       }