diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index de66860..f5113bb 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -11,15 +11,15 @@ class="table-com-search-form" :label-width="90" > - - + +
-
+
+ + - +
@@ -58,6 +60,7 @@ import { mainHeight } from '@/utils/layout' const tableStore = inject('tableStore') as TableStore const tableHeader = ref() +const Picker = ref() const date = ref([ window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd'), window.XEUtils.toDateString(new Date(), 'yyyy-MM-dd') @@ -71,8 +74,8 @@ const props = withDefaults(defineProps(), { datePicker: false }) if (props.datePicker) { - tableStore.table.params.searchBeginTime = date.value[0] - tableStore.table.params.searchEndTime = date.value[1] + // tableStore.table.params.searchBeginTime = Picker.value.timeValue[0] + // tableStore.table.params.searchEndTime = Picker.value.timeValue[1] } // 动态计算table高度 const resizeObserver = new ResizeObserver(entries => { @@ -82,10 +85,12 @@ const resizeObserver = new ResizeObserver(entries => { }) const showUnfoldButton = ref(false) onMounted(() => { + tableStore.table.params.searchBeginTime = Picker.value.timeValue[0] + tableStore.table.params.searchEndTime = Picker.value.timeValue[1] nextTick(() => { resizeObserver.observe(tableHeader.value) const dom = document.getElementById('header-form') - console.log(dom.offsetHeight,'123123') + console.log(dom.offsetHeight, '123123') if (dom.offsetHeight > 50) { showUnfoldButton.value = true } @@ -107,15 +112,19 @@ const showSelectChange = () => { handlerHeight() }) } -const onComSearch = () => { - tableStore.onTableAction('search', {}) +const onComSearch = async () => { + console.log('时间1233123') + + tableStore.table.params.searchBeginTime = Picker.value.timeValue[0] + tableStore.table.params.searchEndTime = Picker.value.timeValue[1] + await tableStore.onTableAction('search', {}) } const onResetForm = () => { tableStore.onTableAction('reset', {}) } const dateChange = () => { - tableStore.table.params.searchBeginTime = date.value[0] - tableStore.table.params.searchEndTime = date.value[1] + // tableStore.table.params.searchBeginTime = date.value[0] + // tableStore.table.params.searchEndTime = date.value[1] }