Merge branch 'feature_overseas-supply' of…

Merge branch 'feature_overseas-supply' of http://47.122.114.111:9999/qinjianhui/factory_front into feature_overseas-supply

src/views/order/podUs/PodMakeOrder.vue

@@ -274,7 +274,7 @@ const podOrderDetailsColumns = computed(() => [
     width: 250,
     width: 250,
     slot: 'image',
     slot: 'image',
     align: 'center',
     align: 'center',
-    fixed: 'left',
+    
   },
   },
   {
   {
     label: '生产单号',
     label: '生产单号',
@@ -282,21 +282,23 @@ const podOrderDetailsColumns = computed(() => [
     width: 150,
     width: 150,
     align: 'center',
     align: 'center',
   },
   },
-  // {
-  //   label: 'base SKU',
-  //   prop: 'baseSku',
-  //   width: 140,
-  //   align: 'center',
-  // },
+  {
+    label: '库存 SKU',
+    prop: 'thirdSkuCode',
+    width: 180,
+    align: 'center',
+  },
   {
   {
     label: 'variant SKU',
     label: 'variant SKU',
     prop: 'variantSku',
     prop: 'variantSku',
-    width: 140,
+    width: 160,
     align: 'center',
     align: 'center',
   },
   },
+  
   {
   {
     label: '商品名称',
     label: '商品名称',
     prop: 'productName',
     prop: 'productName',
+    minWidth: 100,
   },
   },
 
 
   {
   {
@@ -304,18 +306,21 @@ const podOrderDetailsColumns = computed(() => [
     prop: 'purchaseNumber',
     prop: 'purchaseNumber',
     width: 90,
     width: 90,
     align: 'center',
     align: 'center',
+    fixed: 'right',
   },
   },
   {
   {
     label: '拣货数量',
     label: '拣货数量',
     prop: 'count',
     prop: 'count',
     width: 90,
     width: 90,
     align: 'center',
     align: 'center',
+    fixed: 'right',
   },
   },
   {
   {
     label: '验证结果',
     label: '验证结果',
     slot: 'verifyResult',
     slot: 'verifyResult',
     width: 90,
     width: 90,
     align: 'center',
     align: 'center',
+    fixed: 'right',
   },
   },
 ])
 ])
 const boxChange = ref<boolean>(false)
 const boxChange = ref<boolean>(false)
@@ -401,7 +406,13 @@ watch(
   (val) => {
   (val) => {
     if (val && val.productList?.length)
     if (val && val.productList?.length)
       val.productList.forEach((el) => {
       val.productList.forEach((el) => {
-        if (!el.previewImgs) el.previewImgs = el.imageAry ? JSON.parse(el.imageAry) : [{url: el.variantImage}]
+        if (!el.previewImgs) {
+          if (el.productMark === 'custom_normal') {
+            el.previewImgs = [{ url: el.variantImage || '' }]
+          } else {
+            el.previewImgs = el.imageAry ? JSON.parse(el.imageAry) : [{url: el.variantImage}]
+          }
+        }
       })
       })
   },
   },
   { deep: true },
   { deep: true },
@@ -410,7 +421,7 @@ watch(
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
 
 
 let renderLock = false
 let renderLock = false
-
+ 
 const renderItemBox = (bool: boolean) => {
 const renderItemBox = (bool: boolean) => {
   if (
   if (
     !podBoxList.value ||
     !podBoxList.value ||
@@ -426,7 +437,13 @@ const renderItemBox = (bool: boolean) => {
   if (!boxItem) boxItem = { data: { productList: [] } }
   if (!boxItem) boxItem = { data: { productList: [] } }
   const { data } = boxItem
   const { data } = boxItem
   data?.productList?.forEach((el) => {
   data?.productList?.forEach((el) => {
-    if (!el.previewImgs) el.previewImgs = JSON.parse(el.imageAry)
+    if (!el.previewImgs) {
+      if (el.productMark === 'custom_normal') {
+        el.previewImgs = [{ url: el.variantImage || '' }]
+      } else {
+        el.previewImgs = JSON.parse(el.imageAry)
+      }
+    }
   })
   })
   if (!data) {
   if (!data) {
     renderLock = false
     renderLock = false
@@ -690,7 +707,13 @@ const initOrderDetailBox = async () => {
     boxIndex.value = boxList.find((item) => item.data)?.box || null
     boxIndex.value = boxList.find((item) => item.data)?.box || null
 
 
     podOrderDetailsData.value?.productList?.forEach((el) => {
     podOrderDetailsData.value?.productList?.forEach((el) => {
-      if (!el.previewImgs) el.previewImgs = el.imageAry ? JSON.parse(el.imageAry) : [{url: el.variantImage}]
+      if (!el.previewImgs) {
+        if (el.productMark === 'custom_normal') {
+          el.previewImgs = [{ url: el.variantImage || '' }]
+        } else {
+          el.previewImgs = el.imageAry ? JSON.parse(el.imageAry) : [{url: el.variantImage}]
+        }
+      }
     })
     })
     coverImage.value =
     coverImage.value =
       podOrderDetailsData.value?.productList?.[0]?.previewImgs?.[0].url || ''
       podOrderDetailsData.value?.productList?.[0]?.previewImgs?.[0].url || ''

src/views/order/podUs/index.vue

@@ -5238,7 +5238,7 @@ const handleMark = (mark: string) => {
       }
       }
     case 'custom_normal':
     case 'custom_normal':
       return {
       return {
-        name: 'OS',
+        name: 'CB',
         color: '#67C23A',
         color: '#67C23A',
         label: '海外供应',
         label: '海外供应',
       }
       }