From b4153deb2e40bff179d4fd9aac967a655349d1b9 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Tue, 30 Dec 2025 11:26:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AE=9E=E5=90=8D?= =?UTF-8?q?=E5=88=B6-=E5=90=8E=E5=8F=B0=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 --- public/login/js/userForm.js | 6 +- public/public.js | 4 +- .../faceContrast/faceContrastDetail.css | 2 +- smz-web/js/filePreview.js | 12 +- .../managementReview/managementReviewList.js | 14 +- smz-web/js/work/ownPerson/corporationMag.js | 6 + smz-web/js/work/ownPerson/dictionaryList.js | 5 + .../ownPerson/own-certificate-card-form.js | 5 +- .../js/work/ownPerson/own-certificate-form.js | 5 +- .../js/work/ownPerson/own-certificate-list.js | 9 +- smz-web/js/work/ownPerson/own-certificate.js | 18 +- smz-web/js/work/ownPerson/paySlip.js | 10 + smz-web/js/work/ownPerson/workerBenefits.js | 17 + .../js/work/ownPerson/workerBenefitsForm.js | 13 +- .../js/work/ownPerson/workerBenefitsList.js | 51 +-- .../ownPerson/workerContractManagementList.js | 17 + .../workerContractManagementRecords.js | 14 +- smz-web/js/work/ownPerson/workerDepart.js | 45 ++- .../ownPerson/workerDepartFaceContrast.js | 35 +- .../workerDepartFaceContrastDetail.js | 2 +- .../ownPerson/workerDepartFaceContrastForm.js | 6 + .../work/ownPerson/workerDepartHandleForm.js | 3 +- smz-web/js/work/ownPerson/workerOn.js | 12 + .../ownPersonContract/certainJobContract.js | 15 +- .../contractingHNLaborContract.js | 14 +- .../contractingQiliLaborContract.js | 15 +- .../driverQiliLaborContract.js | 15 +- .../employProtocolContract.js | 14 +- .../managementNengyongLaborContract.js | 14 +- .../managementQiliLaborContract.js | 14 +- .../nonFiveInsurancesContract.js | 14 +- smz-web/js/work/person/blacklist.js | 12 +- .../certificateRecheckUpload.js | 12 + .../certificateManage/certificateTypeList.js | 7 +- .../certificateManage/workCertificateList.js | 10 + .../workCertificateNumList.js | 11 + smz-web/js/work/person/redlist.js | 6 + .../employmentManagementAccountForm.js | 8 + .../employmentManagementAccountList.js | 8 + .../salaryApprovalFormList.js | 15 +- .../salaryPaymentStatisticsForm.js | 5 + .../salaryPaymentStatisticsList.js | 8 + .../js/work/person/safeguardingAppealList.js | 5 + smz-web/js/work/person/workGive.js | 8 + smz-web/js/work/train/trainForm.js | 5 - smz-web/js/work/train/trainList.js | 9 +- .../work/uploadResults/uploadResultsList.js | 20 +- smz-web/login.html | 2 +- .../managementReviewList.html | 9 +- .../work/ownPerson/addCorporationMag.html | 192 ++++++----- .../pages/work/ownPerson/corporationMag.html | 5 +- .../pages/work/ownPerson/dictionaryForm.html | 72 ++-- .../pages/work/ownPerson/dictionaryList.html | 5 +- smz-web/pages/work/ownPerson/fileSharing.html | 87 +++-- .../ownPerson/own-certificate-card-form.html | 89 +++-- .../work/ownPerson/own-certificate-form.html | 91 +++-- .../work/ownPerson/own-certificate-list.html | 3 +- .../work/ownPerson/own-certificate-photo.html | 2 +- .../pages/work/ownPerson/own-certificate.html | 3 +- smz-web/pages/work/ownPerson/paySlip.html | 4 +- .../pages/work/ownPerson/workerBenefits.html | 7 +- .../work/ownPerson/workerBenefitsForm.html | 88 +++-- .../work/ownPerson/workerBenefitsList.html | 5 +- .../workerContractManagementFormOld.html | 312 ++++++++++++------ .../workerContractManagementList.html | 3 +- .../pages/work/ownPerson/workerDepart.html | 3 +- .../ownPerson/workerDepartFaceContrast.html | 3 +- .../workerDepartFaceContrastForm.html | 13 +- .../ownPerson/workerDepartHandleForm.html | 6 +- smz-web/pages/work/ownPerson/workerOn.html | 9 +- smz-web/pages/work/person/blacklist.html | 5 +- smz-web/pages/work/person/blacklistForm.html | 86 +++-- .../certificateRecheckUpload.html | 3 +- .../certificateTypeFrom.html | 139 +++++--- .../certificateTypeList.html | 5 +- .../workCertificateSetting.html | 4 +- .../workerCertificateFrom.html | 4 +- .../workerCertificateList.html | 3 +- .../workerCertificateNumList.html | 3 +- smz-web/pages/work/person/redlist.html | 5 +- smz-web/pages/work/person/redlistForm.html | 145 +++++--- .../employmentManagementAccountForm.html | 10 +- .../employmentManagementAccountList.html | 3 +- .../reportStatistics/salaryApprovalForm.html | 23 +- .../salaryApprovalFormList.html | 3 +- .../salaryPaymentStatisticsForm.html | 28 +- .../salaryPaymentStatisticsList.html | 3 +- .../work/person/safeguardingAppealList.html | 3 +- smz-web/pages/work/person/workGive.html | 7 +- .../salaryAttendanceList.html | 2 +- smz-web/pages/work/train/trainForm.html | 121 ++++--- smz-web/pages/work/train/trainList.html | 5 +- .../work/uploadResults/uploadResultsList.html | 4 +- 93 files changed, 1489 insertions(+), 713 deletions(-) diff --git a/public/login/js/userForm.js b/public/login/js/userForm.js index 9e0b57d..aa8f6d8 100644 --- a/public/login/js/userForm.js +++ b/public/login/js/userForm.js @@ -16,13 +16,13 @@ $(function () { $("#smz").change(function () { - alert(1); + if ($(this).is(':checked')) { $("#smzqx").css("display","inline-block"); - alert(1); + } else { $("#smzqx").css("display","none"); - alert(2); + } form.render(); }); diff --git a/public/public.js b/public/public.js index 8f5cecb..9bfcad9 100644 --- a/public/public.js +++ b/public/public.js @@ -3,13 +3,13 @@ // let request_url="http://20.56.230.91:10080/bnscloud" // let contentPath="/bonus_cloud_web"; let contentPath="/hn_cloud_web"; -let web_url="http://127.0.0.1:8849" +let web_url="http://192.168.0.50:8849" let request_url="http://192.168.0.50:18080/bnscloud" //承载力大屏 -let czl_url= request_url+"/czldp"; +let czl_url= request_url+"/czl"; //承载力后台 let czl_ht_url= request_url+"/czl"; //实名制大屏 diff --git a/smz-web/css/work/person/faceContrast/faceContrastDetail.css b/smz-web/css/work/person/faceContrast/faceContrastDetail.css index 4ee2a5d..6515098 100644 --- a/smz-web/css/work/person/faceContrast/faceContrastDetail.css +++ b/smz-web/css/work/person/faceContrast/faceContrastDetail.css @@ -177,7 +177,7 @@ body,html{ height: 33px; line-height: 33px; padding: 0 13px; - background-color: #009688; + background-color: #16baaa; color: #fff; white-space: nowrap; text-align: center; diff --git a/smz-web/js/filePreview.js b/smz-web/js/filePreview.js index a11c970..4618394 100644 --- a/smz-web/js/filePreview.js +++ b/smz-web/js/filePreview.js @@ -91,16 +91,8 @@ var Base64 = { var filePreviewPath = smz_ht_url ; -// var filePreviewPathAll = "http://140.210.195.210:8012/onlinePreview?url="; +var filePreviewPathAll =""; //公司测试地址 -// var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?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 ="http://127.0.0.1:1918/hnBmw"; function filePreview(url) { let path; if (url.indexOf("http") != -1) { @@ -167,4 +159,4 @@ function download(url, filename) { getBlob(url).then(blob => { saveAs(blob, filename); }); -} \ No newline at end of file +} diff --git a/smz-web/js/work/managementReview/managementReviewList.js b/smz-web/js/work/managementReview/managementReviewList.js index 3acfaa0..dc8f5a5 100644 --- a/smz-web/js/work/managementReview/managementReviewList.js +++ b/smz-web/js/work/managementReview/managementReviewList.js @@ -1,6 +1,6 @@ var example = null; var pers = checkPermission(); -var laydate; +var laydate,form; var times = getCurrentDateTimeArr(); var nextTimes = getCurrentMonthAndLastMonth(); var state=''; @@ -8,7 +8,7 @@ layui.use(['form', 'layer', 'laydate'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); - + form = layui.form; laydate = layui.laydate; init(); @@ -24,9 +24,17 @@ layui.use(['form', 'layer', 'laydate'], function () { $('.checkData').css('background','#fff'); $('.checkData').css('color','#31A7FF'); - $(this).css('background','#31A7FF'); + $(this).css('background','#16baaa'); $(this).css('color','#fff'); }) + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $("#months").val(""); + $("#state").val(""); + form.render('select'); + example.ajax.reload(); + }); }) function stateBtn(id) { diff --git a/smz-web/js/work/ownPerson/corporationMag.js b/smz-web/js/work/ownPerson/corporationMag.js index 0d59c17..6c92aa4 100644 --- a/smz-web/js/work/ownPerson/corporationMag.js +++ b/smz-web/js/work/ownPerson/corporationMag.js @@ -8,6 +8,12 @@ layui.use([ 'layer' ,'form'], function() { $("#searchBt").click(function(){ example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + example.ajax.reload(); + }); + init(); }); diff --git a/smz-web/js/work/ownPerson/dictionaryList.js b/smz-web/js/work/ownPerson/dictionaryList.js index 88af2b9..cce74ff 100644 --- a/smz-web/js/work/ownPerson/dictionaryList.js +++ b/smz-web/js/work/ownPerson/dictionaryList.js @@ -9,6 +9,11 @@ layui.use([ 'layer' ,'form'], function() { localStorage.setItem("keyWords",$("#keyWord").val()); location.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + location.reload(); + }); init() }); diff --git a/smz-web/js/work/ownPerson/own-certificate-card-form.js b/smz-web/js/work/ownPerson/own-certificate-card-form.js index df48c90..8cf5a0b 100644 --- a/smz-web/js/work/ownPerson/own-certificate-card-form.js +++ b/smz-web/js/work/ownPerson/own-certificate-card-form.js @@ -185,7 +185,8 @@ function setDatas(data) { $("#id").val(data[0].id); $("#ids").val(data[1].id); - var path1 = smz_ht_url +"/"+data[0].filePath; + // var path1 = smz_ht_url +"/"+data[0].filePath; + var path1 = data[0].filePath; $("#preview1").css("display",""); var demo1 = $("#demo1"); var html = ''; @@ -221,4 +222,4 @@ function reloading() { var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 parent.layer.close(index); //再执行关闭 window.parent.example.ajax.reload( null, false ); // 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPerson/own-certificate-form.js b/smz-web/js/work/ownPerson/own-certificate-form.js index bc67be7..26a536c 100644 --- a/smz-web/js/work/ownPerson/own-certificate-form.js +++ b/smz-web/js/work/ownPerson/own-certificate-form.js @@ -193,7 +193,8 @@ function setDatas(data) { $("#acquisitionTime").val(data.acquisitionTime); //获取证件时间 $("#level").val(data.level); //证件等级 - var path1 = smz_ht_url +"/"+data.filePath; + // var path1 = smz_ht_url +"/"+data.filePath; + var path1 = data.filePath; $("#preview1").css("display",""); var demo1 = $("#demo1"); var html = ''; @@ -221,4 +222,4 @@ function reloading() { var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 parent.layer.close(index); //再执行关闭 window.parent.example.ajax.reload( null, false ); // 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPerson/own-certificate-list.js b/smz-web/js/work/ownPerson/own-certificate-list.js index c0823fd..bb4b4a7 100644 --- a/smz-web/js/work/ownPerson/own-certificate-list.js +++ b/smz-web/js/work/ownPerson/own-certificate-list.js @@ -10,6 +10,11 @@ layui.use(['layer', 'laydate', 'form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + example.ajax.reload(); + }); }); @@ -131,8 +136,8 @@ function edit(id) { data: {"id": id}, dataType: 'json', success: function (data) { - var height = '97.5%'; - var width = '97.5%'; + 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/ownPerson/own-certificate.js b/smz-web/js/work/ownPerson/own-certificate.js index e66f453..55f000d 100644 --- a/smz-web/js/work/ownPerson/own-certificate.js +++ b/smz-web/js/work/ownPerson/own-certificate.js @@ -15,6 +15,20 @@ $(function () { example.ajax.reload(); }); + $("#resetBt").click(function () { + $("#ssdw").val(""); + $("#orgName").val(""); + $("#orgId").val(""); + $("#companyId").val(""); + + $("#ryxz").val(""); + $("#name").val(""); + $("#idNumber").val(""); + $("#state").val(""); + form.render('select'); + example.ajax.reload(); + + }); }); //自有人员-员工性质字典下拉 @@ -286,8 +300,8 @@ function buttonEdits(id, permission, pers) { */ function edit(id) { localStorage.setItem("id",id); - var height = '75%'; - var width = '75%'; + var height = '97.5%'; + var width = '97.5%'; layer.open({ title: ['查看', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, diff --git a/smz-web/js/work/ownPerson/paySlip.js b/smz-web/js/work/ownPerson/paySlip.js index c3e2c67..5359434 100644 --- a/smz-web/js/work/ownPerson/paySlip.js +++ b/smz-web/js/work/ownPerson/paySlip.js @@ -43,6 +43,16 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#month").val(currentDate + ' - ' + currentDate); + $("#typeName").val(""); + $("#orgName").val(""); + $("#idNumber").val(""); + $("#name").val(""); + form.render('select'); + example.ajax.reload(); + }); }); }); function getusertype(form,name,type,text) { diff --git a/smz-web/js/work/ownPerson/workerBenefits.js b/smz-web/js/work/ownPerson/workerBenefits.js index 5ca0eae..7b01d8b 100644 --- a/smz-web/js/work/ownPerson/workerBenefits.js +++ b/smz-web/js/work/ownPerson/workerBenefits.js @@ -15,6 +15,23 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#ssdw").val("") + + $("#orgName").val(""); + $("#orgId").val(""); + $("#companyId").val(""); + + $("#ryxz").val(""); + $("#name").val(""); + $("#idNumber").val(""); + $("#state").val(""); + form.render('select'); + example.ajax.reload(); + + }); + }); }); diff --git a/smz-web/js/work/ownPerson/workerBenefitsForm.js b/smz-web/js/work/ownPerson/workerBenefitsForm.js index e967f09..1e9a0ae 100644 --- a/smz-web/js/work/ownPerson/workerBenefitsForm.js +++ b/smz-web/js/work/ownPerson/workerBenefitsForm.js @@ -5,7 +5,7 @@ var flag = true; var form; var num= 0; var fileNum = 0; -var reportPathsFileId = ''; +var delImg = ''; var addLoadingMsg =''; $(function () { @@ -175,6 +175,9 @@ function setData(data) { } demo1.append(html); } + + var imgNum = $("#demo1 img").length; + $("#test1").text(imgNum + "个文件"); } //新增 @@ -212,6 +215,7 @@ function insertBenefits(formData) { //修改工程 function updateBenefits(formData) { + formData.field.delImg = delImg; // 加载提示 addLoadingMsg = top.layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0, shade: [0.8, '#393D49']}); // form请求地址 @@ -263,8 +267,11 @@ function updateBenefits(formData) { function delPhoto(id, photoId) { $('#' + id).remove(); if (id.indexOf('reportPathsFile') != -1) { - reportPathsFileId += photoId + ','; + delImg += photoId + ','; } + + var imgNum = $("#demo1 img").length; + $("#test1").text(imgNum + "个文件"); } //设置弹窗关闭 @@ -272,4 +279,4 @@ function reloading() { var index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 parent.layer.close(index); //再执行关闭 window.parent.example.ajax.reload( null, false ); // 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPerson/workerBenefitsList.js b/smz-web/js/work/ownPerson/workerBenefitsList.js index 9b6e741..93db095 100644 --- a/smz-web/js/work/ownPerson/workerBenefitsList.js +++ b/smz-web/js/work/ownPerson/workerBenefitsList.js @@ -28,6 +28,18 @@ function setBenefitsData(id){ if (!dateRange) { return layer.msg('请选择日期范围', { icon: 2, time: 2000 }); } + example.ajax.reload(); + }); + + $("#resetBt").click(function () { + var today = getNowTime(); // 假设你的 getNowTime() 返回 'yyyy-MM-dd' 格式 + $('#test6').val(today + ' - ' + today); + $("#reportType").val(""); + form.render('select'); + + + + example.ajax.reload(); }); }); @@ -160,8 +172,8 @@ function init(){ * 新增页面 * */ function inserts() { - 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, @@ -191,8 +203,8 @@ function inserts() { //查看附件详情 function dataFileView(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, @@ -235,8 +247,8 @@ function edit(id) { data: {"id": id}, dataType: 'json', success: function (data) { - 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, @@ -261,33 +273,6 @@ function edit(id) { }); } }) - - /*localStorage.setItem("id", id); - var height = getDefaultHeight().toFixed(0) + 'px'; - var width = getDefaultWidth().toFixed(0) + 'px'; - var layerIndex = layer.open({ - id: 'layer-contract-signing-infor', - title: ['修改', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], - content: './workerBenefitsForm.html', - area: [width, height], - type: 2, - maxmin: false, - shadeClose: false, //开启遮罩关闭 - shade: 0.3, //显示遮罩 - move: false, - resize: false, - btn: ['关闭'], - success:function(layero,index){ - let iframeWin = window["layui-layer-iframe" + layerIndex]; - iframeWin.setParam(idNumber); - $(window).resize(function () { - if (autoResizeWidth) autoResizeWidth(index); - if (autoResizeHeight) autoResizeHeight(index); - }) - }, - btn2: function (index, layero) { - } - });*/ } /** diff --git a/smz-web/js/work/ownPerson/workerContractManagementList.js b/smz-web/js/work/ownPerson/workerContractManagementList.js index e806167..76e6f92 100644 --- a/smz-web/js/work/ownPerson/workerContractManagementList.js +++ b/smz-web/js/work/ownPerson/workerContractManagementList.js @@ -47,6 +47,23 @@ $(function () { elem: '#crateTime' , value: '' }); + + $("#resetBt").click(function () { + $("#ssdw").val(""); + $("#orgName").val(""); + $("#orgId").val(""); + $("#companyId").val(""); + + $("#state").val(""); + $("#name").val(""); + $("#idNumber").val(""); + $("#rzrq").val(""); + $("#htOn").val(""); + $("#htOff").val(""); + $("#crateTime").val(""); + form.render('select'); + example.ajax.reload(); + }); }); }); diff --git a/smz-web/js/work/ownPerson/workerContractManagementRecords.js b/smz-web/js/work/ownPerson/workerContractManagementRecords.js index 6c7c129..139d7a8 100644 --- a/smz-web/js/work/ownPerson/workerContractManagementRecords.js +++ b/smz-web/js/work/ownPerson/workerContractManagementRecords.js @@ -135,16 +135,16 @@ function init(){ var isActive = row['isActive']; var html = ''; if(state==null){ - html="未签署"; + html="未签署"; }else if(state==0){ - html="已下发"; + html="已下发"; }else if(state==1 || state==3){ - html="已签署"; + html="已签署"; }else if(state==4){ - html="临期"; + html="临期"; } if(isActive==0){ - html="失效"; + html="失效"; } return html; } @@ -176,7 +176,7 @@ function init(){ } var recordType=localStorage.getItem("recordType") if (recordType==="1"){ - html += "  删除"; + html += "  删除"; } return html; } @@ -199,7 +199,7 @@ function electronicContractView(id,contractType,idNumber,url){ title: ['电子合同详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: 'ownContractView.html', - area: [width, height], + area: ['97.5%', '97.5%'], maxmin: false, shadeClose: false, //开启遮罩关闭 shade: 0.3, //显示遮罩 diff --git a/smz-web/js/work/ownPerson/workerDepart.js b/smz-web/js/work/ownPerson/workerDepart.js index cadf666..4e0039b 100644 --- a/smz-web/js/work/ownPerson/workerDepart.js +++ b/smz-web/js/work/ownPerson/workerDepart.js @@ -15,6 +15,18 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#ssdw").val(""); + $("#orgName").val(""); + $("#orgId").val(""); + $("#companyId").val(""); + $("#name").val(""); + $("#idNumber").val(""); + $("#offType").val(""); + form.render('select'); + example.ajax.reload(); + }); }); }); @@ -339,15 +351,14 @@ function contractHistoryBtn(id) { //查看电子合同详情 function electronicContractView(url){ - let height = getDefaultHeight().toFixed(0) + 'px'; - let width = getDefaultWidth().toFixed(0) + 'px'; + localStorage.setItem("recordurl", url); let layerIndex = parent.layer.open({ id: 'layer-electronicContract', title: ['详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: 'pages/work/ownPerson/ownContractView.html', - area: [width, height], + area: ['75%', '75%'], maxmin: false, shadeClose: false, //开启遮罩关闭 shade: 0.3, //显示遮罩 @@ -369,8 +380,8 @@ function electronicContractView(url){ * 新增页面 * */ function insertWorkerOff() { - var height = '85%'; - var width = '85%'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['离职办理', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -397,8 +408,8 @@ function dws(id,name,idNumber,lxdh) { btn: ['派遣协议书', '承揽协议书'] , }, function(index, layero){ - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; localStorage.setItem("noticeId",id); localStorage.setItem("offName",name); localStorage.setItem("offIdNumber",idNumber); @@ -428,8 +439,8 @@ function dws(id,name,idNumber,lxdh) { } }); }, function(index){ - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; localStorage.setItem("noticeId",id); localStorage.setItem("offName",name); localStorage.setItem("offIdNumber",idNumber); @@ -462,8 +473,8 @@ function dws(id,name,idNumber,lxdh) { function xiangqing(id,name,idNumber) { - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; localStorage.setItem("noticeId",id); localStorage.setItem("offName",name); localStorage.setItem("offIdNumber",idNumber); @@ -493,8 +504,8 @@ function jilu(id,name,idNumber) { * 编辑页面 */ function edit(id,offType,lxdh,workerId) { - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; localStorage.setItem("offid",id); localStorage.setItem("offTyped",offType); localStorage.setItem("lxdh",lxdh); @@ -561,8 +572,8 @@ function buttonEdits(id, permission, pers) { //解除（终止）劳动关系证明--派遣 function secures(idNumber,name,lxdh) { var url = 'pages/work/ownPerson/workerDepartEvidenceDismissForm.html'; - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; var offType = '2'; var orgName = $("#orgName").val(); var htbh = $("#htbh").val(); @@ -631,8 +642,8 @@ function secures(idNumber,name,lxdh) { //解除（终止）劳动关系证明--承揽 function securesCl(idNumber,name,lxdh) { var url = 'pages/work/ownPerson/workerDepartEvidenceFormHireOfWork.html'; - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; var offType = '2'; var orgName = $("#orgName").val(); var htbh = $("#htbh").val(); diff --git a/smz-web/js/work/ownPerson/workerDepartFaceContrast.js b/smz-web/js/work/ownPerson/workerDepartFaceContrast.js index 82d972d..85d9ecb 100644 --- a/smz-web/js/work/ownPerson/workerDepartFaceContrast.js +++ b/smz-web/js/work/ownPerson/workerDepartFaceContrast.js @@ -30,6 +30,23 @@ $(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#ssdw").val(""); + + $("#orgName").val(""); + $("#orgId").val(""); + $("#companyId").val(""); + + $("#rylx").val(""); + $("#state").val(""); + $("#proName").val(""); + $("#name").val(""); + + $('#test6').val(today + ' - ' + today); + form.render('select'); + example.ajax.reload(); + }); }); }); @@ -216,8 +233,13 @@ function exportBtn() { var state = $("#state").val(); var proName = $("#proName").val(); var name = $("#name").val(); - var startTime = $("#startTime").val(); - var endTime = $("#endTime").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, @@ -261,8 +283,13 @@ function downloadWorks() { var subName = $("#subName").val(); var proId = $("#proId").val(); var status = $("#status").val(); - var startTime = $("#startTime").val(); - var endTime = $("#endTime").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}); diff --git a/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js b/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js index 2450dd9..9684242 100644 --- a/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js +++ b/smz-web/js/work/ownPerson/workerDepartFaceContrastDetail.js @@ -229,7 +229,7 @@ function querys() { var index = top.layer.load(0, { shade: false }); // 0代表加载的风格，支持0-2 - $("#query").css("background-image", "url(../../../img/info/查询点击.png)"); + // $("#query").css("background-image", "url(../../../img/info/查询点击.png)"); //$("#export").css("background-image", "url(../../../img/info/导出.png)"); var opt = { url: smz_ht_url + '/WorkerDepartFaceContrast/getById', diff --git a/smz-web/js/work/ownPerson/workerDepartFaceContrastForm.js b/smz-web/js/work/ownPerson/workerDepartFaceContrastForm.js index 1146fc8..4b92de7 100644 --- a/smz-web/js/work/ownPerson/workerDepartFaceContrastForm.js +++ b/smz-web/js/work/ownPerson/workerDepartFaceContrastForm.js @@ -10,6 +10,12 @@ $(function () { example.ajax.reload(); }); init(); + + $("#resetBt").click(function () { + $("#name").val(""); + $("#idNumber").val(""); + example.ajax.reload(); + }); }); }); diff --git a/smz-web/js/work/ownPerson/workerDepartHandleForm.js b/smz-web/js/work/ownPerson/workerDepartHandleForm.js index e057067..f62c732 100644 --- a/smz-web/js/work/ownPerson/workerDepartHandleForm.js +++ b/smz-web/js/work/ownPerson/workerDepartHandleForm.js @@ -16,7 +16,6 @@ $(function () { form.render(); // 验证成功后才会执行下面的操作 form.on('submit(formDemo)', function (data) { - alert(1); var id = $("#id").val(); if (id == '') { insertWorker(data); // 新增 @@ -388,4 +387,4 @@ function reloading() { parent.layer.closeAll(); layer.closeAll(); window.parent.example.ajax.reload(null, false); // 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPerson/workerOn.js b/smz-web/js/work/ownPerson/workerOn.js index 5cbd2b1..90e1d4c 100644 --- a/smz-web/js/work/ownPerson/workerOn.js +++ b/smz-web/js/work/ownPerson/workerOn.js @@ -32,6 +32,18 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#ssdw").val(""); + $("#orgName").val(""); + $("#orgId").val(""); + $("#companyId").val(""); + $("#rylx").val(""); + $("#proName").val(""); + $("#name").val(""); + form.render('select'); + example.ajax.reload(); + }); }); }); diff --git a/smz-web/js/work/ownPersonContract/certainJobContract.js b/smz-web/js/work/ownPersonContract/certainJobContract.js index 1f80385..2a2615a 100644 --- a/smz-web/js/work/ownPersonContract/certainJobContract.js +++ b/smz-web/js/work/ownPersonContract/certainJobContract.js @@ -133,10 +133,19 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if(electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } + } function inht() { $('#onht').attr('disabled','disabled'); @@ -478,4 +487,4 @@ function getNoFixed() { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/contractingHNLaborContract.js b/smz-web/js/work/ownPersonContract/contractingHNLaborContract.js index 3eccfea..15a85a7 100644 --- a/smz-web/js/work/ownPersonContract/contractingHNLaborContract.js +++ b/smz-web/js/work/ownPersonContract/contractingHNLaborContract.js @@ -221,10 +221,18 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if(electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } } function inht() { $('#onht').attr('disabled','disabled'); @@ -603,4 +611,4 @@ function getNoFixed() { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/contractingQiliLaborContract.js b/smz-web/js/work/ownPersonContract/contractingQiliLaborContract.js index 0a951cc..9666840 100644 --- a/smz-web/js/work/ownPersonContract/contractingQiliLaborContract.js +++ b/smz-web/js/work/ownPersonContract/contractingQiliLaborContract.js @@ -188,10 +188,19 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if(electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } + } function inht() { $('#onht').attr('disabled','disabled'); @@ -490,4 +499,4 @@ function getNoFixed() { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/driverQiliLaborContract.js b/smz-web/js/work/ownPersonContract/driverQiliLaborContract.js index c69db03..cc2970f 100644 --- a/smz-web/js/work/ownPersonContract/driverQiliLaborContract.js +++ b/smz-web/js/work/ownPersonContract/driverQiliLaborContract.js @@ -166,10 +166,17 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; - + if(electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } } function inht() { $('#onht').attr('disabled','disabled'); @@ -457,4 +464,4 @@ function getNoFixed() { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/employProtocolContract.js b/smz-web/js/work/ownPersonContract/employProtocolContract.js index 8889293..06cebee 100644 --- a/smz-web/js/work/ownPersonContract/employProtocolContract.js +++ b/smz-web/js/work/ownPersonContract/employProtocolContract.js @@ -141,10 +141,18 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if(electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } } function inht() { $('#onht').attr('disabled','disabled'); @@ -404,4 +412,4 @@ function getMonthDifference(date1, date2) { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/managementNengyongLaborContract.js b/smz-web/js/work/ownPersonContract/managementNengyongLaborContract.js index 2ac5f38..c76e0b4 100644 --- a/smz-web/js/work/ownPersonContract/managementNengyongLaborContract.js +++ b/smz-web/js/work/ownPersonContract/managementNengyongLaborContract.js @@ -103,10 +103,18 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if(electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } } function inht() { $('#onht').attr('disabled','disabled'); @@ -326,4 +334,4 @@ function getNoFixed() { btns: ['clear', 'now', 'confirm'], done: handleDateChange }); -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/managementQiliLaborContract.js b/smz-web/js/work/ownPersonContract/managementQiliLaborContract.js index 3e214f0..249cba3 100644 --- a/smz-web/js/work/ownPersonContract/managementQiliLaborContract.js +++ b/smz-web/js/work/ownPersonContract/managementQiliLaborContract.js @@ -133,10 +133,18 @@ function initData() { $("#sex").val(sex=='null'?"":sex); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if( electronicSeal.indexOf("http") != -1){ + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if( legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } } function inht() { $('#onht').attr('disabled','disabled'); @@ -474,4 +482,4 @@ function getNoFixed() { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/ownPersonContract/nonFiveInsurancesContract.js b/smz-web/js/work/ownPersonContract/nonFiveInsurancesContract.js index 378cc56..23f40cc 100644 --- a/smz-web/js/work/ownPersonContract/nonFiveInsurancesContract.js +++ b/smz-web/js/work/ownPersonContract/nonFiveInsurancesContract.js @@ -125,10 +125,18 @@ function initData() { $("#gw").val(gw=='null'?"":gw); var partyA = document.getElementById('partyA'); - partyA.src = smz_ht_url + "/" + electronicSeal; + if (electronicSeal.indexOf("http") != -1) { + partyA.src = electronicSeal; + }else{ + partyA.src = smz_ht_url + "/" + electronicSeal; + } var entrustedAgent = document.getElementById('entrustedAgent'); - entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + if(legalPersonSeal.indexOf("http") != -1){ + entrustedAgent.src = legalPersonSeal; + }else{ + entrustedAgent.src = smz_ht_url + "/" + legalPersonSeal; + } } function inht() { $('#onht').attr('disabled','disabled'); @@ -272,4 +280,4 @@ function inht() { function reloading() { parent.layer.closeAll(); //再执行关闭 window.parent.parent.location.reload();// 刷新页面 -} \ No newline at end of file +} diff --git a/smz-web/js/work/person/blacklist.js b/smz-web/js/work/person/blacklist.js index 20de159..e32cb59 100644 --- a/smz-web/js/work/person/blacklist.js +++ b/smz-web/js/work/person/blacklist.js @@ -20,6 +20,13 @@ var pers = null; }); } }); + + $("#resetBt").click(function () { + $("#name").val(""); + $("#idNumber").val(""); + example.ajax.reload(); + }); + init(); }); @@ -167,8 +174,8 @@ function addBlacklist() { layer.msg("无添加黑名单权限"); return; } - var height = '525px'; - var width = '925px'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ['新增','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -311,6 +318,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/person/certificateManage/certificateRecheckUpload.js b/smz-web/js/work/person/certificateManage/certificateRecheckUpload.js index 76adeeb..6ebc184 100644 --- a/smz-web/js/work/person/certificateManage/certificateRecheckUpload.js +++ b/smz-web/js/work/person/certificateManage/certificateRecheckUpload.js @@ -19,6 +19,18 @@ layui.use(['layer','form'], function () { form.on('select(subId)', function (data) { getSubTeamInfo(data.value,form); }); + + $("#resetBt").click(function () { + $("#proId").val(""); + $("#subId").val(""); + $("#teamId").val(""); + $("#postName").val(""); + $("#certificateName").val(""); + $("#idNumber").val(""); + form.render('select'); + example.ajax.reload(); + }); + }); diff --git a/smz-web/js/work/person/certificateManage/certificateTypeList.js b/smz-web/js/work/person/certificateManage/certificateTypeList.js index 0589cf5..e03232e 100644 --- a/smz-web/js/work/person/certificateManage/certificateTypeList.js +++ b/smz-web/js/work/person/certificateManage/certificateTypeList.js @@ -10,6 +10,11 @@ layui.use(['layer','form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + example.ajax.reload(); + }); }); @@ -197,7 +202,7 @@ function checkView(id) { content: 'certificateTypeFrom.html', area: ['75%', '75%'], maxmin: false, - btn: ['关闭'], + btn: ['确定','关闭'], success: function (layero, index) { var myIframe = window[layero.find('iframe')[0]['name']]; myIframe.selectCheck(); //aaa()为子页面的方法 diff --git a/smz-web/js/work/person/certificateManage/workCertificateList.js b/smz-web/js/work/person/certificateManage/workCertificateList.js index 9c3bc28..ff9cd26 100644 --- a/smz-web/js/work/person/certificateManage/workCertificateList.js +++ b/smz-web/js/work/person/certificateManage/workCertificateList.js @@ -24,6 +24,16 @@ layui.use(['layer','form'], function () { getSubTeamInfo(data.value,form); }); + $("#resetBt").click(function () { + $("#proId").val(""); + $("#subId").val(""); + $("#teamId").val(""); + $("#name").val(""); + $("#idNumber").val(""); + $("#postName").val(""); + form.render('select'); + example.ajax.reload(); + }); }); diff --git a/smz-web/js/work/person/certificateManage/workCertificateNumList.js b/smz-web/js/work/person/certificateManage/workCertificateNumList.js index 6a7f0ea..a95d190 100644 --- a/smz-web/js/work/person/certificateManage/workCertificateNumList.js +++ b/smz-web/js/work/person/certificateManage/workCertificateNumList.js @@ -21,6 +21,17 @@ layui.use(['layer','form'], function () { form.on('select(subId)', function (data) { getSubTeamInfo(data.value,form); }); + + $("#resetBt").click(function () { + $("#proId").val(""); + $("#subId").val(""); + $("#teamId").val(""); + $("#idNumber").val(""); + $("#postName").val(""); + $("#certificateName").val(""); + form.render('select'); + example.ajax.reload(); + }); }); diff --git a/smz-web/js/work/person/redlist.js b/smz-web/js/work/person/redlist.js index 7bc5646..f551dd7 100644 --- a/smz-web/js/work/person/redlist.js +++ b/smz-web/js/work/person/redlist.js @@ -23,6 +23,12 @@ layui.use(['layer', 'form'], function () { }); } }); + + $("#resetBt").click(function () { + $("#name").val(""); + $("#idNumber").val(""); + example.ajax.reload(); + }); init(); }); diff --git a/smz-web/js/work/person/reportStatistics/employmentManagementAccountForm.js b/smz-web/js/work/person/reportStatistics/employmentManagementAccountForm.js index 868cca0..68eeb0c 100644 --- a/smz-web/js/work/person/reportStatistics/employmentManagementAccountForm.js +++ b/smz-web/js/work/person/reportStatistics/employmentManagementAccountForm.js @@ -24,6 +24,14 @@ $(function () { //根据子公司查询项目部 getTeam(data.value,""); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $("#subId").val(""); + $("#teamId").val(""); + form.render('select'); + initTable(); + }); }); }); diff --git a/smz-web/js/work/person/reportStatistics/employmentManagementAccountList.js b/smz-web/js/work/person/reportStatistics/employmentManagementAccountList.js index f1b2d45..284260f 100644 --- a/smz-web/js/work/person/reportStatistics/employmentManagementAccountList.js +++ b/smz-web/js/work/person/reportStatistics/employmentManagementAccountList.js @@ -10,6 +10,14 @@ layui.use(['layer', 'form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $("#proId").val(""); + $("#proState").val(""); + form.render('select'); + example.ajax.reload(); + }); }); function init() { diff --git a/smz-web/js/work/person/reportStatistics/salaryApprovalFormList.js b/smz-web/js/work/person/reportStatistics/salaryApprovalFormList.js index a48512b..8d73cbf 100644 --- a/smz-web/js/work/person/reportStatistics/salaryApprovalFormList.js +++ b/smz-web/js/work/person/reportStatistics/salaryApprovalFormList.js @@ -20,12 +20,15 @@ layui.use(['layer','laydate','form'], function () { }); $("#searchBt").click(function () { - if(nums =="0" || nums==0){ - init(); - nums = "1" - }else{ - example.ajax.reload(); - } + example.ajax.reload(); + }); + + $("#resetBt").click(function () { + $("#days").val(new Date().getFullYear() + "-" + month); + $("#keyWord").val(""); + $("#proId").val(""); + form.render('select'); + example.ajax.reload(); }); }); diff --git a/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsForm.js b/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsForm.js index 87548f9..0a2bb86 100644 --- a/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsForm.js +++ b/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsForm.js @@ -90,6 +90,11 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + example.ajax.reload(); + }); }); }) function init() { diff --git a/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsList.js b/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsList.js index bf215cb..7a61522 100644 --- a/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsList.js +++ b/smz-web/js/work/person/reportStatistics/salaryPaymentStatisticsList.js @@ -10,6 +10,14 @@ layui.use(['layer','form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $("#proId").val(""); + $("#receiptFlage").val(""); + form.render('select'); + example.ajax.reload(); + }); }); function init() { diff --git a/smz-web/js/work/person/safeguardingAppealList.js b/smz-web/js/work/person/safeguardingAppealList.js index b1f93c7..648deb6 100644 --- a/smz-web/js/work/person/safeguardingAppealList.js +++ b/smz-web/js/work/person/safeguardingAppealList.js @@ -11,6 +11,11 @@ $(function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + $("#keyword").val(""); + example.ajax.reload(); + }); }); function init() { diff --git a/smz-web/js/work/person/workGive.js b/smz-web/js/work/person/workGive.js index ef609cb..e482cf6 100644 --- a/smz-web/js/work/person/workGive.js +++ b/smz-web/js/work/person/workGive.js @@ -12,6 +12,14 @@ layui.use(['layer','form'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); + + $("#resetBt").click(function () { + // $("#orgId").val(""); + $("#proId").val(""); + $("#keyWord").val(""); + form.render('select'); + example.ajax.reload(); + }); }); diff --git a/smz-web/js/work/train/trainForm.js b/smz-web/js/work/train/trainForm.js index 096e635..4563f47 100644 --- a/smz-web/js/work/train/trainForm.js +++ b/smz-web/js/work/train/trainForm.js @@ -2,11 +2,6 @@ $(function () { layui.use(['form'], function () { var form = layui.form; //只有执行了这一步，部分表单元素才会自动修饰成功 form.render(); - // 验证成功后才会执行下面的操作 - form.on('submit(formDemo)', function (data) { - - }); - // 验证成功后才会执行下面的操作 form.on('submit(formDemo)', function (data) { var id = $("#id").val(); diff --git a/smz-web/js/work/train/trainList.js b/smz-web/js/work/train/trainList.js index 113dce5..e664465 100644 --- a/smz-web/js/work/train/trainList.js +++ b/smz-web/js/work/train/trainList.js @@ -35,6 +35,11 @@ layui.use(['layer'], function () { xhr.send(); }); + $("#resetBt").click(function () { + $("#keyWord").val(""); + example.ajax.reload(); + }); + }); @@ -143,8 +148,8 @@ function init() { * 新增页面 * */ function addCommonProblem() { - var height = '525px'; - var width = '925px'; + 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/uploadResults/uploadResultsList.js b/smz-web/js/work/uploadResults/uploadResultsList.js index c75e3b0..25c53a9 100644 --- a/smz-web/js/work/uploadResults/uploadResultsList.js +++ b/smz-web/js/work/uploadResults/uploadResultsList.js @@ -1,12 +1,13 @@ var example = null; var pers = checkPermission(); -var laydate; +var laydate,form; layui.use(['form', 'layer', 'laydate'], function () { $("#searchBt").click(function () { example.ajax.reload(); }); laydate = layui.laydate; + form = layui.form; init(); // 年月范围 @@ -15,6 +16,15 @@ layui.use(['form', 'layer', 'laydate'], function () { type: 'month', range: true }); + + $("#resetBt").click(function () { + $("#keyWord").val(""); + $("#month").val(""); + $("#state").val(""); + $("#status").val(""); + form.render('select'); + example.ajax.reload(); + }); }) function init() { @@ -197,8 +207,8 @@ function edit(id) { data:{"id":id}, dataType: 'json', success: function (data) { - var height = '80%'; - var width = '60%'; + var height = '97.5%'; + var width = '97.5%'; var index = layer.open({ title: ['修改','color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -334,8 +344,8 @@ function addFeaturesInfo(){ * 查看流程 */ function processView(){ - var height = '100%'; - var width = '70%'; + var height = '97.5%'; + var width = '97.5%'; var index = layer.open({ title: '流程说明', type: 2, diff --git a/smz-web/login.html b/smz-web/login.html index eb55aa9..6104a4f 100644 --- a/smz-web/login.html +++ b/smz-web/login.html @@ -295,4 +295,4 @@ }); } - \ No newline at end of file + diff --git a/smz-web/pages/work/managementReview/managementReviewList.html b/smz-web/pages/work/managementReview/managementReviewList.html index ebbcfa4..3dc4030 100644 --- a/smz-web/pages/work/managementReview/managementReviewList.html +++ b/smz-web/pages/work/managementReview/managementReviewList.html @@ -14,14 +14,14 @@ } #commonFunctionsContent > span { - border: 1px solid #31A7FF; + border: 1px solid #16baaa; color: #31A7FF; padding: 5px 10px; cursor: pointer; } #commonFunctionsContent > span:hover { - border: 1px solid #4E50F0; + border: 1px solid #16baaa; color: #4E50F0; } @@ -37,7 +37,7 @@
全部全部待确认已确认
- + +
diff --git a/smz-web/pages/work/ownPerson/addCorporationMag.html b/smz-web/pages/work/ownPerson/addCorporationMag.html index b48bf8a..8fc156a 100644 --- a/smz-web/pages/work/ownPerson/addCorporationMag.html +++ b/smz-web/pages/work/ownPerson/addCorporationMag.html @@ -9,94 +9,136 @@ +
-
-
- -
- +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ + + + +
+
-
-
- -
- +
+
+ +
+ +
+
+ +
+ + + + +
+
-
-
- -
- -
-
-
- -
-
- -
- -
-
-
- -
-
- -
- -
-
-
- -
-
- -
- -
-
-
- -
- -
- - - - -
- -
- -
- -
- - - - -
- -
-
+
diff --git a/smz-web/pages/work/ownPerson/dictionaryForm.html b/smz-web/pages/work/ownPerson/dictionaryForm.html index ec12a0a..8bf2f6a 100644 --- a/smz-web/pages/work/ownPerson/dictionaryForm.html +++ b/smz-web/pages/work/ownPerson/dictionaryForm.html @@ -11,13 +11,29 @@ @@ -25,38 +41,40 @@
-