Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev

src/views/order/pod/fastProduction.vue

@@ -392,8 +392,20 @@ watch(
           { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
           { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
         ].filter((el) => el.url)
         ].filter((el) => el.url)
       } else {
       } else {
-        arr =
-          typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
+        arr = Array.isArray(d.imageAry)
+          ? d.imageAry
+          : typeof d.imageAry === 'string'
+          ? (() => {
+              try {
+                const parsed = JSON.parse(d.imageAry)
+                return parsed
+              } catch {
+                return [{ url: d.imageAry }]
+              }
+            })()
+          : [d.imageAry]?.filter?.((v) => v != null) || []
+        // arr =
+        //   typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
         arr = arr.concat([
         arr = arr.concat([
           { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
           { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
         ])
         ])
@@ -591,7 +603,10 @@ const trackcodeInput = async () => {
   // AAAB_60527128-9_1_JMSC250121017 新版示例
   // AAAB_60527128-9_1_JMSC250121017 新版示例
   const regex = /^[A-Z]{4}_/ //是否以四个大写字母加下划线开头
   const regex = /^[A-Z]{4}_/ //是否以四个大写字母加下划线开头
   if (regex.test(orderNumber)) {
   if (regex.test(orderNumber)) {
-    orderNumber = orderNumber.split('_')[0] + "-"+ orderNumber.split('_')[orderNumber.split('_').length - 1]
+    orderNumber =
+      orderNumber.split('_')[0] +
+      '-' +
+      orderNumber.split('_')[orderNumber.split('_').length - 1]
   }
   }
   try {
   try {
     const res = await getSubOrderBySubOrderNumber(orderNumber)
     const res = await getSubOrderBySubOrderNumber(orderNumber)
@@ -612,7 +627,20 @@ const trackcodeInput = async () => {
         { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
         { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
       ].filter((el) => el.url)
       ].filter((el) => el.url)
     } else {
     } else {
-      arr = typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
+      arr = Array.isArray(d.imageAry)
+        ? d.imageAry
+        : typeof d.imageAry === 'string'
+        ? (() => {
+            try {
+              const parsed = JSON.parse(d.imageAry)
+              return parsed
+            } catch {
+              return [{ url: d.imageAry }]
+            }
+          })()
+        : [d.imageAry]?.filter?.((v) => v != null) || []
+
+      // arr = typeof d.imageAry == 'string' ? JSON.parse(d.imageAry) : d.imageAry
       arr = arr.concat([
       arr = arr.concat([
         { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
         { url: d.negativeImage, title: '反面', id: d.negativeDesignId },
       ])
       ])

src/views/order/pod/index.vue

@@ -1449,7 +1449,20 @@ const openDetail = async (id: number) => {
     const res = await getOrderDetail(id)
     const res = await getOrderDetail(id)
     if (res.code == 200) {
     if (res.code == 200) {
       if (res.data.imageAry) {
       if (res.data.imageAry) {
-        res.data.imageAry = JSON.parse(res.data.imageAry as string)
+        const newarr = res.data.imageAry
+        res.data.imageAry = Array.isArray(newarr)
+          ? newarr
+          : typeof newarr === 'string'
+          ? (() => {
+              try {
+                const parsed = JSON.parse(newarr)
+                return parsed
+              } catch {
+                return [{ url: newarr }]
+              }
+            })()
+          : [newarr]?.filter?.((v) => v != null) || []
+        // res.data.imageAry = JSON.parse(res.data.imageAry as string)
       }
       }
       detailData.value = res.data || {}
       detailData.value = res.data || {}
       detailVisible.value = true
       detailVisible.value = true
@@ -1457,6 +1470,8 @@ const openDetail = async (id: number) => {
       fastType.value = 0
       fastType.value = 0
     }
     }
   } catch (e) {
   } catch (e) {
+    console.log(e)
+
     //showError(e)
     //showError(e)
   }
   }
 }
 }
@@ -1691,7 +1706,7 @@ const [searchForm] = useValue<SearchForm>({
   userMark: '',
   userMark: '',
   customizedQuantity: '',
   customizedQuantity: '',
   order: 'desc',
   order: 'desc',
-  platform:''
+  platform: '',
 })
 })
 const tableColumns = computed<CustomColumn<CardOrderData[]>>(() => {
 const tableColumns = computed<CustomColumn<CardOrderData[]>>(() => {
   return [
   return [