feat：工厂订单（New）增加物流方式筛选 #1004264

src/types/api/factoryOrderNew.ts

@@ -32,6 +32,7 @@ export interface SearchForm {
   tagsId?: string
   tagsId?: string
   source?: string
   source?: string
   size?: string
   size?: string
+  logisticsWayId?: number | string
   logisticsCompanyCode?: string
   logisticsCompanyCode?: string
   interceptStatus?: boolean
   interceptStatus?: boolean
   standardDesignImage?: number
   standardDesignImage?: number

src/types/api/order/factoryOrderNew.ts

@@ -32,6 +32,7 @@ export interface SearchForm {
   tagsId?: string
   tagsId?: string
   source?: string
   source?: string
   size?: string
   size?: string
+  logisticsWayId?: number | string
   logisticsCompanyCode?: string
   logisticsCompanyCode?: string
   interceptStatus?: boolean
   interceptStatus?: boolean
   shopNumber?: string
   shopNumber?: string

src/views/order/factoryOrderNew/index.vue

@@ -295,6 +295,22 @@
                       ></ElOption>
                       ></ElOption>
                     </ElSelect>
                     </ElSelect>
                   </ElFormItem>
                   </ElFormItem>
+                  <ElFormItem v-if="status === 'ALL'" label="物流方式">
+                    <ElSelect
+                      v-model="searchForm.logisticsWayId"
+                      placeholder="请选择"
+                      clearable
+                      :teleported="false"
+                      style="width: 150px"
+                    >
+                      <ElOption
+                        v-for="(item, index) in logisticsWayList"
+                        :key="index"
+                        :value="item.id"
+                        :label="item.name"
+                      ></ElOption>
+                    </ElSelect>
+                  </ElFormItem>
                   <ElFormItem label="自有物流公司">
                   <ElFormItem label="自有物流公司">
                     <ElSelect
                     <ElSelect
                       v-model="searchForm.logisticsCompanyCode"
                       v-model="searchForm.logisticsCompanyCode"
@@ -974,6 +990,7 @@ import {
   arrangeFinishApi,
   arrangeFinishApi,
   exportFactoryOrderInfo,
   exportFactoryOrderInfo,
 } from '@/api/factoryOrderNew'
 } from '@/api/factoryOrderNew'
+import { getLogisticsWayApi } from '@/api/podUsOrder'
 import BigNumber from 'bignumber.js'
 import BigNumber from 'bignumber.js'
 import { filePath } from '@/api/axios'
 import { filePath } from '@/api/axios'
 import { OrderData } from '@/types/api/podMakeOrder'
 import { OrderData } from '@/types/api/podMakeOrder'
@@ -2007,13 +2024,7 @@ const printOrder = async (
       length: pdfPayload?.length || 0,
       length: pdfPayload?.length || 0,
       preview: pdfPayload?.slice(0, 30),
       preview: pdfPayload?.slice(0, 30),
     })
     })
-    lodop.ADD_PRINT_PDF(
-      0,
-      0,
-      '100%',
-      '100%',
-      pdfPayload,
-    )
+    lodop.ADD_PRINT_PDF(0, 0, '100%', '100%', pdfPayload)
   } else {
   } else {
     console.log('[printOrder] raw payload meta', {
     console.log('[printOrder] raw payload meta', {
       id: data.id,
       id: data.id,
@@ -2458,9 +2469,15 @@ const handleStatusPush = async () => {
     successText: '状态推送成功',
     successText: '状态推送成功',
   })
   })
 }
 }
+const logisticsWayList = ref<{ name: string; id: number }[]>([])
+const getLogisticsWay = async () => {
+  const { data } = await getLogisticsWayApi()
+  logisticsWayList.value = data
+}
 onMounted(() => {
 onMounted(() => {
   loadStatusTreeCounts()
   loadStatusTreeCounts()
   loadAllDictionaries()
   loadAllDictionaries()
+  getLogisticsWay()
   // 仅用于消除 TS 插件的 unused-vars 警告：template refs 会绑定这两个变量
   // 仅用于消除 TS 插件的 unused-vars 警告：template refs 会绑定这两个变量
   void treeRef.value
   void treeRef.value
   void tableRef.value
   void tableRef.value