From 28d958ecc9271b26e8aaf979e24d85bddd00d192 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 11 Oct 2022 17:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHealthReport/components/Detail.vue     | 131 +++++++-----------
 1 file changed, 48 insertions(+), 83 deletions(-)

diff --git a/project/pingchang/apps/AppHealthReport/components/Detail.vue b/project/pingchang/apps/AppHealthReport/components/Detail.vue
index 2ca5e198..f9325d31 100644
--- a/project/pingchang/apps/AppHealthReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHealthReport/components/Detail.vue
@@ -12,65 +12,44 @@
             <ai-wrapper
               label-width="120px">
               <ai-info-item label="姓名" :value="info.name"></ai-info-item>
-              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="手机号" :value="info.phone"></ai-info-item>
+              <ai-info-item label="上报时间" :value="info.createTime"></ai-info-item>
               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
-              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
-              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
-              <ai-info-item label="登记卡口" isLine :value="info.gatewayName"></ai-info-item>
+              <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="详细地址" isLine :value="info.address"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="行程信息">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
-              <ai-info-item label="出发地区" >
-                <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
-              </ai-info-item>
-              <ai-info-item label="出发地址" isLine :value="info.startAddress"></ai-info-item>
-              <ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item>
-              <ai-info-item label="车次/航班" isLine :value="info.trainNo"></ai-info-item>
-              <ai-info-item label="行程描述" isLine :value="info.description"></ai-info-item>
-              <ai-info-item label="抵平时间" :value="info.arriveTime"></ai-info-item>
-              <ai-info-item label="目的地区" :value="info.arriveAreaName"></ai-info-item>
-              <ai-info-item label="目的详址" isLine :value="info.arriveAddress"></ai-info-item>
-            </ai-wrapper>
+      </div>
+      <div v-show="currIndex === 1">
+        <ai-card title="每日上报">
+          <template #right>
+            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
           </template>
-        </ai-card>
-        <ai-card title="健康状况">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="是否有风险旅居史" v-if="info.fromHighRiskArea === '1'">
-                <span style="color: red">{{ info.highRiskAreaName }}</span>
-              </ai-info-item>
-              <ai-info-item label="是否有风险旅居史" v-else value="否"></ai-info-item>
-              <ai-info-item label="7天内是否接触新冠确诊或疑似患者">
-                <span :style="{color: info.contactPatients === '1' ? 'red' : ''}">{{ dict.getLabel('yesOrNo', info.contactPatients) }}</span>
-              </ai-info-item>
-              <ai-info-item label="当前健康状况" v-if="info.abnormalHealth === '1'">
-                <span style="color: red">{{ dict.getLabel('EP_abnormalType', info.abnormalType) }}</span>
-              </ai-info-item>
-              <ai-info-item label="当前健康状况" v-else value="否"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="同行情况">
           <template #content>
             <ai-table
               :isShowPagination="false"
               tableSize="small"
               border
-              :tableData="info.companionList"
-              :col-configs="colConfigs"
+              :tableData="info.reportInfos"
+              :col-configs="colConfigs1"
               @getList="() => {}">
+
+              <el-table-column slot="nucleicAcidUrl" label="核酸截图" align="center">
+                <template slot-scope="{ row }">
+                  <ai-uploader
+                    :instance="instance"
+                    :value="[{url: row.nucleicAcidUrl}]"
+                    disabled
+                    :limit="9">
+                  </ai-uploader>
+                </template>
+              </el-table-column>
             </ai-table>
           </template>
         </ai-card>
       </div>
-      <div v-show="currIndex === 1">
+      <div v-show="currIndex === 2">
         <ai-card title="风险处置">
           <template #right>
             <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
@@ -79,45 +58,24 @@
             <ai-wrapper
               label-width="120px">
               <ai-info-item label="姓名" :value="info.name"></ai-info-item>
