Revert "Merge branch 'cherry-pick-eed3cfb1' into 'dev'"

This reverts merge request !225

src/views/order/factoryOrderNew/component/CardLayout.vue

@@ -254,7 +254,7 @@
       <ElPagination
         :current-page="currentPage"
         :page-size="pageSize"
-        :page-sizes="[50, 100, 200, 300, 500]"
+        :page-sizes="[50, 100, 200, 300]"
         background
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"

src/views/order/podUs/PodMakeOrder.vue

@@ -531,7 +531,9 @@ const podBoxList = computed(() => {
   return orderStore.podBoxList
 })
 const coverImage = ref<string>('')
-
+watch(coverImage, (value) => {
+  console.log('🍡🍡🍡🍡🍡coverImage changed:', value)
+})
 let currentCode = ''
 const tableRef = ref()
 watch(visible, async (value: boolean) => {
@@ -710,8 +712,7 @@ const renderItemBox = (bool: boolean) => {
     if (!currentCode.startsWith('JM')) {
       const parts = currentCode.split('_')
       currentCode =
-        parts.length > 3 &&
-        (parts[3].startsWith('USPSC') || parts[3].startsWith('OP'))
+        parts.length > 3 && parts[3].startsWith('USPSC')
           ? parts[3]
           : parts.length > 1
           ? parts[1]
@@ -748,13 +749,17 @@ const renderItemBox = (bool: boolean) => {
       renderLock = false
       return
     }
+    console.log('=======⭐⭐⭐打印=======')
 
     print(data, false, () => {
+      console.log('⭐⭐⭐打印结果data.printResult', data.printResult)
+
       if (
         props.wallType === 'sort' &&
         isAutoPrint.value &&
         data.printResult === 'printSuccess'
       ) {
+        console.log('⭐⭐⭐提交打单')
         submitInspection(() => {
           renderLock = false
         })
@@ -963,7 +968,43 @@ const getPackingData = async (code: string) => {
 
     boxChange.value = true
     boxIndex.value = box as number
+    // 尝试修复线上扫码后大缩略图不更新问题
+    {
+      let parsedCode = code
+      if (!parsedCode.startsWith('JM')) {
+        const parts = parsedCode.split('_')
+        parsedCode =
+          parts.length > 3 && parts[3].startsWith('USPSC')
+            ? parts[3]
+            : parts.length > 1
+            ? parts[1]
+            : parts[0]
+      }
 
+      for (const product of data?.productList || []) {
+        if (
+          product.podJomallUsNo === parsedCode ||
+          product.thirdSkuCode === parsedCode ||
+          (product.operationNos && product.operationNos.includes(parsedCode))
+        ) {
+          if (!product.previewImgs || !product.previewImgs.length) {
+            if (
+              product.productMark === 'custom_normal' ||
+              product.productMark === 'normal'
+            ) {
+              product.previewImgs = [{ url: product.variantImage || '' }]
+            } else {
+              product.previewImgs = product.imageAry
+                ? JSON.parse(product.imageAry)
+                : [{ url: product.variantImage || '' }]
+            }
+          }
+          coverImage.value = product.previewImgs?.[0]?.url || ''
+          console.log('🍉🍉🍉🍉getPackingData', coverImage.value)
+          break
+        }
+      }
+    }
     if (boxIndex.value == 0) {
       podOrderDetailsData.value = data as OrderData
       podOrderDetailsData.value.fromUser = userStore.user?.id
@@ -1011,6 +1052,7 @@ const getPackingData = async (code: string) => {
 // 提交打单
 const submitInspection = async (callback: () => void) => {
   const factoryNo = userStore.user?.factory.id
+  console.log('⭐⭐⭐提交打单factoryNo', factoryNo)
   if (!factoryNo) {
     return
   }
@@ -1419,6 +1461,7 @@ const handleRowClick = (row: ProductList) => {
 const handleCurrentChange = (url: string) => {
   if (url) {
     coverImage.value = url || ''
+    console.log('🍉🍉🍉🍉handleCurrentChange', coverImage.value)
   }
 }
 const warehouseId = ref<string | number>('')