From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/business/goodsorder.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/business/goodsorder.vue b/admin/src/views/business/goodsorder.vue
index 275e639..41d831a 100644
--- a/admin/src/views/business/goodsorder.vue
+++ b/admin/src/views/business/goodsorder.vue
@@ -116,7 +116,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,
@@ -159,7 +159,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