From f6458a209e20d8cf100fa6c02ae1542bfbb1096f Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 18 Apr 2025 11:26:20 +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 --- .../imgUpload/QualityInspectionMapper.xml | 6 +- .../child/qualityInspectionForm.js | 61 ++++++++++++++---- .../qualityInspectionList.js | 9 ++- .../child/safetyViolationsForm.js | 63 ++++++++++++++----- .../safetyViolations/safetyViolationsList.js | 8 ++- 5 files changed, 114 insertions(+), 33 deletions(-) diff --git a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml index 292400a..2ac7ced 100644 --- a/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml +++ b/src/main/resources/mappers/imgUpload/QualityInspectionMapper.xml @@ -29,8 +29,7 @@ rect_status, data_source, create_user_id, - create_user_name, - create_time + create_user_name )values ( #{proId}, #{proName}, @@ -55,8 +54,7 @@ #{rectStatus}, #{dataSource}, #{createUserId}, - #{createUserName}, - #{createTime} + #{createUserName} ) 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 6984011..6108a49 100644 --- a/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js +++ b/src/main/resources/static/js/imageUpload/qualityInspection/child/qualityInspectionForm.js @@ -14,10 +14,11 @@ let correctionImgList = []; // 整改照片 const deleteFileList = [];// 删除照片 let CODE_1 = 0, CODE_2 = 0; -// 自定义文件队列 let files1,files2; let proId, proName, majorId, majorName, gxId, gxName; + +let formData; layui.use(['laydate', 'upload'], function () { var upload = layui.upload; var layer = layui.layer; @@ -70,6 +71,7 @@ layui.use(['laydate', 'upload'], function () { }); }, before: function (obj) { + }, done: function (res, index, upload) { if (res.code === 200) { @@ -78,13 +80,20 @@ layui.use(['laydate', 'upload'], function () { } }, + allDone: function(obj){ + if (CODE_2 != 0) { + $("#hideUpload2").trigger("click"); + }else{ + saveData(formData); + } + }, + error: function (e) { //请求异常回调 console.log(e) } }); - // 多图片上传 var uploadcom2 = upload.render({ elem: '#test2', @@ -126,6 +135,11 @@ layui.use(['laydate', 'upload'], function () { } }, + + allDone: function(obj){ + saveData(formData); + }, + error: function (e) { //请求异常回调 console.log(e) @@ -242,9 +256,10 @@ function setParams(params) { form.render();//重新渲染页面checkbox控件 form.on('submit(formData)', function (data) { data.field.id = $('#id').val(); - saveData(data); + //先调用上传图片接口 + formData = data; + uploadPhoto() }); - }); } @@ -416,21 +431,43 @@ function saveData2() { $('#formSubmit').trigger('click') } -// 保存数据 -function saveData(data) { +let loadingMsgNewS = ""; +function uploadPhoto(){ + vrImgList = []; // 违章照片 + correctionImgList = []; // 整改照片 if(idParam =="" || idParam == null || idParam == undefined){ if (CODE_1 == 0) { layer.msg("请上传缺陷问题照片", {icon: 2, time: 2000}); return ""; } + let length = $('#demo1 img').length; + if(length <1){ + layer.msg("请上传缺陷问题照片", {icon: 2, time: 2000}); + return ""; + } + }else{ + let length = $('#demo1 img').length; + if(length <1){ + layer.msg("请上传缺陷问题照片", {icon: 2, time: 2000}); + return ""; + } } - $("#hideUpload1").trigger("click"); - if (CODE_2 != 0) { - $("#hideUpload2").trigger("click"); + loadingMsgNewS = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}) + if(CODE_1==1){ + $("#hideUpload1").trigger("click"); + }else{ + if (CODE_2 != 0) { + $("#hideUpload2").trigger("click"); + }else{ + saveData(formData) + } } +} - let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); +// 保存数据 +function saveData(data) { + console.log(loadingMsgNewS) let url = dataUrl + "/imgUpload/qualityInspection/insertQualityInspection"; data.field.uploadType = "2"; data.field.dataSource = 1; @@ -479,7 +516,7 @@ function saveData(data) { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); }, function (result) { - layer.close(loadingMsg); // 关闭提示层 + layer.close(loadingMsgNewS); // 关闭提示层 if (result.code === 200) { closePage(1); parent.layer.msg(result.msg, {icon: 1}); @@ -489,7 +526,7 @@ function saveData(data) { $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); } }, function (xhr) { - layer.close(loadingMsg); // 关闭提示层 + layer.close(loadingMsgNewS); // 关闭提示层 $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); error(xhr) diff --git a/src/main/resources/static/js/imageUpload/qualityInspection/qualityInspectionList.js b/src/main/resources/static/js/imageUpload/qualityInspection/qualityInspectionList.js index 6f9fda3..3ea2219 100644 --- a/src/main/resources/static/js/imageUpload/qualityInspection/qualityInspectionList.js +++ b/src/main/resources/static/js/imageUpload/qualityInspection/qualityInspectionList.js @@ -112,7 +112,14 @@ function initTable(dataList, limit, page) { let updaetpwd=""; let del="" let edit=""; - html=updaetpwd + edit+del; + + if(d.rectStatus==0){ + html=updaetpwd + edit+del; + }else if(d.rectStatus==1){ + html=updaetpwd; + }else if(d.rectStatus==2){ + html= updaetpwd+del; + } return html; } }, 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 cfe7f71..63305e9 100644 --- a/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js +++ b/src/main/resources/static/js/imageUpload/safetyViolations/child/safetyViolationsForm.js @@ -17,6 +17,8 @@ let CODE_1 = 0, CODE_2 = 0; let files1,files2; let proId, proName, majorId, majorName, gxId, gxName; + +let formData; layui.use(['laydate', 'upload'], function () { var upload = layui.upload; var layer = layui.layer; @@ -78,9 +80,14 @@ layui.use(['laydate', 'upload'], function () { } }, - allDone: function (res, index, upload) { - + allDone: function(obj){ + if (CODE_2 != 0) { + $("#hideUpload2").trigger("click"); + }else{ + saveData(formData); + } }, + error: function (e) { //请求异常回调 console.log(e) @@ -128,16 +135,17 @@ layui.use(['laydate', 'upload'], function () { } }, - allDone: function (res, index, upload) { + allDone: function(obj){ + saveData(formData); }, + error: function (e) { //请求异常回调 console.log(e) } }); - window.removeImage1 = function (uniqueId,index) { delete files1[index];//删除指定图片 $('#img-' + uniqueId).remove(); @@ -149,7 +157,6 @@ layui.use(['laydate', 'upload'], function () { }; laydate = layui.laydate; - laydate.render({ elem: '#vioDate', done: function(value, date) { @@ -249,7 +256,9 @@ function setParams(params) { form.render();//重新渲染页面checkbox控件 form.on('submit(formData)', function (data) { data.field.id = $('#id').val(); - saveData(data); + //先调用上传图片接口 + formData = data; + uploadPhoto() }); }); } @@ -422,20 +431,43 @@ function saveData2() { $('#formSubmit').trigger('click') } -// 保存数据 -function saveData(data) { +let loadingMsgNew = ""; +function uploadPhoto(){ + vrImgList = []; // 违章照片 + correctionImgList = []; // 整改照片 if(idParam =="" || idParam == null || idParam == undefined){ if (CODE_1 == 0) { layer.msg("请上传违章照片", {icon: 2, time: 2000}); return ""; } - } - $("#hideUpload1").trigger("click"); - if (CODE_2 != 0) { - $("#hideUpload2").trigger("click"); + let length = $('#demo1 img').length; + if(length <1){ + layer.msg("请上传违章照片", {icon: 2, time: 2000}); + return ""; + } + }else{ + let length = $('#demo1 img').length; + if(length <1){ + layer.msg("请上传违章照片", {icon: 2, time: 2000}); + return ""; + } } - let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); + loadingMsgNew = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}) + if(CODE_1==1){ + $("#hideUpload1").trigger("click"); + }else{ + if (CODE_2 != 0) { + $("#hideUpload2").trigger("click"); + }else{ + saveData(formData) + } + } + +} + +// 保存数据 +function saveData(data) { let url = dataUrl + "/imgUpload/safetyViolation/insertSafetyViolation"; data.field.uploadType = "1"; data.field.dataSource = 1; @@ -471,6 +503,7 @@ function saveData(data) { data.field.gxId = gxId; data.field.gxName = gxName; console.log("data:", data) + let params = data.field; if (params.id != "") { url = dataUrl + "/imgUpload/safetyViolation/updateSafetyViolationById"; @@ -483,7 +516,7 @@ function saveData(data) { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); }, function (result) { - layer.close(loadingMsg); // 关闭提示层 + layer.close(loadingMsgNew); // 关闭提示层 if (result.code === 200) { closePage(1); parent.layer.msg(result.msg, {icon: 1}); @@ -493,7 +526,7 @@ function saveData(data) { $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); } }, function (xhr) { - layer.close(loadingMsg); // 关闭提示层 + layer.close(loadingMsgNew); // 关闭提示层 $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); error(xhr) diff --git a/src/main/resources/static/js/imageUpload/safetyViolations/safetyViolationsList.js b/src/main/resources/static/js/imageUpload/safetyViolations/safetyViolationsList.js index ec8c0f0..5bc6858 100644 --- a/src/main/resources/static/js/imageUpload/safetyViolations/safetyViolationsList.js +++ b/src/main/resources/static/js/imageUpload/safetyViolations/safetyViolationsList.js @@ -111,7 +111,13 @@ function initTable(dataList, limit, page) { let updaetpwd=""; let del="" let edit=""; - html=updaetpwd + edit+del; + if(d.rectStatus==0){ + html=updaetpwd + edit+del; + }else if(d.rectStatus==1){ + html=updaetpwd; + }else if(d.rectStatus==2){ + html= updaetpwd+del; + } return html; } },