From 18e5a30dc54b1f379fa0b62242b5744ce51181cc Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 16 Jan 2025 18:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/CreateOrder.vue | 6 +++++-
 src/views/waybill/CreateZeroOrder.vue            | 9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 7932971c..e85b9a09 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -66,6 +66,7 @@
                   prefix-icon="Calendar"
                   type="datetime"
                   placeholder="创建时间"
+                  value-format="YYYY-MM-DD HH:mm:ss"
                   :clearable="false"
                 />
               </div>
@@ -2353,7 +2354,7 @@ const onEditLoad = async () => {
 
       details.query.openOrderUserName = details.query.agent;
       details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
-      details.query.openOrderDate = data.warehouseWaybill.createTime;
+      details.query.openOrderDate = data.warehouseWaybill.documentMakingTime;
       details.query.orderCode = data.warehouseWaybill.orderNo;
       details.query.transportType = details.query.transportType ? details.query.transportType : '1';
       details.query.receipt = data.warehouseWaybill.receipt
@@ -3774,6 +3775,7 @@ const getTranslationArr = codeArr => {
 
 /** 提交 */
 const handleSubmit = (formEl: FormInstance | undefined) => {
+  console.log('details.form :>> ', details.query.openOrderDate);
   if (!formEl) return;
   formEl.validate(async valid => {
     if (!valid) return false;
@@ -3782,6 +3784,8 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 
     const timer = setTimeout(async () => {
       try {
+        if (!details.query.openOrderDate) return ElMessage.warning('请选择制单时间');
+
         // if (!details.query.shipperId)
         //   return ElMessage.warning('未选择系统内维护的发货单位，请选择或维护');
         // if (!details.query.consigneeId)
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 92ec3c7f..ca16091f 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -56,11 +56,15 @@
               <el-icon><User /></el-icon>
               <span style="margin-left: 10px">{{ details.query.openOrderUserName }}</span>
             </div>
+
             <el-date-picker
               v-model="query.openOrderDate"
+              :readonly="$route.query.type === 'edit'"
+              prefix-icon="Calendar"
               type="datetime"
-              :clearable="false"
               placeholder="创建时间"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :clearable="false"
             />
           </div>
         </div>
@@ -1810,7 +1814,7 @@ const initPageInfo = async () => {
       delete details.query.warehouseWaybill;
       details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
       console.log('data :>> ', data);
-      details.query.openOrderDate = data.warehouseWaybill.createTime;
+      details.query.openOrderDate = data.warehouseWaybill.documentMakingTime;
       details.query.orderCode = data.warehouseWaybill.orderNo;
 
       // 是否提货
@@ -2952,6 +2956,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
           //   return ElMessage.warning('请选择系统内维护的发货单位，请选择或维护');
           // if (!details.query.consigneeId)
           //   return ElMessage.warning('请选择系统内维护的收货单位，请选择或维护');
+          if (!details.query.openOrderDate) return ElMessage.warning('请选择制单时间');
 
           let _arr = [];