Merge branch 'dev'

src/api/podCnOrder.ts

@@ -10,7 +10,7 @@ import {
   ExportParams,
   IconfirmSubmit,
 } from '@/types/api/podCnOrder'
-import { InterceptStateGroupData } from '@/types/api/podUsOrder'
+import { InterceptStateGroupData,ProductionClient } from '@/types/api/podUsOrder'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 export function exportPodCnInfo(data: ExportParams) {
@@ -134,6 +134,11 @@ export function confirmOrderApi(
     },
   )
 }
+export function getProductionClientApi() {
+  return axios.get<never, BaseRespData<ProductionClient[]>>(
+    'factory/podJomallOrderCn/getProductionClientList',
+  )
+}
 export function updateExceptionOrderApi(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderCn/updateExceptionOrders',

src/router/index.ts

@@ -88,6 +88,13 @@ const router = createRouter({
           },
           component: () => import('@/views/order/orderTracking/index.vue'),
         },
+         {
+          path: '/pod-cn-order/orderTracking',
+          meta: {
+            title: 'POD(CN)订单跟踪',
+          },
+          component: () => import('@/views/order/orderTracking/indexcn.vue'),
+        },
         {
           path: '/pod-delivery-note/list',
           meta: {

src/router/menu.ts

@@ -127,10 +127,14 @@ const menu: MenuItem[] = [
         id: 8,
         label: 'POD订单(US)',
       },
-
       {
-        index: '/pod-us-order/orderTracking',
+        index: '/pod-cn-order/orderTracking',
         id: 9,
+        label: 'POD(CN)订单跟踪',
+      },
+      {
+        index: '/pod-us-order/orderTracking',
+        id: 10,
         label: 'POD(US)订单跟踪',
       },
     ],

src/views/order/podCN/index.vue

@@ -4765,7 +4765,6 @@ watch(
         }
       })
     })
-    console.log(tableData.value, '@@@@', newData)
   },
   { deep: true, immediate: true }, // 添加immediate确保初始化时执行
 )