Merge branch 'fix_1001695' into 'master'

Fix 1001695

See merge request !224

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

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

src/views/order/podUs/PodMakeOrder.vue

@@ -531,9 +531,7 @@ const podBoxList = computed(() => {
   return orderStore.podBoxList
   return orderStore.podBoxList
 })
 })
 const coverImage = ref<string>('')
 const coverImage = ref<string>('')
-watch(coverImage, (value) => {
-  console.log('🍡🍡🍡🍡🍡coverImage changed:', value)
-})
+
 let currentCode = ''
 let currentCode = ''
 const tableRef = ref()
 const tableRef = ref()
 watch(visible, async (value: boolean) => {
 watch(visible, async (value: boolean) => {
@@ -712,7 +710,8 @@ const renderItemBox = (bool: boolean) => {
     if (!currentCode.startsWith('JM')) {
     if (!currentCode.startsWith('JM')) {
       const parts = currentCode.split('_')
       const parts = currentCode.split('_')
       currentCode =
       currentCode =
-        parts.length > 3 && parts[3].startsWith('USPSC')
+        parts.length > 3 &&
+        (parts[3].startsWith('USPSC') || parts[3].startsWith('OP'))
           ? parts[3]
           ? parts[3]
           : parts.length > 1
           : parts.length > 1
           ? parts[1]
           ? parts[1]
@@ -749,17 +748,13 @@ const renderItemBox = (bool: boolean) => {
       renderLock = false
       renderLock = false
       return
       return
     }
     }
-    console.log('=======⭐⭐⭐打印=======')
 
 
     print(data, false, () => {
     print(data, false, () => {
-      console.log('⭐⭐⭐打印结果data.printResult', data.printResult)
-
       if (
       if (
         props.wallType === 'sort' &&
         props.wallType === 'sort' &&
         isAutoPrint.value &&
         isAutoPrint.value &&
         data.printResult === 'printSuccess'
         data.printResult === 'printSuccess'
       ) {
       ) {
-        console.log('⭐⭐⭐提交打单')
         submitInspection(() => {
         submitInspection(() => {
           renderLock = false
           renderLock = false
         })
         })
@@ -968,43 +963,7 @@ const getPackingData = async (code: string) => {
 
 
     boxChange.value = true
     boxChange.value = true
     boxIndex.value = box as number
     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) {
     if (boxIndex.value == 0) {
       podOrderDetailsData.value = data as OrderData
       podOrderDetailsData.value = data as OrderData
       podOrderDetailsData.value.fromUser = userStore.user?.id
       podOrderDetailsData.value.fromUser = userStore.user?.id
@@ -1052,7 +1011,6 @@ const getPackingData = async (code: string) => {
 // 提交打单
 // 提交打单
 const submitInspection = async (callback: () => void) => {
 const submitInspection = async (callback: () => void) => {
   const factoryNo = userStore.user?.factory.id
   const factoryNo = userStore.user?.factory.id
-  console.log('⭐⭐⭐提交打单factoryNo', factoryNo)
   if (!factoryNo) {
   if (!factoryNo) {
     return
     return
   }
   }
@@ -1461,7 +1419,6 @@ const handleRowClick = (row: ProductList) => {
 const handleCurrentChange = (url: string) => {
 const handleCurrentChange = (url: string) => {
   if (url) {
   if (url) {
     coverImage.value = url || ''
     coverImage.value = url || ''
-    console.log('🍉🍉🍉🍉handleCurrentChange', coverImage.value)
   }
   }
 }
 }
 const warehouseId = ref<string | number>('')
 const warehouseId = ref<string | number>('')