From f8fd1bd1df45a1aa7b6717562722e61c7ee8b4c3 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 15 十月 2025 10:20:31 +0800
Subject: [PATCH] 显示调整

---
 manager/src/views/order/order/orderList.vue |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index b13591e..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"
@@ -51,11 +60,29 @@
             <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="涓嬪崟鏃堕棿">
           <DatePicker
             v-model="selectDate"
             type="datetimerange"
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
             clearable
             @on-change="selectDateRange"
             placeholder="閫夋嫨璧峰鏃堕棿"
@@ -231,6 +258,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 +269,8 @@
   },
   data() {
     return {
+      //涓嬫媺妗嗘暟鎹�
+      storeSelectList:[],
       // 琛ㄦ牸鐨勮〃澶翠互鍙婂唴瀹�
       fields: {
         璁㈠崟缂栧彿: "sn",
@@ -364,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",
@@ -523,6 +569,13 @@
     };
   },
   methods: {
+    getStoreSelect(){
+      API_Order.getStoreSelect().then(res =>{
+        if (res.result){
+          this.storeSelectList = res.result;
+        }
+      })
+    },
     closeGeneralQrCode(){
       this.showGeneralQrCode = false;
     },
@@ -765,6 +818,7 @@
   },
   mounted() {
     this.init();
+    this.getStoreSelect();
   },
 };
 </script>

--
Gitblit v1.8.0