样式修改
This commit is contained in:
parent
9b4d232ad6
commit
f245ad29d8
|
|
@ -14,6 +14,8 @@ let buildAfterImgList = []; // 恢复后照片
|
|||
|
||||
let CODE_1 = 0, CODE_2 = 0, CODE_3 = 0;
|
||||
|
||||
let files1,files2,files3;
|
||||
|
||||
let proId, proName, majorId, majorName, gxId, gxName;
|
||||
layui.use(['laydate', 'upload'], function () {
|
||||
var upload = layui.upload;
|
||||
|
|
@ -54,6 +56,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_1 = 1;
|
||||
uploadcom1.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files1 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo1 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -66,7 +69,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo1').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage1(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -105,6 +108,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_2 = 1;
|
||||
uploadcom2.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files2 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo2 img').length;
|
||||
if (length > 49) {
|
||||
|
|
@ -116,7 +120,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo2').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage2(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -155,6 +159,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_3 = 1;
|
||||
uploadcom3.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files3 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo3 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -166,7 +171,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo3').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage3(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -190,7 +195,18 @@ layui.use(['laydate', 'upload'], function () {
|
|||
});
|
||||
|
||||
|
||||
window.removeImage = function (uniqueId) {
|
||||
window.removeImage1 = function (uniqueId,index) {
|
||||
delete files1[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
window.removeImage2 = function (uniqueId,index) {
|
||||
delete files2[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
window.removeImage3 = function (uniqueId,index) {
|
||||
delete files3[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
laydate = layui.laydate;
|
||||
|
|
|
|||
|
|
@ -287,7 +287,7 @@ function exportExcel() {
|
|||
gxId: $('#processId').val(),
|
||||
};
|
||||
let loadingMsg = layer.msg("数据导出中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
|
||||
let url = dataUrl + "/imgUpload/safetyViolation/downloadExcel?token=" + tokens + "&encryptedData=" + encodeURIComponent(encryptCBC(JSON.stringify(obj)));
|
||||
let url = dataUrl + "/coordinatePhoto/coordinatePhotoExport?token=" + tokens + "&encryptedData=" + encodeURIComponent(encryptCBC(JSON.stringify(obj)));
|
||||
let xhr = new XMLHttpRequest();
|
||||
xhr.open("post", url, true);
|
||||
xhr.responseType = "blob"; // 转换流
|
||||
|
|
@ -299,7 +299,7 @@ function exportExcel() {
|
|||
var a = document.createElement("a");
|
||||
var url = window.URL.createObjectURL(blob);
|
||||
a.href = url;
|
||||
a.download = "安全违章列表" + ".xlsx"; // 文件名
|
||||
a.download = "协调照片(建设用地)列表" + ".xlsx"; // 文件名
|
||||
} else {
|
||||
layer.msg("数据导出发生异常,请稍后重试", {icon: 16, scrollbar: false, time: 2000});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ let processList;
|
|||
let vrImgList = []; // 违章照片
|
||||
let CODE_1 = 0;
|
||||
|
||||
let files1;
|
||||
|
||||
let proId, proName, majorId, majorName, gxId, gxName;
|
||||
layui.use(['laydate', 'upload'], function () {
|
||||
var upload = layui.upload;
|
||||
|
|
@ -39,6 +41,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_1 = 1;
|
||||
uploadcom1.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files1 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo1 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -51,7 +54,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo1').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage1(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -75,7 +78,8 @@ layui.use(['laydate', 'upload'], function () {
|
|||
}
|
||||
});
|
||||
|
||||
window.removeImage = function (uniqueId) {
|
||||
window.removeImage1 = function (uniqueId) {
|
||||
delete files1[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@ let correctionImgList = []; // 整改照片
|
|||
const deleteFileList = [];// 删除照片
|
||||
let CODE_1 = 0, CODE_2 = 0;
|
||||
|
||||
// 自定义文件队列
|
||||
let files1,files2;
|
||||
|
||||
let proId, proName, majorId, majorName, gxId, gxName;
|
||||
layui.use(['laydate', 'upload'], function () {
|
||||
var upload = layui.upload;
|
||||
|
|
@ -48,6 +51,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_1 = 1;
|
||||
uploadcom1.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files1 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo1 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -60,7 +64,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo1').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage1(\'' + uniqueId + '\', \'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -96,6 +100,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_2 = 1;
|
||||
uploadcom2.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files2 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo2 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -107,7 +112,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo2').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage2(\'' + uniqueId + '\', \'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -127,22 +132,62 @@ layui.use(['laydate', 'upload'], function () {
|
|||
}
|
||||
});
|
||||
|
||||
window.removeImage = function (uniqueId) {
|
||||
window.removeImage1 = function (uniqueId,index) {
|
||||
delete files1[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
window.removeImage2 = function (uniqueId,index) {
|
||||
delete files2[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
laydate = layui.laydate;
|
||||
laydate.render({
|
||||
elem: '#vioDate',
|
||||
done: function(value, date) {
|
||||
validateDates();
|
||||
}
|
||||
});
|
||||
laydate.render({
|
||||
elem: '#rectDate',
|
||||
done: function(value, date) {
|
||||
validateDates();
|
||||
}
|
||||
});
|
||||
laydate.render({
|
||||
elem: '#rectTime',
|
||||
done: function(value, date) {
|
||||
validateDates();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 校验日期逻辑
|
||||
function validateDates() {
|
||||
var vioDate = document.getElementById('vioDate').value;
|
||||
var rectDate = document.getElementById('rectDate').value;
|
||||
var rectTime = document.getElementById('rectTime').value;
|
||||
|
||||
if (vioDate && rectDate) {
|
||||
if (new Date(rectDate) < new Date(vioDate)) {
|
||||
document.getElementById('rectDate').value = ''; // 清空整改期限
|
||||
layer.msg('整改期限必须大于等于检查时间', {icon: 5});
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (rectDate && rectTime) {
|
||||
if (new Date(rectTime) < new Date(rectDate)) {
|
||||
document.getElementById('rectTime').value = ''; // 清空整改时间
|
||||
layer.msg('整改时间必须大于等于整改期限', {icon: 5});
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function setParams(params) {
|
||||
idParam = JSON.parse(params).id;
|
||||
details = JSON.parse(params).details;
|
||||
|
|
@ -391,10 +436,26 @@ function saveData(data) {
|
|||
data.field.dataSource = 1;
|
||||
|
||||
data.field.fileList = [...vrImgList, ...correctionImgList];
|
||||
let rectTime = $("#rectTime").val()
|
||||
if (correctionImgList.length > 0) {
|
||||
if(rectTime == ""){
|
||||
layer.msg("请填写整改时间", {icon: 2, time: 2000});
|
||||
return "";
|
||||
}
|
||||
data.field.rectStatus = 1;
|
||||
} else {
|
||||
data.field.rectStatus = 0;
|
||||
//获取当前日期进行判断
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
data.field.delFileList = deleteFileList;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
|
|||
layui.form.render();
|
||||
getProSelected();
|
||||
getProcessIdSelected();
|
||||
getStateIdSelected();
|
||||
pages(1, 10, 1);
|
||||
|
||||
})
|
||||
|
|
@ -136,7 +135,7 @@ function getReqParams(page, limit, type) {
|
|||
$('#keyWord').val('')
|
||||
$('#proId').val('')
|
||||
$('#processId').val('')
|
||||
$('#stateId').val('')
|
||||
$('#rectStatus').val('')
|
||||
layui.form.render();
|
||||
}
|
||||
obj = {
|
||||
|
|
@ -145,7 +144,7 @@ function getReqParams(page, limit, type) {
|
|||
keyWord: $('#keyWord').val(),
|
||||
proId: $('#proId').val(),
|
||||
gxId: $('#processId').val(),
|
||||
proStatus: $('#stateId').val()
|
||||
rectStatus: $('#rectStatus').val()
|
||||
};
|
||||
console.log(obj)
|
||||
obj={
|
||||
|
|
@ -266,26 +265,6 @@ function getProcessIdSelected() {
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取状态
|
||||
*/
|
||||
function getStateIdSelected() {
|
||||
let url = dataUrl + '/sys/select/getDictSelectByType';
|
||||
let data={
|
||||
encryptedData:encryptCBC(JSON.stringify({"code":"pro_status"}))
|
||||
}
|
||||
ajaxRequest(url, "GET", data, true, function () {
|
||||
}, function (result) {
|
||||
if (result.code === 200) {
|
||||
setSelectValue(result.data, 'stateId','请选择状态类型');
|
||||
} else {
|
||||
layer.alert(result.msg, {icon: 2})
|
||||
}
|
||||
}, function (xhr) {
|
||||
error(xhr)
|
||||
});
|
||||
}
|
||||
|
||||
/*下拉选表单赋值*/
|
||||
function setSelectValue(list, selectName, placeholder) {
|
||||
let html = '<option value="" selected>'+placeholder+'</option>';
|
||||
|
|
@ -319,7 +298,7 @@ function exportExcel() {
|
|||
keyWord: $('#keyWord').val(),
|
||||
proId: $('#proId').val(),
|
||||
gxId: $('#processId').val(),
|
||||
proStatus: $('#stateId').val()
|
||||
rectStatus: $('#rectStatus').val()
|
||||
};
|
||||
let loadingMsg = layer.msg("数据导出中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
|
||||
let url = dataUrl + "/imgUpload/qualityInspection/downloadExcel?token=" + tokens + "&encryptedData=" + encodeURIComponent(encryptCBC(JSON.stringify(obj)));
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ let processList;
|
|||
let vrImgList = []; // 违章照片
|
||||
let CODE_1 = 0;
|
||||
|
||||
let files1;
|
||||
|
||||
let proId, proName, majorId, majorName, gxId, gxName;
|
||||
layui.use(['laydate', 'upload'], function () {
|
||||
var upload = layui.upload;
|
||||
|
|
@ -39,6 +41,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_1 = 1;
|
||||
uploadcom1.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files1 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo1 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -51,7 +54,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo1').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -75,7 +78,8 @@ layui.use(['laydate', 'upload'], function () {
|
|||
}
|
||||
});
|
||||
|
||||
window.removeImage = function (uniqueId) {
|
||||
window.removeImage = function (uniqueId, index) {
|
||||
delete files1[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@ let correctionImgList = []; // 整改照片
|
|||
const deleteFileList = [];// 删除照片
|
||||
let CODE_1 = 0, CODE_2 = 0;
|
||||
|
||||
let files1,files2;
|
||||
|
||||
let proId, proName, majorId, majorName, gxId, gxName;
|
||||
layui.use(['laydate', 'upload'], function () {
|
||||
var upload = layui.upload;
|
||||
|
|
@ -48,6 +50,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_1 = 1;
|
||||
uploadcom1.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files1 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo1 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -60,7 +63,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo1').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage1(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -99,6 +102,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
CODE_2 = 1;
|
||||
uploadcom2.config.elem.next()[0].value = '';
|
||||
let files = obj.pushFile();
|
||||
files2 = obj.pushFile();
|
||||
obj.preview(function (index, file, result) {
|
||||
var length = $('#demo2 img').length;
|
||||
if (length > 8) {
|
||||
|
|
@ -110,7 +114,7 @@ layui.use(['laydate', 'upload'], function () {
|
|||
$('#demo2').append(
|
||||
'<div id="img-' + uniqueId + '" style="display: inline-block; position: relative; margin: 5px 5px">' +
|
||||
'<img src="' + result + '" alt="' + file.name + '" style="width: 90px; height: 90px;">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage(\'' + uniqueId + '\')">删除</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-danger" style="position: absolute; top: 0; right: 0;" onclick="removeImage2(\'' + uniqueId + '\',\'' + index + '\')">删除</button>' +
|
||||
'</div>'
|
||||
);
|
||||
});
|
||||
|
|
@ -134,7 +138,13 @@ layui.use(['laydate', 'upload'], function () {
|
|||
});
|
||||
|
||||
|
||||
window.removeImage = function (uniqueId) {
|
||||
window.removeImage1 = function (uniqueId,index) {
|
||||
delete files1[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
window.removeImage2 = function (uniqueId,index) {
|
||||
delete files2[index];//删除指定图片
|
||||
$('#img-' + uniqueId).remove();
|
||||
};
|
||||
|
||||
|
|
@ -142,15 +152,48 @@ layui.use(['laydate', 'upload'], function () {
|
|||
|
||||
laydate.render({
|
||||
elem: '#vioDate',
|
||||
done: function(value, date) {
|
||||
validateDates();
|
||||
}
|
||||
});
|
||||
laydate.render({
|
||||
elem: '#rectDate',
|
||||
done: function(value, date) {
|
||||
validateDates();
|
||||
}
|
||||
});
|
||||
laydate.render({
|
||||
elem: '#rectTime',
|
||||
done: function(value, date) {
|
||||
validateDates();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// 校验日期逻辑
|
||||
function validateDates() {
|
||||
var vioDate = document.getElementById('vioDate').value;
|
||||
var rectDate = document.getElementById('rectDate').value;
|
||||
var rectTime = document.getElementById('rectTime').value;
|
||||
|
||||
if (vioDate && rectDate) {
|
||||
if (new Date(rectDate) < new Date(vioDate)) {
|
||||
document.getElementById('rectDate').value = ''; // 清空整改期限
|
||||
layer.msg('整改期限必须大于等于检查时间', {icon: 5});
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (rectDate && rectTime) {
|
||||
if (new Date(rectTime) < new Date(rectDate)) {
|
||||
document.getElementById('rectTime').value = ''; // 清空整改时间
|
||||
layer.msg('整改时间必须大于等于整改期限', {icon: 5});
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function setParams(params) {
|
||||
idParam = JSON.parse(params).id;
|
||||
|
|
@ -398,10 +441,26 @@ function saveData(data) {
|
|||
data.field.dataSource = 1;
|
||||
|
||||
data.field.fileList = [...vrImgList, ...correctionImgList];
|
||||
let rectTime = $("#rectTime").val()
|
||||
if (correctionImgList.length > 0) {
|
||||
if(rectTime == ""){
|
||||
layer.msg("请填写整改时间", {icon: 2, time: 2000});
|
||||
return "";
|
||||
}
|
||||
data.field.rectStatus = 1;
|
||||
} else {
|
||||
data.field.rectStatus = 0;
|
||||
//获取当前日期进行判断
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
data.field.delFileList = deleteFileList;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () {
|
|||
layui.form.render();
|
||||
getProSelected();
|
||||
getProcessIdSelected();
|
||||
getStateIdSelected();
|
||||
pages(1, 10, 1);
|
||||
|
||||
})
|
||||
|
|
@ -135,7 +134,7 @@ function getReqParams(page, limit, type) {
|
|||
$('#keyWord').val('')
|
||||
$('#proId').val('')
|
||||
$('#processId').val('')
|
||||
$('#stateId').val('')
|
||||
$('#rectStatus').val('')
|
||||
layui.form.render();
|
||||
}
|
||||
obj = {
|
||||
|
|
@ -144,7 +143,7 @@ function getReqParams(page, limit, type) {
|
|||
keyWord: $('#keyWord').val(),
|
||||
proId: $('#proId').val(),
|
||||
gxId: $('#processId').val(),
|
||||
proStatus: $('#stateId').val()
|
||||
rectStatus: $('#rectStatus').val()
|
||||
|
||||
};
|
||||
console.log(obj)
|
||||
|
|
@ -266,26 +265,6 @@ function getProcessIdSelected() {
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取状态
|
||||
*/
|
||||
function getStateIdSelected() {
|
||||
let url = dataUrl + '/sys/select/getDictSelectByType';
|
||||
let data={
|
||||
encryptedData:encryptCBC(JSON.stringify({"code":"pro_status"}))
|
||||
}
|
||||
ajaxRequest(url, "GET", data, true, function () {
|
||||
}, function (result) {
|
||||
if (result.code === 200) {
|
||||
setSelectValue(result.data, 'stateId','请选择状态类型');
|
||||
} else {
|
||||
layer.alert(result.msg, {icon: 2})
|
||||
}
|
||||
}, function (xhr) {
|
||||
error(xhr)
|
||||
});
|
||||
}
|
||||
|
||||
/*下拉选表单赋值*/
|
||||
function setSelectValue(list, selectName, placeholder) {
|
||||
let html = '<option value="" selected>'+placeholder+'</option>';
|
||||
|
|
@ -319,7 +298,7 @@ function exportExcel() {
|
|||
keyWord: $('#keyWord').val(),
|
||||
proId: $('#proId').val(),
|
||||
gxId: $('#processId').val(),
|
||||
proStatus: $('#stateId').val()
|
||||
rectStatus: $('#rectStatus').val()
|
||||
};
|
||||
let loadingMsg = layer.msg("数据导出中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
|
||||
let url = dataUrl + "/imgUpload/safetyViolation/downloadExcel?token=" + tokens + "&encryptedData=" + encodeURIComponent(encryptCBC(JSON.stringify(obj)));
|
||||
|
|
|
|||
|
|
@ -287,4 +287,13 @@ function getGxsSelect(majorId) {
|
|||
error(xhr)
|
||||
});
|
||||
return data;
|
||||
}
|
||||
|
||||
// 获取当前日期并格式化为 yyyy-MM-dd
|
||||
function getCurrentDate() {
|
||||
var today = new Date();
|
||||
var year = today.getFullYear();
|
||||
var month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从0开始,需要+1
|
||||
var day = String(today.getDate()).padStart(2, '0'); // 获取日
|
||||
return `${year}-${month}-${day}`;
|
||||
}
|
||||
|
|
@ -87,9 +87,9 @@
|
|||
<div class="layui-input-inline">
|
||||
<input type="text" name="checkUserName" id="checkUserName" placeholder="输入内容" maxlength="30" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<label class="layui-form-label">检查时间:</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>检查时间:</label>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="vioDate" id="vioDate" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
<input type="text" name="vioDate" id="vioDate" lay-verify="required" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -98,9 +98,9 @@
|
|||
<div class="layui-input-inline">
|
||||
<input type="text" name="vioPlace" id="vioPlace" lay-verify="required" maxlength="30" placeholder="输入内容" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<label class="layui-form-label">整改期限:</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>整改期限:</label>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="rectDate" id="rectDate" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
<input type="text" name="rectDate" id="rectDate" lay-verify="required" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,11 @@
|
|||
|
||||
<div class="layui-inline" style="padding: 0 0 0 10px;">
|
||||
<div class="layui-input-inline">
|
||||
<select id="stateId" name="stateName" class="form-control input-sm">
|
||||
|
||||
<select id="rectStatus" name="rectStatus" class="form-control input-sm">
|
||||
<option value="">请选择状态</option>
|
||||
<option value="0">待整改</option>
|
||||
<option value="1">已整改</option>
|
||||
<option value="2">待整改</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -88,9 +88,9 @@
|
|||
<div class="layui-input-inline">
|
||||
<input type="text" name="checkUserName" id="checkUserName" placeholder="输入内容" maxlength="30" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<label class="layui-form-label">违章时间:</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>违章时间:</label>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="vioDate" id="vioDate" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
<input type="text" name="vioDate" id="vioDate" lay-verify="required" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -99,9 +99,9 @@
|
|||
<div class="layui-input-inline">
|
||||
<input type="text" name="vioPlace" id="vioPlace" lay-verify="required" maxlength="30" placeholder="输入内容" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
<label class="layui-form-label">整改期限:</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>整改期限:</label>
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" name="rectDate" id="rectDate" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
<input type="text" name="rectDate" id="rectDate" lay-verify="required" readonly placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -42,8 +42,11 @@
|
|||
|
||||
<div class="layui-inline" style="padding: 0 0 0 10px;">
|
||||
<div class="layui-input-inline">
|
||||
<select id="stateId" name="stateName" class="form-control input-sm">
|
||||
|
||||
<select id="rectStatus" name="rectStatus" class="form-control input-sm">
|
||||
<option value="">请选择状态</option>
|
||||
<option value="0">待整改</option>
|
||||
<option value="1">已整改</option>
|
||||
<option value="2">待整改</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue