From 64473dcf2c896728d90603b6ee962313d629b4fc Mon Sep 17 00:00:00 2001
From: LHD_HY <2872546851@qq.com>
Date: Wed, 4 Jun 2025 19:34:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../person/PersonComprehensiveMapper.xml | 106 +++++++++++++++++-
.../downloads/农民工实名制导入模版.xlsx | Bin 15821 -> 15547 bytes
.../AttendanceMachine/personEntryList.js | 51 +++------
3 files changed, 121 insertions(+), 36 deletions(-)
diff --git a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
index ba8d4fb..60c56c2 100644
--- a/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/person/PersonComprehensiveMapper.xml
@@ -944,7 +944,7 @@
diff --git a/modules/bmw/src/main/resources/static/downloads/农民工实名制导入模版.xlsx b/modules/bmw/src/main/resources/static/downloads/农民工实名制导入模版.xlsx
index 466a379a282a5367ea9faf9fab7a302a543a3e8f..2ad20692e585075b8f3b73a9451e4064a5d5ccdd 100644
GIT binary patch
delta 8999
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
ZO@t_j{&~gV?~~$zvxFGof_Q#?`!6U_@<{*y
delta 9267
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
diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js
index 0c3c247..eec0ee3 100644
--- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js
+++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryList.js
@@ -382,16 +382,19 @@ function downloadCheckup(idNumber, checkupFilePath) {
}
function importData(){
+ var formData = new FormData($('form')[0]);
+ var name = $("#basePersonFile").val();
+ if (name == null || name == "") {
+ layer.msg("请上传文件!");
+ return false; // 阻止表单提交
+ }
+
var idx = layer.msg('正在提交数据,请稍等...', {
icon: 16
, shade: 0.01
, time: '-1'
});
- var formData = new FormData($('form')[0]);
- var name = $("#basePersonFile").val();
- if (name == null || name == "") {
- return;
- }
+
if (!(name.endsWith(".xls") || name.endsWith(".xlsx") || name.endsWith(".xlsm"))) {
layer.msg("请上传正确的Excel表格!");
$("#basePersonFile").val("");
@@ -489,42 +492,22 @@ function checkViewEn(idNumber) {
//导出excel表格
function exportPersonnelOnSite() {
- var name = $("#mame").val();
- var idNumber = $("#idNumber").val();
- var phone = $("#phone").val();
- var postName = $("#postName").val();
+ var name = $("#name").val();
var proName = $("#proName").val();
+ var idNumber = $("#idNumber").val();
var employmentType = $("#employmentType").val();
+ var einStatus = $("#einStatus").val();
var lightStatus = $("#lightStatus").val();
- var exitStatus = $("#exitStatus").val();
- var checkupState = $("#checkupState").val();
+ var keyWord = $("#keyWord").val();
+
+
window.location.href = ctxPath + "/personComprehensive/exportBtnOut?token=" + token
+ "&name=" + name
- + "&idNumber=" + idNumber
- + "&phone=" + phone
- + "&postName=" + postName
+ "&proName=" + proName
+ + "&idNumber=" + idNumber
+ "&employmentType=" + employmentType
+ + "&einStatus=" + einStatus
+ "&lightStatus=" + lightStatus
- + "&exitStatus=" + exitStatus
- + "&checkupState=" + checkupState;
- var xhr = new XMLHttpRequest();
- xhr.open("get", url, true);
- xhr.responseType = "blob"; // 转换流
- xhr.onload = function () {
- layer.close(loadingMsg);
- if (this.status === 200) {
- var blob = this.response;
- var a = document.createElement("a");
- var url = window.URL.createObjectURL(blob);
- a.href = url;
- a.download = "入场人员信息.xlsx"; // 文件名
- }else {
- layer.msg('发生异常,请稍后重试', {icon: 16, scrollbar: false, time: 2000});
- }
- a.click()
- window.URL.revokeObjectURL(url)
- };
- xhr.send();
+ + "&keyWord=" + keyWord;
}