diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue index 296ebc680..5a4a2ad38 100644 --- a/jero-web/src/components/OcrUpload/index.vue +++ b/jero-web/src/components/OcrUpload/index.vue @@ -50,12 +50,14 @@ methods:{ beforeUpload(file,fileList) { console.log('file',this.accept) + this.fileTypeSatus=false if(this.myfileList&&this.myfileList.length>=1){ this.$message.warning('只能上传一个文件') return false }else{ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); if(file.type==this.accept){ + // console.log('111111') this.fileTypeSatus = true; this.$message.destroy() // 207M.doc文件大小超出100MB限制, 请压缩或降低文件质量! @@ -69,6 +71,7 @@ }, handleChange(info) { // console.log('info',info) + let { file,fileList } = info; const status = info.file.status; info.fileList.forEach((val,index)=>{ diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue index 41d39919d..d4590ff36 100644 --- a/jero-web/src/components/SplitUpload/index.vue +++ b/jero-web/src/components/SplitUpload/index.vue @@ -16,9 +16,9 @@ :remove='remove' @change="handleChange">

- +

-

{{this.$t('clickUpload')}}

+

{{this.$t('clickUpload')}}

@@ -70,13 +70,11 @@ }, beforeUpload(file) { let fileFlag=false - console.log('accept',this.accept,file) - + // console.log('accept',this.accept,file) + this.fileTypeSatus=false let fileTypes=this.accept.split('/') let fileNowTypes=file.type.split('/') fileFlag=fileTypes[0]==fileTypes[0]?true:false - - // console.log('filetype',fileFlag) if(!fileFlag){ this.$message.warning(this.$t('fileFormatIncorrect')) diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 33457d452..a776fb2a3 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -183,8 +183,16 @@ // console.log('formdata',formData) axios({ url: '/jero-boot/split/sarFileSplitInfo/deleteBatch', - method: 'get', - params:params, + method: 'post', + data: params, + transformRequest: [function (data) { + // Do whatever you want to transform the data + let ret = '' + for (let it in data) { + ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' + } + return ret + }], headers: { 'Content-Type': 'application/x-www-form-urlencoded', 'X-Access-Token':this.token diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index 2fa24904a..58b5b9e32 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -34,7 +34,8 @@ :wrapper-col="wrapperCol" > - + + @@ -123,7 +124,7 @@ form:{}, rules:{ file:[ - { required: true, message: this.$t('pleaseUploadFile'), trigger: 'blur' }, + { required: true, message: this.$t('pleaseUploadFile'), trigger: 'change' }, ], }, spinning:false, //loading标识 @@ -227,70 +228,92 @@ //保存 handleSubmit(){ // console.log('seleced',this.selectedRowKeys,this.rows) + console.log('this.form.file,',this.form.file) if(this.rows.length===0){ this.$message.warning(this.$t('PleaseSelectData')) }else if(this.rows&&this.rows.length>1){ this.$message.warning(this.$t('OnlyOneSelected')) }else if(this.rows&&this.rows.length===1){ - this.$refs.ruleForm.validate(valid=>{ - if(valid){ - this.flag=true - if(this.flag){ - let params={ - connectId:this.rows[0].connect_id, - splitFileId:this.form.file, - fileName:this.rows[0].file_name, - serialNumber:this.rows[0].serial_number, - title:this.rows[0].title, + let params={ + connectId:this.rows[0].connect_id, + splitFileId:this.form.file, + fileName:this.rows[0].file_name, + serialNumber:this.rows[0].serial_number, + title:this.rows[0].title, - } - if(this.rows[0].text_info=='发布稿(必读)'){ - params.fileType='1' - }else if(this.rows[0].text_info=='增补件(必读)'){ - params.fileType='2' - }else if(this.rows[0].text_info=='报批稿'){ - params.fileType='3' - }else if(this.rows[0].text_info=='征求意见稿'){ - params.fileType='4' - }else if(this.rows[0].text_info=='测试程序'){ - params.fileType='5' - }else if(this.rows[0].text_info=='相关资料'){ - params.fileType='6' - } - let formData = new FormData() - Object.keys(params).forEach((key) => { - console.log('key',key,params[key]) - formData.append(key, params[key]); - }); - console.log('formData',params,formData.getAll) - axios({ - url: '/jero-boot/split/sarFileSplitItems/importSplitResult', - method: 'post', - data:formData, - // data: params, - // transformRequest: [function (data) { - // // Do whatever you want to transform the data - // let ret = '' - // for (let it in data) { - // ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&' - // } - // return ret - // }], - headers: { - 'Content-Type': 'multipart/form-data', - // 'Content-Type': 'application/x-www-form-urlencoded', - 'X-Access-Token':this.token - } - }).then(res => { - if (res.data.success) { + } + if(this.rows[0].text_info=='发布稿(必读)'){ + params.fileType='1' + }else if(this.rows[0].text_info=='增补件(必读)'){ + params.fileType='2' + }else if(this.rows[0].text_info=='报批稿'){ + params.fileType='3' + }else if(this.rows[0].text_info=='征求意见稿'){ + params.fileType='4' + }else if(this.rows[0].text_info=='测试程序'){ + params.fileType='5' + }else if(this.rows[0].text_info=='相关资料'){ + params.fileType='6' + } + let formData = new FormData() + Object.keys(params).forEach((key) => { + console.log('key',key,params[key]) + formData.append(key, params[key]); + }); + console.log('formData',params,formData.getAll) + if(!this.form.file) { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.flag = true + if (this.flag) { - } - }).finally(()=>[ - this.flag=false - ]) + axios({ + url: '/jero-boot/split/sarFileSplitItems/importSplitResult', + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data', + // 'Content-Type': 'application/x-www-form-urlencoded', + 'X-Access-Token': this.token + } + }).then(res => { + if (res.data.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + }else{ + this.$message.warning(res.data.message) + } + }).finally(() => [ + this.flag = false + ]) + } } + }) + }else { + this.flag = true + this.$refs.ruleForm.clearValidate() + if (this.flag) { + axios({ + url: '/jero-boot/split/sarFileSplitItems/importSplitResult', + method: 'post', + data: formData, + headers: { + 'Content-Type': 'multipart/form-data', + // 'Content-Type': 'application/x-www-form-urlencoded', + 'X-Access-Token': this.token + } + }).then(res => { + if (res.data.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + }else{ + this.$message.warning(res.data.message) + } + }).finally(() => [ + this.flag = false + ]) } - }) + } } } } diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 3cdf74268..532447974 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -50,8 +50,8 @@ {{ $t('add') }}
- - {{ uploadMenuId===''? $t('import'):'' }} + + {{ (uploadMenuId===''||uploadMenuId===undefined)? $t('import'):'' }} @@ -412,6 +412,7 @@ this.uploadMenuId=selectedKeys[0] // eventBUs.$emit('searchReset') // console.log('sele',selectedKeys) + // console.log('uploadMenuId',this.uploadMenuId) }, //树形新增 orgAdd(){