Merge remote-tracking branch 'origin/dev' into dev

src/views/order/orderTracking/index.vue

@@ -426,7 +426,13 @@ const submitExportForm = async () => {
   try {
   try {
     await exportPodUSInfo({
     await exportPodUSInfo({
       ...params,
       ...params,
-      ...(resourceType === 2 ? searchForm.value : {}),
+      ...(resourceType === 2
+        ? {
+            ...searchForm.value,
+            startTime: timeRange.value?.[0] || null,
+            endTime: timeRange.value?.[1] || null,
+          }
+        : {}),
     })
     })
     ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
     ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
     exportVisible.value = false
     exportVisible.value = false

src/views/order/orderTracking/indexcn.vue

@@ -424,7 +424,13 @@ const submitExportForm = async () => {
   try {
   try {
     await exportPodCnInfo({
     await exportPodCnInfo({
       ...params,
       ...params,
-      ...(resourceType === 2 ? searchForm.value : {}),
+      ...(resourceType === 2
+        ? {
+            ...searchForm.value,
+            startTime: timeRange.value?.[0] || null,
+            endTime: timeRange.value?.[1] || null,
+          }
+        : {}),
     })
     })
     ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
     ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
     exportVisible.value = false
     exportVisible.value = false

src/views/order/podCN/PodMakeOrder.vue

@@ -505,6 +505,7 @@ const renderItemBox = (bool: boolean) => {
           : parts[0]
           : parts[0]
     for (const product of productList) {
     for (const product of productList) {
       if (product.podJomallCnNo === currentCode) {
       if (product.podJomallCnNo === currentCode) {
+        coverImage.value = product.previewImgs?.[0]?.url || ''
         nextTick(() => {
         nextTick(() => {
           tableRef.value?.setCurrentRow(product)
           tableRef.value?.setCurrentRow(product)
         })
         })

src/views/order/podCN/index.vue

@@ -2644,11 +2644,20 @@ const submitExportForm = async () => {
       console.error('未知的资源类型:', resourceType)
       console.error('未知的资源类型:', resourceType)
   }
   }
   try {
   try {
-    const res = await exportPodCnInfo({
+    await exportPodCnInfo({
       ...params,
       ...params,
-      ...(resourceType === 2 ? searchForm.value : {}),
+      ...(resourceType === 2
+        ? {
+            ...searchForm.value,
+            startTime: timeRange.value?.[0] || null,
+            endTime: timeRange.value?.[1] || null,
+          }
+        : {}),
+
+      status: 'COMPLETE',
     })
     })
-    window.open(filePath + res.message, '_blank')
+    ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
+    // window.open(filePath + res.message, '_blank')
     exportVisible.value = false
     exportVisible.value = false
     exportLoading.value = false
     exportLoading.value = false
   } catch (e) {
   } catch (e) {

src/views/order/podUs/index.vue

@@ -3063,7 +3063,13 @@ const submitExportForm = async () => {
   try {
   try {
     await exportPodUSInfo({
     await exportPodUSInfo({
       ...params,
       ...params,
-      ...(resourceType === 2 ? searchForm.value : {}),
+      ...(resourceType === 2
+        ? {
+            ...searchForm.value,
+            startTime: timeRange.value?.[0] || null,
+            endTime: timeRange.value?.[1] || null,
+          }
+        : {}),
     })
     })
     ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
     ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
     exportVisible.value = false
     exportVisible.value = false