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

# Conflicts:
#	src/views/order/podUs/index.vue

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

@@ -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
                         }}
                         }}
@@ -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',
   },
   },
@@ -3461,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 {