From c0423849d1682914d23390cf49c725954e7b5bc6 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 4 Dec 2025 17:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E5=90=8D=E5=88=B6-?= =?UTF-8?q?=E6=96=BD=E5=B7=A5=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/person/contract/contractDetails.css | 3 +- smz-web/js/work/person/accessFieldInfor.js | 71 +++--- smz-web/js/work/person/accessFieldInform.js | 15 +- smz-web/js/work/person/baseManager.js | 43 ++-- smz-web/js/work/person/faceContrast.js | 185 ++++----------- .../WorkNumberListByCurrentDay.js | 12 +- .../js/work/person/faceContrast/workPerson.js | 130 +++-------- .../WorkNumberListByCurrentDay.js | 2 +- smz-web/js/work/person/inOutInfo.js | 76 ++++--- .../templateManage/contractManageList.js | 22 +- .../templateManage/contractSingletonList.js | 16 +- .../pages/work/person/BaseManagerForm.html | 160 +++++++------ .../work/person/BaseViewManagerForm.html | 210 ++++++++++-------- .../pages/work/person/accessFieldInfor.html | 65 ++---- .../pages/work/person/accessFieldInform.html | 23 +- smz-web/pages/work/person/baseManager.html | 45 ++-- smz-web/pages/work/person/faceContrast.html | 94 +++++--- .../WorkNumberListByCurrentDay.html | 30 ++- .../work/person/faceContrast/workPerson.html | 39 ++-- .../WorkNumberListByCurrentDay.html | 6 +- smz-web/pages/work/person/inOutInfo.html | 21 +- .../person/templateManage/acceptanceView.html | 3 +- .../templateManage/contractDetails.html | 84 ++++--- .../templateManage/contractManageList.html | 18 +- .../templateManage/contractSingletonList.html | 4 +- .../templateManage/contractTypeView.html | 3 +- .../work/person/workerAttendHistory.html | 6 +- 27 files changed, 652 insertions(+), 734 deletions(-) diff --git a/smz-web/css/work/person/contract/contractDetails.css b/smz-web/css/work/person/contract/contractDetails.css index 2829f7d..9f84928 100644 --- a/smz-web/css/work/person/contract/contractDetails.css +++ b/smz-web/css/work/person/contract/contractDetails.css @@ -15,5 +15,4 @@ body{ .item{ width: 99%; - margin: 1%; -} \ No newline at end of file +} diff --git a/smz-web/js/work/person/accessFieldInfor.js b/smz-web/js/work/person/accessFieldInfor.js index 83e67a9..81778b3 100644 --- a/smz-web/js/work/person/accessFieldInfor.js +++ b/smz-web/js/work/person/accessFieldInfor.js @@ -165,25 +165,17 @@ function init() { return c; } }, - {"data": "name", "width": "5%"}, - {"data": "idNumber", "width": "6%"}, - {"data": "ethnic", "width": "6%"}, - {"data": "ages", "width": "6%"}, + {"data": "name", "orderable": false,"width": "5%"}, + {"data": "idNumber", "orderable": false,"width": "6%"}, + {"data": "ethnic", "orderable": false,"width": "6%"}, + {"data": "ages", "orderable": false,"width": "6%"}, - // { - // "width": "2%", - // "render": function (data, type, row) { - // var idNumber = row['idNumber']; - // var age = GetAge(idNumber); - // return age; - // } - // }, - {"data": "postName", "width": "6%"}, - {"data": "proName", "width": "8%"}, - {"data": "subName", "width": "8%"}, - {"data": "teamName", "width": "6%"}, - {"data": "einTime", "width": "6%"}, - {"data": "exitTime", "width": "6%"}, + {"data": "postName","orderable": false, "width": "6%"}, + {"data": "proName","orderable": false, "width": "8%"}, + {"data": "subName","orderable": false, "width": "8%"}, + {"data": "teamName","orderable": false, "width": "6%"}, + {"data": "einTime","orderable": false, "width": "6%"}, + {"data": "exitTime","orderable": false, "width": "6%"}, { "width": "4%", @@ -215,17 +207,9 @@ function init() { return html; } }, - // { - // "width": "4%", - // "render": function (data, type, row) { - // var html = ''; - // var isFull = row['isFull']; - // html += ''+isFull+''; - // return html; - // } - // }, + { - "width": "8%", + "width": "12%", "defaultContent": "", "orderable": false, "render": function (data, type, row) { @@ -265,7 +249,7 @@ function init() { }, ], - "order": [[2, "desc"],[3, "desc"],[4, "desc"],[5, "desc"],[6, "desc"],[7, "desc"],[8, "desc"],[9, "desc"], [10, "desc"]] //在栏目列上显示排序功能 + "order": [] //在栏目列上显示排序功能 }); } @@ -297,8 +281,8 @@ function edit(id, proId, subId, orgId,einTime,isCheck) { localStorage.setItem("orgId", orgId); localStorage.setItem("type", '1'); localStorage.setItem("einTime", einTime); - var height = '425px'; - var width = '525px'; + var height = '30%'; + var width = '30%'; var index = layer.open({ title: ['出场', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -414,8 +398,8 @@ function update(id, proId, subId, orgId) { data: {"id": id,"orgId": orgId,"proId": proId}, dataType: 'json', success: function (data) { - var height = '700px'; - var width = '1050px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -451,8 +435,8 @@ function view(id,orgId,proId) { data: {"id": id,"orgId": orgId,"proId": proId}, dataType: 'json', success: function (data) { - var height = '700px'; - var width = '1050px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -462,7 +446,8 @@ function view(id,orgId,proId) { btn: ['关闭'], success: function (layero, index) { var myIframe = window[layero.find('iframe')[0]['name']]; - var fnc = myIframe.setData(data); //aaa()为子页面的方法 + var fnc = myIframe.setData(data); + myIframe.setGrey(data); }, }); } @@ -475,8 +460,8 @@ function rectifyView(id,orgId) { localStorage.setItem("orgId", orgId); var companyId = $("#orgId").val(); localStorage.setItem("companyId", companyId); - var height = '650px'; - var width = '1300px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['出入场记录', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -531,7 +516,7 @@ function buttonView(id, orgId, proId, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -542,7 +527,7 @@ function buttonEdits(id, proId, subId, orgId, einTime,isCheck, permission, pers) return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -553,7 +538,7 @@ function buttonUpdate(id, proId, subId, orgId, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -564,7 +549,7 @@ function buttonCheck(data, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } // 出入场记录查看 @@ -574,7 +559,7 @@ function rectifyCheck(data, orgId,permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } diff --git a/smz-web/js/work/person/accessFieldInform.js b/smz-web/js/work/person/accessFieldInform.js index 626ff53..3109cd6 100644 --- a/smz-web/js/work/person/accessFieldInform.js +++ b/smz-web/js/work/person/accessFieldInform.js @@ -8,12 +8,10 @@ var einTime = localStorage.getItem("einTime"); $(function () { if(type == '1'){ document.getElementById("outNum").style.display = "none"; - document.getElementById("outTime").style.margin = "24% 0% 0% 13%"; }else { var idNumberArr = idNumber.split(","); $("#num").html(idNumberArr.length); document.getElementById("outNum").style.display = "block"; - document.getElementById("outTime").style.margin = "10% 0% 0% 13%"; } }); layui.use(['form', 'laydate'], function () { @@ -30,18 +28,7 @@ layui.use(['form', 'laydate'], function () { var scd=today.getSeconds()>9?today.getSeconds():'0'+today.getSeconds(); var submitTime=yeard+'-'+monthd+'-'+dayd+" "+hourd+":"+mind+":"+scd; $("#exitTime").attr('value',submitTime); - // laydate.render({ - // elem: '#exitTime' //指定元素 元素选择器 - // , type: 'datetime' //选择时间类型 可选值:year(年) month(年月) date(年月日) time(时分秒) datetime(年月日时分秒) - // , trigger: 'click' - // , format: 'yyyy-MM-dd HH:mm:ss' //时间格式 常用时间格式:yyyy-MM-dd HH:mm:ss - // , btns: ['clear', 'now', 'confirm'] //选择框右下角显示的按钮 清除-现在-确定 - // , done: function (value, date) {//时间回调 - // console.log(value); - // console.log(date); - // } - // , min: einTime - // }); + // 验证成功后才会执行下面的操作 form.on('submit(formDemo)', function (data) { data.field.idNumber = idNumber; diff --git a/smz-web/js/work/person/baseManager.js b/smz-web/js/work/person/baseManager.js index 99e1b8c..7b83a25 100644 --- a/smz-web/js/work/person/baseManager.js +++ b/smz-web/js/work/person/baseManager.js @@ -88,12 +88,12 @@ function init() { return c; } }, - {"data": "name",'width': '60px'}, - {"data": "idNumber",'width': '150px'}, - {"data": "sex",'width': '40px'}, - {"data": "ethnic",'width': '40px'}, - {"data": "birthday",'width': '90px'}, - {"data": "issureAuthority",'width': '150px'}, + {"data": "name","orderable": false,'width': '60px'}, + {"data": "idNumber","orderable": false,'width': '150px'}, + {"data": "sex","orderable": false,'width': '40px'}, + {"data": "ethnic","orderable": false,'width': '40px'}, + {"data": "birthday","orderable": false,'width': '90px'}, + {"data": "issureAuthority","orderable": false,'width': '150px'}, { "data": "", 'width': '160px', @@ -105,7 +105,7 @@ function init() { } }, {"data": "address","orderable": false,'width': '210px'}, - {"data": "phone",'width': '110px'}, + {"data": "phone","orderable": false,'width': '110px'}, { "width": "40px", "orderable": false, @@ -133,16 +133,15 @@ function init() { "render": function (data, type, row) { var id = row['idNumber']; var html = ''; - // sys:project:view html += buttonView(id, "", pers); - html += buttonEdits(id, "", pers);//sys:project:add + html += buttonEdits(id, "", pers); html += buttonDel(id, "sys:sgry:del", pers);// return html; } }, ], - "order": [[1, "desc"],[2, "desc"], [3, "desc"], [4, "desc"], [5, "asc"],[6, "asc"], [9, "asc"]] //在栏目列上显示排序功能 + "order": [] //在栏目列上显示排序功能 }); } //照片查看 @@ -151,8 +150,8 @@ function photoView(fileNames,fileTimes,filePaths) { localStorage.setItem("fileTimes", fileTimes); localStorage.setItem("fileNames", fileNames); console.log(filePaths); - var height = '525px'; - var width = '800px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -174,8 +173,8 @@ function edit(id) { data:{"id":id}, dataType: 'json', success: function (data) { - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['修改','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -213,8 +212,8 @@ function view(id) { data:{"id":id}, dataType: 'json', success: function (data) { - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['查看','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -260,7 +259,7 @@ function buttonView(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } // 编辑按钮 @@ -270,7 +269,7 @@ function buttonEdits(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -281,13 +280,13 @@ function buttonDel(data, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } // 新增特征信息弹出框 function addFeaturesInfo(){ - var height = '600px'; - var width = '780px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: '新增', type: 2, @@ -337,4 +336,4 @@ function exportBtnOutBase() { window.URL.revokeObjectURL(url) }; xhr.send(); -} \ No newline at end of file +} diff --git a/smz-web/js/work/person/faceContrast.js b/smz-web/js/work/person/faceContrast.js index 800b97f..f7ea250 100644 --- a/smz-web/js/work/person/faceContrast.js +++ b/smz-web/js/work/person/faceContrast.js @@ -7,113 +7,25 @@ $(function () { var form = layui.form; getPro(form); pers = checkPermission(); - init(); - var minListDate = $('#hidMinListDate').val();//最小可选时间，例：1990-02-01 - var maxListDate = $('#hidMaxListDate').val();//最大可选时间，例：2200-12-31 - $('#startTime').val(getNowTime()); - $('#endTime').val(getNowTime()); - var begin = "#startTime", end = "#endTime";//开始时间选择框、结束时间选择框：文本框 - var endChange = function (val, date) { - if (date && date.year) - begindate.config.max = { - year: date.year, - month: date.month - 1,//必须减1才是正确值 - date: date.date, - hours: date.hours, - minutes: date.minutes, - seconds: date.seconds - }; - else { - var dateInit = new Date(maxListDate.replace(/-/g, "/")); - begindate.config.max = { - year: dateInit.getFullYear(), - month: dateInit.getMonth(), - date: dateInit.getDate(), - hours: dateInit.getHours(), - minutes: dateInit.getMinutes(), - seconds: dateInit.getSeconds() - }; - } - }; - var beginChange = function (val, date) { - if (date && date.year) - enddate.config.min = { - year: date.year, - month: date.month - 1, - date: date.date, - hours: date.hours, - minutes: date.minutes, - seconds: date.seconds - }; - else { - var dateInit = new Date(minListDate.replace(/-/g, "/")); - enddate.config.min = { - year: dateInit.getFullYear(), - month: dateInit.getMonth(), - date: dateInit.getDate(), - hours: dateInit.getHours(), - minutes: dateInit.getMinutes(), - seconds: dateInit.getSeconds() - }; - } - }; - var enddate = laydate.render({ - elem: end, - format: 'yyyy-MM-dd', - min: minListDate, - max: maxListDate, - done: endChange - }); - var begindate = laydate.render({ - elem: begin, - format: 'yyyy-MM-dd', - min: minListDate, - max: maxListDate, - done: beginChange + + var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式 + $('#test6').val(today + ' - ' + today); + laydate.render({ + elem: '#test6', + range: true, + min: $('#hidMinListDate').val(), + max: $('#hidMaxListDate').val() }); $("#searchBt").click(function () { - var startTime = $("#startTime").val(); - var endTime = $("#endTime").val(); - var dateStart = new Date(startTime); - var dateEnd = new Date(endTime); - var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24); - if ((startTime == '' && endTime != '') || (startTime != '' && endTime == '')) { - return top.layer.msg('时间填写不完整', { - icon: 2, - time: 2000 //2秒关闭（如果不配置，默认是3秒） - }); + var dateRange = $.trim($('#test6').val()); + if (!dateRange) { + return layer.msg('请选择日期范围', { icon: 2, time: 2000 }); } - var startDateTemp = startTime.split("-"); - var endDateTemp = endTime.split("-"); - var allStartDate = new Date(startDateTemp[0], startDateTemp[1], startDateTemp[2]); - var allEndDate = new Date(endDateTemp[0], endDateTemp[1], endDateTemp[2]); - if (allStartDate.getTime() > allEndDate.getTime()) { - return top.layer.msg('时间选择不合理，请重新选择', { - icon: 2, - time: 2000 //2秒关闭（如果不配置，默认是3秒） - }); - } - example.ajax.reload(); - // if (difValue >= 0 && difValue <= 31) { - // example.ajax.reload(); - // } else { - // top.layer.msg('请选择31天以内，请重新选择', { - // icon: 2, - // time: 2000 //2秒关闭（如果不配置，默认是3秒） - // }); - // } }); + init(); }); - //导出 - // $("#exportBt").click(function () { - // exportBtn(); - // }); - /*$("#ssss").click(function(){ - view(); - });*/ - }) function init() { @@ -129,14 +41,19 @@ function init() { "url": ctxPath + "/faceContrast", "type": "get", "data": function (d) { + var dateRange = $.trim($('#test6').val()); + var parts = dateRange.split(' - '); + var startTime = parts[0]; + var endTime = parts[1]; + d.name = $("#name").val(); d.subName = $("#subName").val(); d.teamName = $("#teamName").val(); d.proId = $("#proId").val(); d.status = $("#status").val(); - d.startTime = $("#startTime").val(); - d.endTime = $("#endTime").val(); + d.startTime = startTime; + d.endTime = endTime; }, "error": function (xhr, textStatus, errorThrown) { var msg = xhr.responseText; @@ -196,16 +113,16 @@ function init() { return c; } }, - {"data": "name",width: '6%'}, - {"data": "idNumber",width: '8%'}, - {"data": "postName",width: '6%'}, + {"data": "name","orderable": false,width: '6%'}, + {"data": "idNumber","orderable": false,width: '8%'}, + {"data": "postName","orderable": false,width: '6%'}, // {"data": "orgName",width: '10%'}, - {"data": "proName",width: '10%'}, + {"data": "proName","orderable": false,width: '10%'}, {"data": "status",width: '6%',"orderable": false}, - {"data": "subName",width: '10%'}, - {"data": "teamName",width: '10%'}, + {"data": "subName","orderable": false,width: '10%'}, + {"data": "teamName","orderable": false,width: '10%'}, // {"data": "checkInDay",width: '5%'}, {"data": "workHours","orderable": false,width: '5%'}, {"data": "notWorkHours","orderable": false,width: '5%'}, @@ -236,7 +153,7 @@ function init() { }, ], - "order": [[1, "desc"], [2, "desc"], [3, "desc"], [4, "desc"], [6, "desc"], [7, "desc"]] //在栏目列上显示排序功能 + "order": [] //在栏目列上显示排序功能 }); } @@ -245,8 +162,10 @@ function init() { * 查看 * */ function view(exitTime,einTime,idNumber,proId,name,proName,subId,teamId,gz,effectDate) { - var startTime = $('#startTime').val(); - var endTime = $('#endTime').val(); + var dateRange = $.trim($('#test6').val()); + var parts = dateRange.split(' - '); + var startTime = parts[0]; + var endTime = parts[1]; localStorage.setItem("startTime",startTime); localStorage.setItem("endTime",endTime); localStorage.setItem("idNumber", idNumber); @@ -262,7 +181,7 @@ function view(exitTime,einTime,idNumber,proId,name,proName,subId,teamId,gz,effec title: false, type: 2, content: './faceContrastDetail.html', - area: ['80%', '96%'], + area: ['97.5%', '97.5%'], maxmin: false }); } @@ -275,7 +194,7 @@ function buttonView(exitTime,einTime,idNumber,proId,name,proName,subId,teamId,gz return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -289,39 +208,18 @@ function exportBtn() { var subName = $("#subName").val(); var proId = $("#proId").val(); var status = $("#status").val(); - var startTime = $("#startTime").val(); - var endTime = $("#endTime").val(); + + var dateRange = $.trim($('#test6').val()); + var parts = dateRange.split(' - '); + var startTime = parts[0]; + var endTime = parts[1]; var index = top.layer.msg('数据较多，请稍等。。。', { icon: 4, time: 5000 //2秒关闭（如果不配置，默认是3秒） }); - // $.ajax({ - // type: 'get', - // url: ctxPath + '/faceContrast/exportWorkerAttendance', - // data: { - // name: name, - // teamName: teamName, - // orgId: orgId, - // proId: proId, - // status: status, - // startTime: startTime, - // endTime: endTime, - // token: token - // - // }, - // async: false, - // success: function (data) { - // console.log("成功啦"); - // }, - // error: function (err) { - // - // } - // }); window.location.href = ctxPath + "/faceContrast/exportWorkerAttendance?name=" + name + "&teamName=" + teamName +"&subName=" + subName + "&proId=" + proId + "&status=" + status + "&startTime=" + startTime + "&endTime=" + endTime+"&token=" + token; - - // top.layer.close(index); } /** @@ -334,8 +232,11 @@ function downloadWorks() { var subName = $("#subName").val(); var proId = $("#proId").val(); var status = $("#status").val(); - var startTime = $("#startTime").val(); - var endTime = $("#endTime").val(); + + var dateRange = $.trim($('#test6').val()); + var parts = dateRange.split(' - '); + var startTime = parts[0]; + var endTime = parts[1]; var loadingMsg = layer.msg('下载中,请稍候...', {icon: 16, scrollbar: false, time: 0}); @@ -405,4 +306,4 @@ function getPro(form) { console.log("获取工程下拉列表出错：", err); } }); -} \ No newline at end of file +} diff --git a/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js b/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js index 413ebb6..d7e4f99 100644 --- a/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js +++ b/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js @@ -18,16 +18,8 @@ layui.use(['layer', 'laydate', 'form'], function () { //getProject(form); } pers = checkPermission(); - var begin = "#startTime"; - var begindate = laydate.render({ - elem: begin, - format: 'yyyy-MM-dd' - }); - - $(begin).val(time); - + $('#startTime').val(time); init(); - $("#searchBt").click(function () { example.ajax.reload(); }); @@ -158,7 +150,7 @@ function init() { } }, ], - "order": [[0, "desc"], [1, "asc"]] //在栏目列上显示排序功能 + "order": [] //在栏目列上显示排序功能 }); } diff --git a/smz-web/js/work/person/faceContrast/workPerson.js b/smz-web/js/work/person/faceContrast/workPerson.js index db91355..8dd7e83 100644 --- a/smz-web/js/work/person/faceContrast/workPerson.js +++ b/smz-web/js/work/person/faceContrast/workPerson.js @@ -10,97 +10,23 @@ layui.use(['layer', 'laydate', 'form'], function () { getProject(form); pers = checkPermission(); - var minListDate = $('#hidMinListDate').val();//最小可选时间，例：1990-02-01 - var maxListDate = $('#hidMaxListDate').val();//最大可选时间，例：2200-12-31 - $('#startTime').val(getNowTime()); - $('#endTime').val(getNowTime()); - var begin = "#startTime", end = "#endTime";//开始时间选择框、结束时间选择框：文本框 - var endChange = function (val, date) { - if (date && date.year) - begindate.config.max = { - year: date.year, - month: date.month - 1,//必须减1才是正确值 - date: date.date, - hours: date.hours, - minutes: date.minutes, - seconds: date.seconds - }; - else { - var dateInit = new Date(maxListDate.replace(/-/g, "/")); - begindate.config.max = { - year: dateInit.getFullYear(), - month: dateInit.getMonth(), - date: dateInit.getDate(), - hours: dateInit.getHours(), - minutes: dateInit.getMinutes(), - seconds: dateInit.getSeconds() - }; - } - }; - var beginChange = function (val, date) { - if (date && date.year) - enddate.config.min = { - year: date.year, - month: date.month - 1, - date: date.date, - hours: date.hours, - minutes: date.minutes, - seconds: date.seconds - }; - else { - var dateInit = new Date(minListDate.replace(/-/g, "/")); - enddate.config.min = { - year: dateInit.getFullYear(), - month: dateInit.getMonth(), - date: dateInit.getDate(), - hours: dateInit.getHours(), - minutes: dateInit.getMinutes(), - seconds: dateInit.getSeconds() - }; - } - }; - var enddate = laydate.render({ - elem: end, - format: 'yyyy-MM-dd', - min: minListDate, - max: maxListDate, - done: endChange - }); - var begindate = laydate.render({ - elem: begin, - format: 'yyyy-MM-dd', - min: minListDate, - max: maxListDate, - done: beginChange - }); - $("#searchBt").click(function () { - var startTime = $("#startTime").val(); - var endTime = $("#endTime").val(); - var dateStart = new Date(startTime); - var dateEnd = new Date(endTime); - var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24); - if ((startTime == '' && endTime != '') || (startTime != '' && endTime == '')) { - return top.layer.msg('时间填写不完整', { - icon: 2, - time: 2000 //2秒关闭（如果不配置，默认是3秒） - }); - } - var startDateTemp = startTime.split("-"); - var endDateTemp = endTime.split("-"); - var allStartDate = new Date(startDateTemp[0], startDateTemp[1], startDateTemp[2]); - var allEndDate = new Date(endDateTemp[0], endDateTemp[1], endDateTemp[2]); - if (allStartDate.getTime() > allEndDate.getTime()) { - return top.layer.msg('时间选择不合理，请重新选择', { - icon: 2, - time: 2000 //2秒关闭（如果不配置，默认是3秒） - }); - } + var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式 + $('#test6').val(today + ' - ' + today); + laydate.render({ + elem: '#test6', + range: true, + min: $('#hidMinListDate').val(), + max: $('#hidMaxListDate').val() }); - init(); $("#searchBt").click(function () { + var dateRange = $.trim($('#test6').val()); + if (!dateRange) { + return layer.msg('请选择日期范围', { icon: 2, time: 2000 }); + } example.ajax.reload(); }); + $("#updatenow").click(function () { var loadingMsg = layer.msg('数据库更新中,请稍候...', {icon: 16, scrollbar: false, time: 0}); let url,data,reason; @@ -173,7 +99,7 @@ layui.use(['layer', 'laydate', 'form'], function () { }; xhr.send(); }); - + init(); }); @@ -192,10 +118,14 @@ function init() { "url": ctxPath + "/faceContrast/getWorkNumber", "type": "post", "data": function (d) { + var dateRange = $.trim($('#test6').val()); + var parts = dateRange.split(' - '); + var startTime = parts[0]; + var endTime = parts[1]; + d.proId = $("#proId").val(); - d.status = $("#status").val(); - d.startTime = $("#startTime").val(); - d.endTime = $("#endTime").val(); + d.startTime = startTime; + d.endTime = endTime; }, "error": function (xhr, textStatus, errorThrown) { var msg = xhr.responseText; @@ -256,15 +186,15 @@ function init() { return c; } }, - {"data": "orgName", "defaultContent": "", "width": "15%"}, - {"data": "proName", "defaultContent": "", "width": "15%"}, + {"data": "orgName","orderable": false, "defaultContent": "", "width": "15%"}, + {"data": "proName","orderable": false, "defaultContent": "", "width": "15%"}, {"data": "time","orderable": false, "defaultContent": "", "width": "8%"}, - {"data": "entranceNum", "defaultContent": "", "width": "10%"}, - {"data": "workNum", "defaultContent": "", "width": "10%"}, - {"data": "restNum", "defaultContent": "", "width": "10%"}, - {"data": "noWorkNum", "defaultContent": "", "width": "10%"}, - {"data": "einNum", "defaultContent": "", "width": "10%"}, - {"data": "exitNum", "defaultContent": "", "width": "10%"}, + {"data": "entranceNum","orderable": false, "defaultContent": "", "width": "10%"}, + {"data": "workNum","orderable": false, "defaultContent": "", "width": "10%"}, + {"data": "restNum","orderable": false, "defaultContent": "", "width": "10%"}, + {"data": "noWorkNum","orderable": false, "defaultContent": "", "width": "10%"}, + {"data": "einNum","orderable": false, "defaultContent": "", "width": "10%"}, + {"data": "exitNum","orderable": false, "defaultContent": "", "width": "10%"}, { "data": "", "defaultContent": "",width: '5%', @@ -311,7 +241,7 @@ function buttonCheckView(proId,proName, time,einNum,exitNum, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -326,7 +256,7 @@ function checkView(proId,proName,time,einNum,exitNum) { title: ['查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: 'WorkNumberListByCurrentDay.html', - area: ['95%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false }); } diff --git a/smz-web/js/work/person/faceContrastNew/WorkNumberListByCurrentDay.js b/smz-web/js/work/person/faceContrastNew/WorkNumberListByCurrentDay.js index fd675b2..d7e4f99 100644 --- a/smz-web/js/work/person/faceContrastNew/WorkNumberListByCurrentDay.js +++ b/smz-web/js/work/person/faceContrastNew/WorkNumberListByCurrentDay.js @@ -150,7 +150,7 @@ function init() { } }, ], - "order": [[0, "desc"], [1, "asc"]] //在栏目列上显示排序功能 + "order": [] //在栏目列上显示排序功能 }); } diff --git a/smz-web/js/work/person/inOutInfo.js b/smz-web/js/work/person/inOutInfo.js index fe14a4a..c27592d 100644 --- a/smz-web/js/work/person/inOutInfo.js +++ b/smz-web/js/work/person/inOutInfo.js @@ -1,4 +1,4 @@ -var roleLevel= localStorage.getItem("roleLevel"); +var roleLevel = localStorage.getItem("roleLevel"); $(function () { layui.use(['form', 'laydate'], function () { var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功 @@ -64,6 +64,20 @@ function setData(data) { $("#wageCriterion").val(data.wageCriterion); }; +function setGrey() { +// 创建 style 元素 + const style = document.createElement('style'); + style.textContent = ` + .layui-input, + .layui-select, + .layui-textarea { + background-color: #eee !important; + } +`; + // 插入到 head 中 + document.head.appendChild(style); +} + function cancelReadOnly() { $("#name").prop("readonly", false); $("#phone").prop("readonly", false); @@ -103,15 +117,19 @@ function cancelReadOnly() { function updateWorkRecord(formData) { var wageApprovedWay = $("#wageApprovedWay").val();//工资核定方式 var wageCriterion = $("#wageCriterion").val();//工种工资核定标准 - if(wageApprovedWay == '每天'){ //天：60-600 - if(Number(wageCriterion) < 60 || Number(wageCriterion) > 600){ - layer.msg('工资标准应在60-600之间', {icon: 2, time: 2000}); - return false; + if (wageApprovedWay == '每天') { //天：60-600 + if(wageCriterion){ + if (Number(wageCriterion) < 60 || Number(wageCriterion) > 600) { + layer.msg('工资标准应在60-600之间', {icon: 2, time: 2000}); + return false; + } } - }else if(wageApprovedWay == '每月'){ //月：1800-18000 - if(Number(wageCriterion) < 1800 || Number(wageCriterion) > 18000){ - layer.msg('工资标准应在1800-18000之间', {icon: 2, time: 2000}); - return false; + } else if (wageApprovedWay == '每月') { //月：1800-18000 + if(wageCriterion){ + if (Number(wageCriterion) < 1800 || Number(wageCriterion) > 18000) { + layer.msg('工资标准应在1800-18000之间', {icon: 2, time: 2000}); + return false; + } } } // form请求地址 @@ -128,17 +146,17 @@ function updateWorkRecord(formData) { parent.layer.msg('修改成功', {icon: 1, time: 2000}); var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 parent.layer.close(index); //再执行关闭 - window.parent.example.ajax.reload( null, false ); // 刷新页面 + window.parent.example.ajax.reload(null, false); // 刷新页面 } else if (data.resMsg == "修改失败") { parent.layer.msg('修改失败', {icon: 2, time: 2000}); var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 parent.layer.close(index); //再执行关闭 - window.parent.example.ajax.reload( null, false ); // 刷新页面 + window.parent.example.ajax.reload(null, false); // 刷新页面 } else { parent.layer.msg(data.resMsg, {icon: 2, time: 2000}); var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 parent.layer.close(index); //再执行关闭 - window.parent.example.ajax.reload( null, false ); // 刷新页面 + window.parent.example.ajax.reload(null, false); // 刷新页面 } }, error: function (XMLHttpRequest, textStatus, e) { @@ -148,7 +166,7 @@ function updateWorkRecord(formData) { } //获取工种 -function getPostName(postName,postId) { +function getPostName(postName, postId) { $("#postName").empty(); $.ajax({ type: 'POST', @@ -158,10 +176,10 @@ function getPostName(postName,postId) { console.log(data); var str = ''; if (data.length > 0) { - for (var i = 0;i < data.length; i++){ - if (postName == data[i].name ) { - str += ''; - }else{ + for (var i = 0; i < data.length; i++) { + if (postName == data[i].name) { + str += ''; + } else { str += ''; } } @@ -173,22 +191,22 @@ function getPostName(postName,postId) { } //获取分包商 -function getSubName(companyId,subId) { +function getSubName(companyId, subId) { $("#subName").empty(); $.ajax({ type: 'POST', url: ctxPath + '/WorkRecord/getSubNameByCompany', dataType: 'json', data: { - companyId:companyId, + companyId: companyId, }, success: function (data) { var str = ''; if (data.length > 0) { - for (var i = 0;i < data.length; i++){ + for (var i = 0; i < data.length; i++) { if (subId === data[i].id) { str += ''; - }else{ + } else { str += ''; } } @@ -200,25 +218,25 @@ function getSubName(companyId,subId) { } //获取班组 -function getTeamName(subId,teamName,type) { +function getTeamName(subId, teamName, type) { $("#teamName").empty(); $.ajax({ type: 'POST', url: ctxPath + '/WorkRecord/getTeamName', dataType: 'json', - data:{ - subId:subId, + data: { + subId: subId, }, success: function (data) { var str = ''; if (data.length > 0) { - for (var i = 0;i < data.length; i++){ + for (var i = 0; i < data.length; i++) { if (teamName == data[i].name) { str += ''; - }else{ - if (type==1){ + } else { + if (type == 1) { str += ''; - }else { + } else { } } @@ -228,4 +246,4 @@ function getTeamName(subId,teamName,type) { layui.form.render('select'); //这里就是我们要渲染的地方了 } }) -} \ No newline at end of file +} diff --git a/smz-web/js/work/person/templateManage/contractManageList.js b/smz-web/js/work/person/templateManage/contractManageList.js index 0e2daae..1efc397 100644 --- a/smz-web/js/work/person/templateManage/contractManageList.js +++ b/smz-web/js/work/person/templateManage/contractManageList.js @@ -330,8 +330,8 @@ function init() { } //查看电子合同详情 function electronicContractView(id,contractType,idNumber,url){ - let height = getDefaultHeight().toFixed(0) + 'px'; - let width = getDefaultWidth().toFixed(0) + 'px'; + let height = "75%"; + let width = "75%"; localStorage.setItem("idNumber", idNumber); localStorage.setItem("url", url); localStorage.setItem("id", id); @@ -370,8 +370,8 @@ function electronicContractView(id,contractType,idNumber,url){ function acceptanceView(id,idNumber) { localStorage.setItem("id",id); localStorage.setItem("idNumber",idNumber); - let height ="80%"; - let width = "80%"; + let height ="75%"; + let width = "75%"; var index = layer.open({ title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -390,15 +390,15 @@ function particularsContractWitness(idNumber, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } //合同签订信息 function particularsContractWitnessPage(idNumber) { localStorage.setItem("idNumber", idNumber); - let height = getDefaultHeight().toFixed(0) + 'px'; - let width = getDefaultWidth().toFixed(0) + 'px'; + let height = '75%'; + let width = '75%'; var layerIndex = layer.open({ id: 'layer-contract-signing-infor', title: ['合同签订信息', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], @@ -450,8 +450,8 @@ function uploadContractWitnessView(idNumber,id,proId) { } function openContractWitnessFormHtml(idNumber,id,proId,contractId) { - let height = getDefaultHeight2().toFixed(0) + 'px'; - let width = getDefaultWidth2().toFixed(0) + 'px'; + let height = '75%'; + let width = '75%'; let layerIndex = layer.open({ title: false, type: 1, @@ -492,8 +492,8 @@ function choosePersonnelType(value,idNumber,id,proId,contractId) { if(value === 2){ title = '合同见证上传（班组长）'; } - let height = getDefaultHeight().toFixed(0) + 'px'; - let width = getDefaultWidth().toFixed(0) + 'px'; + let height = '75%'; + let width = '75%'; let layerIndex = layer.open({ id: 'layer_Personnel_add', title: [title, 'color:#3A81AD;font-size:22px;background-color:#eee;'], diff --git a/smz-web/js/work/person/templateManage/contractSingletonList.js b/smz-web/js/work/person/templateManage/contractSingletonList.js index 37fe7cd..a5d5d1a 100644 --- a/smz-web/js/work/person/templateManage/contractSingletonList.js +++ b/smz-web/js/work/person/templateManage/contractSingletonList.js @@ -22,7 +22,7 @@ function init() { "language": { "url": contentPath + "/js/plugin/datatables/Chinese.lang" }, - 'scrollY': 'calc(100vh - 150px)', + 'scrollY': 'calc(100vh - 192px)', 'scroller': true, 'scrollCollapse':true, "ajax": { @@ -201,8 +201,8 @@ function init() { //查看合同pdf或照片 function electronicContractView(id,contractType,idNumber,url){ - let height = getDefaultHeight().toFixed(0) + 'px'; - let width = getDefaultWidth().toFixed(0) + 'px'; + let height = '75%'; + let width = '75%'; // localStorage.setItem("idNumber", idNumber); // localStorage.setItem("url", url); // localStorage.setItem("contractId", id); @@ -253,9 +253,9 @@ function electronicContractView(id,contractType,idNumber,url){ function acceptanceView(id,idNumber) { localStorage.setItem("id",id); localStorage.setItem("idNumber",idNumber); - let height ="100%"; - let width = "90%"; - var index = layer.open({ + let height ="75%"; + let width = "75%"; + var index = parent.layer.open({ title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: 'acceptanceView.html', @@ -277,8 +277,8 @@ function contractSigningInformation(idNumber, id, contractType, permission, pers //合同签订信息 function contractSigningInformationView(idNumber,id,contractType) { - let height = getDefaultHeight().toFixed(0) + 'px'; - let width = getDefaultWidth().toFixed(0) + 'px'; + let height = '75%'; + let width = '75%'; //电子合同详情 // localStorage.setItem("idNumber", idNumber); // localStorage.setItem("contractId", id); diff --git a/smz-web/pages/work/person/BaseManagerForm.html b/smz-web/pages/work/person/BaseManagerForm.html index 3a578f4..5fbd435 100644 --- a/smz-web/pages/work/person/BaseManagerForm.html +++ b/smz-web/pages/work/person/BaseManagerForm.html @@ -14,97 +14,109 @@ .layui-form-label { width: 120px; } - .layui-input-block { - margin-left: 150px; - } + + .layui-input-block { + margin-left: 150px; + } -
+
-
- -
- +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
- -
- +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
-
- -
- +
+
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
- -
- -
-
-
- -
- -
-
-
- -
- +
+ +
+ +
-
- -
- +
+
+ +
+ +