From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/combo/record.vue |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/combo/record.vue b/admin/src/views/combo/record.vue
index 8d8b0c7..9e99055 100644
--- a/admin/src/views/combo/record.vue
+++ b/admin/src/views/combo/record.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="main_app">
     <Breadcrumb />
-    <QueryForm v-model="querys" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clearQueryForm">
+    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clearQueryForm">
     </QueryForm>
     <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" />
@@ -32,6 +32,7 @@
           <span>{{ scope.row.useStartDate }}鑷硔{ scope.row.useEndDate }}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="鍒涘缓鏃堕棿" min-width="150" prop="createDate" show-overflow-tooltip />
       <el-table-column align="center" label="濂楅鐘舵��" min-width="80">
         <template v-slot="scope">
           <span v-if="scope.row.status == '0'" class="text_success">姝ｅ父</span>
@@ -144,8 +145,17 @@
           clearable: true,
           options: [
             { value: '0', label: '姝ｅ父' },
-            { value: '1', label: '浣滃簾' },
-            // { value: '2', label: '寰呮敮浠�' }
+            { value: '1', label: '浣滃簾' }
+          ]
+        },{
+          filed: 'createDate',
+          type: 'daterange',
+          label: '鍒涘缓鏃ユ湡',
+          placeholder: '璇烽�夋嫨鐘舵��',
+          clearable: true,
+          options: [
+            { value: '0', label: '姝ｅ父' },
+            { value: '1', label: '浣滃簾' }
           ]
         }],
         online: true
@@ -171,7 +181,6 @@
       remarkCan: '',
       // 猬囷笍adjust璋冩暣鐩稿叧
       isShowAdjust: false,
-      isShowCan: false,
       canList: [],
       adjustData: {
         flag: 0,
@@ -200,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)
@@ -233,9 +248,15 @@
       const { pagination, filters } = this
       this.loading = true
       if (page) { pagination.page = page }
+      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
+      }
       comboSalePage({
         model: {
-          ...filters
+          ...form
         },
         capacity: pagination.pageSize,
         page: pagination.page,
@@ -249,7 +270,7 @@
     },
     clearQueryForm() {
       // eslint-disable-next-line no-unused-vars
-      this.querys = {}
+      this.filters = {}
       this.getList(1)
     },
     // 鎵撳紑modal 鍐荤粨 瑙ｅ喕 浣滃簾

--
Gitblit v1.9.3