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;