bonus
/
lp_smz_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.按固定人员考勤、临时人员考勤区分

This commit is contained in:
lSun 2026-02-09 14:56:01 +08:00
parent f6476354d7
commit 73f0282d45
9 changed files with 150 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html
View File

@ -226,7 +226,7 @@
lay-verify="required" onchange="employmentTypeChange(this);"> lay-verify="required" onchange="employmentTypeChange(this);">
<!-- <option value="0">临时用工</option>--> <!-- <option value="0">临时用工</option>-->
<option value="1" selected>固定用工</option> <option value="1" selected>固定用工</option>
<option value="2">分包管理人员</option> <!-- <option value="2">分包管理人员</option>-->
</select> </select>
</div> </div>
</div> </div>
@ -291,7 +291,7 @@
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%"> <div class="layui-input-inline" style="width: 60%;margin-top: 2%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属分包合同 所属分包合同
</label> </label>
@ -300,7 +300,7 @@
> >
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属工程 所属工程
</label> </label>

7
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js
View File

@ -135,9 +135,10 @@ layui.use(["form", "laydate", "upload", "element"], function () {
var einTime = laydate.render({ var einTime = laydate.render({
elem: "#einTime", elem: "#einTime",
trigger: "click", trigger: "click",
format: "yyyy-MM-dd", type: 'datetime',
min: minListDate, format: "yyyy-MM-dd HH:mm:ss",
max: maxListDate, min: minListDate + '00:00:00',
max: maxListDate + '23:59:59',
}); });
var begin = "#contractStartTime", var begin = "#contractStartTime",

6
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html
View File

@ -212,7 +212,7 @@
lay-verify="required" onchange="employmentTypeChange(this);"> lay-verify="required" onchange="employmentTypeChange(this);">
<!-- <option value="0">临时用工</option>--> <!-- <option value="0">临时用工</option>-->
<option value="1" selected>固定用工</option> <option value="1" selected>固定用工</option>
<option value="2">分包管理人员</option> <!-- <option value="2">分包管理人员</option>-->
</select> </select>
</div> </div>
</div> </div>
@ -264,7 +264,7 @@
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%"> <div class="layui-input-inline" style="width: 60%;margin-top: 2%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属分包合同 所属分包合同
</label> </label>
@ -273,7 +273,7 @@
> >
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属工程 所属工程
</label> </label>

7
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js
View File

@ -192,9 +192,10 @@ layui.use(['form', 'laydate', 'upload', 'element'], function () {
var einTime = laydate.render({ var einTime = laydate.render({
elem: "#einTime", elem: "#einTime",
trigger: "click", trigger: "click",
format: 'yyyy-MM-dd', type: 'datetime',
min: minListDate, format: "yyyy-MM-dd HH:mm:ss",
max: maxListDate min: minListDate + '00:00:00',
max: maxListDate + '23:59:59',
}); });
//基础信息文件上传 //基础信息文件上传

147
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html
View File

@ -190,8 +190,75 @@
</select> </select>
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 42%">
<label class="layui-form-label" style="width: 110px">
考勤机
</label>
<div class="layui-input-block" >
<!-- <select id="attendanceMachineId" name="attendanceMachineId" lay-filter="attendanceMachineId"-->
<!-- lay-verify="required">-->
<div id="attendanceMachineId"></div>
</select>
</div>
</div>
</div> </div>
</div> </div>
<!--分包班组信息-->
<div class="layui-colla-item" id="subTeamModule">
<div class="layui-colla-title">分包班组信息
<i class="tip-required" style="color: red;">（固定人员生成工资册之前必须完善）</i>
</div>
<div class="layui-colla-content layui-show">
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属分包
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="subId" name="subId" lay-filter="subId" lay-verify="required"
lay-filter="subId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属班组
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="teamId" name="teamId" lay-filter="teamId" lay-verify="required"
lay-filter="teamId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
<i class="tip-required" style="color: red;font-size: 20px">*</i>实际入场时间</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="einTime" id="einTime" class="layui-input"
lay-verify="required" readonly>
</div>
</div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%;display: none;">
<label class="layui-form-label" style="width: 130px">
所属分包合同
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallContract" id="fallContract" class="layui-input">
</div>
</div>
<div class="layui-input-inline" style="width: 60%;display: none;">
<label class="layui-form-label" style="width: 130px">
所属工程
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallPro" id="fallPro" class="layui-input">
</div>
</div>
</div>
</div>
<!--安全培训考试--> <!--安全培训考试-->
<div class="layui-colla-item"> <div class="layui-colla-item">
<div class="layui-colla-title">安全培训考试 <div class="layui-colla-title">安全培训考试
@ -396,87 +463,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--分包班组信息-->
<div class="layui-colla-item" id="subTeamModule">
<div class="layui-colla-title">分包班组信息
<i class="tip-required" style="color: red;">（固定人员生成工资册之前必须完善）</i>
</div>
<div class="layui-colla-content layui-show">
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属分包
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="subId" name="subId" lay-filter="subId" lay-verify="required"
lay-filter="subId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属班组
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="teamId" name="teamId" lay-filter="teamId" lay-verify="required"
lay-filter="teamId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%">
<label class="layui-form-label" style="width: 130px">
所属分包合同
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallContract" id="fallContract" class="layui-input">
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属工程
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallPro" id="fallPro" class="layui-input">
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
考勤机
</label>
<div class="layui-input-block" style="margin-left: 130px">
<!-- <select id="attendanceMachineId" name="attendanceMachineId" lay-filter="attendanceMachineId"-->
<!-- lay-verify="required">-->
<div id="attendanceMachineId"></div>
</select>
</div>
</div>
<!--<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
是否为班组固定人员
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="teamRegularSwitch" name="teamRegularSwitch"
lay-filter="teamRegularSwitch" lay-verify="required" lay-search>
<option value="1">是</option>
<option value="0" selected>否</option>
</select>
</div>
</div>-->
<!--<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
是否为班组长
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="isForeman" name="isForeman" lay-filter="isForeman" lay-search>
<option value="1">是</option>
<option value="0" selected>否</option>
</select>
</div>
</div>-->
</div>
</div>
<div class="layui-colla-item" id="electronicContractModule" style="display: none"> <div class="layui-colla-item" id="electronicContractModule" style="display: none">
<div class="layui-colla-title">合同信息 <div class="layui-colla-title">合同信息
<i class="tip-required" style="color: red;">（正式人员生成工资册之前必须完善）</i> <i class="tip-required" style="color: red;">（正式人员生成工资册之前必须完善）</i>

16
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js
View File

@ -154,17 +154,10 @@ function proChange(value) {
} }
function employmentTypeChange(value) { function employmentTypeChange(value) {
if (value === "0") { $("#socialSecurityModule").css("display", "");
$("#socialSecurityModule").css("display", "none"); $("#subTeamModule").css("display", "");
$("#subTeamModule").css("display", "none"); $("#contractModule").css("display", "");
$("#contractModule").css("display", "none"); $("#wagesModule").css("display", "");
$("#wagesModule").css("display", "none");
} else {
$("#socialSecurityModule").css("display", "");
$("#subTeamModule").css("display", "");
$("#contractModule").css("display", "");
$("#wagesModule").css("display", "");
}
} }
function setSel() { function setSel() {
@ -445,6 +438,7 @@ function setData(data) {
} }
$('#checkupDate').val(data.checkupDate) $('#checkupDate').val(data.checkupDate)
$('#einTime').val(data.einTime)
layui.form.render("select"); layui.form.render("select");
} }

4
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryFrom.html
View File

@ -290,7 +290,7 @@
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%"> <div class="layui-input-inline" style="width: 60%;margin-top: 2%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属分包合同 所属分包合同
</label> </label>
@ -299,7 +299,7 @@
> >
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属工程 所属工程
</label> </label>

4
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryUpd.html
View File

@ -264,7 +264,7 @@
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%"> <div class="layui-input-inline" style="width: 60%;margin-top: 2%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属分包合同 所属分包合同
</label> </label>
@ -273,7 +273,7 @@
> >
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 60%"> <div class="layui-input-inline" style="width: 60%;display: none;">
<label class="layui-form-label" style="width: 130px"> <label class="layui-form-label" style="width: 130px">
所属工程 所属工程
</label> </label>

140
modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryView.html
View File

@ -190,6 +190,66 @@
</select> </select>
</div> </div>
</div> </div>
<div class="layui-input-inline" style="width: 42%;">
<label class="layui-form-label" style="width: 110px">
考勤机
</label>
<div class="layui-input-block" >
<div id="attendanceMachineId"></div>
</select>
</div>
</div>
</div>
</div>
<!--分包班组信息-->
<div class="layui-colla-item" id="subTeamModule">
<div class="layui-colla-title">分包班组信息
<i class="tip-required" style="color: red;">（固定人员生成工资册之前必须完善）</i>
</div>
<div class="layui-colla-content layui-show">
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属分包
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="subId" name="subId" lay-filter="subId" lay-verify="required"
lay-filter="subId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属班组
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="teamId" name="teamId" lay-filter="teamId" lay-verify="required"
lay-filter="teamId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%;display: none;">
<label class="layui-form-label" style="width: 130px">
所属分包合同
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallContract" id="fallContract" class="layui-input">
</div>
</div>
<div class="layui-input-inline" style="width: 60%;display: none;">
<label class="layui-form-label" style="width: 130px">
所属工程
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallPro" id="fallPro" class="layui-input">
</div>
</div>
</div> </div>
</div> </div>
<!--安全培训考试--> <!--安全培训考试-->
@ -396,87 +456,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--分包班组信息-->
<div class="layui-colla-item" id="subTeamModule">
<div class="layui-colla-title">分包班组信息
<i class="tip-required" style="color: red;">（固定人员生成工资册之前必须完善）</i>
</div>
<div class="layui-colla-content layui-show">
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属分包
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="subId" name="subId" lay-filter="subId" lay-verify="required"
lay-filter="subId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属班组
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="teamId" name="teamId" lay-filter="teamId" lay-verify="required"
lay-filter="teamId" lay-search>
</select>
</div>
</div>
<div class="layui-input-inline" style="width: 60%;margin-top: 2%">
<label class="layui-form-label" style="width: 130px">
所属分包合同
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallContract" id="fallContract" class="layui-input">
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
所属工程
</label>
<div class="layui-input-block" style="margin-left: 130px">
<input type="text" name="fallPro" id="fallPro" class="layui-input">
</div>
</div>
<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
考勤机
</label>
<div class="layui-input-block" style="margin-left: 130px">
<!-- <select id="attendanceMachineId" name="attendanceMachineId" lay-filter="attendanceMachineId"-->
<!-- lay-verify="required">-->
<div id="attendanceMachineId"></div>
</select>
</div>
</div>
<!--<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
是否为班组固定人员
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="teamRegularSwitch" name="teamRegularSwitch"
lay-filter="teamRegularSwitch" lay-verify="required" lay-search>
<option value="1">是</option>
<option value="0" selected>否</option>
</select>
</div>
</div>-->
<!--<div class="layui-input-inline" style="width: 60%">
<label class="layui-form-label" style="width: 130px">
是否为班组长
</label>
<div class="layui-input-block" style="margin-left: 130px">
<select id="isForeman" name="isForeman" lay-filter="isForeman" lay-search>
<option value="1">是</option>
<option value="0" selected>否</option>
</select>
</div>
</div>-->
</div>
</div>
<div class="layui-colla-item" id="electronicContractModule" style="display: none"> <div class="layui-colla-item" id="electronicContractModule" style="display: none">
<div class="layui-colla-title">合同信息 <div class="layui-colla-title">合同信息
<i class="tip-required" style="color: red;">（正式人员生成工资册之前必须完善）</i> <i class="tip-required" style="color: red;">（正式人员生成工资册之前必须完善）</i>