feat: 物流分拣逻辑优化 #1010046

src/types/api/logistics.ts

 export interface Ilogistics {
 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
+  code?: string
+  basicsName?: string
+  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 {
 export interface IsortingInfo {
   id?: number
   id?: number

src/views/logistics/sortingConfiguration.vue

@@ -12,11 +12,12 @@ const { mouseoverImg, mouseleaveImg } = useImagePreview()
 import sortingImg from '@/assets/images/分拣口说明.png'
 import sortingImg from '@/assets/images/分拣口说明.png'
 import {
 import {
   getsortingConfigListApi,
   getsortingConfigListApi,
-  usableAllList,
+  // usableAllList,
   createSortingApi,
   createSortingApi,
   updateSortingApi,
   updateSortingApi,
   deleteSortingApi,
   deleteSortingApi,
 } from '@/api/logistics'
 } from '@/api/logistics'
+import { allErpCodeListApi } from '@/api/podCnOrder'
 import { nextTick, ref } from 'vue'
 import { nextTick, ref } from 'vue'
 import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts'
 import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts'
 
 
@@ -66,7 +67,7 @@ const rules = computed(() => {
     serviceCode: [
     serviceCode: [
       {
       {
         required: true,
         required: true,
-        message: `请选择${activeName.value == '1' ? '物流方式' : '平台'}`,
+        message: `请选择${activeName.value == '1' ? '物流公司' : '平台'}`,
         trigger: 'change',
         trigger: 'change',
       },
       },
     ],
     ],
@@ -94,8 +95,15 @@ const {
 })
 })
 const logisticsMethodsList = ref<Ilogistics[]>([])
 const logisticsMethodsList = ref<Ilogistics[]>([])
 const getlogisticsMethods = async () => {
 const getlogisticsMethods = async () => {
-  const res = await usableAllList()
+  const res = await allErpCodeListApi()
   logisticsMethodsList.value = res.data || []
   logisticsMethodsList.value = res.data || []
+  logisticsMethodsList.value = [
+    ...logisticsMethodsList.value,
+    {
+      code: 'JOMALL_FACTORY',
+      basicsName: '九猫统筹物流',
+    },
+  ]
 }
 }
 
 
 interface interSorting {
 interface interSorting {
@@ -136,6 +144,30 @@ const sortingList = ref<interSorting[]>([
     value: 8,
     value: 8,
   },
   },
   {
   {
+    label: 'L5',
+    value: 9,
+  },
+  {
+    label: 'R5',
+    value: 10,
+  },
+  {
+    label: 'L6',
+    value: 11,
+  },
+  {
+    label: 'R6',
+    value: 12,
+  },
+  {
+    label: 'L7',
+    value: 13,
+  },
+  {
+    label: 'R7',
+    value: 14,
+  },
+  {
     label: 'E0',
     label: 'E0',
     value: 99,
     value: 99,
   },
   },
@@ -302,7 +334,7 @@ useEnterKeyTrigger({
                 ></el-option>
                 ></el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
-            <el-form-item label="物流方式">
+            <el-form-item label="物流公司">
               <el-select
               <el-select
                 v-model="searchForm.serviceCode"
                 v-model="searchForm.serviceCode"
                 clearable
                 clearable
@@ -314,9 +346,9 @@ useEnterKeyTrigger({
               >
               >
                 <el-option
                 <el-option
                   v-for="item in logisticsMethodsList"
                   v-for="item in logisticsMethodsList"
-                  :key="item.serviceCode"
-                  :label="item.serviceCode"
-                  :value="item.serviceCode"
+                  :key="item.code"
+                  :label="item.basicsName"
+                  :value="item.code"
                 ></el-option>
                 ></el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -581,7 +613,7 @@ useEnterKeyTrigger({
         </el-form-item>
         </el-form-item>
         <el-form-item
         <el-form-item
           v-if="activeName == '1'"
           v-if="activeName == '1'"
-          label="物流方式"
+          label="物流公司"
           prop="serviceCode"
           prop="serviceCode"
         >
         >
           <div class="flex">
           <div class="flex">
@@ -594,9 +626,9 @@ useEnterKeyTrigger({
             >
             >
               <el-option
               <el-option
                 v-for="item in logisticsMethodsList"
                 v-for="item in logisticsMethodsList"
-                :key="item.serviceCode"
-                :label="item.serviceCode"
-                :value="item.serviceCode"
+                :key="item.code"
+                :label="item.basicsName"
+                :value="item.code"
               ></el-option>
               ></el-option>
             </el-select>
             </el-select>
             &ensp;
             &ensp;