From 5965c857d575f5b4ebc6e73345c992f4f5def4a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 19 三月 2025 15:25:21 +0800
Subject: [PATCH] 优化

---
 admin/src/views/combo/record.vue |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/combo/record.vue b/admin/src/views/combo/record.vue
index d87a233..9e99055 100644
--- a/admin/src/views/combo/record.vue
+++ b/admin/src/views/combo/record.vue
@@ -6,7 +6,7 @@
     <div class="table_btns">
       <el-button plain type="primary" @click="handleEx">瀵煎嚭</el-button>
       <el-button plain type="danger" @click="openModal('zuofei')">浣滃簾</el-button>
-      <el-button plain @click="openModal('tiaozheng')">濂楅璋冩暣</el-button>
+      <el-button plain type="primary" @click="openModal('tiaozheng')">濂楅璋冩暣</el-button>
     </div>
     <el-table v-loading="loading" :data="list" stripe border @selection-change="handleSelectionChange">
       <el-table-column fixed="left" align="center" type="selection" :selectable="handleDisable" width="55" />
@@ -209,13 +209,19 @@
     },
     handleEx() {
       const { pagination, filters } = this
+      let form = JSON.parse(JSON.stringify(filters))
+      if (form.createDate && form.createDate.length > 0) {
+        form.startCreateDate = form.createDate[0] + ' 00:00:00'
+        form.endCreateDate = form.createDate[1] + ' 23:59:59'
+        delete form.createDate
+      }
       this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
         .then(() => {
           this.loading = true
           comboSaleEx({
             page: 1,
             capacity: 1000000,
-            model: filters
+            model: form
           })
             .then(response => {
               this.download(response)
@@ -244,8 +250,8 @@
       if (page) { pagination.page = page }
       let form = JSON.parse(JSON.stringify(filters))
       if (form.createDate && form.createDate.length > 0) {
-        form.startCreateDate = form.createDate[0]
-        form.endCreateDate = form.createDate[1]
+        form.startCreateDate = form.createDate[0] + ' 00:00:00'
+        form.endCreateDate = form.createDate[1] + ' 23:59:59'
         delete form.createDate
       }
       comboSalePage({

--
Gitblit v1.9.3