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 70a69a0..885ee90 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 @@ -1390,8 +1390,10 @@ function uploadFileContract(number){ multiple: true, //是否允许多文件上传,默认未false dataType: "json", // data: {"pickId": id}, - exts: 'jpg|png|jpeg|txt|pdf|xlsx|xls|docx|doc|ppt|pptx|PDF', - //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx', + // exts: 'jpg|png|jpeg|txt|pdf|xlsx|xls|docx|doc|ppt|pptx|PDF', + // //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx', + exts: 'jpg|png|jpeg|pdf|PDF', + acceptMime: 'image/jpg,image/png,image/jpeg,application/pdf', auto: false, //是否自动上传 ,默认为true number: number, //最大上传数量 size: 1024*30, //最大文件大小,单位k @@ -1573,14 +1575,14 @@ function getTypeImgConsPerson(str){ function choseType(str) { if (str.indexOf("jpg") > 0) { return true; + } else if (str.indexOf("JPG") > 0) { + return true; } else if (str.indexOf("png") > 0) { return true; } else if (str.indexOf("jpeg") > 0) { return true; } else if (str.indexOf("gif") > 0) { return true; - }else if (str.indexOf("pdf") > 0) { - return true; }else { return false; } 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 6947c77..48e8622 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 @@ -1357,8 +1357,10 @@ function uploadFileContract(number) { multiple: true, //是否允许多文件上传,默认未false dataType: "json", // data: {"pickId": id}, - exts: "jpg|png|jpeg|txt|pdf|xlsx|xls|docx|doc|ppt|pptx|PDF", + // exts: "jpg|png|jpeg|txt|pdf|xlsx|xls|docx|doc|ppt|pptx|PDF", //acceptMime: 'image/jpg,image/png,image/jpeg,file/pdf,file/xlsx', + exts: 'jpg|png|jpeg|pdf|PDF', + acceptMime: 'image/jpg,image/png,image/jpeg,application/pdf', auto: false, //是否自动上传 ,默认为true number: number, //最大上传数量 size: 1024 * 30, //最大文件大小,单位k @@ -1538,13 +1540,15 @@ function getTypeImgConsPerson(str) { function choseType(str) { if (str.indexOf("jpg") > 0) { return true; + } else if (str.indexOf("JPG") > 0) { + return true; } else if (str.indexOf("png") > 0) { return true; } else if (str.indexOf("jpeg") > 0) { return true; } else if (str.indexOf("gif") > 0) { return true; - } else { + }else { return false; } }