From 765c8ea94f7a63b5d1d5788fe3febb434a1f287e Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 13 May 2026 00:42:29 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8F=AA=E8=83=BD=E5=88=A0=E9=99=A4=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E7=9A=84=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/formatTime.ts | 21 +- .../md/item/sku/components/ItemSkuSelect.vue | 295 +++++++++++ .../wms/order/receipt/ReceiptOrderDetail.vue | 15 +- .../wms/order/receipt/ReceiptOrderForm.vue | 480 ++++++++++++++++++ .../wms/order/receipt/ReceiptOrderPrint.vue | 13 +- src/views/wms/order/receipt/index.vue | 21 +- src/views/wms/utils/order.ts | 12 + 7 files changed, 826 insertions(+), 31 deletions(-) create mode 100644 src/views/wms/md/item/sku/components/ItemSkuSelect.vue create mode 100644 src/views/wms/order/receipt/ReceiptOrderForm.vue create mode 100644 src/views/wms/utils/order.ts diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts index 99eb428c3..570464823 100644 --- a/src/utils/formatTime.ts +++ b/src/utils/formatTime.ts @@ -63,7 +63,7 @@ export const defaultShortcuts = [ * @description format 季度 + 星期 + 几周:"YYYY-MM-DD HH:mm:ss WWW QQQQ ZZZ" * @returns 返回拼接后的时间字符串 */ -export function formatDate(date: Date, format?: string): string { +export function formatDate(date: Date | string, format?: string): string { // 日期不存在,则返回空 if (!date) { return '' @@ -72,6 +72,25 @@ export function formatDate(date: Date, format?: string): string { return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : '' } +/** + * 格式化可为空的时间日期 + * + * @param date 当前时间,new Date() 格式或者字符串时间格式 + * @param format 需要转换的时间格式字符串 + * @param emptyText 空值展示文案 + * @returns 返回格式化后的时间字符串 + */ +export function formatNullableDate( + date?: Date | string | null, + format = 'YYYY-MM-DD HH:mm:ss', + emptyText = '-' +): string { + if (!date) { + return emptyText + } + return formatDate(date, format) || emptyText +} + /** * 获取当前的日期+时间 */ diff --git a/src/views/wms/md/item/sku/components/ItemSkuSelect.vue b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue new file mode 100644 index 000000000..ba9970aa0 --- /dev/null +++ b/src/views/wms/md/item/sku/components/ItemSkuSelect.vue @@ -0,0 +1,295 @@ + + + + diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue index fee28e295..12e1c3076 100644 --- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue +++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue @@ -40,13 +40,13 @@ {{ formatPrice(detailData.totalAmount) || '-' }} - {{ formatNullableDate(detailData.createTime) || '-' }} + {{ formatNullableDate(detailData.createTime) }} {{ detailData.creatorName || detailData.creator || '-' }} - {{ formatNullableDate(detailData.updateTime) || '-' }} + {{ formatNullableDate(detailData.updateTime) }} {{ detailData.updaterName || detailData.updater || '-' }} @@ -78,12 +78,12 @@ @@ -108,7 +108,7 @@ diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue index 6a2062d21..da0b23715 100644 --- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue +++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue @@ -16,7 +16,7 @@
库区:{{ printData.areaName || '-' }}
总数量:{{ formatQuantity(printData.totalQuantity) || '-' }}
总金额:{{ formatPrice(printData.totalAmount) || '-' }}
-
创建时间:{{ formatNullableDate(printData.createTime) || '-' }}
+
创建时间:{{ formatNullableDate(printData.createTime) }}
备注:{{ printData.remark || '-' }}
@@ -70,10 +70,10 @@ {{ detail.batchNo || '-' }}
- {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') || '-' }} + {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }} - {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') || '-' }} + {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }} {{ formatQuantity(detail.quantity) || '-' }} @@ -98,7 +98,7 @@