diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index cebc50ed3..a71bb48e9 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -78,6 +78,7 @@ const search = async () => { if (isValid) { const { getFormData } = methods const model = await getFormData() + console.log(model) emit('search', model) } }) diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts index 9b965d703..05dbc82b6 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts @@ -38,6 +38,15 @@ export const Systemcalendar = useCrudSchemas(reactive([ } }, isSearch: true, + search: { + show: true, + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + } }, { label: '结束时间', @@ -61,6 +70,14 @@ export const Systemcalendar = useCrudSchemas(reactive([ } }, isSearch: true, + search: { + show: true, + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + } + } }, { label: '是否可用',