Merge branch 'dev-fangyi0926' into yantai_master

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>
 
@@ -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>
 

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"