Merge remote-tracking branch 'origin/dev' into dev

src/api/podUsOrder.ts

@@ -544,6 +544,25 @@ export function statusPushApi(params: (string | number)[]) {
   )
   )
 }
 }
 
 
+// 转至已完成
+export function changeToFinished(ids: string) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateToComplete`,
+    { params: { ids } },
+  )
+}
+
+// 转至已完成
+export function updateTrackingNumberAndRegister(
+  id: number,
+  trackingNumber: string,
+) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateTrackingNumberAndRegister`,
+    { id, trackingNumber },
+  )
+}
+
 // 完成发货
 // 完成发货
 export function completeDeliveryApi(params: {
 export function completeDeliveryApi(params: {
   orderIdList: (string | number)[]
   orderIdList: (string | number)[]
@@ -585,3 +604,10 @@ export function printProductionPdfByBatchNumberApi(params: {
     },
     },
   )
   )
 }
 }
+
+// 待跟踪 注册列表统计接口
+export function countTrackRegisterApi() {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/countTrackRegister`,
+  )
+}

src/router/menu.ts

@@ -181,11 +181,6 @@ const menu: MenuItem[] = [
         label: '下载生产客户端',
         label: '下载生产客户端',
       },
       },
       {
       {
-        index: '/system/external-authorisation',
-        id: 5,
-        label: '外部授权',
-      },
-      {
         index: '/system/customers',
         index: '/system/customers',
         id: 6,
         id: 6,
         label: '客户管理',
         label: '客户管理',

src/types/api/podUsOrder.ts

@@ -35,6 +35,7 @@ export interface SearchForm {
   craftCode?: string
   craftCode?: string
   thirdStockSku?: string
   thirdStockSku?: string
   interceptStatus?: number | string
   interceptStatus?: number | string
+  trackRegisterSelect?: string | number
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number