From 14ae2f656166b98302682664888d2b882b7e4649 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 16 十月 2025 11:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
seller/src/views/order/order/orderList.vue | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 77d9044..fbf74b7 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -42,6 +42,16 @@
<Option value="STAY_PICKED_UP">寰呰嚜鎻�</Option>
</Select>
</Form-item>
+ <Form-item label="瀹氬埗鍟嗗搧" prop="customizeFlag">
+ <Select
+ v-model="searchForm.customizeFlag"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 160px"
+ >
+ <Option value="CUSTOMIZE">瀹氬埗鍟嗗搧</Option>
+ </Select>
+ </Form-item>
<Form-item label="璁㈠崟绫诲瀷" prop="orderType">
<Select
v-model="searchForm.orderPromotionType"
@@ -60,7 +70,7 @@
<DatePicker
v-model="selectDate"
type="datetimerange"
- format="yyyy-MM-dd"
+ format="yyyy-MM-dd HH:mm:ss"
clearable
@on-change="selectDateRange"
placeholder="閫夋嫨璧峰鏃堕棿"
@@ -231,6 +241,23 @@
return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} );
},
},
+ {
+ title: "瀹氬埗鍟嗗搧",
+ key: "customizeFlag",
+ minWidth: 120,
+ tooltip: true,
+ render: (h, params) => {
+ if (params.row.customizeFlag == "CUSTOMIZE") {
+ return h("div", [
+ h("tag", { props: { color: "blue" } }, "瀹氬埗鍟嗗搧"),
+ ]);
+ } else {
+ return h("div", [
+ h("tag", { props: { color: "volcano" } }, "鏅�氬晢鍝�"),
+ ]);
+ }
+ },
+ },
{
title: "璁㈠崟鐘舵��",
@@ -292,6 +319,7 @@
key: "action",
align: "center",
width: 100,
+ fixed: "right",
render: (h, params) => {
return h("div", [
h(
@@ -453,7 +481,7 @@
},
// 椤甸潰缂撳瓨澶勭悊锛屼粠璇ラ〉闈㈢寮�鏃讹紝淇敼KeepAlive涓篺alse锛屼繚璇佽繘鍏ヨ椤甸潰鏄埛鏂�
beforeRouteLeave(to, from, next) {
- from.meta.keepAlive = false;
+ from.meta.keepAlive = true;
next();
},
};
--
Gitblit v1.8.0