feat: 查询条件修改

src/api/factoryOrderNew.ts

@@ -14,6 +14,21 @@ import type {
 } from '@/types/api/factoryOrderNew'
 import { ResultInfoDataItem } from '@/types/api/order/common'
 import type { OrderData } from '@/types/api/podMakeOrder'
+function normalizePodOrderQueryPayload(
+  data: Record<string, unknown>,
+): Record<string, unknown> {
+  const { receiverCountry, ...rest } = data
+  if (!Array.isArray(receiverCountry)) {
+    return data
+  }
+  return {
+    ...rest,
+    ...(receiverCountry.length
+      ? { receiverCountry: receiverCountry.join(',') }
+      : {}),
+  }
+}
+
 export function getPodOrderStateGroupListApi() {
   return axios.get<never, BaseRespData<StatusTreeNode[]>>(
     'factory/podOrder/findStateGroupList',
@@ -27,10 +42,11 @@ export function getFactoryOrderNewListApi(
   status?: string,
   subStatus?: number,
 ) {
+  const body = normalizePodOrderQueryPayload({ ...data } as Record<string, unknown>)
   return axios.post<never, BasePaginationData<FactoryOrderNewListData>>(
     'factory/podOrder/list_page',
     {
-      ...data,
+      ...body,
       currentPage,
       pageSize,
       status,
@@ -55,7 +71,7 @@ export function getPodOrderAcceptedStatisticsApi(
       totalCount?: number
     }>
   >('factory/podOrder/acceptedStatistics', {
-    ...data,
+    ...normalizePodOrderQueryPayload({ ...data } as Record<string, unknown>),
     currentPage,
     pageSize,
     status,
@@ -246,9 +262,10 @@ export function getCardLayoutListApi(
   currentPage: number,
   pageSize: number,
 ) {
+  const body = normalizePodOrderQueryPayload({ ...data })
   return axios.post<never, BasePaginationData<FactoryOrderNewListData>>(
     'factory/podOrderOperation/list_page',
-    { ...data, currentPage, pageSize },
+    { ...body, currentPage, pageSize },
   )
 }
 
@@ -258,9 +275,10 @@ export function getSuspendListApi(
   pageSize: number,
   pauseReason?: number,
 ) {
+  const body = normalizePodOrderQueryPayload({ ...data } as Record<string, unknown>)
   return axios.post<never, BasePaginationData<FactoryOrderNewListData>>(
     'factory/podOrderPauseControl/list_page',
-    { ...data, currentPage, pageSize, pauseReason },
+    { ...body, currentPage, pageSize, pauseReason },
   )
 }
 
@@ -270,9 +288,10 @@ export function getSuspendStatisticsApi(
   pageSize: number,
   pauseReason?: number,
 ) {
+  const body = normalizePodOrderQueryPayload({ ...data } as Record<string, unknown>)
   return axios.post<never, BaseRespData<Record<string, number>>>(
     'factory/podOrderPauseControl/suspendStatistics',
-    { ...data, currentPage, pageSize, pauseReason },
+    { ...body, currentPage, pageSize, pauseReason },
   )
 }
 

src/types/api/order/factoryOrderNew.ts

@@ -34,6 +34,7 @@ export interface SearchForm {
   interceptStatus?: boolean
   standardDesignImage?: number
   productMarkList?: string[]
+  operationNo?: string
 }
 
 export interface FactoryOrderNewListData {

src/views/order/factoryOrderNew/index.vue

@@ -102,7 +102,10 @@
               />
             </ElFormItem>
 
-            <ElFormItem label="批次号">
+            <ElFormItem
+              v-if="cardLayoutStatuses.includes(status)"
+              label="批次号"
+            >
               <ElInput
                 v-model.trim="searchForm.batchArrangeNumber"
                 placeholder="批次号"
@@ -111,9 +114,12 @@
               />
             </ElFormItem>
 
-            <ElFormItem label="操作单号">
+            <ElFormItem
+              v-if="cardLayoutStatuses.includes(status)"
+              label="操作单号"
+            >
               <ElInput
-                v-model.trim="searchForm.orderNumber"
+                v-model.trim="searchForm.operationNo"
                 placeholder="操作单号"
                 clearable
                 style="width: 140px"
@@ -272,7 +278,7 @@
                       style="width: 150px"
                     >
                       <ElOption
-                        v-for="(item, index) in ['自提', '快递']"
+                        v-for="(item, index) in ['自有物流', '工厂物流','自提']"
                         :key="index"
                         :value="index"
                         :label="item"
@@ -298,26 +304,6 @@
                       ></ElOption>
                     </ElSelect>
                   </ElFormItem>
-                  <ElFormItem label="ERP标签">
-                    <ElSelect
-                      v-model="searchForm.tagsIdArr"
-                      placeholder="请选择ERP标签"
-                      clearable
-                      filterable
-                      multiple
-                      collapse-tags
-                      collapse-tags-tooltip
-                      :teleported="false"
-                      style="width: 150px"
-                    >
-                      <ElOption
-                        v-for="(item, index) in customTagList"
-                        :key="index"
-                        :value="item.id"
-                        :label="item.name"
-                      ></ElOption>
-                    </ElSelect>
-                  </ElFormItem>
                   <ElFormItem label="订单来源">
                     <ElSelect
                       v-model="searchForm.source"
@@ -368,23 +354,6 @@
                       ></ElOption>
                     </ElSelect>
                   </ElFormItem>
-                  <ElFormItem v-if="status !== 'CANCELLED'" label="拦截订单">
-                    <ElSelect
-                      v-model="searchForm.interceptStatus"
-                      placeholder="请选择"
-                      clearable
-                      filterable
-                      :teleported="false"
-                      style="width: 150px"
-                    >
-                      <ElOption
-                        v-for="(_, index) in ['否', '是']"
-                        :key="index"
-                        :value="!!index"
-                        :label="index === 0 ? '否' : '是'"
-                      ></ElOption>
-                    </ElSelect>
-                  </ElFormItem>
                   <ElFormItem label="规范素材">
                     <ElSelect
                       v-model="searchForm.standardDesignImage"
@@ -965,7 +934,6 @@ const cardLayoutRef = ref<InstanceType<typeof CardLayout>>()
 const {
   userMarkList,
   receiverCountryList,
-  customTagList,
   allCodelist,
   craftList,
   warehouseList,