Merge remote-tracking branch 'origin/dev'

src/types/api/podOrder.ts

@@ -21,6 +21,7 @@ export interface SearchForm {
   endTime?: string | null
   endTime?: string | null
   internalMemo?: string
   internalMemo?: string
   productionFileId?: string
   productionFileId?: string
+  interceptedStatus?: boolean
 }
 }
 export interface CardOrderData {
 export interface CardOrderData {
   id: number
   id: number

src/views/order/pod/index.vue

@@ -249,6 +249,7 @@
             'WAIT_SHIPMENT',
             'WAIT_SHIPMENT',
             'TO_BE_REPLENISHMENT',
             'TO_BE_REPLENISHMENT',
             'INVALID',
             'INVALID',
+            'INTERCEPTED',
           ].includes(status)
           ].includes(status)
         "
         "
       >
       >
@@ -1460,10 +1461,8 @@ const CardOrderList = ref<(PodProductList | CardOrderData)[]>([])
 const loadCardList = async () => {
 const loadCardList = async () => {
   loading.value = true
   loading.value = true
   try {
   try {
-    const res = await getCardOrderList(
-      {
+    const params = {
       ...searchForm.value,
       ...searchForm.value,
-        status: status.value,
       timeType: searchForm.value.timeType,
       timeType: searchForm.value.timeType,
       startTime:
       startTime:
         timeRange.value && timeRange.value.length > 0
         timeRange.value && timeRange.value.length > 0
@@ -1473,7 +1472,16 @@ const loadCardList = async () => {
         timeRange.value && timeRange.value.length > 0
         timeRange.value && timeRange.value.length > 0
           ? timeRange.value[1]
           ? timeRange.value[1]
           : null,
           : null,
-      },
+    }
+
+    if (status.value === 'INTERCEPTED') {
+      params.interceptedStatus = true
+    } else {
+      params.status = status.value
+    }
+
+    const res = await getCardOrderList(
+      params,
       currentPage.value,
       currentPage.value,
       pageSize.value,
       pageSize.value,
     )
     )
@@ -1641,6 +1649,7 @@ const loadDiffList = async () => {
       'TO_BE_REPLENISHMENT',
       'TO_BE_REPLENISHMENT',
       'TO_BE_CONFIRMED',
       'TO_BE_CONFIRMED',
       'INVALID',
       'INVALID',
+      'INTERCEPTED',
     ].includes(status.value)
     ].includes(status.value)
   ) {
   ) {
     await loadCardList()
     await loadCardList()

src/views/order/podUs/index.vue

@@ -1944,7 +1944,6 @@ const resultRefs = ref<InstanceType<typeof ResultInfo> | null>(null)
 const confirmDialogShow = ref(false)
 const confirmDialogShow = ref(false)
 const tifDownloadLoading = ref(false)
 const tifDownloadLoading = ref(false)
 const pngDownloadLoading = ref(false)
 const pngDownloadLoading = ref(false)
-// const reComposingLoading = ref(false)
 const isChangeWay = ref(false)
 const isChangeWay = ref(false)
 const confirmData = ref([])
 const confirmData = ref([])
 const logisticsWayData = ref([])
 const logisticsWayData = ref([])