From 0a60e4b5530e508c830584497e857491e1d92f55 Mon Sep 17 00:00:00 2001
From: liyu1201 <1492230202@qq.com>
Date: Mon, 29 Dec 2025 15:28:08 +0800
Subject: [PATCH] 最新

---
 antis-ncc-admin/src/views/statisticsList/form13.vue |   2 +-
 antis-ncc-admin/src/views/statisticsList/form14.vue |   2 +-
 antis-ncc-admin/src/views/statisticsList/form18.vue |   2 +-
 antis-ncc-admin/src/views/statisticsList/form21.vue | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------
 4 files changed, 94 insertions(+), 97 deletions(-)

diff --git a/antis-ncc-admin/src/views/statisticsList/form13.vue b/antis-ncc-admin/src/views/statisticsList/form13.vue
index b1c3cc4..2d064cc 100644
--- a/antis-ncc-admin/src/views/statisticsList/form13.vue
+++ b/antis-ncc-admin/src/views/statisticsList/form13.vue
@@ -609,7 +609,7 @@ export default {
         params.SourceType = this.query.SourceType
       }
       if (this.query.storeIds && this.query.storeIds.length > 0) {
-        params.StoreIds = this.query.storeIds
+        params.StoreIds = this.query.storeIds.join(',')
       }
 
       request({
diff --git a/antis-ncc-admin/src/views/statisticsList/form14.vue b/antis-ncc-admin/src/views/statisticsList/form14.vue
index f4a0869..21e1c43 100644
--- a/antis-ncc-admin/src/views/statisticsList/form14.vue
+++ b/antis-ncc-admin/src/views/statisticsList/form14.vue
@@ -554,7 +554,7 @@ export default {
       }
 
       if (this.query.StoreIds && this.query.StoreIds.length > 0) {
-        params.StoreIds = this.query.StoreIds
+        params.StoreIds = this.query.StoreIds.join(',')
       }
 
       request({
diff --git a/antis-ncc-admin/src/views/statisticsList/form18.vue b/antis-ncc-admin/src/views/statisticsList/form18.vue
index 1e8725b..30bcf36 100644
--- a/antis-ncc-admin/src/views/statisticsList/form18.vue
+++ b/antis-ncc-admin/src/views/statisticsList/form18.vue
@@ -539,7 +539,7 @@ export default {
       }
 
       if (this.query.StoreIds && this.query.StoreIds.length > 0) {
-        params.StoreIds = this.query.StoreIds
+        params.StoreIds = this.query.StoreIds.join(',')
       }
 
       if (this.query.StartTime) {
diff --git a/antis-ncc-admin/src/views/statisticsList/form21.vue b/antis-ncc-admin/src/views/statisticsList/form21.vue
index 8d57715..2c440f8 100644
--- a/antis-ncc-admin/src/views/statisticsList/form21.vue
+++ b/antis-ncc-admin/src/views/statisticsList/form21.vue
@@ -285,8 +285,8 @@
 
 <script>
 import request from '@/utils/request'
+
 import Pagination from '@/components/Pagination'
-import { saveAs } from 'file-saver'
 
 export default {
   name: 'RefundDetailList',
@@ -295,6 +295,7 @@ export default {
   },
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       query: {
         organizationType: undefined,
         departmentId: undefined,
@@ -805,107 +806,103 @@ export default {
     },
 
     // 导出Excel
-    async exportExcel() {
-      if (!this.list || this.list.length === 0) {
-        this.$message({
-          type: 'warning',
-          message: '暂无数据可导出',
-          duration: 1500
-        })
-        return
+    exportExcel() {
+      this.listLoading = true
+
+      // 构建导出参数（参考后端 RefundDetailListQueryInput）
+      const params = {}
+
+      if (this.query.storeIds && this.query.storeIds.length > 0) {
+        params.storeIds = this.query.storeIds
       }
 
-      try {
-        // 动态导入 xlsx 库
-        const XLSX = await import('xlsx')
-        
-        // 构建表头
-        const headers = [
-          '门店名称',
-          '会员名称',
-          '会员电话',
-          '退卡时间',
-          '退卡品项名称',
-          '退卡数量',
-          '单价',
-          '总价',
-          '业绩类型',
-          '科美类型',
-          '来源类型',
-          '品项分类'
-        ]
-        
-        // 构建数据行
-        const dataRows = this.list.map(row => [
-          row.storeName || '无',
-          row.memberName || '无',
-          row.memberPhone || '无',
-          this.formatDateTime(row.refundTime) || '无',
-          row.itemName || '无',
-          row.refundQuantity || 0,
-          this.formatMoney(row.unitPrice),
-          this.formatMoney(row.totalPrice),
-          row.performanceType || '无',
-          row.beautyType || '无',
-          row.sourceType || '无',
-          row.itemCategory || '无'
-        ])
-        
-        // 合并表头和数据
-        const excelData = [headers, ...dataRows]
-        
-        // 创建工作簿
-        const ws = XLSX.utils.aoa_to_sheet(excelData)
-        
-        // 设置列宽
-        ws['!cols'] = [
-          { wch: 15 }, // 门店名称
-          { wch: 12 }, // 会员名称
-          { wch: 13 }, // 会员电话
-          { wch: 18 }, // 退卡时间
-          { wch: 20 }, // 退卡品项名称
-          { wch: 10 }, // 退卡数量
-          { wch: 12 }, // 单价
-          { wch: 12 }, // 总价
-          { wch: 12 }, // 业绩类型
-          { wch: 12 }, // 科美类型
-          { wch: 12 }, // 来源类型
-          { wch: 12 }  // 品项分类
-        ]
-        
-        // 创建工作簿
-        const wb = XLSX.utils.book_new()
-        XLSX.utils.book_append_sheet(wb, ws, '退卡品项明细表')
-        
-        // 生成文件名
-        const now = new Date()
-        const fileName = `退卡品项明细表_${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, '0')}${String(now.getDate()).padStart(2, '0')}_${now.getTime()}.xlsx`
-        
-        // 导出文件
-        const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'array' })
-        saveAs(new Blob([wbout], { type: 'application/octet-stream' }), fileName)
-        
-        this.$message({
-          type: 'success',
-          message: '导出成功',
-          duration: 1500
-        })
-      } catch (error) {
-        console.error('导出失败:', error)
-        if (error.message && error.message.includes('xlsx')) {
-          this.$message({
-            type: 'error',
-            message: '导出失败：请先安装 xlsx 库，运行命令: npm install xlsx --save',
-            duration: 3000
-          })
+      if (this.query.memberId) {
+        params.memberId = this.query.memberId
+      }
+
+      if (this.query.startTime) {
+        params.startTime = this.query.startTime
+      }
+
+      if (this.query.endTime) {
+        params.endTime = this.query.endTime
+      }
+
+      if (this.query.itemId) {
+        params.itemId = this.query.itemId
+      }
+
+      if (this.query.performanceType) {
+        params.performanceType = this.query.performanceType
+      }
+
+      if (this.query.beautyType) {
+        params.beautyType = this.query.beautyType
+      }
+
+      if (this.query.sourceType) {
+        params.sourceType = this.query.sourceType
+      }
+
+      if (this.query.itemCategory) {
+        params.itemCategory = this.query.itemCategory
+      }
+
+      // 排序参数（导出时也使用相同的排序）
+      if (this.sortProp) {
+        params.sidx = this.sortProp
+        params.sort = this.sortOrder === 'ascending' ? 'asc' : 'desc'
+      }
+
+      request({
+        url: '/api/Extend/LqHytkHytk/refund-detail-export',
+        method: 'POST',
+        data: params
+      }).then(res => {
+        this.listLoading = false
+        if (res.code === 200 && res.data) {
+          // 如果返回了错误消息
+          if (res.data.message) {
+            this.$message({
+              type: 'warning',
+              message: res.data.message,
+              duration: 2000
+            })
+            return
+          }
+          // 如果返回了下载链接
+          if (res.data.url) {
+            // 构建完整URL并下载
+            const downloadUrl = this.baseUrl + res.data.url
+            window.location.href = downloadUrl
+            this.$message({
+              type: 'success',
+              message: '导出成功',
+              duration: 1500
+            })
+          } else {
+            this.$message({
+              type: 'error',
+              message: '导出失败：未返回下载链接',
+              duration: 2000
+            })
+          }
         } else {
           this.$message({
             type: 'error',
-            message: '导出失败：' + (error.message || '未知错误'),
+            message: res.msg || '导出失败',
             duration: 2000
           })
         }
-      }
+      }).catch(err => {
+        this.listLoading = false
+        console.error('导出失败:', err)
+        this.$message({
+          type: 'error',
+          message: '导出失败，请重试',
+          duration: 2000
+        })
+      })
     }
   }
 }
--
libgit2 0.21.4