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
---
manager/src/views/order/order/orderList.vue | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 083b224..112e451 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -36,7 +36,16 @@
style="width: 160px"
/>
</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"
@@ -385,7 +394,23 @@
},
},
-
+ {
+ 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: "璁㈠崟鐘舵��",
key: "orderStatus",
--
Gitblit v1.8.0