From 2f9a6cd260109fcca947c2b7d48ca94f8d21af7d Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 5 Jan 2024 09:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/header/index.vue | 31 +++++++++++++++++----------
 1 file changed, 20 insertions(+), 11 deletions(-)

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"
                 >
-                    <slot name="select"></slot>
                     <el-form-item label="日期" v-if="datePicker">
-                        <DatePicker v-model="date" @change="dateChange"></DatePicker>
+                        <DatePicker fef="Picker"></DatePicker>
                     </el-form-item>
+                    <slot name="select"></slot>
                 </el-form>
             </div>
         </transition>
         <div class="table-header ba-scroll-style">
-            <div  style="flex: 1; height: 32px; overflow: hidden">
+            <div style="flex: 1; height: 32px; overflow: hidden">
                 <el-form
                     v-show="!showSelect"
                     id="header-form"
@@ -30,9 +30,11 @@
                     class="table-com-search-form2"
                     :label-width="100"
                 >
+                   
                     <slot name="select"></slot>
+                    
                     <el-form-item label="日期" v-if="datePicker">
-                        <DatePicker v-model="date" @change="dateChange"></DatePicker>
+                        <DatePicker ref="Picker"></DatePicker>
                     </el-form-item>
                 </el-form>
             </div>
@@ -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<Props>(), {
     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]
 }
 </script>