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 03b3b12..f985f5f 100644 --- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js +++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js @@ -465,7 +465,12 @@ function uploadPhoto() { $("#hideUpload1").trigger("click"); } else { if (CODE_2 != 0) { - $("#hideUpload2").trigger("click"); + var length = $('#demo2 img').length; + if(length>0){ + $("#hideUpload2").trigger("click"); + }else{ + saveData(formData) + } } else { saveData(formData) } @@ -489,13 +494,16 @@ function saveData(data) { return ""; } data.field.rectStatus = 1; - } - if(rectTime == ""){ - data.field.rectStatus = 0; }else{ - data.field.rectStatus = 1; + var length = $('#demo2 img').length; + if(length > 0){ + data.field.rectStatus =1; + }else { + data.field.rectStatus = 0; + } } + 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 2475129..adf6270 100644 --- a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js +++ b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js @@ -466,7 +466,12 @@ function uploadPhoto() { $("#hideUpload1").trigger("click"); } else { if (CODE_2 != 0) { - $("#hideUpload2").trigger("click"); + var length = $('#demo2 img').length; + if(length>0){ + $("#hideUpload2").trigger("click"); + }else{ + saveData(formData) + } } else { saveData(formData) } @@ -490,13 +495,16 @@ function saveData(data) { return ""; } data.field.rectStatus = 1; - } - if(rectTime == ""){ - data.field.rectStatus = 0; }else{ - data.field.rectStatus = 1; + var length = $('#demo2 img').length; + if(length > 0){ + data.field.rectStatus = 1; + }else{ + data.field.rectStatus = 0; + } } + data.field.delFileList = deleteFileList; data.field.proId = proId;