From aeee05dc6fbee3a4c39a730c38701668d8a60b0f Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 26 Dec 2025 09:52:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E5=90=8D=E5=88=B6-?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ldlz-web/src/views/perform_check/index.vue | 4 +- .../faceContrast/faceContrastDetail.css | 18 +++- smz-web/js/work/basic/subBlackList.js | 6 ++ smz-web/js/work/fileLibrary/fileAllLibrary.js | 2 +- smz-web/js/work/person/accessFieldInfor.js | 13 ++- smz-web/js/work/person/baseManager.js | 9 +- smz-web/js/work/person/contractView.js | 13 +-- smz-web/js/work/person/faceContrast.js | 12 +++ .../WorkNumberListByCurrentDay.js | 8 ++ .../js/work/person/faceContrast/workPerson.js | 14 ++- smz-web/js/work/person/faceContrastDetail.js | 99 ++++++++++--------- .../templateManage/contractManageList.js | 41 +++++--- .../templateManage/contractSingletonList.js | 2 +- .../person/wagesManage/generatePayrollList.js | 36 +++++-- .../person/wagesManage/generatePayrollUpd.js | 15 ++- .../person/wagesManage/generatePayrollView.js | 5 + .../work/person/wagesManage/wagesGrantForm.js | 46 +++------ .../work/person/wagesManage/wagesGrantList.js | 9 ++ .../js/work/person/wagesManage/wagesInfo.js | 14 ++- .../wagesManage/wagesInfoReceiptUploadList.js | 15 ++- .../pages/work/basic/ProManagerFormView.html | 2 +- smz-web/pages/work/basic/proCompletion.html | 2 +- smz-web/pages/work/basic/subBlackList.html | 8 +- smz-web/pages/work/basic/teamWorkInfo.html | 2 +- .../pages/work/basic/teamWorkerPerson.html | 2 +- .../pages/work/person/BaseManagerForm.html | 2 +- .../work/person/BaseViewManagerForm.html | 2 +- .../pages/work/person/accessFieldInfor.html | 3 +- smz-web/pages/work/person/baseManager.html | 3 +- smz-web/pages/work/person/faceContrast.html | 3 +- .../WorkNumberListByCurrentDay.html | 3 +- .../work/person/faceContrast/workPerson.html | 3 +- .../pages/work/person/faceContrastDetail.html | 15 ++- smz-web/pages/work/person/inOutInfo.html | 2 +- smz-web/pages/work/person/openDisphoto.html | 2 +- .../templateManage/contractDetails.html | 2 +- .../templateManage/contractManageList.html | 3 +- .../person/wagesManage/generatePayroll.html | 2 +- .../wagesManage/generatePayrollForm.html | 24 +++-- .../wagesManage/generatePayrollList.html | 4 +- .../wagesManage/generatePayrollUpd.html | 9 +- .../wagesManage/generatePayrollUpdForm.html | 76 +++++++------- .../wagesManage/generatePayrollView.html | 9 +- .../person/wagesManage/wagesCheckView.html | 54 +++++----- .../person/wagesManage/wagesGrantForm.html | 11 ++- .../person/wagesManage/wagesGrantList.html | 5 +- .../work/person/wagesManage/wagesInfo.html | 7 +- .../wagesInfoReceiptUploadList.html | 4 +- .../person/wagesManage/wagesPhotoView.html | 44 ++++++--- smz-web/pages/work/sysMag/facePhotoForm.html | 2 +- 50 files changed, 431 insertions(+), 260 deletions(-) diff --git a/ldlz-web/src/views/perform_check/index.vue b/ldlz-web/src/views/perform_check/index.vue index 9edccd5..03a42e7 100644 --- a/ldlz-web/src/views/perform_check/index.vue +++ b/ldlz-web/src/views/perform_check/index.vue @@ -305,13 +305,13 @@ import { this.open = true; this.title = "新增手册"; }, - /** 查看按钮操作 */ + /** 详情按钮操作 */ handleShow(row) { this.showData = {}; getHandbook(row.id).then(response => { this.showData = response.data; this.openShow = true; - this.titleShow = "查看手册"; + this.titleShow = "详情手册"; }); }, /** 修改按钮操作 */ diff --git a/smz-web/css/work/person/faceContrast/faceContrastDetail.css b/smz-web/css/work/person/faceContrast/faceContrastDetail.css index 284be3a..4ee2a5d 100644 --- a/smz-web/css/work/person/faceContrast/faceContrastDetail.css +++ b/smz-web/css/work/person/faceContrast/faceContrastDetail.css @@ -199,7 +199,7 @@ body,html{ background-repeat: no-repeat; } */ #export{ - width: 4%; +/* width: 4%; height: 77.5%; float: left; margin-top: 0.5%; @@ -207,7 +207,21 @@ body,html{ background-color: transparent; outline:none; background-image: url(../../../../img/info/导出.png); - background-repeat: no-repeat; + background-repeat: no-repeat;*/ + float: left; + margin-top: 0.5%; + margin-left: 1%; + height: 33px; + line-height: 33px; + padding: 0 13px; + background-color: #009688; + color: #fff; + white-space: nowrap; + text-align: center; + font-size: 14px; + border: none; + border-radius: 2px; + cursor: pointer; } #dataCount{ width: 70%; diff --git a/smz-web/js/work/basic/subBlackList.js b/smz-web/js/work/basic/subBlackList.js index 5ed68da..577070e 100644 --- a/smz-web/js/work/basic/subBlackList.js +++ b/smz-web/js/work/basic/subBlackList.js @@ -21,6 +21,11 @@ var pers = null; } }); init(); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + example.ajax.reload(); + }); }); @@ -247,6 +252,7 @@ function importExcel(){ var formData = new FormData($('form')[0]); var name = $("#articleImageFile").val(); if(name==null|| name == "") { + layer.msg("请选择Excel表格!"); return; } if(!(name.endsWith(".xls") || name.endsWith(".xlsx") || name.endsWith(".xlsm"))) { diff --git a/smz-web/js/work/fileLibrary/fileAllLibrary.js b/smz-web/js/work/fileLibrary/fileAllLibrary.js index 2e5bbd4..dada12c 100644 --- a/smz-web/js/work/fileLibrary/fileAllLibrary.js +++ b/smz-web/js/work/fileLibrary/fileAllLibrary.js @@ -524,7 +524,7 @@ function fileMiss(path) { layer.msg("文件未转换成功") } -//查看附件详情 +//详情附件详情 function filePreView(url, fileName, time,fileId) { if(url != "" && url != null){ localStorage.setItem("filePaths", url); diff --git a/smz-web/js/work/person/accessFieldInfor.js b/smz-web/js/work/person/accessFieldInfor.js index 7dfce5b..a0abf50 100644 --- a/smz-web/js/work/person/accessFieldInfor.js +++ b/smz-web/js/work/person/accessFieldInfor.js @@ -33,6 +33,15 @@ layui.use(['layer', 'laydate', 'form'], function () { }); } }); + + $("#resetBt").click(function () { + $("#proId").val(""); + $("#subId").val(""); + $("#einStatus").val(""); + $("#keyWord").val(""); + layui.form.render('select'); + example.ajax.reload(); + }); }); function getLoginUser() { @@ -443,7 +452,7 @@ function view(id,orgId,proId) { content: 'inOutInfo.html', area: [width, height], maxmin: false, - btn: ['关闭'], + btn: ['确定','关闭'], success: function (layero, index) { var myIframe = window[layero.find('iframe')[0]['name']]; var fnc = myIframe.setData(data); @@ -468,7 +477,7 @@ function rectifyView(id,orgId) { content: './workerAttendHistory.html', area: [width, height], maxmin: false, - btn: ['关闭'], + btn: ['确定','关闭'], success: function (layero, index) { var myIframe = window[layero.find('iframe')[0]['name']]; }, diff --git a/smz-web/js/work/person/baseManager.js b/smz-web/js/work/person/baseManager.js index 196a23d..ca57c8a 100644 --- a/smz-web/js/work/person/baseManager.js +++ b/smz-web/js/work/person/baseManager.js @@ -9,6 +9,13 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#name").val(""); + $("#idNumber").val(""); + $("#phone").val(""); + example.ajax.reload(); + }); }) function init() { @@ -220,7 +227,7 @@ function view(id) { content: 'BaseViewManagerForm.html', area: [width, height], maxmin: false, - btn: ['关闭'], + btn: ['确定', '关闭'], success:function(layero,index){ var myIframe = window[layero.find('iframe')[0]['name']]; var fnc = myIframe.setData(data); //aaa()为子页面的方法 diff --git a/smz-web/js/work/person/contractView.js b/smz-web/js/work/person/contractView.js index 6cbc2b8..61a9e26 100644 --- a/smz-web/js/work/person/contractView.js +++ b/smz-web/js/work/person/contractView.js @@ -88,21 +88,12 @@ var Base64 = { return t } } - -// var filePreviewPathAll = "http://140.210.195.210:8012/onlinePreview?url="; -// var filePreviewPathAll = "http://192.168.0.204:8012/onlinePreview?url="; -// var filePath = localStorage.getItem("url"); -var filePreviewPath = smz_ht_url ; - // var filePreviewPathAll ="http://140.210.209.102:1918/hnBmw"; //部署上线地址 -var filePreviewPathAll ="http://192.168.0.14:19118/hnBmw"; //公司测试地址 -// var filePreviewPathAll ="http://116.63.172.211:1918/hnBmw"; //线上正式环境--外网 -// var filePreviewPathAll ="http://172.16.0.235:1918/hnBmw"; //线上正式环境--内网 -// var dataPath ="http://101.201.61.123:19118/hnBmw"; //外围公司测试地址 - +var filePreviewPathAll = smz_ht_url; //公司测试地址 var downloadFileName = localStorage.getItem("downloadFileName"); var filePreviewPath; let filePath; function setParam(urlParam){ + debugger; filePath = urlParam; if(filePath.indexOf("http") != -1){ filePreviewPath = filePreviewPathAll + "/" + filePath; diff --git a/smz-web/js/work/person/faceContrast.js b/smz-web/js/work/person/faceContrast.js index deb1e9a..f94f996 100644 --- a/smz-web/js/work/person/faceContrast.js +++ b/smz-web/js/work/person/faceContrast.js @@ -24,6 +24,18 @@ $(function () { } example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#name").val(""); + $("#subName").val(""); + $("#teamName").val(""); + $("#proId").val(""); + $("#status").val(""); + $('#test6').val(today + ' - ' + today); + layui.form.render('select'); + example.ajax.reload(); + }); + init(); }); }) diff --git a/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js b/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js index 24ce386..1a2c086 100644 --- a/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js +++ b/smz-web/js/work/person/faceContrast/WorkNumberListByCurrentDay.js @@ -23,6 +23,14 @@ layui.use(['layer', 'laydate', 'form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $('#att').val(""); + layui.form.render('select'); + example.ajax.reload(); + }); + $("#exportBt").click(function () { var token = localStorage.getItem("smz-token"); var loadingMsg = layer.msg('下载中,请稍候...', {icon: 16, scrollbar: false, time: 0}); diff --git a/smz-web/js/work/person/faceContrast/workPerson.js b/smz-web/js/work/person/faceContrast/workPerson.js index 12abd15..eed5d6f 100644 --- a/smz-web/js/work/person/faceContrast/workPerson.js +++ b/smz-web/js/work/person/faceContrast/workPerson.js @@ -100,6 +100,14 @@ layui.use(['layer', 'laydate', 'form'], function () { xhr.send(); }); init(); + + $("#resetBt").click(function () { + $("#proId").val(""); + $('#test6').val(today + ' - ' + today); + layui.form.render('select'); + example.ajax.reload(); + }); + }); @@ -241,11 +249,11 @@ function buttonCheckView(proId,proName, time,einNum,exitNum, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } -//查看班组详情，工程查询页面 +//详情班组详情，工程查询页面 function checkView(proId,proName,time,einNum,exitNum) { localStorage.setItem("proId", proId); localStorage.setItem("proName", proName); @@ -253,7 +261,7 @@ function checkView(proId,proName,time,einNum,exitNum) { localStorage.setItem("einNum",einNum); localStorage.setItem("exitNum",exitNum); layer.open({ - title: ['查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], + title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: 'WorkNumberListByCurrentDay.html', area: ['97.5%', '97.5%'], diff --git a/smz-web/js/work/person/faceContrastDetail.js b/smz-web/js/work/person/faceContrastDetail.js index a915abd..7221ac0 100644 --- a/smz-web/js/work/person/faceContrastDetail.js +++ b/smz-web/js/work/person/faceContrastDetail.js @@ -11,50 +11,42 @@ var gz = localStorage.getItem("gz"); var effectDate = localStorage.getItem("effectDate"); var pers = null; -let form,layer; +let form,layer,laydate; $(function() { - layui.use(['layer', 'form'], function () { + layui.use(['layer', 'laydate','form'], function () { layer = layui.layer; form = layui.form; + laydate = layui.laydate; + $('#test6').val(startTime + ' - ' + endTime); + laydate.render({ + elem: '#test6', + range: true, + min: $('#hidMinListDate').val(), + max: $('#hidMaxListDate').val() + }); + pers = checkPermission(); + + $.ajax({ + url: smz_ht_url + '/faceContrast/getNameByIdNumber', + type: "POST", + headers: { + Authorization: "Bearer " + localStorage.getItem("public_token"), + }, + data: { + idNumber: idNumber + }, + success: function(data) { + leftTitle2( "合同生效日期:"+effectDate); + leftTitle(startTime + "~" + endTime + "(" + data[0].name + ")"); + }, + error: function(e) { + alert(e); + } + }); + + initDate(); + initTable(); }); - jeDate({ - dateCell: "#startTime", // isinitVal:true, - format: "YYYY-MM-DD", - isTime: false, // isClear:false, - minDate: "2015-10-19 00:00:00", - maxDate: "2026-11-08 00:00:00" - }); - jeDate({ - dateCell: "#endTime", // isinitVal:true, - format: "YYYY-MM-DD", - isTime: false, // isClear:false, - minDate: "2015-10-19 00:00:00", - maxDate: "2026-11-08 00:00:00" - }); - $("#startTime").val(startTime); - $("#endTime").val(endTime); - - pers = checkPermission(); - - $.ajax({ - url: smz_ht_url + '/faceContrast/getNameByIdNumber', - type: "post", - data: { - idNumber: idNumber - }, - success: function(data) { - leftTitle2( "合同生效日期:"+effectDate); - leftTitle(startTime + "~" + endTime + "(" + data[0].name + ")"); - }, - error: function(e) { - alert(e); - } - }); - - initDate(); - initTable(); - - }); // 子页面调用的刷新父页面方法 @@ -65,8 +57,10 @@ function reloadData() { function initDate() { //初始化Table - 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]; $.ajax({ url: smz_ht_url + '/faceContrast/getWorkerAttendanceCurrentDay', type: "post", @@ -104,8 +98,10 @@ function initTable() { icon: 4, time: 3000 //2秒关闭（如果不配置，默认是3秒） }); - 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]; $("#table").bootstrapTable('destroy').bootstrapTable({ classes: 'table table-hover', url: smz_ht_url + '/faceContrast/getWorkerAttendanceOne', @@ -316,8 +312,11 @@ function initTable() { // 模糊查询数据、重置查询 function querys(type) { - 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 dateStart = new Date(startTime); var dateEnd = new Date(endTime); var difValue = (dateEnd - dateStart) / (1000 * 60 * 60 * 24); @@ -362,8 +361,10 @@ function exportBtn() { var orgId = $("#orgId").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]; window.location.href = smz_ht_url + "/faceContrast/exportWorkerAttendance?idNumber=" + idNumber + "&startTime=" + startTime + "&endTime=" + endTime+"&token=" + token; } @@ -829,4 +830,4 @@ function closePage(type) { } function closePage2() { layer.closeAll(); //再执行关闭 -} \ 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 1c4382d..fccaaec 100644 --- a/smz-web/js/work/person/templateManage/contractManageList.js +++ b/smz-web/js/work/person/templateManage/contractManageList.js @@ -10,6 +10,15 @@ layui.use(['layer','form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $('#proId').val(""); + $('#isSmallBag').val(""); + $('#contractStatus').val(""); + layui.form.render('select'); + example.ajax.reload(); + }); }); function init() { @@ -104,7 +113,7 @@ function init() { var postName = row['postName']; var html = ''; if(postName != '' && postName != null){ - html += "" + postName + ""; + html += "" + postName + ""; }else{ html += "无" } @@ -120,7 +129,7 @@ function init() { var wageCriterion = row['wageCriterion']; var html = ''; if(wageCriterion != '' && wageCriterion != null){ - html += "" + wageCriterion + ""; + html += "" + wageCriterion + ""; }else{ html += "无" } @@ -136,7 +145,7 @@ function init() { var achievementsMoney = row['achievementsMoney']; var html = ''; if(achievementsMoney != '' && achievementsMoney != null){ - html += "" + achievementsMoney + ""; + html += "" + achievementsMoney + ""; }else{ html += "无" } @@ -153,7 +162,7 @@ function init() { var html = ''; if(effectDate != '' && effectDate != null){ - html += "" + effectDate + ""; + html += "" + effectDate + ""; }else{ html += "无" } @@ -195,7 +204,7 @@ function init() { var html = ''; if(contractType != '' && contractType != null){ - html += ""+ name + contractType + ""; + html += ""+ name + contractType + ""; }else{ html += "无" } @@ -330,8 +339,8 @@ function init() { } //查看电子合同详情 function electronicContractView(id,contractType,idNumber,url){ - let height = "75%"; - let width = "75%"; + let height = "97.5%"; + let width = "97.5%"; localStorage.setItem("idNumber", idNumber); localStorage.setItem("url", url); localStorage.setItem("id", id); @@ -370,8 +379,8 @@ function electronicContractView(id,contractType,idNumber,url){ function acceptanceView(id,idNumber) { localStorage.setItem("id",id); localStorage.setItem("idNumber",idNumber); - let height ="75%"; - let width = "75%"; + let height ="97.5%"; + let width = "97.5%"; var index = layer.open({ title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -397,8 +406,8 @@ function particularsContractWitness(idNumber, permission, pers){ //合同签订信息 function particularsContractWitnessPage(idNumber) { localStorage.setItem("idNumber", idNumber); - let height = '75%'; - let width = '75%'; + let height = '97.5%'; + let width = '97.5%'; var layerIndex = layer.open({ id: 'layer-contract-signing-infor', title: ['合同签订信息', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], @@ -410,7 +419,7 @@ function particularsContractWitnessPage(idNumber) { shade: 0.3, //显示遮罩 move: false, resize: false, - btn: ['关闭'], + success:function(layero,index){ let iframeWin = window["layui-layer-iframe" + layerIndex]; iframeWin.setParam(idNumber); @@ -450,8 +459,8 @@ function uploadContractWitnessView(idNumber,id,proId) { } function openContractWitnessFormHtml(idNumber,id,proId,contractId) { - let height = '75%'; - let width = '75%'; + let height = '97.5%'; + let width = '97.5%'; let layerIndex = layer.open({ title: false, type: 1, @@ -492,8 +501,8 @@ function choosePersonnelType(value,idNumber,id,proId,contractId) { if(value === 2){ title = '合同见证上传（班组长）'; } - let height = '75%'; - let width = '75%'; + let height = '97.5%'; + let width = '97.5%'; 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 8efe0a4..1335741 100644 --- a/smz-web/js/work/person/templateManage/contractSingletonList.js +++ b/smz-web/js/work/person/templateManage/contractSingletonList.js @@ -271,7 +271,7 @@ function contractSigningInformation(idNumber, id, contractType, permission, pers return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } diff --git a/smz-web/js/work/person/wagesManage/generatePayrollList.js b/smz-web/js/work/person/wagesManage/generatePayrollList.js index 2066241..133f057 100644 --- a/smz-web/js/work/person/wagesManage/generatePayrollList.js +++ b/smz-web/js/work/person/wagesManage/generatePayrollList.js @@ -19,6 +19,13 @@ layui.use(['form','layer'], function () { $("#generateData").click(function(){ generateData(); }); + + $("#resetBt").click(function () { + $("#proId").val(""); + $("#keyWord").val(""); + form.render('select'); + example.ajax.reload(); + }); init(); }); @@ -135,12 +142,21 @@ function checkDown(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } function downLoad(id){ - window.location.href = smz_ht_url + "/export/exportPayrollInfo?id="+id +"&token=" + token; + if (!id) { + layer.msg('无效的工资单ID', { icon: 2 }); + return; + } + var loadIndex = layer.msg('正在准备下载，请稍候...', { icon: 16, shade: 0.3, time: false }); + setTimeout(function() { + // 先关闭 loading 提示（关键！） + layer.close(loadIndex); + window.location.href = smz_ht_url + "/export/exportPayrollInfo?id="+id +"&token=" + token; + }, 300); } @@ -189,15 +205,15 @@ function buttonDel(id, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } //查看 function view(id){ localStorage.setItem("id", id); - var height = '75%'; - var width = '75%'; + var height = '97.5%'; + var width = '97.5%'; var index = layer.open({ title: ['详情','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -228,14 +244,14 @@ function checkUpd(id, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } function upd(id){ localStorage.setItem("id", id); - var height = '75%'; - var width = '75%'; + var height = '97.5%'; + var width = '97.5%'; var index = layer.open({ title: ['工资册修改','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -262,8 +278,8 @@ function upd(id){ function generateData() { - var height = '75%'; - var width = '75%'; + var height = '97.5%'; + var width = '97.5%'; var index = layer.open({ title: ['生成工资册','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, diff --git a/smz-web/js/work/person/wagesManage/generatePayrollUpd.js b/smz-web/js/work/person/wagesManage/generatePayrollUpd.js index 21aa707..95cdf10 100644 --- a/smz-web/js/work/person/wagesManage/generatePayrollUpd.js +++ b/smz-web/js/work/person/wagesManage/generatePayrollUpd.js @@ -9,13 +9,17 @@ $(function () { }); - pers = checkPermission(); init(); $("#searchBt").click(function () { example.ajax.reload(); }); + $("#resetBt").click(function () { + $("#keyword").val(""); + example.ajax.reload(); + }); + }); function init() { @@ -127,6 +131,7 @@ function init() { "data": "", "defaultContent": "", "orderable": false, + "width": '150px', "render": function (data, type, row) { var idNumbers = row['idNumber']; var html = ''; @@ -173,7 +178,7 @@ function buttonDel(idNumbers, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -184,15 +189,15 @@ function checkUpd(id,idNumbers, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } function upd(id,idNumbers){ localStorage.setItem("id", id); localStorage.setItem("idNumbers", idNumbers); - var height = '600px'; - var width = '1000px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['工资册修改','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, diff --git a/smz-web/js/work/person/wagesManage/generatePayrollView.js b/smz-web/js/work/person/wagesManage/generatePayrollView.js index e9aad02..056c663 100644 --- a/smz-web/js/work/person/wagesManage/generatePayrollView.js +++ b/smz-web/js/work/person/wagesManage/generatePayrollView.js @@ -17,6 +17,11 @@ $(function () { example.ajax.reload(); }); + $("#resetBt").click(function () { + $("#keyword").val(""); + example.ajax.reload(); + }); + }); diff --git a/smz-web/js/work/person/wagesManage/wagesGrantForm.js b/smz-web/js/work/person/wagesManage/wagesGrantForm.js index ed4fbed..ffbfb9f 100644 --- a/smz-web/js/work/person/wagesManage/wagesGrantForm.js +++ b/smz-web/js/work/person/wagesManage/wagesGrantForm.js @@ -14,13 +14,6 @@ $(function () { var layer = layui.layer; var laydate = layui.laydate; form = layui.form; - teamSel = xmSelect.render({ - el: '#teamId', - language: 'zn', - toolbar: {show: true}, - data: [] - }) - //年选择器 laydate.render({ @@ -68,20 +61,7 @@ $(function () { date = date.split("-"); $("#year").val(date[0]); $("#month").val(date[1]); - //获取当前多选选中的值 - var selectArr = teamSel.getValue(); - console.log(selectArr) - //teamId = $("#teamId").val(); - if(selectArr.length === 0){ - parent.layer.msg("请选择班组", {icon: 2, time: 2000}); - return; - }else { - teamIds = []; - for (let i = 0; i < selectArr.length; i++) { - teamIds.push(selectArr[i].value); - } - } - console.log(teamIds) + teamId = $("#teamId").val(); proName =$("#proId option:selected").text(); //获取选中的项 teamName =$("#teamId option:selected").text(); //获取选中的项 $("#proName").html(proName); @@ -111,7 +91,7 @@ function init() { var startTime = parts[0]; var endTime = parts[1]; - d.teamIds = teamIds.toString(); + d.teamIds = $("#teamId").val(); d.proId = $("#proId").val(); d.startTime = startTime; d.endTime = endTime; @@ -497,9 +477,9 @@ function getOvertimePays(that,type) { //保存 function recordsBtn(){ - // var teamId = $("#teamId").val(); + var teamId = $("#teamId").val(); - let teamId = []; +/* let teamId = []; var selectArr = teamSel.getValue(); console.log(selectArr) if(selectArr.length === 0){ @@ -509,7 +489,7 @@ function recordsBtn(){ for (let i = 0; i < selectArr.length; i++) { teamId.push(selectArr[i].value); } - } + }*/ var proId = $("#proId").val(); var year = $("#year").val(); @@ -646,23 +626,23 @@ function getTeam(subId) { }, dataType: 'json', success: function (data) { - console.log(data) + /*console.log(data) teamSel.update({ data: data, autoRow: true, - }) - /*if(data.length>0){ - var str = ''; + })*/ + if(data.length>0){ + var str = ''; for(var i = 0; i < data.length; i++) { - if(teamId == data[i].id) { - str += ''; + if(teamId == data[i].value) { + str += ''; } else { - str += ''; + str += ''; } } $("#teamId").append(str); layui.form.render('select'); //这里就是我们要渲染的地方了 - }*/ + } } }) } diff --git a/smz-web/js/work/person/wagesManage/wagesGrantList.js b/smz-web/js/work/person/wagesManage/wagesGrantList.js index 64f1e34..189c5ce 100644 --- a/smz-web/js/work/person/wagesManage/wagesGrantList.js +++ b/smz-web/js/work/person/wagesManage/wagesGrantList.js @@ -27,6 +27,15 @@ layui.use(['layer', 'laydate','form'], function () { getSubsByProId($("#proId").val()) }); + $("#resetBt").click(function () { + $('#monthTime').val(getNowTime()); + $('#proId').val(""); + $('#subId').val(""); + $('#keyWord').val(""); + form.render('select'); + example.ajax.reload(); + }); + }); function init() { diff --git a/smz-web/js/work/person/wagesManage/wagesInfo.js b/smz-web/js/work/person/wagesManage/wagesInfo.js index f7595c3..bc89576 100644 --- a/smz-web/js/work/person/wagesManage/wagesInfo.js +++ b/smz-web/js/work/person/wagesManage/wagesInfo.js @@ -36,6 +36,14 @@ $(function () { }; xhr.send(); }); + + $("#resetBt").click(function () { + $("#proId").val(""); + $("#keyWord").val(""); + form.render('select'); + example.ajax.reload(); + }); + }); function init() { @@ -362,8 +370,8 @@ function wageCard(idNumber) { localStorage.setItem("witnessPath", data.witnessPath); localStorage.setItem("uploadName", data.uploadName); localStorage.setItem("uploadTime", data.uploadTime); - var height = '585px'; - var width = '675px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['查看图片','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -421,7 +429,7 @@ function history(idNumber) { shade: 0.3, //显示遮罩 move: false, resize: false, - btn: ['关闭'], + btn: ['确定', '关闭'], success:function(layero,index){ let iframeWin = window["layui-layer-iframe" + layerIndex]; iframeWin.setParam(idNumber); diff --git a/smz-web/js/work/person/wagesManage/wagesInfoReceiptUploadList.js b/smz-web/js/work/person/wagesManage/wagesInfoReceiptUploadList.js index 52e0c9d..cd034da 100644 --- a/smz-web/js/work/person/wagesManage/wagesInfoReceiptUploadList.js +++ b/smz-web/js/work/person/wagesManage/wagesInfoReceiptUploadList.js @@ -31,6 +31,17 @@ layui.use(['layer', 'form', 'laydate'], function () { form.on('select(subId)', function (data) { getSubTeamInfo(data.value,form); }); + + $("#resetBt").click(function () { + $('#monthTime').val(getNowTime()); + $('#proId').val(""); + $('#subId').val(""); + $('#teamId').val(""); + $('#receiptFlage').val(""); + form.render('select'); + example.ajax.reload(); + }); + }); function init() { @@ -198,7 +209,7 @@ function buttonView(receiptFlage, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } @@ -209,7 +220,7 @@ function buttonEdits(receiptFlage, permission, pers) { return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } diff --git a/smz-web/pages/work/basic/ProManagerFormView.html b/smz-web/pages/work/basic/ProManagerFormView.html index 62fb599..7181836 100644 --- a/smz-web/pages/work/basic/ProManagerFormView.html +++ b/smz-web/pages/work/basic/ProManagerFormView.html @@ -88,7 +88,7 @@ --> -
+
diff --git a/smz-web/pages/work/basic/teamWorkInfo.html b/smz-web/pages/work/basic/teamWorkInfo.html index c3de1fe..62b17ea 100644 --- a/smz-web/pages/work/basic/teamWorkInfo.html +++ b/smz-web/pages/work/basic/teamWorkInfo.html @@ -28,7 +28,7 @@
- +
diff --git a/smz-web/pages/work/basic/teamWorkerPerson.html b/smz-web/pages/work/basic/teamWorkerPerson.html index 9185598..a72e682 100644 --- a/smz-web/pages/work/basic/teamWorkerPerson.html +++ b/smz-web/pages/work/basic/teamWorkerPerson.html @@ -40,7 +40,7 @@
- + diff --git a/smz-web/pages/work/person/BaseManagerForm.html b/smz-web/pages/work/person/BaseManagerForm.html index 2321bb5..0904a8c 100644 --- a/smz-web/pages/work/person/BaseManagerForm.html +++ b/smz-web/pages/work/person/BaseManagerForm.html @@ -25,7 +25,7 @@
-
+
diff --git a/smz-web/pages/work/person/BaseViewManagerForm.html b/smz-web/pages/work/person/BaseViewManagerForm.html index e0816ed..9aa9f08 100644 --- a/smz-web/pages/work/person/BaseViewManagerForm.html +++ b/smz-web/pages/work/person/BaseViewManagerForm.html @@ -30,7 +30,7 @@ -
+
diff --git a/smz-web/pages/work/person/accessFieldInfor.html b/smz-web/pages/work/person/accessFieldInfor.html index 9c1fb77..6ce190d 100644 --- a/smz-web/pages/work/person/accessFieldInfor.html +++ b/smz-web/pages/work/person/accessFieldInfor.html @@ -55,8 +55,9 @@
+
diff --git a/smz-web/pages/work/person/baseManager.html b/smz-web/pages/work/person/baseManager.html index 5c99b00..1add29a 100644 --- a/smz-web/pages/work/person/baseManager.html +++ b/smz-web/pages/work/person/baseManager.html @@ -38,7 +38,8 @@
- + +
diff --git a/smz-web/pages/work/person/faceContrast.html b/smz-web/pages/work/person/faceContrast.html index 9ca7654..79f80f1 100644 --- a/smz-web/pages/work/person/faceContrast.html +++ b/smz-web/pages/work/person/faceContrast.html @@ -70,8 +70,9 @@
+
diff --git a/smz-web/pages/work/person/faceContrast/WorkNumberListByCurrentDay.html b/smz-web/pages/work/person/faceContrast/WorkNumberListByCurrentDay.html index b4dd7d8..1144a58 100644 --- a/smz-web/pages/work/person/faceContrast/WorkNumberListByCurrentDay.html +++ b/smz-web/pages/work/person/faceContrast/WorkNumberListByCurrentDay.html @@ -45,7 +45,8 @@
- + +
diff --git a/smz-web/pages/work/person/faceContrast/workPerson.html b/smz-web/pages/work/person/faceContrast/workPerson.html index 0f07551..70c45c7 100644 --- a/smz-web/pages/work/person/faceContrast/workPerson.html +++ b/smz-web/pages/work/person/faceContrast/workPerson.html @@ -36,7 +36,8 @@ value='@DateTime.Now.ToString("yyyy-MM-dd")'/> - + +
diff --git a/smz-web/pages/work/person/faceContrastDetail.html b/smz-web/pages/work/person/faceContrastDetail.html index 44c7a77..bc5e6ec 100644 --- a/smz-web/pages/work/person/faceContrastDetail.html +++ b/smz-web/pages/work/person/faceContrastDetail.html @@ -29,10 +29,17 @@
施工人员考勤详情
- ~ - - - + + + + + + + + +
diff --git a/smz-web/pages/work/person/inOutInfo.html b/smz-web/pages/work/person/inOutInfo.html index 027bbcf..3122096 100644 --- a/smz-web/pages/work/person/inOutInfo.html +++ b/smz-web/pages/work/person/inOutInfo.html @@ -31,7 +31,7 @@
-
+
diff --git a/smz-web/pages/work/person/openDisphoto.html b/smz-web/pages/work/person/openDisphoto.html index abde980..7458679 100644 --- a/smz-web/pages/work/person/openDisphoto.html +++ b/smz-web/pages/work/person/openDisphoto.html @@ -34,7 +34,7 @@ width: 98%; height: 84%; position: absolute; - top: 50px; + top: 10px; left: 22px; overflow-x: hidden; overflow-y: scroll; diff --git a/smz-web/pages/work/person/templateManage/contractDetails.html b/smz-web/pages/work/person/templateManage/contractDetails.html index 081b269..5b4bafa 100644 --- a/smz-web/pages/work/person/templateManage/contractDetails.html +++ b/smz-web/pages/work/person/templateManage/contractDetails.html @@ -20,7 +20,7 @@
- +
diff --git a/smz-web/pages/work/person/templateManage/contractManageList.html b/smz-web/pages/work/person/templateManage/contractManageList.html index d21e86c..fad0ad5 100644 --- a/smz-web/pages/work/person/templateManage/contractManageList.html +++ b/smz-web/pages/work/person/templateManage/contractManageList.html @@ -54,7 +54,8 @@
- + +
diff --git a/smz-web/pages/work/person/wagesManage/generatePayroll.html b/smz-web/pages/work/person/wagesManage/generatePayroll.html index 3065ccd..6060bf2 100644 --- a/smz-web/pages/work/person/wagesManage/generatePayroll.html +++ b/smz-web/pages/work/person/wagesManage/generatePayroll.html @@ -48,7 +48,7 @@ ~ --> - +
diff --git a/smz-web/pages/work/person/wagesManage/generatePayrollForm.html b/smz-web/pages/work/person/wagesManage/generatePayrollForm.html index bd5637e..224028c 100644 --- a/smz-web/pages/work/person/wagesManage/generatePayrollForm.html +++ b/smz-web/pages/work/person/wagesManage/generatePayrollForm.html @@ -9,16 +9,24 @@ +
-
+
-
+
@@ -26,7 +34,7 @@
-
+
@@ -34,7 +42,7 @@
-
+
@@ -56,7 +64,7 @@
-
+
@@ -65,7 +73,7 @@
-
+
@@ -80,4 +88,4 @@
- \ No newline at end of file + diff --git a/smz-web/pages/work/person/wagesManage/generatePayrollList.html b/smz-web/pages/work/person/wagesManage/generatePayrollList.html index e1d362a..703710a 100644 --- a/smz-web/pages/work/person/wagesManage/generatePayrollList.html +++ b/smz-web/pages/work/person/wagesManage/generatePayrollList.html @@ -39,8 +39,10 @@
+ +
diff --git a/smz-web/pages/work/person/wagesManage/generatePayrollUpd.html b/smz-web/pages/work/person/wagesManage/generatePayrollUpd.html index 0459068..2c7d8e1 100644 --- a/smz-web/pages/work/person/wagesManage/generatePayrollUpd.html +++ b/smz-web/pages/work/person/wagesManage/generatePayrollUpd.html @@ -25,8 +25,11 @@
- - +
+ +
+ +
@@ -79,4 +82,4 @@ \ No newline at end of file + diff --git a/smz-web/pages/work/person/wagesManage/generatePayrollUpdForm.html b/smz-web/pages/work/person/wagesManage/generatePayrollUpdForm.html index 8f1c9e4..2b25587 100644 --- a/smz-web/pages/work/person/wagesManage/generatePayrollUpdForm.html +++ b/smz-web/pages/work/person/wagesManage/generatePayrollUpdForm.html @@ -46,7 +46,7 @@
- +
@@ -57,7 +57,7 @@
- +
@@ -66,54 +66,56 @@
-
- +
+
- -
-
-
- -
- +
+
+
+ +
+ +
+
+
-
+
- +
-
- -
+
+ +
-
- -
- +
+ +
+
-
- -
+
+ +
@@ -132,17 +137,16 @@
-
-
- -
- +
+ +
+
-
- -
- +
+ +
+
@@ -157,4 +161,4 @@ - \ No newline at end of file + diff --git a/smz-web/pages/work/person/wagesManage/generatePayrollView.html b/smz-web/pages/work/person/wagesManage/generatePayrollView.html index afcc63a..4f1ebb3 100644 --- a/smz-web/pages/work/person/wagesManage/generatePayrollView.html +++ b/smz-web/pages/work/person/wagesManage/generatePayrollView.html @@ -22,8 +22,11 @@
- - +
+ +
+ +
@@ -75,4 +78,4 @@ \ No newline at end of file + diff --git a/smz-web/pages/work/person/wagesManage/wagesCheckView.html b/smz-web/pages/work/person/wagesManage/wagesCheckView.html index f7e69e2..93b5941 100644 --- a/smz-web/pages/work/person/wagesManage/wagesCheckView.html +++ b/smz-web/pages/work/person/wagesManage/wagesCheckView.html @@ -6,7 +6,7 @@ - + - + diff --git a/smz-web/pages/work/person/wagesManage/wagesGrantList.html b/smz-web/pages/work/person/wagesManage/wagesGrantList.html index bc0069d..593ba28 100644 --- a/smz-web/pages/work/person/wagesManage/wagesGrantList.html +++ b/smz-web/pages/work/person/wagesManage/wagesGrantList.html @@ -54,10 +54,11 @@
+
-
+
1.已完成确认的工资表，已自动生成工资支付表
2.在“工资管理生成工资支付表”，完善并提交工资支付表
diff --git a/smz-web/pages/work/person/wagesManage/wagesInfo.html b/smz-web/pages/work/person/wagesManage/wagesInfo.html index 78d4826..cfe7fb6 100644 --- a/smz-web/pages/work/person/wagesManage/wagesInfo.html +++ b/smz-web/pages/work/person/wagesManage/wagesInfo.html @@ -37,10 +37,13 @@
- - + +
+
+ +
diff --git a/smz-web/pages/work/person/wagesManage/wagesInfoReceiptUploadList.html b/smz-web/pages/work/person/wagesManage/wagesInfoReceiptUploadList.html index 3305284..77d5e84 100644 --- a/smz-web/pages/work/person/wagesManage/wagesInfoReceiptUploadList.html +++ b/smz-web/pages/work/person/wagesManage/wagesInfoReceiptUploadList.html @@ -61,9 +61,11 @@
+ +
diff --git a/smz-web/pages/work/person/wagesManage/wagesPhotoView.html b/smz-web/pages/work/person/wagesManage/wagesPhotoView.html index 8d77086..91fbc79 100644 --- a/smz-web/pages/work/person/wagesManage/wagesPhotoView.html +++ b/smz-web/pages/work/person/wagesManage/wagesPhotoView.html @@ -6,7 +6,7 @@ - + 新增接地信息 @@ -65,14 +70,16 @@
- +
- +
-
-
-
-
- +
+
+
+ +
+ +
+
+
+
diff --git a/smz-web/pages/work/sysMag/facePhotoForm.html b/smz-web/pages/work/sysMag/facePhotoForm.html index 39e753e..083e8ac 100644 --- a/smz-web/pages/work/sysMag/facePhotoForm.html +++ b/smz-web/pages/work/sysMag/facePhotoForm.html @@ -2,7 +2,7 @@ - 查看 + 详情