Merge branch 'dev' into 'master'

Dev

See merge request !240

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
+  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 {
   id?: number

src/views/logistics/sortingConfiguration.vue

@@ -7,16 +7,17 @@ import {
   QuestionFilled,
 } from '@element-plus/icons-vue'
 import platformJson from '@/json/platform.json'
-import useImagePreview from '@/utils/hooks/useImagePreview.'
-const { mouseoverImg, mouseleaveImg } = useImagePreview()
+// import useImagePreview from '@/utils/hooks/useImagePreview.'
+// const { mouseoverImg, mouseleaveImg } = useImagePreview()
 import sortingImg from '@/assets/images/分拣口说明.png'
 import {
   getsortingConfigListApi,
-  usableAllList,
+  // usableAllList,
   createSortingApi,
   updateSortingApi,
   deleteSortingApi,
 } from '@/api/logistics'
+import { allErpCodeListApi } from '@/api/podCnOrder'
 import { nextTick, ref } from 'vue'
 import { useEnterKeyTrigger } from '@/utils/hooks/useEnterKeyTrigger.ts'
 
@@ -66,7 +67,7 @@ const rules = computed(() => {
     serviceCode: [
       {
         required: true,
-        message: `请选择${activeName.value == '1' ? '物流方式' : '平台'}`,
+        message: `请选择${activeName.value == '1' ? '物流公司' : '平台'}`,
         trigger: 'change',
       },
     ],
@@ -94,8 +95,15 @@ const {
 })
 const logisticsMethodsList = ref<Ilogistics[]>([])
 const getlogisticsMethods = async () => {
-  const res = await usableAllList()
+  const res = await allErpCodeListApi()
   logisticsMethodsList.value = res.data || []
+  logisticsMethodsList.value = [
+    ...logisticsMethodsList.value,
+    {
+      code: 'JOMALL_FACTORY',
+      basicsName: '九猫统筹物流',
+    },
+  ]
 }
 
 interface interSorting {
@@ -136,6 +144,30 @@ const sortingList = ref<interSorting[]>([
     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',
     value: 99,
   },
@@ -302,7 +334,7 @@ useEnterKeyTrigger({
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="物流方式">
+            <el-form-item label="物流公司">
               <el-select
                 v-model="searchForm.serviceCode"
                 clearable
@@ -310,13 +342,13 @@ useEnterKeyTrigger({
                 multiple
                 collapse-tags
                 collapse-tags-tooltip
-                style="width: 200px"
+                style="width: 220px"
               >
                 <el-option
                   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-select>
             </el-form-item>
@@ -362,7 +394,7 @@ useEnterKeyTrigger({
               </el-table-column>
               <el-table-column
                 align="center"
-                label="物流编码"
+                label="物流公司"
                 show-overflow-tooltip
                 prop="serviceCode"
               ></el-table-column>
@@ -569,19 +601,28 @@ useEnterKeyTrigger({
               ></el-option>
             </el-select>
             &ensp;
-            <el-icon
+            <el-popover placement="bottom-start" width="700" trigger="click">
+              <img :src="sortingImg" alt="分拣口示意图" style="width: 100%" />
+              <template #reference>
+                <el-icon size="30" color="#606266" style="cursor: pointer">
+                  <QuestionFilled />
+                </el-icon>
+              </template>
+            </el-popover>
+            <!-- <el-icon
               size="30"
               title="分拣口示意图"
               style="cursor: pointer"
+              @click="mouseoverImg(ev, sortingImg, '700px', true, true)"
               @mouseover="(ev:MouseEvent) => mouseoverImg(ev, sortingImg,'700px',true,true)"
               @mouseleave="mouseleaveImg"
               ><QuestionFilled
-            /></el-icon>
+            /></el-icon> -->
           </div>
         </el-form-item>
         <el-form-item
           v-if="activeName == '1'"
-          label="物流方式"
+          label="物流公司"
           prop="serviceCode"
         >
           <div class="flex">
@@ -594,9 +635,9 @@ useEnterKeyTrigger({
             >
               <el-option
                 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-select>
             &ensp;

src/views/order/podUs/PodMakeOrder.vue

@@ -851,9 +851,9 @@ const handleSearch = () => {
   }
   productionOrder.value = ''
   isLock.value = true
-  const everyPower = podOrderDetailsData.value?.productList?.every(
-    (item) => item.power,
-  )
+  const everyPower =
+    podOrderDetailsData.value &&
+    podOrderDetailsData.value?.productList?.every((item) => item.power)
   if (props.wallType === 'sort' && !isAutoPrint.value) {
     getPackingData(code)
     return