Merge branch 'dev' into 'master'

Dev

See merge request !293

src/views/order/cancelOrderProcess/index.vue

@@ -710,17 +710,27 @@ const handleEmbryoInStockByCard = async (
     background: 'rgba(0, 0, 0, 0.3)',
     background: 'rgba(0, 0, 0, 0.3)',
   })
   })
   try {
   try {
-    const skus = operationList.map((r) => r.thirdSkuCode as string)
-    const res =
-      type === 'embryoInStock'
-        ? await getBySkuAndUserMarkApi(firstWid, skus.join(','), null)
-        : await getBySkuAndUserMarkAndInboundTypeApi(
+    otherPurchaseData.value = []
+    if(type!=='embryoInStock'){
+      const res = await getBySkuAndUserMarkAndInboundTypeApi(
         operationList.map((r) => r.operationNo as string),
         operationList.map((r) => r.operationNo as string),
       )
       )
       if (res.code !== 200) return
       if (res.code !== 200) return
       otherPurchaseData.value = res.data.map((item: InterskuList) =>
       otherPurchaseData.value = res.data.map((item: InterskuList) =>
         mapInterskuToProduct(item, type),
         mapInterskuToProduct(item, type),
       )
       )
+    }else{
+      for(const item of operationList){
+        if(!item.thirdSkuCode) return
+        const userMark = item.thirdSkuCode.includes('JM')?null:item.thirdSkuCode.slice(0,4)
+        const res =  await getBySkuAndUserMarkApi(firstWid, item.thirdSkuCode, userMark)
+        otherPurchaseData.value = otherPurchaseData.value.concat(
+          res.data.map((it: InterskuList) =>
+            mapInterskuToProduct(it, type)
+          )
+        )
+      }
+    }
     await fetchReceiptLocationList('')
     await fetchReceiptLocationList('')
     const listRes = await warehouseInfoGetAll()
     const listRes = await warehouseInfoGetAll()
     warehouseList.value = listRes.data || []
     warehouseList.value = listRes.data || []

src/views/order/components/FastProduction.vue

@@ -512,7 +512,7 @@ const normalizeDetail = (value: unknown): FastProductionDetail => {
     }
     }
   }
   }
   if (!Array.isArray(d.note)) d.note = []
   if (!Array.isArray(d.note)) d.note = []
-  const imageSource = d.imageAry || d.designImages || d.imgList
+  const imageSource = d.imageAry || d.designImages || d.imgList || d.variantImage
   d.imgList = parseImages(imageSource)
   d.imgList = parseImages(imageSource)
   return d as unknown as FastProductionDetail
   return d as unknown as FastProductionDetail
 }
 }