From 2024e545575f94c03b5e70887285a70d7b06b61d Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Thu, 23 May 2024 08:53:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=97=A5=E6=9C=9F=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinishedProductWarehousingForm.vue           |  8 ++++----
 .../ProductionWorkOrderForm.vue                  | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
index 3886eef..7614781 100644
--- a/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
+++ b/src/views/Gw/finishedProductWarehousing/FinishedProductWarehousingForm.vue
@@ -374,10 +374,10 @@ const fnSubmitA = async () => {
                 return;
             }
     let finishedCount = await FinishedProductWarehousingApi.getFinishedProductCount(formDataA.value.SupplierWorkNo)
-    if(finishedCount< 32){
-        VXETable.modal.alert({content:"当前工单数据不完整，请检查原材料/组部件检验、生产工艺及过程检验、出厂试验是否都已完整录入"})
-                return;
-    }
+    // if(finishedCount< 32){
+    //     VXETable.modal.alert({content:"当前工单数据不完整，请检查原材料/组部件检验、生产工艺及过程检验、出厂试验是否都已完整录入"})
+    //             return;
+    // }
     switch (formTypeA.value) {
         case 'add':
             const paramsA = {
diff --git a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
index 5770db3..b7ef100 100644
--- a/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
+++ b/src/views/Gw/productionWorkOrder/ProductionWorkOrderForm.vue
@@ -279,6 +279,12 @@ const formRulesA: any = ref({
     PlanFinishDate: [
         { required: true, message: '请输入计划完成日期' }
     ],
+    ActualStartDate: [
+        { required: true, message: '请输入实际开始日期' }
+    ],
+    ActualFinishDate: [
+        { required: true, message: '请输入实际完成日期' }
+    ],
     WoStatus: [
         { required: true, message: '请输入工单状态' }
     ],
@@ -448,9 +454,19 @@ const fnDeleteA = async (row: any) => {
 const fnSubmitA = async () => {
     if (formDataA.value.ActualStartDate == undefined || formDataA.value.ActualStartDate == "") {
         formDataA.value.ActualStartDate = null
+    }else{
+        if(new Date(formDataA.value.ActualStartDate)> Date.now()){
+            VXETable.modal.alert({content:"实际开始日期不能大于当前日期，请重新选择"})
+                return;
+        }
     }
     if (formDataA.value.ActualFinishDate == undefined || formDataA.value.ActualFinishDate == "") {
         formDataA.value.ActualFinishDate = null
+    }else{
+        if(new Date(formDataA.value.ActualFinishDate)> Date.now()){
+            VXETable.modal.alert({content:"实际结束日期不能大于当前日期，请重新选择"})
+                return;
+        }
     }
 
     switch (formTypeA.value) {