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

src/views/order/hook/usePodShipment.ts

@@ -48,12 +48,18 @@ export default function useShipment(callback?: () => void) {
         offset: window.innerHeight / 2,
       })
     }
+    if (!orderList.value.length) {
+      await getPackingData(code)
+    }
+
     let rowData
-    const code1 = code?.split('_')[0]
+    const code1 = code?.split('_')[3]
+    const code2 = code?.split('_')[0]
     for (const item of orderList.value) {
       // rowData = item.productList?.find((jj) => jj.factorySubOrderNumber === code1)
       rowData = item.productList?.find(
-        (jj) => `${item.userMark}-${jj.thirdSubOrderNumber}` === code1,
+        (jj) =>
+          `${jj.thirdSubOrderNumber}` === code1 && item.userMark === code2,
       )
       if (rowData) {
         rowData.factoryOrderNumber = item.factoryOrderNumber
@@ -100,8 +106,6 @@ export default function useShipment(callback?: () => void) {
 
         rowEl.scrollIntoView()
       }
-    } else {
-      getPackingData(code)
     }
   }
   const getPackingData = async (code: string) => {

src/views/order/pod/index.vue

@@ -1622,7 +1622,7 @@ const saveCompleteShipment = async () => {
     loadDiffList()
   } catch (e) {
     console.error(e)
-  }finally {
+  } finally {
     loading.close()
   }
 }
@@ -1675,7 +1675,6 @@ const loadCardList = async () => {
         item.images = images
       } else {
         if (item.imageAry) {
-          console.log(item.imageAry)
           let images
           if (
             typeof item.imageAry === 'string' &&