From ef70f387ae504f20e15aa7d7a933800b768892fc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:26:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager/src/views/promotions/coupon/coupon_store_receive.vue | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/manager/src/views/promotions/coupon/coupon_store_receive.vue b/manager/src/views/promotions/coupon/coupon_store_receive.vue
index 05d1ca6..602581f 100644
--- a/manager/src/views/promotions/coupon/coupon_store_receive.vue
+++ b/manager/src/views/promotions/coupon/coupon_store_receive.vue
@@ -50,10 +50,10 @@
<Option value="CLOSED">宸蹭綔搴�</Option>
</Select>
</Form-item>
- <Form-item label="娲诲姩鏃堕棿">
+ <Form-item label="棰嗗彇鏃堕棿">
<DatePicker
v-model="selectDate"
- type="daterange"
+ type="datetimerange"
clearable
placeholder="閫夋嫨璧峰鏃堕棿"
style="width: 200px"
@@ -197,6 +197,32 @@
},
},
{
+ title: "璁㈠崟鐘舵��",
+ key: "orderStatus",
+ width: 120,
+ render: (h, params) => {
+ if (params.row.orderStatus === "UNPAID") {
+ return h("Tag", { props: { color: "orange" } }, "鏈粯娆�");
+ } else if (params.row.orderStatus === "PAID") {
+ return h("Tag", { props: { color: "green" } }, "宸蹭粯娆�");
+ } else if(params.row.orderStatus === "UNDELIVERED"){
+ return h("Tag", { props: { color: "orange" } }, "寰呭彂璐�");
+ }else if(params.row.orderStatus === "DELIVERED"){
+ return h("Tag", { props: { color: "green" } }, "宸插彂璐�");
+ }else if(params.row.orderStatus === "COMPLETED"){
+ return h("Tag", { props: { color: "green" } }, "宸插畬鎴�");
+ }else if(params.row.orderStatus === "STAY_PICKED_UP"){
+ return h("Tag", { props: { color: "orange" } }, "寰呰嚜鎻�");
+ }else if(params.row.orderStatus === "CANCELLED"){
+ return h("Tag", { props: { color: "purple" } }, "宸插叧闂�");
+ }else if(params.row.orderStatus === "TAKE"){
+ return h("Tag", { props: { color: "orange" } }, "寰呮牳楠�");
+ }else{
+ return h("Tag", { props: { color: "purple" } }, "鏈煡");
+ }
+ },
+ },
+ {
title: "鏈夋晥鏃堕棿",
width: 150,
render: (h, params) => {
@@ -215,6 +241,18 @@
}
},
},
+ {
+ title: "棰嗗彇鏃堕棿",
+ width: 150,
+ render: (h, params) => {
+ return h("div", {
+ domProps: {
+ innerHTML:
+ params.row.claimTime,
+ },
+ });
+ },
+ },
],
data: [], // 琛ㄥ崟鏁版嵁
total: 0, // 琛ㄥ崟鏁版嵁鎬绘暟
--
Gitblit v1.8.0