优化优化

src/modules/unified-orders/pages/UnifiedOrdersView.vue

@@ -39,7 +39,6 @@ import {
 
 type FilterModel = QueryModel & {
   tenantId: string
-  mainStatus: UnifiedOrderMainStatus | ''
   receivingWarehouseId: string
   destinationWarehouseId: string
   inboundCode: string
@@ -96,6 +95,8 @@ let detailLoadingKey = ''
 let detailRequestSerial = 0
 const showAdvancedFilters = ref(false)
 const filters = ref<FilterModel>(emptyFilters())
+const appliedFilters = ref<FilterModel>(emptyFilters())
+const selectedStatus = ref<UnifiedOrderMainStatus | ''>('')
 const orderId = computed(() => typeof route.params.orderId === 'string' ? route.params.orderId : '')
 const detailTenantId = computed(() => typeof route.query.tenantId === 'string' ? route.query.tenantId : '')
 const detailRouteKey = computed(() => orderId.value ? `${detailTenantId.value}:${orderId.value}` : '')
@@ -240,13 +241,17 @@ const columns: DataTableColumn[] = [
 
 function emptyFilters(): FilterModel {
   return {
-    tenantId: '', mainStatus: '', receivingWarehouseId: '', destinationWarehouseId: '',
+    tenantId: '', receivingWarehouseId: '', destinationWarehouseId: '',
     inboundCode: '', expectedArrivalDate: '', feeReviewStatus: '', channelName: '',
     containerNo: '', cabinetNo: '', sailingDate: '', loaded: '', fullContainer: '', measurementReviewStatus: '',
     fbaCode: '', createdRange: [],
   }
 }
 
+function cloneFilters(source: FilterModel): FilterModel {
+  return { ...source, createdRange: [...source.createdRange] }
+}
+
 function trimmed(value: string) {
   return value.trim() || undefined
 }
@@ -256,8 +261,10 @@ function optionalBoolean(value: string) {
 }
 
 function selectStatus(status: UnifiedOrderMainStatus | '') {
-  filters.value = { ...filters.value, mainStatus: status }
-  search()
+  if (selectedStatus.value === status) return
+  selectedStatus.value = status
+  if (page.value === 1) void loadOrders()
+  else page.value = 1
 }
 
 function handleTabKeydown(event: KeyboardEvent, index: number) {
@@ -625,23 +632,24 @@ async function loadOrders() {
   loading.value = true
   loadError.value = null
   try {
-    const range = filters.value.createdRange
+    const activeFilters = appliedFilters.value
+    const range = activeFilters.createdRange
     const result = await listPlatformUnifiedOrders({
-      tenantId: filters.value.tenantId || undefined,
-      mainStatus: filters.value.mainStatus || undefined,
-      receivingWarehouseId: filters.value.receivingWarehouseId || undefined,
-      destinationWarehouseId: filters.value.destinationWarehouseId || undefined,
-      inboundCode: trimmed(filters.value.inboundCode),
-      expectedArrivalDate: filters.value.expectedArrivalDate || undefined,
-      feeReviewStatus: filters.value.feeReviewStatus || undefined,
-      channelName: trimmed(filters.value.channelName),
-      containerNo: trimmed(filters.value.containerNo),
-      cabinetNo: trimmed(filters.value.cabinetNo),
-      sailingDate: filters.value.sailingDate || undefined,
-      loaded: optionalBoolean(filters.value.loaded),
-      fullContainer: optionalBoolean(filters.value.fullContainer),
-      measurementReviewStatus: filters.value.measurementReviewStatus || undefined,
-      fbaCode: trimmed(filters.value.fbaCode),
+      tenantId: activeFilters.tenantId || undefined,
+      mainStatus: selectedStatus.value || undefined,
+      receivingWarehouseId: activeFilters.receivingWarehouseId || undefined,
+      destinationWarehouseId: activeFilters.destinationWarehouseId || undefined,
+      inboundCode: trimmed(activeFilters.inboundCode),
+      expectedArrivalDate: activeFilters.expectedArrivalDate || undefined,
+      feeReviewStatus: activeFilters.feeReviewStatus || undefined,
+      channelName: trimmed(activeFilters.channelName),
+      containerNo: trimmed(activeFilters.containerNo),
+      cabinetNo: trimmed(activeFilters.cabinetNo),
+      sailingDate: activeFilters.sailingDate || undefined,
+      loaded: optionalBoolean(activeFilters.loaded),
+      fullContainer: optionalBoolean(activeFilters.fullContainer),
+      measurementReviewStatus: activeFilters.measurementReviewStatus || undefined,
+      fbaCode: trimmed(activeFilters.fbaCode),
       createdFrom: range.length === 2 ? `${range[0]}T00:00:00` : undefined,
       createdTo: range.length === 2 ? `${range[1]}T23:59:59` : undefined,
       page: page.value,
@@ -660,6 +668,7 @@ async function loadOrders() {
 }
 
 function search() {
+  appliedFilters.value = cloneFilters(filters.value)
   if (page.value !== 1) {
     page.value = 1
     return
@@ -669,6 +678,7 @@ function search() {
 
 function reset() {
   filters.value = emptyFilters()
+  appliedFilters.value = emptyFilters()
   if (page.value === 1) void loadOrders()
   else page.value = 1
 }
@@ -1026,10 +1036,10 @@ onMounted(() => {
           :key="tab.value || 'ALL'"
           type="button"
           role="tab"
-          :aria-selected="filters.mainStatus === tab.value"
+          :aria-selected="selectedStatus === tab.value"
           aria-controls="unified-orders-results"
-          :tabindex="filters.mainStatus === tab.value ? 0 : -1"
-          :class="['status-tab', { 'is-active': filters.mainStatus === tab.value }]"
+          :tabindex="selectedStatus === tab.value ? 0 : -1"
+          :class="['status-tab', { 'is-active': selectedStatus === tab.value }]"
           @click="selectStatus(tab.value)"
           @keydown="handleTabKeydown($event, index)"
         >{{ tab.label }}</button>