From c6d6a1fa6a2db66ef900c6a188b492f8b0e13e57 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Fri, 18 Apr 2025 18:40:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../child/qualityInspectionForm.js            | 22 ++++++++-----------
 .../child/safetyViolationsForm.js             | 22 ++++++++-----------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
index 74eb751..5b47ef2 100644
--- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
+++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js
@@ -159,12 +159,14 @@ layui.use(['laydate', 'upload'], function () {
     laydate = layui.laydate;
     laydate.render({
         elem: '#vioDate',
+        max: 0,
         done: function (value, date) {
             validateDates();
         }
     });
     laydate.render({
         elem: '#rectDate',
+        min: 0,
         done: function (value, date) {
             validateDates();
         }
@@ -479,6 +481,7 @@ function saveData(data) {
     data.field.dataSource = 1;
 
     data.field.fileList = [...vrImgList, ...correctionImgList];
+
     let rectTime = $("#rectTime").val()
     if (correctionImgList.length > 0) {
         if (rectTime == "") {
@@ -486,20 +489,13 @@ function saveData(data) {
             return "";
         }
         data.field.rectStatus = 1;
-    } else {
-        //获取当前日期进行判断
-        let currentDate = getCurrentDate();
-        if (rectTime == "") {
-            data.field.rectStatus = 0;
-        } else {
-            // 判断整改时间是否早于当前日期
-            if (new Date(rectTime) < new Date(currentDate)) {
-                data.field.rectStatus = 0;
-            } else {
-                data.field.rectStatus = 2;
-            }
-        }
     }
+    if(rectTime == ""){
+        data.field.rectStatus = 0;
+    }else{
+        data.field.rectStatus = 1;
+    }
+
     data.field.delFileList = deleteFileList;
 
     data.field.proId = proId;
diff --git a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
index 8f9ab94..4223453 100644
--- a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
+++ b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js
@@ -159,12 +159,14 @@ layui.use(['laydate', 'upload'], function () {
     laydate = layui.laydate;
     laydate.render({
         elem: '#vioDate',
+        max: 0,
         done: function (value, date) {
             validateDates();
         }
     });
     laydate.render({
         elem: '#rectDate',
+        min: 0,
         done: function (value, date) {
             validateDates();
         }
@@ -480,6 +482,7 @@ function saveData(data) {
     data.field.dataSource = 1;
 
     data.field.fileList = [...vrImgList, ...correctionImgList];
+
     let rectTime = $("#rectTime").val()
     if (correctionImgList.length > 0) {
         if (rectTime == "") {
@@ -487,20 +490,13 @@ function saveData(data) {
             return "";
         }
         data.field.rectStatus = 1;
-    } else {
-        //获取当前日期进行判断
-        let currentDate = getCurrentDate();
-        if (rectTime == "") {
-            data.field.rectStatus = 0;
-        } else {
-            // 判断整改时间是否早于当前日期
-            if (new Date(rectTime) < new Date(currentDate)) {
-                data.field.rectStatus = 0;
-            } else {
-                data.field.rectStatus = 2;
-            }
-        }
     }
+    if(rectTime == ""){
+        data.field.rectStatus = 0;
+    }else{
+        data.field.rectStatus = 1;
+    }
+
     data.field.delFileList = deleteFileList;
 
     data.field.proId = proId;