From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/order.vue | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index 949d402..bee9272 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="openid" 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>
@@ -27,12 +27,19 @@
<span>灏忕▼搴忕</span>
</template>
</el-table-column>
+ <el-table-column prop="payWay" align="center" label="璁㈠崟鐘舵��" min-width="80" show-overflow-tooltip>
+ <template v-slot="{ row }">
+ <span v-if="row.status == 0">鏈敮浠�</span>
+ <span v-if="row.status == 1">宸叉敮浠�</span>
+ </template>
+ </el-table-column>
<el-table-column prop="refundUserName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
- <el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="140" show-overflow-tooltip />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="80" show-overflow-tooltip>
+ <el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="160" show-overflow-tooltip />
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="120" 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>
@@ -55,6 +62,7 @@
comboListOrderEx,
comboOrderDetailPost
} from '@/api/business/combo.js'
+import dayjs from 'dayjs'
export default {
extends: BasePageTemp,
components: {
@@ -73,19 +81,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 +105,12 @@
]
},
{
- filed: 'time',
- type: 'date',
+ filed: 'selDate',
+ type: 'daterange',
label: '鏀粯鏃堕棿',
},
{
- filed: 'username',
+ filed: 'openid',
type: 'input',
label: '鐢ㄦ埛淇℃伅',
},
@@ -109,6 +120,8 @@
}
},
created() {
+ let date = dayjs().format('YYYY-MM-DD')
+ this.$set(this.filters, 'selDate', [date, date])
this.getList()
// this.initData()
},
@@ -117,22 +130,36 @@
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] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
+ } else {
+ filters.startDate = null
+ filters.endDate = null
+ }
comboListOrderEx({
page: 1,
capacity: 1000000,
- model: this.filters
+ model: {
+ ...filters,
+ type: 1
+ },
})
.then(response => {
this.download(response)
@@ -154,6 +181,13 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
+ if (filters.selDate && filters.selDate.length > 0) {
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
+ } else {
+ filters.startDate = null
+ filters.endDate = null
+ }
if (page) { pagination.page = page }
comboOrderPost({
model: {
--
Gitblit v1.9.3