diff --git a/jero-web/src/components/splitUpload/SplitAddClauseUploadImage.vue b/jero-web/src/components/splitUpload/SplitAddClauseUploadImage.vue index b2e70df..654a484 100644 --- a/jero-web/src/components/splitUpload/SplitAddClauseUploadImage.vue +++ b/jero-web/src/components/splitUpload/SplitAddClauseUploadImage.vue @@ -72,24 +72,19 @@ export default { } }, beforeUpload (file) { - let fileFlag = false - // console.log('accept',this.accept,file) this.fileTypeSatus = false - const fileTypes = this.accept.split('/') - const fileNowTypes = file.type.split('/') - fileFlag = (fileTypes[0] === fileNowTypes[0]) - // console.log('filetype',fileFlag) + const fileName = file.name + const index1 = fileName.lastIndexOf('.') + const index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + fileSuffix = fileSuffix.toLowerCase() const fileSize = file.size // 上传的文件大小 if (fileSize > 1024 * 1024 * 500) { this.$message.warning('文件大小超出500MB限制, 请压缩或降低文件质量!') this.fileTypeSatus = false return false } - if (!fileFlag) { - this.$message.warning(this.$t('文件格式不正确,请上传图片格式文件')) - this.fileTypeSatus = false - } else { - // let thisFileType = this.thisFileType.replace(/\s+/g, ""); + if (this.accept.includes(fileSuffix)) { if (this.uploadFileFlag < 20) { this.uploadFileFlag++ } @@ -97,6 +92,9 @@ export default { this.$message.destroy() // 207M.doc文件大小超出100MB限制, 请压缩或降低文件质量! this.errorMessage = file.name + '文件大小超出500MB限制, 请压缩或降低文件质量!' + } else { + this.$message.warning('文件格式不正确,请上传' + this.accept + '文件') + this.fileTypeSatus = false } }, remove () { diff --git a/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue b/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue index 45eb85d..95d67c3 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue @@ -131,7 +131,7 @@ export default { disabled: false, titleImg: this.$t('uploadPictures'), listType: 'picture', - accept: 'image/*', + accept: '.png,.jpg,.jpeg,.gif', // 表格行列相关数据 rowColForm: {}, validatorRowColRules: {