From 44808eb3f438d9839e4676418d5be7682f74777b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 14 May 2026 00:02:03 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88wms=EF=BC=89=EF=BC=9A=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20order=5Ftime=20=E6=94=BE=E5=88=B0=E3=80=90=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E3=80=91=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/order/receipt/ReceiptOrderDetail.vue  |  6 ++---
 .../wms/order/receipt/ReceiptOrderForm.vue    | 22 +++++++++----------
 .../wms/order/receipt/ReceiptOrderPrint.vue   |  2 +-
 .../order/shipment/ShipmentOrderDetail.vue    |  6 ++---
 .../wms/order/shipment/ShipmentOrderForm.vue  | 22 +++++++++----------
 .../wms/order/shipment/ShipmentOrderPrint.vue |  2 +-
 6 files changed, 30 insertions(+), 30 deletions(-)

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 @@
         <el-descriptions-item label="仓库">
           {{ detailData.warehouseName || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item label="单据日期">
-          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
-        </el-descriptions-item>
         <el-descriptions-item label="单据状态">
           <dict-tag
             v-if="detailData.status !== undefined"
@@ -27,6 +24,9 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
         <el-descriptions-item label="供应商">
           {{ detailData.merchantName || '-' }}
         </el-descriptions-item>
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 @@
             <WarehouseSelect v-model="formData.warehouseId" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="供应商" prop="merchantId">
             <MerchantSelect
@@ -56,17 +67,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="单据日期" prop="orderTime">
-            <el-date-picker
-              v-model="formData.orderTime"
-              class="!w-1/1"
-              placeholder="请选择单据日期"
-              type="date"
-              value-format="x"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="总数量" prop="totalQuantity">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
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) || '-' }}
         </div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
-        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>入库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>供应商：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>
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 @@
         <el-descriptions-item label="仓库">
           {{ detailData.warehouseName || '-' }}
         </el-descriptions-item>
-        <el-descriptions-item label="单据日期">
-          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
-        </el-descriptions-item>
         <el-descriptions-item label="单据状态">
           <dict-tag
             v-if="detailData.status !== undefined"
@@ -27,6 +24,9 @@
           />
           <span v-else>-</span>
         </el-descriptions-item>
+        <el-descriptions-item label="单据日期">
+          {{ formatNullableDate(detailData.orderTime, 'YYYY-MM-DD') }}
+        </el-descriptions-item>
         <el-descriptions-item label="客户">
           {{ detailData.merchantName || '-' }}
         </el-descriptions-item>
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 @@
             <WarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据日期" prop="orderTime">
+            <el-date-picker
+              v-model="formData.orderTime"
+              class="!w-1/1"
+              placeholder="请选择单据日期"
+              type="date"
+              value-format="x"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="merchantId">
             <MerchantSelect
@@ -56,17 +67,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="单据日期" prop="orderTime">
-            <el-date-picker
-              v-model="formData.orderTime"
-              class="!w-1/1"
-              placeholder="请选择单据日期"
-              type="date"
-              value-format="x"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="总数量" prop="totalQuantity">
             <el-input :model-value="formatQuantity(totalQuantity)" disabled />
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) || '-' }}
         </div>
         <div>仓库：{{ printData.warehouseName || '-' }}</div>
-        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>出库状态：{{ getDictLabel(DICT_TYPE.WMS_ORDER_STATUS, printData.status) || '-' }}</div>
+        <div>单据日期：{{ formatNullableDate(printData.orderTime, 'YYYY-MM-DD') }}</div>
         <div>客户：{{ printData.merchantName || '-' }}</div>
         <div>业务单号：{{ printData.bizOrderNo || '-' }}</div>
         <div>总数量：{{ formatQuantity(printData.totalQuantity) || '-' }}</div>