diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue index 9fa64c52e..a5e4e9ab1 100644 --- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue +++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue @@ -16,9 +16,6 @@ {{ detailData.warehouseName || '-' }} - - {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }} - - + + {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }} + {{ detailData.merchantName || '-' }} diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue index badecb0f9..7b8b4858d 100644 --- a/src/views/wms/order/receipt/ReceiptOrderForm.vue +++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue @@ -31,6 +31,17 @@ + + + + + - - - - - diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue index 5af41b541..74941d24b 100644 --- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue +++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue @@ -10,8 +10,8 @@ 入库类型:{{ getDictLabel(DICT_TYPE.WMS_RECEIPT_ORDER_TYPE, printData.type) || '-' }}
仓库:{{ printData.warehouseName || '-' }}
-
单据日期:{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}
入库状态:{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}
+
单据日期:{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}
供应商:{{ printData.merchantName || '-' }}
业务单号:{{ printData.bizOrderNo || '-' }}
总数量:{{ formatQuantity(printData.totalQuantity) || '-' }}
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue index 4d7e21297..96ff3f899 100644 --- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue +++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue @@ -16,9 +16,6 @@ {{ detailData.warehouseName || '-' }} - - {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }} - - + + {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }} + {{ detailData.merchantName || '-' }} diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue index 876f3276a..48cf029b5 100644 --- a/src/views/wms/order/shipment/ShipmentOrderForm.vue +++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue @@ -31,6 +31,17 @@
+ + + + + - - - - - diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue index 9a3de8682..7e1145d90 100644 --- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue +++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue @@ -10,8 +10,8 @@ 出库类型:{{ getDictLabel(DICT_TYPE.WMS_SHIPMENT_ORDER_TYPE, printData.type) || '-' }}
仓库:{{ printData.warehouseName || '-' }}
-
单据日期:{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}
出库状态:{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}
+
单据日期:{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}
客户:{{ printData.merchantName || '-' }}
业务单号:{{ printData.bizOrderNo || '-' }}
总数量:{{ formatQuantity(printData.totalQuantity) || '-' }}