Merge branch 'dev' into 'master'

Dev

See merge request !45

auto-imports.d.ts

@@ -88,21 +88,6 @@ declare global {
 // for type re-export
 // for type re-export
 declare global {
 declare global {
   // @ts-ignore
   // @ts-ignore
-  export type {
-    Component,
-    ComponentPublicInstance,
-    ComputedRef,
-    DirectiveBinding,
-    ExtractDefaultPropTypes,
-    ExtractPropTypes,
-    ExtractPublicPropTypes,
-    InjectionKey,
-    PropType,
-    Ref,
-    MaybeRef,
-    MaybeRefOrGetter,
-    VNode,
-    WritableComputedRef,
-  } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
   import('vue')
 }
 }

src/views/order/podUs/index.vue

@@ -329,7 +329,7 @@
           <ElButton
           <ElButton
             :loading="tifDownloadLoading"
             :loading="tifDownloadLoading"
             type="warning"
             type="warning"
-            @click="downloadTif('tiff', 'tiff')"
+            @click="downloadTif('tiff')"
           >
           >
             TIF排版
             TIF排版
           </ElButton>
           </ElButton>
@@ -338,7 +338,7 @@
           <ElButton
           <ElButton
             :loading="pngDownloadLoading"
             :loading="pngDownloadLoading"
             type="warning"
             type="warning"
-            @click="downloadTif('png', 'composingPNG')"
+            @click="downloadTif('png')"
           >
           >
             PNG排版
             PNG排版
           </ElButton>
           </ElButton>
@@ -678,8 +678,8 @@
                           status === 'EXCEPTION_ORDER' ||
                           status === 'EXCEPTION_ORDER' ||
                           status === 'PICKING' ||
                           status === 'PICKING' ||
                           status === 'TO_BE_CONFIRMED' ||
                           status === 'TO_BE_CONFIRMED' ||
-                        status === 'STOCK_OUT'
-                          ? '数量:'
+                          status === 'STOCK_OUT'||
+                          status === 'CREATE_LOGISTICS'  ? '数量:'
                             : '已生产数量:'
                             : '已生产数量:'
                         }}</span>
                         }}</span>
                       <span class="goods-item-info-item-value">
                       <span class="goods-item-info-item-value">
@@ -687,7 +687,8 @@
                           status === 'EXCEPTION_ORDER' ||
                           status === 'EXCEPTION_ORDER' ||
                           status === 'PICKING' ||
                           status === 'PICKING' ||
                           status === 'TO_BE_CONFIRMED' ||
                           status === 'TO_BE_CONFIRMED' ||
-                          status === 'STOCK_OUT'
+                          status === 'STOCK_OUT' ||
+                          status === 'CREATE_LOGISTICS'
                             ? item.num
                             ? item.num
                             : item.passNum
                             : item.passNum
                         }}
                         }}
@@ -1636,7 +1637,7 @@ import platformJson from '../../../json/platform.json'
 declare global {
 declare global {
   interface Window {
   interface Window {
     ActiveXObject: {
     ActiveXObject: {
-      new (type: string): XMLHttpRequest
+      new(type: string): XMLHttpRequest
     }
     }
     VBS_BinaryToArray: {
     VBS_BinaryToArray: {
       (data: unknown): { toArray(): number[] }
       (data: unknown): { toArray(): number[] }
@@ -1813,7 +1814,7 @@ const tableColumns = computed(() => [
     label: '商品',
     label: '商品',
     prop: 'goods',
     prop: 'goods',
     slot: 'goods',
     slot: 'goods',
-    minWidth: 800,
+    minWidth: 920,
   },
   },
   {
   {
     label: '订单详情',
     label: '订单详情',
@@ -1831,7 +1832,7 @@ const tableColumns = computed(() => [
   {
   {
     label: '时间',
     label: '时间',
     slot: 'time',
     slot: 'time',
-    width: 300,
+    width: 180,
     prop: 'time',
     prop: 'time',
     align: 'left',
     align: 'left',
   },
   },
@@ -2183,7 +2184,7 @@ const productionClientVisible = ref(false)
 //   productionClientVisible.value = true
 //   productionClientVisible.value = true
 // }
 // }
 
 
-const downloadTif = async (type: string, dir: string) => {
+const downloadTif = async (type: string) => {
   if (!cardSelection.value.length) {
   if (!cardSelection.value.length) {
     return ElMessage.warning('请选择数据')
     return ElMessage.warning('请选择数据')
   }
   }
@@ -2197,18 +2198,19 @@ const downloadTif = async (type: string, dir: string) => {
       cardSelection.value.map((el) => el.id),
       cardSelection.value.map((el) => el.id),
       type,
       type,
     )
     )
-    window.open(`https://ps.jomalls.com/${dir}/` + res.message, '_blank')
+    const url = type === 'tiff' ? `https://ps.jomalls.com/tiff/` + res.message : filePath + res.message
+    window.open(url, '_blank')
     if (type === 'tiff') {
     if (type === 'tiff') {
-      tifDownloadLoading.value = true
+      tifDownloadLoading.value = false
     } else {
     } else {
-      pngDownloadLoading.value = true
+      pngDownloadLoading.value = false
     }
     }
   } catch (e) {
   } catch (e) {
     console.log(e)
     console.log(e)
     if (type === 'tiff') {
     if (type === 'tiff') {
-      tifDownloadLoading.value = true
+      tifDownloadLoading.value = false
     } else {
     } else {
-      pngDownloadLoading.value = true
+      pngDownloadLoading.value = false
     }
     }
   }
   }
 }
 }
@@ -3460,7 +3462,7 @@ const replenishmentSuccess = async () => {
 
 
 .goods-item {
 .goods-item {
   display: grid;
   display: grid;
-  grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px;
+  grid-template-columns: 100px 1fr minmax(180px, 1fr) 180px;
   gap: 20px;
   gap: 20px;
 
 
   .goods-item-img {
   .goods-item-img {