From d65ab1e868d706fe23962e1f31b2e53221afa4de Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Sat, 7 Jan 2023 10:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E5=8F=91=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=EF=BC=8C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base-ui/src/api/kucun/wholesale.js       | 8 +++-----
 base-ui/src/views/kucun/pfsjgl/index.vue | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/base-ui/src/api/kucun/wholesale.js b/base-ui/src/api/kucun/wholesale.js
index 42673201..16f4c345 100644
--- a/base-ui/src/api/kucun/wholesale.js
+++ b/base-ui/src/api/kucun/wholesale.js
@@ -1,10 +1,8 @@
 import request from '@/utils/request'
 
 // 条件查询
-export function exportExcel(data) {
+export function exportExcel(logId) {
   return request({
-    url: '/kucun/kchz',
-    method: 'get',
-    data: data
+    url: '/wholesale/buildExcel/' + logId
   })
-}
\ No newline at end of file
+}
diff --git a/base-ui/src/views/kucun/pfsjgl/index.vue b/base-ui/src/views/kucun/pfsjgl/index.vue
index 5103e76e..907d6ec5 100644
--- a/base-ui/src/views/kucun/pfsjgl/index.vue
+++ b/base-ui/src/views/kucun/pfsjgl/index.vue
@@ -88,7 +88,7 @@
         <div>
           <h3>文件上传结果</h3>
           <el-card class="box-card">
-            <div>共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }}  条；用时：{{ currentLog.durations }}  毫秒。</div>
+            <div>共导入数据：{{ currentLog.allNum }} 条；符合监管条件的数据：{{ currentLog.validNum }} 条；用时：{{ currentLog.durations }} 毫秒。</div>
           </el-card>
         </div>
         <div>
@@ -108,6 +108,7 @@
 </template>
 
 <script>
+import { exportExcel } from '@/api/kucun/wholesale'
 import ButtonBar from '@/components/ButtonBar'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -237,12 +238,11 @@ export default {
       _this.fullscreenloading.text = '数据导入完成，进行数据整理'
       _this.currentLog = resp.data
 
-      kchz()
+      exportExcel(_this.currentLog.idStr)
         .then(res => {
           if (this.fullscreenloading) this.fullscreenloading.close()
           this.fullscreenloading = null
-          console.log('333', res)
-          _this.hzFilePath = res.data
+          _this.currentLog = resp.data
         })
         .catch(e => {
           if (this.fullscreenloading) this.fullscreenloading.close()