From 96d9c429c71db5674333d3d53acbf3d8dbb4b89b Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 21 Oct 2022 16:40:47 +0800
Subject: [PATCH] 11

---
 .../base/epidemic/natInfo/natDetail.vue       |  6 +++-
 .../modules/base/epidemic/natInfo/natForm.vue | 30 +++++++++----------
 .../modules/base/epidemic/natInfo/natList.vue | 30 +++++++++----------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/natDetail.vue b/src/views/modules/base/epidemic/natInfo/natDetail.vue
index 65498f1ff..718b51c4e 100644
--- a/src/views/modules/base/epidemic/natInfo/natDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/natDetail.vue
@@ -18,9 +18,13 @@
             <span class="info-title-2">证件号：</span>
             <span>{{ formData.idCard||'--'  }}</span>
           </div>
+          <div class="info-prop">
+            <span class="info-title-2">采样时间：</span>
+            <span>{{ formData.sampleTime||'--'  }}</span>
+          </div>
 
           <div class="info-prop">
-            <span class="info-title-2">检检测地点：</span>
+            <span class="info-title-2">检测地点：</span>
             <span>{{ formData.natAddress||'--'  }}</span>
           </div>
           <div class="info-prop">
diff --git a/src/views/modules/base/epidemic/natInfo/natForm.vue b/src/views/modules/base/epidemic/natInfo/natForm.vue
index ebd7d29f3..1bcdf2af5 100644
--- a/src/views/modules/base/epidemic/natInfo/natForm.vue
+++ b/src/views/modules/base/epidemic/natInfo/natForm.vue
@@ -95,7 +95,20 @@
                     v-model="formData.idCard">
           </el-input>
         </el-form-item>
-
+        <el-form-item label="采样时间"
+                      style="display: block"
+                      prop="sampleTime"
+                      label-width="150px">
+          <el-date-picker class="item_width_2"
+                          v-model="formData.sampleTime"
+                          format="yyyy-MM-dd HH:mm"
+                          value-format="yyyy-MM-dd HH:mm"
+                          type="datetime"
+                          :picker-options="pickerOptions"
+                          clearable
+                          placeholder="选择时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="检测时间"
                       style="display: block"
                       prop="natTime"
@@ -133,21 +146,6 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="采样时间"
-                      style="display: block"
-                      prop="sampleTime"
-                      label-width="150px">
-          <el-date-picker class="item_width_2"
-                          v-model="formData.sampleTime"
-                          format="yyyy-MM-dd HH:mm"
-                          value-format="yyyy-MM-dd HH:mm"
-                          type="datetime"
-                          :picker-options="pickerOptions"
-                          clearable
-                          placeholder="选择时间">
-          </el-date-picker>
-        </el-form-item>
-
         <el-form-item v-if=" formType!=='detail' || (formType=='detail'&&fileList.length>0)"
                       class="block"
                       label-width="150px"
diff --git a/src/views/modules/base/epidemic/natInfo/natList.vue b/src/views/modules/base/epidemic/natInfo/natList.vue
index 4659e13d1..648b2e73f 100644
--- a/src/views/modules/base/epidemic/natInfo/natList.vue
+++ b/src/views/modules/base/epidemic/natInfo/natList.vue
@@ -32,14 +32,13 @@
               </el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="核酸检测时间"
+          <el-form-item label="采样时间"
                         label-width="110px"
-                        prop="startTime">
-            <el-date-picker v-model="timeRange"
+                        prop="sampleStartTime">
+            <el-date-picker v-model="sampleTimeRange"
                             size="small"
                             type="datetimerange"
-                            @change="handleTimeChange"
+                            @change="handleSampleTimeChange"
                             format="yyyy-MM-dd HH:mm"
                             value-format="yyyy-MM-dd HH:mm"
                             range-separator="至"
@@ -48,13 +47,13 @@
             </el-date-picker>
 
           </el-form-item>
-          <el-form-item label="采样时间"
+          <el-form-item label="核酸检测时间"
                         label-width="110px"
-                        prop="sampleStartTime">
-            <el-date-picker v-model="sampleTimeRange"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
                             size="small"
                             type="datetimerange"
-                            @change="handleSampleTimeChange"
+                            @change="handleTimeChange"
                             format="yyyy-MM-dd HH:mm"
                             value-format="yyyy-MM-dd HH:mm"
                             range-separator="至"
@@ -177,6 +176,12 @@
                          label="证件号"
                          min-width="170">
         </el-table-column>
+        <el-table-column prop="sampleTime"
+                         header-align="center"
+                         align="center"
+                         label="采样时间"
+                         width="150">
+        </el-table-column>
         <el-table-column prop="natTime"
                          header-align="center"
                          align="center"
@@ -198,12 +203,7 @@
                          label="检测结果"
                          width="100">
         </el-table-column>
-        <el-table-column prop="sampleTime"
-                         header-align="center"
-                         align="center"
-                         label="采样时间"
-                         width="150">
-        </el-table-column>
+
         <el-table-column v-if="isResiUser"
                          prop="isResiUserShow"
                          header-align="center"