From 9804d4aa0c04b4b6622850e9d44a4ccbb9dd826e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Fri, 24 Oct 2025 17:00:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/person/InOutMapper.xml   |  4 +-
 .../AttendanceMachine/personEntryFrom.js      | 66 ++++++++++++-------
 2 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml b/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml
index 85a6667..494ad6d 100644
--- a/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/person/InOutMapper.xml
@@ -97,7 +97,7 @@
         update bm_worker_contract set is_active = 0 where idCard = #{idNumber};
         update bm_worker_contract_details set is_active = 0 where id_card = #{idNumber};
         update bm_worker_contract_witness set is_active = 0 where id_number = #{idNumber};
-        update bm_team_user_relation set is_active = 0 where id_number = #{idNumber} and is_regular_person = '0' and is_active  = '1';
+        update bm_team_user_relation set is_active = 0 where id_number = #{idNumber}  and is_active  = '1';
         update bm_worker set light_status = 0,is_furlough_person = 0 where id_number = #{idNumber} and is_active = 1;
         update bm_worker_training_result set is_active = 0 where id_number = #{idNumber};
         <if test='einStatus != "1"'>
@@ -355,4 +355,4 @@
 
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
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 dcd25af..73cd0b4 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
@@ -1817,6 +1817,9 @@ function setSel() {
 function addPerson(data, loadingMsg) {
     var wageCard = $("#uploadWageCardSwitch").prop("checked");
     var contract = $("#uploadContractSwitch").prop("checked");
+    $("#hideUploadProve").click();
+    $("#hideUploadWageCard").click();
+    $("#hideUploadContract").click();
     if (wageCard) {
         uploadNum++;
     }
@@ -1834,9 +1837,7 @@ function addPerson(data, loadingMsg) {
         data: JSON.stringify(data), //获取提交的表单字段
         success: function (data) {
             if (data.code == 200) {
-                $("#hideUploadProve").click();
-                $("#hideUploadWageCard").click();
-                $("#hideUploadContract").click();
+
                 setTimeout(function () {
                     layer.close(loadingMsg); // 关闭提示层
                     parent.layer.closeAll();
@@ -2250,24 +2251,34 @@ function uploadCheckup(number) {
                 $("#previewCheckupProve").css("display", "");
                 var previewImgSrc = "../../../../img/filetype/pdf.png"; // 预览图片源
 
-                // $("#checkupProve").append(
-                //     '<div id="' +
-                //         index +
-                //         '" style="display: inline-block;text-align: center;width:150px">' +
-                //         '<img src="' +
-                //         previewImgSrc +
-                //         '" alt="' +
-                //         file.name +
-                //         '" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img">' +
-                //         "<div><span>" +
-                //         (file.name.length > 8
-                //             ? file.name.substr(0, 8) + ".."
-                //             : file.name) +
-                //         "</span></div>" +
-                //         "</div>"
-                // );
-
                 $("#checkupProve").append(
+                    '<div id="' +
+                        index +
+                        '" style="display: inline-block;text-align: center;width:150px">' +
+                        '<img src="' +
+                        previewImgSrc +
+                        '" alt="' +
+                        file.name +
+                        '" style="height: 80px;width: 80px;margin-right: 10px" class="layui-upload-img">' +
+                        "<div><span>" +
+                        (file.name.length > 8
+                            ? file.name.substr(0, 8) + ".."
+                            : file.name) +
+                        "</span></div>" +
+                        "</div>"
+                );
+                $("#checkup_img").attr("disabled", true);
+                $("#" + index).bind("dblclick", function () {
+                    //双击删除指定预上传图片
+                    delete companyExamFiles[index]; //删除指定图片
+                    $(this).remove();
+                    var photoNum = $("#demo1").children().length;
+                    if (photoNum === 0) {
+                        $("#test").attr("disabled", false);
+                        $("#preview").css("display", "none");
+                    }
+                });
+                /*$("#checkupProve").append(
                     '<div id="' +
                         index +
                         '" style="display: inline-block;text-align: center;width:150px;position: relative">' + // 增加了position: relative
@@ -2284,7 +2295,7 @@ function uploadCheckup(number) {
                         // 新增删除图标
                         '<div id="deleteCheckupProve" onClick="deleteCheckupProve()" style="position: absolute;top: -5px;right: 30px;color: #ff4d4f;cursor: pointer;font-size: 18px;"><i class="layui-icon layui-icon-delete"></i></div>' +
                         "</div>"
-                );
+                );*/
             });
         },
         before: function (obj) {
@@ -2341,7 +2352,7 @@ function uploadSpecial(number) {
         url: fileUrl + "/file/upload", //改成您自己的上传接口
         multiple: false, //是否允许多文件上传，默认未false
         dataType: "json",
-        exts: "pdf|PDF",
+        exts: "pdf|PDF|jpg|png|jpeg|gif|bmp|webp",
         auto: true, //是否自动上传 ，默认为true
         number: number, //最大上传数量
         size: 1024 * 30, //最大文件大小，单位k
@@ -2383,6 +2394,17 @@ function uploadSpecial(number) {
                         "</span></div>" +
                         "</div>"
                 );
+                $("#special_img").attr("disabled", true);
+                $("#" + index).bind("dblclick", function () {
+                    //双击删除指定预上传图片
+                    delete ContractFiles[index]; //删除指定图片
+                    $(this).remove();
+                    var photoNum = $("#demo1").children().length;
+                    if (photoNum === 0) {
+                        $("#test").attr("disabled", false);
+                        $("#preview").css("display", "none");
+                    }
+                });
             });
         },
         before: function (obj) {