From 5a80a60227011398c8fe306d4adcdd09297d21e2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 23 十月 2025 18:04:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager/src/views/order/order/orderList.vue | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index fad9ab0..42256b7 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -18,6 +18,15 @@
style="width: 160px"
/>
</Form-item>
+ <Form-item label="浼氬憳id" prop="memberId">
+ <Input
+ type="text"
+ v-model="searchForm.memberId"
+ placeholder="璇疯緭鍏ヤ細鍛榠d"
+ clearable
+ style="width: 160px"
+ />
+ </Form-item>
<!-- <Form-item label="浼氬憳鍚嶇О" prop="buyerName">-->
<!-- <Input-->
<!-- type="text"-->
@@ -36,7 +45,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"
@@ -49,6 +67,24 @@
<Option value="GIFT">璧犲搧璁㈠崟</Option>
<Option value="POINTS">绉垎璁㈠崟</Option>
<Option value="KANJIA">鐮嶄环璁㈠崟</Option>
+ </Select>
+ </Form-item>
+ <Form-item label="搴楅摵" prop="store">
+ <Select
+ v-model="searchForm.storeSelectId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ style="width: 160px"
+ filterable
+ >
+ <Option
+ v-for="store in storeSelectList"
+ :key="store.id"
+ :label="store.label"
+ :value="store.id"
+ >
+ {{ store.label }}
+ </Option>
</Select>
</Form-item>
<Form-item label="涓嬪崟鏃堕棿">
@@ -231,6 +267,7 @@
import * as API_Member from "@/api/member.js";
import { getTags } from "@/api/tag.js";
import vueQr from "vue-qr";
+import {getStoreSelect} from "../../../api/order";
export default {
name: "orderList",
components: {
@@ -241,6 +278,8 @@
},
data() {
return {
+ //涓嬫媺妗嗘暟鎹�
+ storeSelectList:[],
// 琛ㄦ牸鐨勮〃澶翠互鍙婂唴瀹�
fields: {
璁㈠崟缂栧彿: "sn",
@@ -292,6 +331,12 @@
},
selectDate: null,
columns: [
+ {
+ title: "浼氬憳id",
+ key: "memberId",
+ minWidth: 240,
+ tooltip: true
+ },
{
title: "璁㈠崟鍙�",
key: "sn",
@@ -364,7 +409,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",
@@ -523,6 +584,13 @@
};
},
methods: {
+ getStoreSelect(){
+ API_Order.getStoreSelect().then(res =>{
+ if (res.result){
+ this.storeSelectList = res.result;
+ }
+ })
+ },
closeGeneralQrCode(){
this.showGeneralQrCode = false;
},
@@ -765,6 +833,7 @@
},
mounted() {
this.init();
+ this.getStoreSelect();
},
};
</script>
--
Gitblit v1.8.0