diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue index 4ee084693..fba928676 100644 --- a/jero-web/src/components/importSplitUpload/index.vue +++ b/jero-web/src/components/importSplitUpload/index.vue @@ -2,7 +2,7 @@
=1){ // console.log() this.$message.warning(this.$t('onlyOnefileUploaded')) return false }else{ - // let thisFileType = this.thisFileType.replace(/\s+/g, ""); - // console.log('accetptt',this.accept) - let acceptFlag=false - let accepts = this.accept.split(',') - accepts.forEach((item,index)=>{ - if(item==file.type){ - acceptFlag=true - return - }else{ - acceptFlag=false - } - }) - if(acceptFlag){ - // console.log('111111') - this.fileTypeSatus = true; - this.$message.destroy() - // 207M.doc文件大小超出100MB限制, 请压缩或降低文件质量! - this.errorMessage = file.name + "文件大小超出100MB限制, 请压缩或降低文件质量!"; + let suffix=file.name.split('.') + let acceptSuffix=suffix[suffix.length-1] + if(acceptSuffix.toLowerCase()=='zip'){ + this.fileTypeSatus = true; + this.$message.destroy() + // 207M.doc文件大小超出100MB限制, 请压缩或降低文件质量! + this.errorMessage = file.name + "文件大小超出100MB限制, 请压缩或降低文件质量!"; + // } } } }, diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index 3797d0309..b38db7ccc 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -127,7 +127,7 @@ ], }, spinning:false, //loading标识 - type:'', + type:'doc', url:{ tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //表格头部字段 seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //搜索字段 diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index faad6ccc2..d0a803c6c 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -894,6 +894,7 @@ } eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(queryParam))) + this.selectClear() // eventBUs.$emit('searchReset') }else{ this.$message.warning(this.$t('operationFailed')) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index 25ca164ac..77a8c7574 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -137,6 +137,7 @@ OperationList:[], token:Vue.ls.get(ACCESS_TOKEN), cut:'', + submitFlag:false } }, props:{ @@ -226,31 +227,24 @@ fileGroup: this.fileGroup, fileType:file.text_info } + if(!this.submitFlag){ + this.submitFlag=true + + postAction(`split/sarFileSplitInfo/add`, params).then(res => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + this.visible = false; + this.$emit('visible', false) + } else { + this.$message.warning(res.message) + } + }).finally(()=>{ + this.submitFlag =true - // if (file.text_info == '发布稿(必读)') { - // params.fileType = '1' - // } else if (file.text_info == '增补件(必读)') { - // params.fileType = '2' - // } else if (file.text_info == '报批稿') { - // params.fileType = '3' - // } else if (file.text_info == '征求意见稿') { - // params.fileType = '4' - // } else if (file.text_info == '测试程序') { - // params.fileType = '5' - // } else if (file.text_info == '相关资料') { - // params.fileType = '6' - // } - postAction(`split/sarFileSplitInfo/add`, params).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchReset') - this.visible = false; - this.$emit('visible', false) - } else { - this.$message.warning(this.$t('operationFailed')) - } }) this.$emit('exportVisible',true) + } } else { this.$message.warning(this.$t('OnlyWord')) }