From 6dad71cce2a0359c6d23f029ce8b6f6aaf0bb521 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 22 九月 2025 17:46:31 +0800
Subject: [PATCH] 订单列表

---
 manager/src/views/order/order/orderList.vue |   89 +++++++++++++++++++++++++++++---------------
 1 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 1c93b0d..083b224 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -51,11 +51,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 +249,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 +260,8 @@
   },
   data() {
     return {
+      //涓嬫媺妗嗘暟鎹�
+      storeSelectList:[],
       // 琛ㄦ牸鐨勮〃澶翠互鍙婂唴瀹�
       fields: {
         璁㈠崟缂栧彿: "sn",
@@ -464,24 +485,24 @@
                 )
               );
             }
-            // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
-            if (params.row.deliverStatus === 'UNDELIVERED') {
-              buttons.push(
-                h(
-                  "Button",
-                  {
-                    props: { type: "primary", size: "small" },
-                    style: { marginRight: "5px" },
-                    on: {
-                      click: () => {
-                        this.handlerEditorQrcode(params.row);
-                      },
-                    },
-                  },
-                  "淇敼鍦板潃浜岀淮鐮�"
-                )
-              );
-            }
+            // // 鏍规嵁璁㈠崟鐘舵�佷负'PAID'鏃舵樉绀洪澶栨搷浣滄寜閽�
+            // if (params.row.deliverStatus === 'UNDELIVERED') {
+            //   buttons.push(
+            //     h(
+            //       "Button",
+            //       {
+            //         props: { type: "primary", size: "small" },
+            //         style: { marginRight: "5px" },
+            //         on: {
+            //           click: () => {
+            //             this.handlerEditorQrcode(params.row);
+            //           },
+            //         },
+            //       },
+            //       "淇敼鍦板潃浜岀淮鐮�"
+            //     )
+            //   );
+            // }
 
             return h('div', buttons);
           },
@@ -523,20 +544,27 @@
     };
   },
   methods: {
+    getStoreSelect(){
+      API_Order.getStoreSelect().then(res =>{
+        if (res.result){
+          this.storeSelectList = res.result;
+        }
+      })
+    },
     closeGeneralQrCode(){
       this.showGeneralQrCode = false;
     },
-    handlerEditorQrcode(row){
-      this.QRCodeUrl = '';
-      this.showGeneralQrCode = true
-      this.codeLoading = true;
-
-      //鑾峰緱鍟嗗搧瀵瑰簲鐨勭涓�涓猻kuid
-      this.codeLoading = false;
-      this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn
-      console.log(this.QRCodeUrl);
-
-    },
+    // handlerEditorQrcode(row){
+    //   this.QRCodeUrl = '';
+    //   this.showGeneralQrCode = true
+    //   this.codeLoading = true;
+    //
+    //   //鑾峰緱鍟嗗搧瀵瑰簲鐨勭涓�涓猻kuid
+    //   this.codeLoading = false;
+    //   this.QRCodeUrl = this.QRcodeBaseUrl+ '/scanpage/editOrderAddress'+'?orderSn='+row.sn
+    //   console.log(this.QRCodeUrl);
+    //
+    // },
     // 閫変腑鐨勫浘鐗�
     callbackSelected(val) {
       console.log(val)
@@ -765,6 +793,7 @@
   },
   mounted() {
     this.init();
+    this.getStoreSelect();
   },
 };
 </script>

--
Gitblit v1.8.0