-              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="手机号" :value="info.phone"></ai-info-item>
+              <ai-info-item label="上报时间" :value="info.createTime"></ai-info-item>
               <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
-              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
+              <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="详细地址" isLine :value="info.address"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
-        <ai-card title="处理意见">
+        <ai-card title="风险情况记录">
           <template #content>
-            <ai-wrapper
-              style="margin-bottom: 20px;"
-              v-for="item in info.riskDisposalList"
-              :key="item.id"
-              label-width="120px">
-              <ai-info-item label="处理意见" :value="dict.getLabel('EP_handleType', item.handleType)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '2'" label="集中隔离地" :value="dict.getLabel('EP_quarantineAddress', item.quarantineAddress)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '3'" label="居家状态" :value="dict.getLabel('EP_homeStatus', item.homeStatus)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="移交对象" :value="dict.getLabel('EP_handoverObject', item.handoverObject)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="移交方式" :value="dict.getLabel('EP_handoverMethod', item.handoverMethod)"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="交接人员姓名" :value="info.handoverPersonName"></ai-info-item>
-              <ai-info-item v-if="item.handleType === '6'" label="手机号" :value="info.handoverPersonPhone"></ai-info-item>
-              <ai-info-item
-                v-if="['2', '3'].includes(item.handleType)"
-                label="隔离时间"
-                :value="item.quarantineBeginTime ? item.quarantineBeginTime + '至' + item.quarantineEndTime : ''">
-              </ai-info-item>
-              <ai-info-item v-if="['2', '3'].includes(item.handleType)" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy)"></ai-info-item>
-              <ai-info-item v-if="['3'].includes(item.handleType)" label="管控方式" :value="dict.getLabel('EP_controlMethod', item.controlMethod)"></ai-info-item>
-              <ai-info-item v-if="['3'].includes(item.handleType)" isLine label="备注" :value="item.remarks"></ai-info-item>
-              <ai-info-item label="图片" isLine v-if="['3', '6'].includes(item.handleType)">
-                <ai-uploader
-                  :instance="instance"
-                  :value="item.fileList"
-                  disabled
-                  :limit="9">
-                </ai-uploader>
-              </ai-info-item>
-            </ai-wrapper>
-            <ai-empty style="margin-bottom: 60px;" v-if="info.riskDisposalList && !info.riskDisposalList.length"></ai-empty>
+            <ai-table
+              :isShowPagination="false"
+              tableSize="small"
+              border
+              :tableData="info.handleLogs"
+              :col-configs="colConfigs2"
+              @getList="() => {}">
+            </ai-table>
           </template>
         </ai-card>
       </div>
@@ -142,11 +100,18 @@
         currIndex: 0,
         isLoading: false,
         tableData: [],
-        colConfigs: [
-          {prop: 'name', label: '姓名', align: 'center' },
-          {prop: 'phone', label: '手机号', align: 'center'}
+        colConfigs1: [
+          {prop: 'createTime', label: '上报日期', align: 'center' },
+          {prop: 'phone', label: '上报位置', align: 'center'},
+          {prop: 'status', label: '健康状态', align: 'center', formart: v => v === '0' ? '正常' : '异常' },
+          {slot: 'nucleicAcidUrl', label: '核酸截图', align: 'center'}
         ],
-        tabList: ['基本信息', '风险处置']
+        colConfigs2: [
+          {prop: 'content', label: '风险记录', align: 'center' },
+          {prop: 'createTime', label: '创建时间', align: 'center'},
+          {prop: 'createUserName', label: '记录人', align: 'center' }
+        ],
+        tabList: ['基本信息', '每日上报', '风险处置']
       }
     },
 
@@ -163,7 +128,7 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appepidemicpreventionhealthreportinfo/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appepidemicpreventionhealthreportinfo/userDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
             this.info = res.data
             this.info.checkPhoto = res.data.checkPhoto ? JSON.parse(res.data.checkPhoto) : []