Merge branch 'dev_new_status' into 'dev'

feat: 工厂订单左侧状态栏数据统计增加单位描述 #1010844

See merge request !270

src/types/api/factoryOrderNew/index.ts

@@ -3,6 +3,7 @@ export interface StatusTreeNode {
   status: string
   status: string
   statusName: string
   statusName: string
   quantity: number
   quantity: number
+  unit?: string // 数量单位
   children: StatusTreeNode[] | null
   children: StatusTreeNode[] | null
 }
 }
 
 

src/types/api/order/factoryOrderNew.ts

@@ -2,6 +2,7 @@ export interface StatusTreeNode {
   status: string
   status: string
   statusName: string
   statusName: string
   quantity: number
   quantity: number
+  unit?: string // 数量单位
   children: StatusTreeNode[] | null
   children: StatusTreeNode[] | null
 }
 }
 
 

src/views/order/factoryOrderNew/hooks/useOrderStatusTree.ts

@@ -27,6 +27,17 @@ export function useOrderStatusTree(options: UseOrderStatusTreeOptions) {
   ]
   ]
   const specialLayoutStatuses = ['BATCH_MANAGE', 'AWAITING_RESTOCK']
   const specialLayoutStatuses = ['BATCH_MANAGE', 'AWAITING_RESTOCK']
 
 
+  /** 左侧状态栏数量单位 */
+  const STATUS_QUANTITY_UNIT: Record<string, string> = {
+    PENDING_SCHEDULE: '件',
+    PENDING_PICK: '件',
+    PENDING_REPLENISH: '件',
+    IN_PRODUCTION: '件',
+    PENDING_PACKING: '件',
+    BATCH_MANAGE: '批',
+    AWAITING_RESTOCK: '个',
+  }
+
   const statusTree = ref<StatusTreeNode[]>()
   const statusTree = ref<StatusTreeNode[]>()
   const status = ref<string>('PENDING_RECEIVE')
   const status = ref<string>('PENDING_RECEIVE')
   const pendingAcceptSubTab = ref<
   const pendingAcceptSubTab = ref<
@@ -149,7 +160,11 @@ export function useOrderStatusTree(options: UseOrderStatusTreeOptions) {
             hasPermission ||
             hasPermission ||
             (isGroupContainer && filteredChildren.length > 0)
             (isGroupContainer && filteredChildren.length > 0)
           ) {
           ) {
-            result.push({ ...node, children: filteredChildren })
+            result.push({
+              ...node,
+              children: filteredChildren,
+              unit: STATUS_QUANTITY_UNIT[node.status] ?? '单',
+            })
           }
           }
         }
         }
         return result
         return result

src/views/order/factoryOrderNew/index.vue

@@ -28,7 +28,7 @@
                   "
                   "
                   class="tree-node-count"
                   class="tree-node-count"
                 >
                 >
-                  {{ `(${data.quantity})` }}
+                  {{ `(${data.quantity}${data.unit ?? '单'})` }}
                 </span>
                 </span>
               </div>
               </div>
               <span
               <span