From 73f0282d45f0fa9ac7f9a6a12e16bb9cdc482115 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Mon, 9 Feb 2026 14:56:01 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8C=89=E5=9B=BA=E5=AE=9A=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E3=80=81=E4=B8=B4=E6=97=B6=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AttendanceMachine/personEntryFrom.html    |   6 +-
 .../AttendanceMachine/personEntryFrom.js      |   7 +-
 .../AttendanceMachine/personEntryUpd.html     |   6 +-
 .../AttendanceMachine/personEntryUpd.js       |   7 +-
 .../AttendanceMachine/personEntryView.html    | 147 ++++++++----------
 .../AttendanceMachine/personEntryView.js      |  16 +-
 .../temporaryPersonEntryFrom.html             |   4 +-
 .../temporaryPersonEntryUpd.html              |   4 +-
 .../temporaryPersonEntryView.html             | 140 +++++++----------
 9 files changed, 150 insertions(+), 187 deletions(-)

diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html
index 059d7e4..252c367 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.html
@@ -226,7 +226,7 @@
                                         lay-verify="required" onchange="employmentTypeChange(this);">
 <!--                                    <option value="0">临时用工</option>-->
                                     <option value="1" selected>固定用工</option>
-                                    <option value="2">分包管理人员</option>
+<!--                                    <option value="2">分包管理人员</option>-->
                                 </select>
                             </div>
                         </div>
@@ -291,7 +291,7 @@
                             </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>
@@ -300,7 +300,7 @@
                                 >
                             </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>
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js
index ddfdfc4..c13803d 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js
@@ -135,9 +135,10 @@ layui.use(["form", "laydate", "upload", "element"], function () {
     var einTime = laydate.render({
         elem: "#einTime",
         trigger: "click",
-        format: "yyyy-MM-dd",
-        min: minListDate,
-        max: maxListDate,
+        type: 'datetime',
+        format: "yyyy-MM-dd HH:mm:ss",
+        min: minListDate + '00:00:00',
+        max: maxListDate + '23:59:59',
     });
 
     var begin = "#contractStartTime",
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html
index 4cc6928..3a151f5 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.html
@@ -212,7 +212,7 @@
                                         lay-verify="required" onchange="employmentTypeChange(this);">
 <!--                                    <option value="0">临时用工</option>-->
                                     <option value="1" selected>固定用工</option>
-                                    <option value="2">分包管理人员</option>
+<!--                                    <option value="2">分包管理人员</option>-->
                                 </select>
                             </div>
                         </div>
@@ -264,7 +264,7 @@
                             </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>
@@ -273,7 +273,7 @@
                                 >
                             </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>
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js
index 47b82b6..21ecdf3 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js
@@ -192,9 +192,10 @@ layui.use(['form', 'laydate', 'upload', 'element'], function () {
     var einTime = laydate.render({
         elem: "#einTime",
         trigger: "click",
-        format: 'yyyy-MM-dd',
-        min: minListDate,
-        max: maxListDate
+        type: 'datetime',
+        format: "yyyy-MM-dd HH:mm:ss",
+        min: minListDate + '00:00:00',
+        max: maxListDate + '23:59:59',
     });
 
     //基础信息文件上传
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html
index 860dfc1..2522154 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.html
@@ -190,8 +190,75 @@
                                     </select>
                                 </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 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-title">安全培训考试
@@ -396,87 +463,7 @@
                             </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-title">合同信息
                             <i class="tip-required" style="color: red;">（正式人员生成工资册之前必须完善）</i>
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js
index 1e2af95..e5955b2 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js
@@ -154,17 +154,10 @@ function proChange(value) {
 }
 
 function employmentTypeChange(value) {
-    if (value === "0") {
-        $("#socialSecurityModule").css("display", "none");
-        $("#subTeamModule").css("display", "none");
-        $("#contractModule").css("display", "none");
-        $("#wagesModule").css("display", "none");
-    } else {
-        $("#socialSecurityModule").css("display", "");
-        $("#subTeamModule").css("display", "");
-        $("#contractModule").css("display", "");
-        $("#wagesModule").css("display", "");
-    }
+    $("#socialSecurityModule").css("display", "");
+    $("#subTeamModule").css("display", "");
+    $("#contractModule").css("display", "");
+    $("#wagesModule").css("display", "");
 }
 
 function setSel() {
@@ -445,6 +438,7 @@ function setData(data) {
     }
 
     $('#checkupDate').val(data.checkupDate)
+    $('#einTime').val(data.einTime)
 
     layui.form.render("select");
 }
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryFrom.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryFrom.html
index f2fcfdf..279e390 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryFrom.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryFrom.html
@@ -290,7 +290,7 @@
                             </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>
@@ -299,7 +299,7 @@
                                 >
                             </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>
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryUpd.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryUpd.html
index baa668d..b49ae48 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryUpd.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryUpd.html
@@ -264,7 +264,7 @@
                             </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>
@@ -273,7 +273,7 @@
                                 >
                             </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>
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryView.html b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryView.html
index c5cfdd7..e890e6f 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryView.html
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/temporaryPersonEntryView.html
@@ -190,6 +190,66 @@
                                     </select>
                                 </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>
                     <!--安全培训考试-->
@@ -396,87 +456,7 @@
                             </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-title">合同信息
                             <i class="tip-required" style="color: red;">（正式人员生成工资册之前必须完善）</i>