feat: 合并代码

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

@@ -4,7 +4,6 @@ import { type VxeGridInstance, type VxeGridProps } from 'vxe-table'
 import DownloadDialog from './components/DownloadDialog.vue'
 import { autoWidth } from '@/utils/table'
 import { useRowClickStyle } from '@/hooks/rowClickStyle'
-import { ref, onMounted, nextTick } from 'vue'
 import dayjs from 'dayjs'
 import { useRouter } from 'vue-router'
 
@@ -73,8 +72,7 @@ const getTableColumns = async (isInit: boolean) => {
     if (res.code === 200) {
       bookingTable.value.columns = [
         { type: 'checkbox', width: 50, fixed: 'left' },
-        ...handleColumns(res.data.BookingTableColumns),
-        { field: '__serial_no', width: 300, fixed: 'left' }
+        ...handleColumns(res.data.BookingTableColumns)
       ]
       tableOriginColumnsField.value = res.data.BookingTableColumns
     }
@@ -85,21 +83,22 @@ const getTableColumns = async (isInit: boolean) => {
 }
 
 const pageInfo = ref({ pageNo: 1, pageSize: 100, total: 0 })
+const querydata = ref()
 const TransportListItem = ref()
 const TagsList = ref()
 
 // 获取表格数据
-let filterdataobj: any = {}
 const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
   const rc = isPageChange ? pageInfo.value.total : -1
   tableLoading.value = true
+  querydata.value = { cp: pageInfo.value.pageNo, ps: pageInfo.value.pageSize, rc: rc }
   await $api
     .getBookingTableData({
       cp: pageInfo.value.pageNo,
       ps: pageInfo.value.pageSize,
       rc,
       other_filed: '',
-      ...filterdataobj
+      _textSearch: ''
     })
     .then((res: any) => {
       if (res.code === 200) {
@@ -126,20 +125,18 @@ const getTableData = async (isInit: boolean, isPageChange?: boolean) => {
 const searchTableData = (data: any) => {
   tableLoading.value = true
   console.log(data)
-  filterdataobj = data
   $api
     .getBookingTableData({
       cp: pageInfo.value.pageNo,
       ps: pageInfo.value.pageSize,
-      rc: -1,
+      rc: pageInfo.value.total,
       other_filed: '',
       _textSearch: '',
-      ...data
+      filterTag: data.filterTag ? data.filterTag : ['All']
     })
     .then((res: any) => {
       if (res.code === 200) {
         bookingTable.value.data = res.data.searchData
-        pageInfo.value.total = Number(res.data.rc)
         tableLoading.value = false
       }
     })
@@ -330,6 +327,7 @@ const handleCheckAllChange = ({ records }: any) => {
   selectedNumber.value = records.length
 }
 defineExpose({
+  querydata,
   searchTableData,
   TransportListItem,
   TagsList