diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 13924fe18..9a8004888 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -12,12 +12,21 @@ :columns="columns" @change="tableOnChange" > - + - + + + + {{ol.text}} - + + + {{ol.text}} + + + {{ol.text}} + diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue index 6ebedd2ba..a820c4528 100644 --- a/jero-web/src/components/SplitUpload/index.vue +++ b/jero-web/src/components/SplitUpload/index.vue @@ -2,7 +2,7 @@
{ + if(item==file.type){ + fileFlag=true + } + }) + console.log('filetype',fileFlag) + if(!fileFlag){ + this.$message.warning('文件格式不正确') this.fileTypeSatus = false }else{ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); this.fileTypeSatus = true - this.$message.destroy() // 207M.doc文件大小超出100MB限制, 请压缩或降低文件质量! this.errorMessage = file.name + '文件大小超出1000MB限制, 请压缩或降低文件质量!' @@ -90,7 +96,7 @@ window.open(url, '_blank') }, handleChange(info) { - console.log('file',info) + // console.log('file',info) let { file,fileList } = info const status = info.file.status info.fileList.forEach((val, index) => { @@ -149,7 +155,7 @@ } }) this.$emit('uploadSuccess', this.fileList,fileList) - console.log('uplossss',this.fileList,fileList) + // console.log('uplossss',this.fileList,fileList) if (this.myfileList.length > 0) { this.$message.destroy() this.$message.success(`${info.file.name} `+this.$t('uploadSuccessful')) @@ -166,7 +172,7 @@ this.fileList = [] }, preview(file) { - console.log('file111',file) + // console.log('file111',file) this.previewImage = file.response.path; } } diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 537417f44..33457d452 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -184,18 +184,17 @@ axios({ url: '/jero-boot/split/sarFileSplitInfo/deleteBatch', method: 'get', - data: params, params:params, 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')) - if(this.selectedRowKeys&&this.selectedRowKeys.length==this.tableData.length){ - this.queryParams.pageNo=this.queryParams.pageNo-1 - } + // if(this.selectedRowKeys&&this.selectedRowKeys.length==this.tableData.length){ + // this.queryParams.pageNo=this.queryParams.pageNo-1 + // } this.selectedRowKeys=[] eventBUs.$emit('searchReset') // this.loadData() @@ -220,9 +219,9 @@ getAction(`split/sarFileSplitInfo/delete`, { id: val.id }).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) { - this.queryParams.pageNo = this.queryParams.pageNo - 1 - } + // if (this.tableData && this.tableData.length == 1 && this.queryParams.pageNo != 1) { + // this.queryParams.pageNo = this.queryParams.pageNo - 1 + // } eventBUs.$emit('searchReset') // this.loadData() } else { @@ -276,14 +275,31 @@ fileName:val.fileName, connectId:val.connectId } - getAction(`split/sarFileSplitInfo/bindToDocumentLibrary`, params).then((res) => { - if (res.success) { - this.$message.success(res.message) - this.loadData() - } else { - this.$message.warning(res.message) - } - }) + axios({ + url: '/jero-boot/split/sarFileSplitInfo/bindToDocumentLibrary', + method: 'get', + params:params, + headers: { + // 'Content-Type': 'multipart/form-data', + 'X-Access-Token':this.token + } + }).then(res => { + if (res.data.success) { + this.$message.success(this.$t('OperationSuccessful')) + eventBUs.$emit('searchReset') + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + + // getAction(`split/sarFileSplitInfo/bindToDocumentLibrary`, params).then((res) => { + // if (res.success) { + // this.$message.success(res.message) + // this.loadData() + // } else { + // this.$message.warning(res.message) + // } + // }) } }) }, diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index b1a707d89..d8d35ba54 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -12,26 +12,6 @@
- - - - - - - - - - - - - - - - - - - -
@@ -43,21 +23,6 @@ :OperationList="OperationList" @onSelectChange="onSelectChange" /> - - - - - - - - - - - - - - -
{{$t('cancel')}}
- + @@ -162,12 +127,20 @@ seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForOcr', //搜索字段 tableList: 'document/bussDocumentLibraryEO/ocrPageInfo', //表格数据 }, - OperationList:[] + OperationList:[], + upload1:this.$t('upload1'), + accept:'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/msword' } }, props:{ importsVisible:Boolean }, + watch:{ + 'form.file'(val){ + console.log(val) + } + + }, mounted() { this.visible=this.importsVisible // console.log('visibleSplit',this.visible) @@ -224,13 +197,15 @@ }, //上传文件 uploadSuccess(data) { - console.log('updata',data) + // console.log('updata',data) let attIdList = [] data.map(item => { attIdList.push(item.id || data.name) }) + console.log('file',attIdList) // /** 赋值给当前对应的表单文件 */ this.form.file = attIdList.join(',') + // console.log('this.form.file',this.form.file) }, //模板下载 downLoad(){ @@ -259,7 +234,7 @@ margin:20px 0; .file-down{ position: absolute; - left: 260px; + left: 320px; top: 5px; } } diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 8b0363627..049ee320a 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -238,46 +238,8 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{$t('contentValidity')}}
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 7aa40201e..1d6ae077d 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -550,7 +550,7 @@ onOk: async () => { axios({ - url: '/jero-boot/split/sarFileSplitMenu/copyMenuNotChildren', + url: '/jero-boot/split/sarFileSplitMenu/copyMenuNotChildrenall', method: 'get', params: params, // transformRequest: [function (data) {