From a84e35b180a508ec34122e7181f83314ded672e9 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 30 Sep 2022 10:46:40 +0800
Subject: [PATCH 1/2] 11

---
 .../base/epidemic/natInfo/noNatDetail.vue     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index 79b06db74..efccbca2b 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -20,7 +20,11 @@
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">检检测地点：</span>
+            <span class="info-title-2">检测时间：</span>
+            <span>{{ formData.latestNatTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">检测地点：</span>
             <span>{{ formData.natAddress||'--'  }}</span>
           </div>
           <div class="info-prop">
@@ -28,6 +32,19 @@
             <span>{{ formData.natResult==='0'?'阴性':formData.natResult==='1'?'阳性':'--' }}</span>
           </div>
 
+          <div class="info-prop">
+            <span class="info-title-2">本辖区居民：</span>
+            <span>{{ formData.isAgencyUserDesc||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">导入时间：</span>
+            <span>{{ formData.importTime||'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-2">导入组织：</span>
+            <span>{{ formData.agencyName||'--'  }}</span>
+          </div>
+
         </div>
       </div>
 

From 09a06968df678c12360b0d2e5dc635fac3b49229 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 30 Sep 2022 10:49:37 +0800
Subject: [PATCH 2/2] 11

---
 src/views/modules/base/epidemic/natInfo/noNatDetail.vue | 2 +-
 src/views/modules/base/epidemic/natInfo/noNatList.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
index efccbca2b..cf1a7df17 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatDetail.vue
@@ -10,7 +10,7 @@
           </div>
 
           <div class="info-prop">
-            <span class="info-title-2">手机号：</span>
+            <span class="info-title-2">联系方式：</span>
             <span>{{ formData.realMobile||'--' }}</span>
           </div>
 
diff --git a/src/views/modules/base/epidemic/natInfo/noNatList.vue b/src/views/modules/base/epidemic/natInfo/noNatList.vue
index 69640c259..dd712b1de 100644
--- a/src/views/modules/base/epidemic/natInfo/noNatList.vue
+++ b/src/views/modules/base/epidemic/natInfo/noNatList.vue
@@ -131,7 +131,7 @@
         <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
-                         label="手机号"
+                         label="联系方式"
                          min-width="110">
         </el-table-column>
         <el-table-column prop="idCard"