From 0530e553eb5dac5635f8b4b231092c0f851297d4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 13 Oct 2022 08:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=AF=94=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppDataComparison/components/List.vue     | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/project/pingchang/apps/AppDataComparison/components/List.vue b/project/pingchang/apps/AppDataComparison/components/List.vue
index cf7e016d..db8d016b 100644
--- a/project/pingchang/apps/AppDataComparison/components/List.vue
+++ b/project/pingchang/apps/AppDataComparison/components/List.vue
@@ -1,6 +1,6 @@
 <template>
-  <ai-list class="list">
-    <ai-title slot="title" title="数据比对" isShowBottomBorder :instance="instance" v-if="search.arriveAreaId" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
+  <ai-list>
+    <ai-title slot="title" title="数据比对" v-if="search.arriveAreaId" isShowBottomBorder :instance="instance" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
     <template slot="content">
       <ai-search-bar bottomBorder>
         <template #left>
@@ -27,21 +27,16 @@
             placeholder="选择结束日期"
             @change="search.current = 1, getList()">
           </el-date-picker>
+        </template>
+        <template #right>
+          <el-button icon="iconfont" :loading="btnLoading" @click="comparison">比对</el-button>
+          <ai-import :instance="instance" :dict="dict" type="appepidemicpreventiondatamatch" name="数据比对" @success="getList()">
+            <el-button icon="iconfont iconImport" type="primary">导入</el-button>
+          </ai-import>
           <ai-download :instance="instance" url="/app/appepidemicpreventiondatamatch/export" :params="search" fileName="数据比对" :disabled="tableData.length == 0">
             <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
           </ai-download>
         </template>
-        <template #right>
-          <el-input
-            v-model="search.name"
-            size="small"
-            placeholder="请输入姓名、手机号"
-            clearable
-            v-throttle="() => {search.current = 1, getList()}"
-            @clear="search.current = 1, search.name = '', getList()"
-            suffix-icon="iconfont iconSearch">
-          </el-input>
-        </template>
       </ai-search-bar>
       <ai-table
         :tableData="tableData"
@@ -52,6 +47,16 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
+        <el-table-column slot="nucleicAcidSamplingProve" label="核酸结果" align="center">
+          <template slot-scope="{ row }">
+            <ai-uploader
+              :instance="instance"
+              :value="[{url: row.nucleicAcidSamplingProve}]"
+              disabled
+              :limit="9">
+            </ai-uploader>
+          </template>
+        </el-table-column>
         <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
@@ -84,29 +89,29 @@
           queryEndTime: '',
           status: ''
         },
-        info: {},
+        btnLoading: false,
         colConfigs: [
           { prop: 'name', label: '姓名' },
           { prop: 'phone', align: 'center', label: '手机号码' },
-          { prop: 'startTime', align: 'center', label: '所属地区' },
+          { prop: 'arriveAreaName', align: 'center', label: '所属地区' },
           { prop: 'arriveTime', align: 'center', label: '抵平时间' },
-          { prop: 'startAreaName', align: 'center', label: '途径卡口' },
+          { prop: 'gatewayName', align: 'center', label: '途径卡口' },
           {
-            prop: 'arriveTime',
+            prop: 'startAreaName',
             align: 'center',
             label: '出发地址'
           },
           {
-            prop: 'arriveAreaName',
+            prop: 'nucleicAcidSamplingTime',
             align: 'center',
             label: '核酸日期'
           },
-          { prop: 'source',
+          { slot: 'nucleicAcidSamplingProve',
             align: 'center',
-            label: '检测结果',
-            formart: v => this.dict.getLabel('EP_source', v) },
+            label: '检测结果'
+          },
           {
-            prop: 'riskStatus',
+            prop: 'createTime',
             align: 'center',
             label: '导入时间',
             formart: v => this.dict.getLabel('EP_riskStatus', v)
@@ -131,7 +136,7 @@
       this.instance.post(`/app/appdvcpconfig/getCorpArea`).then(res => {
         if (res.code == 0) {
           this.search.arriveAreaId = res.data
-          this.dict.load(['EP_datacContrastStatis', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
+          this.dict.load(['EP_datacContrastStatis']).then(() => {
             this.getList()
           })
         }
@@ -143,7 +148,6 @@
         this.instance.post(`/app/appepidemicpreventiondatamatch/list`, null, {
           params: {
             ...this.search,
-            arriveAreaId: this.search.arriveAreaId,
             queryBeginTime: this.search.queryBeginTime ? this.search.queryBeginTime + ' 00:00:00' : '',
             queryEndTime: this.search.queryEndTime ? this.search.queryEndTime + ' 23:59:59' : ''
           }
@@ -160,6 +164,18 @@
         })
       },
 
+      comparison () {
+        this.btnLoading = true
+
+        this.instance.post(`/app/appepidemicpreventiondatamatch/match`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('比对成功！')
+            this.getList()
+          }
+          this.btnLoading = false
+        })
+      },
+
       changeArea () {
         this.search.current = 1