feat:merge dev

src/views/Booking/src/BookingView.vue

@@ -111,6 +111,7 @@ const defaultTransport = (val: any, value: any) => {
 }
 // defaultDate
 const defaultDate = (val: any, value: any, data: any) => {
+  console.log(sessionStorage.getItem('searchTableQeury'))
   filterData.daterangeData = []
   if (Object.keys(val).length) {
     for (const key in val) {

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -138,7 +138,11 @@ const searchTableData = (data: any) => {
       if (res.code === 200) {
         bookingTable.value.data = res.data.searchData || []
         pageInfo.value.total = Number(res.data.rc)
-        tableLoading.value = false
+        tempSearch.value = res.data.tmp_search
+        nextTick(() => {
+          tableRef.value && autoWidth(bookingTable.value, tableRef.value)
+          tableLoadingTableData.value = false
+        })
         // 拥有所有字段的表格
         setTimeout(() => {
           allTable.value.columns = handleColumns(res.data.allColums, 'all')

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -235,7 +235,11 @@ const searchTableData = (data: any) => {
       if (res.code === 200) {
         trackingTable.value.data = res.data.searchData
         pageInfo.value.total = Number(res.data.rc)
-        tableLoading.value = false
+        tempSearch.value = res.data.tmp_search
+
+        nextTick(() => {
+          tableRef.value && autoWidth(trackingTable.value, tableRef.value)
+        })
 
         // 拥有所有字段的表格
         setTimeout(() => {