From a836f03a5d1fbfa81e147d09ffdfa87ba3975c13 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 18 三月 2025 16:45:02 +0800
Subject: [PATCH] 1

---
 admin/src/views/business/goodsorder.vue |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 51275e5..e862a01 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -135,7 +135,7 @@
 import GoodsOrderDetail from '@/components/business/goodsOrderDetail'
 import BackGoodsorderWindow from '@/components/business/backGoodsorderWindow'
 import { getDetail, getGoodsorderCanBanlanceDTO, closerGoodsorder } from '@/api/business/goodsorder'
-import { formatDateTime } from '@/utils/util'
+import dayjs from 'dayjs'
 export default {
   name: 'Goodsorder',
   extends: BaseTable,
@@ -165,7 +165,12 @@
         closeMoney: '',
         startDate: '',
         endDate: '',
+<<<<<<< HEAD
         bikeType: ''
+=======
+        type: 0
+
+>>>>>>> 32dbee794a7f1b0e407eaf8aa17fa55d9c4f6883
       },
       value1: [new Date(), new Date()]
     }
@@ -177,7 +182,8 @@
       'field.id': 'id',
       'field.main': 'id'
     })
-    this.searchForm.startDate = formatDateTime(new Date(), 'yyyy-MM-dd') + ' 00:00:00'
+    this.searchForm.startDate = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
+    this.searchForm.endDate = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
     this.search()
   },
   methods: {

--
Gitblit v1.9.3