From 880b8717d7e89adb5edff8aa7a8586e098026f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 26 Jul 2023 16:30:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E8=AE=A2=E5=8D=95=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../frontend/src/views/plat/orderList.vue     | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/resources/frontend/src/views/plat/orderList.vue b/resources/frontend/src/views/plat/orderList.vue
index 7164433..40e06c1 100644
--- a/resources/frontend/src/views/plat/orderList.vue
+++ b/resources/frontend/src/views/plat/orderList.vue
@@ -85,7 +85,7 @@
 
                 <el-form-item label="下单时间:">
                     <el-date-picker v-model="form.confirm_at" type="datetimerange" range-separator="-" start-placeholder="起"
-                        end-placeholder="止" value-format="yyyy-MM-dd HH:mm:ss">
+                        end-placeholder="止" format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                 </el-form-item>
 
@@ -93,7 +93,7 @@
                     <el-button type="primary" @click="handleChoose">筛选</el-button>
                     <el-button plain @click="handleReChoose">重置筛选</el-button>
                 </el-form-item>
-                <el-button type="primary" @click="dialogVisible = true">配货单导出</el-button>
+                <el-button type="primary" @click="dialogVisible = true">打印</el-button>
             </el-form>
         </el-card>
 
@@ -182,14 +182,14 @@ export default {
                 // activity_no: "",
                 shipping_status: "",
                 // is_supplier: "",
-                cancel_status: "",
-                after_sales_status: "",
+                cancel_status: "0",
+                after_sales_status: "0",
                 // supply_participate_no: "",
                 // participate_no: "",
                 goods_sku_num: "",
-                print_status: "",
+                print_status: "0",
                 external_sku_ids: [],
-                confirm_at: "",
+                confirm_at: [],
             },
             dialogVisible: false,
             loading: true,
@@ -217,7 +217,8 @@ export default {
                 end_no: [
                     { required: true, trigger: 'blur' }
                 ],
-            }
+            },
+            confirmAt: [],
         };
     },
     mounted() {
@@ -225,7 +226,18 @@ export default {
         this.getPlatOrderList();
         this.getShopsList();
     },
+    created() {
+        this.initConfirmAt();
+    },
     methods: {
+        initConfirmAt() {
+            const nowTimeDate = new Date();
+            nowTimeDate.setHours(0, 0, 0, 0);
+            this.form.confirm_at[0] = nowTimeDate.toLocaleString('zh', { hour12: false }).replaceAll('/', '-');
+            nowTimeDate.setHours(23, 59, 59, 999);
+            this.form.confirm_at[1] = nowTimeDate.toLocaleString('zh', { hour12: false }).replaceAll('/', '-');
+            this.confirmAt = this.form.confirm_at;
+        },
         // 店铺列表
         getPlatOrderList(params = {}) {
             params.page = this.current_page;
@@ -276,14 +288,14 @@ export default {
                 // activity_no: "",
                 shipping_status: "",
                 // is_supplier: "",
-                cancel_status: "",
-                after_sales_status: "",
+                cancel_status: "0",
+                after_sales_status: "0",
                 // supply_participate_no: "",
                 // participate_no: "",
                 goods_sku_num: "",
-                print_status: "",
+                print_status: "0",
                 external_sku_ids: [],
-                confirm_at: "",
+                confirm_at: this.confirmAt,
             };
             this.getPlatOrderList();
         },