From c6ac7827159e71f6906a42ceb29a4f83a2f239f6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 21 二月 2025 14:12:38 +0800
Subject: [PATCH] ll

---
 admin/src/views/combo/order.vue |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index 949d402..e0d03d6 100644
--- a/admin/src/views/combo/order.vue
+++ b/admin/src/views/combo/order.vue
@@ -6,7 +6,7 @@
       <el-button type="primary" @click="handleEx()">瀵煎嚭</el-button>
     </div>
     <el-table v-loading="loading" :data="list" stripe border>
-      <el-table-column prop="code" align="center" label="璁㈠崟缂栧彿" min-width="180" show-overflow-tooltip>
+      <el-table-column prop="code" align="center" label="璁㈠崟缂栧彿" min-width="200" show-overflow-tooltip>
         <template scope="{row}">
           <span @click="handleDetail(row.id)" class="primaryColor pointer">{{ row.code }}</span>
         </template>
@@ -15,7 +15,7 @@
       <el-table-column prop="money" align="center" label="鍚堣(鍏�)" min-width="80" show-overflow-tooltip />
       <el-table-column prop="money" align="center" label="瀹炰粯(鍏�)" min-width="80" show-overflow-tooltip />
       <el-table-column prop="refundMoney" align="center" label="宸查��閲戦(鍏�)" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="memberId" align="center" label="鐢ㄦ埛淇℃伅" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="memberId" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
       <el-table-column prop="payWay" align="center" label="鏀粯鏂瑰紡" min-width="80" show-overflow-tooltip>
         <template v-slot="{ row }">
           <span v-if="row.payWay == 0">寰俊鏀粯</span>
@@ -32,7 +32,8 @@
       <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="80" show-overflow-tooltip>
         <template v-slot="{ row }">
           <span @click="handleDetail(row.id)" class="primaryColor pointer">鏌ョ湅璇︽儏</span>
-          <span v-if="row.status == 1 && (row.refundMoney < row.money)" @click="handRefund(row.id)" class="primaryColor pointer ml10">閫�娆�</span>
+          <span v-if="row.status == 1 && (row.refundMoney < row.money)" @click="handRefund(row.id)"
+            class="primaryColor pointer ml10">閫�娆�</span>
         </template>
       </el-table-column>
     </el-table>
@@ -73,19 +74,22 @@
             label: '璁㈠崟缂栧彿',
           },
           {
-            filed: 'name',
+            filed: 'discountName',
             type: 'input',
             label: '濂楅鍗�',
             placeholder: '璇疯緭鍏ュ崱鍚嶇О',
           },
           {
-            filed: 'pay',
+            filed: 'payWay',
             type: 'select',
             label: '鏀粯鏂瑰紡',
-            options: []
+            options: [
+              { label: '寰俊', value: 0 },
+              { label: '鏀粯瀹�', value: 1 },
+            ]
           },
           {
-            filed: 'status',
+            filed: 'payStatus',
             type: 'select',
             label: '璁㈠崟鐘舵��',
             options: [
@@ -94,12 +98,12 @@
             ]
           },
           {
-            filed: 'time',
+            filed: 'selDate',
             type: 'date',
             label: '鏀粯鏃堕棿',
           },
           {
-            filed: 'username',
+            filed: 'openid',
             type: 'input',
             label: '鐢ㄦ埛淇℃伅',
           },
@@ -117,22 +121,33 @@
       this.$refs.RefundRef.open(id)
     },
     handleDetail(id) {
-      comboOrderDetailPost({id})
+      comboOrderDetailPost({ id })
         .then(res => {
-          this.$refs.OrderDetailRef.open('璁㈠崟璇︽儏', res)
+          if (res) {
+            this.$refs.OrderDetailRef.open('璁㈠崟璇︽儏', res)
+          }
+
         })
         .catch(err => {
           this.$tip.apiFailed(err)
         })
     },
     handleEx() {
+      const { pagination, filters } = this
       this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
         .then(() => {
           this.loading = true
+          if (filters.selDate && filters.selDate.length > 0) {
+            filters.startDate = filters.selDate[0]
+            filters.endDate = filters.selDate[1]
+          } else {
+            filters.startDate = null
+            filters.endDate = null
+          }
           comboListOrderEx({
             page: 1,
             capacity: 1000000,
-            model: this.filters
+            model: filters
           })
             .then(response => {
               this.download(response)
@@ -155,6 +170,13 @@
       const { pagination, filters } = this
       this.loading = true
       if (page) { pagination.page = page }
+      if (filters.selDate && filters.selDate.length > 0) {
+        filters.startDate = filters.selDate[0]
+        filters.endDate = filters.selDate[1]
+      } else {
+        filters.startDate = null
+        filters.endDate = null
+      }
       comboOrderPost({
         model: {
           ...filters,

--
Gitblit v1.9.3