Merge branch 'dev'

auto-imports.d.ts

@@ -6,6 +6,7 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElInput: typeof import('element-plus/es')['ElInput']
   const ElLoading: typeof import('element-plus/es')['ElLoading']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']

components.d.ts

@@ -32,7 +32,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -51,7 +50,6 @@ declare module 'vue' {
     ElTag: typeof import('element-plus/es')['ElTag']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']

src/api/logistics.ts

@@ -9,7 +9,7 @@ import { AddDeclarationRuleObj } from '@/views/logistics/types/declarationRule'
 import { LogisticsQuotation } from '@/views/logistics/types/logisticsQuotation'
 import { LogisticsPartitionObj } from '@/views/logistics/types/logisticsPartition'
 import { ShippingAddressObj } from '@/views/logistics/types/shippingAddress'
-
+import { IsortingInfo } from '@/types/api/logistics'
 export interface ILogisticsList {
   code: string
   basicsName: string
@@ -433,3 +433,37 @@ export function logisticsCompanyAllCodelist() {
     '/logisticsCompany/allCodelist',
   )
 }
+export function getsortingConfigListApi(
+  data: IsortingInfo,
+  currentPage: number,
+  pageSize: number,
+) {
+  return axios.post<never, BasePaginationData<IsortingInfo>>(
+    'logistics/sortingConfig/list_page',
+    {
+      ...data,
+      currentPage,
+      pageSize,
+    },
+  )
+}
+export function createSortingApi(data: IsortingInfo) {
+  return axios.post<never, BaseRespData<never>>(
+    'logistics/sortingConfig/add',
+    data,
+  )
+}
+export function updateSortingApi(data: IsortingInfo) {
+  return axios.post<never, BaseRespData<never>>(
+    'logistics/sortingConfig/update',
+    data,
+  )
+}
+export function deleteSortingApi(ids: string) {
+  return axios.get<never, BaseRespData<never>>(
+    'logistics/sortingConfig/delete',
+    {
+      params: { ids },
+    },
+  )
+}

src/api/podUsOrder.ts

@@ -37,6 +37,12 @@ export function getOrderList(
     },
   )
 }
+export function handleExceptionOrderApi(orderIds: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/processExceptionOrders',
+    orderIds,
+  )
+}
 export function getCardOrderList(
   params: SearchForm,
   currentPage: number,
@@ -80,14 +86,17 @@ export function updateExceptionOrderApi(data: number[]) {
     },
   )
 }
-export function changeExceptionOrderApi(ids: number[], value: string) {
-  return axios.post<never, BaseRespData<never>>(
-    'factory/podJomallOrderUs/exceptionOrders',
-    {
+export function changeExceptionOrderApi(
+  url: string,
+  ids: number[],
+  type: string,
+  value: string,
+) {
+  return axios.post<never, BaseRespData<never>>(url, {
     orderIds: ids,
+    exceptionType: type,
     exceptionReason: value,
-    },
-  )
+  })
 }
 export function cancelOrderApi(ids: number[], value: string) {
   return axios.post<never, BaseRespData<never>>(

src/router/index.ts

@@ -177,6 +177,13 @@ const router = createRouter({
           component: () => import('@/views/logistics/logisticsCalculate.vue'),
         },
                 {
+          path: '/logistics/sortingConfiguration',
+          meta: {
+            title: '分拣配置',
+          },
+          component: () => import('@/views/logistics/sortingConfiguration.vue'),
+        },
+        {
           path: '/warehouse/manage',
           meta: {
             title: '仓库管理',

src/router/menu.ts

@@ -56,6 +56,11 @@ const menu: MenuItem[] = [
         id: 6,
         label: '运费试算',
       },
+      {
+        index: '/logistics/sortingConfiguration',
+        id: 7,
+        label: '分拣配置',
+      },
     ],
   },
   {

src/types/api/logistics.ts

+export interface Ilogistics {
+  id: number
+  name: string
+  warehouseId: number
+  warehouseName: string
+  uinuinWarehouseId: number | null
+  companyId: number | null
+  company: string | null
+  serviceCode: string
+  siteUrl: string
+  status: number
+  factoryId: number
+  createTime: string
+  updateTime: string | null
+}
+export interface IsortingInfo {
+  id?: number
+  sortingArea: number | null
+  sortingAreaName?: string | null
+  serviceCode: string | null
+}

src/types/api/podUsOrder.ts

@@ -16,6 +16,7 @@ export interface SearchForm {
   customizedQuantity: string
   startTime: string | null
   endTime: string | null
+  exceptionHandling: number | undefined
 }
 export interface PodUsOrderListData {
   id: number