Merge branch 'fix_1001802' into 'dev'

Fix 1001802 See merge request !254

Merge branch 'fix_1001802' into 'dev'
Fix 1001802 See merge request !254
ea325cfe · qinjianhui · 62deaf48 · 26a1bab1 · ea325cfe
Commit ea325cfe authored Jul 09, 2026 by qinjianhui
Show whitespace changes
Inline Side-by-side

Showing with 48 additions and 16 deletions

src/views/order/podUs/PodMakeOrder.vue
+48 -16

No files found.
--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/src/views/order/podUs/PodMakeOrder.vue
@@ -572,6 +572,14 @@ watch(visible, async (value: boolean) => {
        sortingAreaId.value = hit.id
        warehouseId.value = hit.warehouseId
        isAutoPrint.value = hit.autoPrint
+      } else {
+        const defaultArea =
+          sortingAreaList.value.find(
+            (item) => item.defaultWarehouse === 1 && item.areaCode === 'AREA_0',
+          ) || sortingAreaList.value[0]
+        sortingAreaId.value = defaultArea.id
+        warehouseId.value = defaultArea.warehouseId
+        isAutoPrint.value = defaultArea.autoPrint || false
      }
    } else {
      /* 先找一次，确认本地值是否存在于列表 */
@@ -634,7 +642,8 @@ watch(
      if (item?.data) {
        renderItemBox(true)
      } else {
-        if (boxIndex.value === podBoxIndex.value) {
+        // 0 号箱为单件，不在播种墙列表中，不应清空当前单件数据
+        if (boxIndex.value === podBoxIndex.value && boxIndex.value !== 0) {
          podOrderDetailsData.value = {}
          boxIndex.value = null
        }
@@ -668,6 +677,7 @@ watch(
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 let renderLock = false
+let pickFinishedAlertToken = 0
 const renderItemBox = (bool: boolean) => {
  if (
@@ -969,21 +979,36 @@ const getPackingData = async (code: string) => {
    boxIndex.value = box as number
    if (boxIndex.value == 0) {
-      podOrderDetailsData.value = data as OrderData
+      const orderData = data as OrderData
+      orderData.productList?.forEach((el) => {
+        if (!el.previewImgs || !el.previewImgs.length) {
+          if (
+            el.productMark === 'custom_normal' ||
+            el.productMark === 'normal'
+          ) {
+            el.previewImgs = [{ url: el.variantImage || '' }]
+          } else {
+            el.previewImgs = el.imageAry
+              ? JSON.parse(el.imageAry)
+              : [{ url: el.variantImage }]
+          }
+        }
+      })
+      podOrderDetailsData.value = orderData
      podOrderDetailsData.value.fromUser = userStore.user?.id
-      if (podOrderDetailsData.value.productList?.length) {
      const list = podOrderDetailsData.value.productList
+      if (list?.length) {
+        await nextTick()
+        tableRef.value?.setCurrentRow(list[0])
+        coverImage.value = list[0].previewImgs?.[0]?.url || ''
        for (const product of list) {
          if (product.count === product.purchaseNumber) {
            product.power = true
-            print(data as OrderData, false, () => {
+            print(orderData, false, () => {
              renderLock = false
            })
          }
        }
-        nextTick(() => {
-          tableRef.value?.setCurrentRow(list[0])
-        })
      }
    }
  } catch (error) {
@@ -1131,6 +1156,8 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
      }
      return item
    })
+    // 当 boxIndex.value 为 0 时，不更新列表数据，防止单件数据丢失
+    if (boxIndex.value !== 0) {
      const currentBox = boxIndex.value
      const currentBoxItem = currentBox
        ? boxList.find((item) => item.box === currentBox && item.data)
@@ -1142,7 +1169,10 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
      podOrderDetailsData.value?.productList?.forEach((el) => {
        if (!el.previewImgs) {
-        if (el.productMark === 'custom_normal' || el.productMark === 'normal') {
+          if (
+            el.productMark === 'custom_normal' ||
+            el.productMark === 'normal'
+          ) {
            el.previewImgs = [{ url: el.variantImage || '' }]
          } else {
            el.previewImgs = el.imageAry
@@ -1153,7 +1183,8 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
      })
      if (type !== 'scan') {
        coverImage.value =
-        podOrderDetailsData.value?.productList?.[0]?.previewImgs?.[0].url || ''
+          podOrderDetailsData.value?.productList?.[0]?.previewImgs?.[0].url ||
+          ''
      }
      if (
@@ -1163,6 +1194,7 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
      ) {
        podOrderDetailsData.value.printResult = 'notPrintSuccess'
      }
+    }
    const pickFinished = boxList.filter((item) => {
      return item.data?.productList?.every((product) => product.power)
    })
@@ -1175,6 +1207,10 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
        // 切换箱子至验货完成的箱子
        boxChange.value = true
        boxIndex.value = boxs[0] as number
+        const token = ++pickFinishedAlertToken
+        if (token > 1) {
+          ElMessageBox.close()
+        }
        try {
          await ElMessageBox.alert(
            `检测到${boxs.join(',')}号箱验货完成，请及时处理`,
@@ -1183,8 +1219,10 @@ const initOrderDetailBox = async (type: 'scan' | 'manual' = 'manual') => {
              confirmButtonText: '确定',
            },
          )
+          if (token !== pickFinishedAlertToken) return
          productionOrderRef.value.focus()
        } catch (error) {
+          if (token !== pickFinishedAlertToken) return
          productionOrderRef.value.focus()
          console.error(error)
        }
@@ -1387,6 +1425,7 @@ const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
      } else {
        ;(podOrderDetailsData.value as OrderData).printResult = 'printFail'
      }
+      return
    }
    const factoryNo = userStore.user?.factory.id
    if (!factoryNo) return
@@ -1556,13 +1595,6 @@ const getSortingAreaList = async () => {
  const res = await getSortingRuleListApi({})
  if (res.code !== 200) return
  sortingAreaList.value = res.data.records
-  const defaultArea =
-    sortingAreaList.value.find(
-      (item) => item.defaultWarehouse === 1 && item.areaCode === 'AREA_0',
-    ) || sortingAreaList.value[0]
-  sortingAreaId.value = defaultArea.id
-  warehouseId.value = defaultArea.warehouseId
-  isAutoPrint.value = defaultArea.autoPrint || false
 }
 </script>