From 804ad667e0b55ba426d2e6b5228fc34675442268 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 14 May 2026 17:03:49 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=9B=98=E5=BA=93=E5=8D=95=E7=9A=84=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/order/check/detail/index.ts | 3 +- src/api/wms/order/check/index.ts | 3 +- src/utils/dict.ts | 2 +- .../inventory/components/InventorySelect.vue | 2 +- src/views/wms/inventory/history/index.vue | 16 +- .../wms/order/check/CheckOrderDetail.vue | 72 ++++++- src/views/wms/order/check/CheckOrderForm.vue | 175 ++++++++++++----- src/views/wms/order/check/CheckOrderPrint.vue | 184 ++++++++++++++++++ src/views/wms/order/check/index.vue | 108 ++++++++-- src/views/wms/utils/format.ts | 8 +- 10 files changed, 484 insertions(+), 89 deletions(-) create mode 100644 src/views/wms/order/check/CheckOrderPrint.vue diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts index 4009d7f5e..9424a3064 100644 --- a/src/api/wms/order/check/detail/index.ts +++ b/src/api/wms/order/check/detail/index.ts @@ -15,8 +15,7 @@ export interface CheckOrderDetailVO { receiptTime?: Date quantity?: number checkQuantity?: number - differenceQuantity?: number availableQuantity?: number - amount?: number + price?: number createTime?: Date } diff --git a/src/api/wms/order/check/index.ts b/src/api/wms/order/check/index.ts index 3773c64ea..a28b298ef 100644 --- a/src/api/wms/order/check/index.ts +++ b/src/api/wms/order/check/index.ts @@ -11,7 +11,8 @@ export interface CheckOrderVO { warehouseId?: number warehouseName?: string totalQuantity?: number - totalAmount?: number + totalPrice?: number + actualPrice?: number details?: CheckOrderDetailVO[] createTime?: Date creator?: string diff --git a/src/utils/dict.ts b/src/utils/dict.ts index df5dbc00a..35774ab65 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -218,7 +218,7 @@ export enum DICT_TYPE { // ========== WMS - 仓库管理模块 ========== WMS_MERCHANT_TYPE = 'merchant_type', // WMS 往来企业类型 - WMS_INVENTORY_HISTORY_TYPE = 'wms_inventory_history_type', // WMS 库存记录类型 + WMS_ORDER_TYPE = 'wms_order_type', // WMS 单据类型 WMS_ORDER_STATUS = 'wms_order_status', // WMS 单据状态 WMS_RECEIPT_ORDER_TYPE = 'wms_receipt_order_type', // WMS 入库单类型 WMS_SHIPMENT_ORDER_TYPE = 'wms_shipment_order_type', // WMS 出库单类型 diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue index 1ecfba9e9..457d55490 100644 --- a/src/views/wms/inventory/components/InventorySelect.vue +++ b/src/views/wms/inventory/components/InventorySelect.vue @@ -129,7 +129,7 @@ import { InventoryApi, InventoryVO } from '@/api/wms/inventory' import { formatQuantity } from '@/views/wms/utils/format' export interface InventorySelectRow extends InventoryVO { - amount?: number + price?: number availableQuantity?: number } diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue index 4d0aaf673..42a7d46e1 100644 --- a/src/views/wms/inventory/history/index.vue +++ b/src/views/wms/inventory/history/index.vue @@ -9,28 +9,28 @@ class="-mb-15px" label-width="68px" > - + - + @@ -107,10 +107,10 @@ :show-overflow-tooltip="true" border > - - + + diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue index f0d6e52af..5bd29292e 100644 --- a/src/views/wms/order/check/CheckOrderDetail.vue +++ b/src/views/wms/order/check/CheckOrderDetail.vue @@ -18,10 +18,20 @@ - - {{ formatQuantity(detailData.totalQuantity) || '-' }} + + {{ formatQuantity(detailData.totalQuantity) || '-' }} + - {{ formatPrice(detailData.totalAmount) || '-' }} + {{ formatPrice(detailData.totalPrice) || '-' }} + + + {{ formatPrice(detailData.actualPrice) || '-' }} + + + + {{ formatPrice(getOrderDifferencePrice(detailData)) || '-' }} + {{ formatNullableDate(detailData.createTime) }} @@ -55,14 +65,26 @@ + + + - - + + - - + + + + + @@ -70,11 +92,21 @@ diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue index 7513d06c1..f22b6474e 100644 --- a/src/views/wms/order/check/index.vue +++ b/src/views/wms/order/check/index.vue @@ -48,10 +48,10 @@ /> - +
+
+
+ +
+ + + + + + + + + - + + + + @@ -202,15 +240,23 @@ {{ row.warehouseName || '-' }} - + @@ -249,6 +295,14 @@ + + 打印 + @@ -257,6 +311,7 @@ +