diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 99b1ed544..537417f44 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -268,18 +268,22 @@ backDocument(val){ this.$confirm({ content: this.$t('backDocument'), - onOk: async () => { - // deleteAction(``, { id: val.id }).then((res) => { - // if (res.success) { - // this.$message.success(res.message) - // this.loadData() - // } else { - // this.$message.warning(res.message) - // } - // }) + let params={ + id:val.id, + 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) + } + }) } }) }, diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index f73551d70..7aa40201e 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -551,16 +551,16 @@ async () => { axios({ url: '/jero-boot/split/sarFileSplitMenu/copyMenuNotChildren', - 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 - }], + method: 'get', + params: 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/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index d7727f888..f3aa27621 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -127,7 +127,7 @@ seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForOcr', //搜索字段 tableList: 'document/bussDocumentLibraryEO/ocrPageInfo', //表格数据 }, - type:'', + type:'doc', OperationList:[] } }, @@ -205,11 +205,12 @@ if (file.file_name) { let name = file.file_name.split('.') let nameSuffix = name[name.length - 1] - // if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx') { + if (nameSuffix.toLowerCase() === 'doc'||nameSuffix.toLowerCase() === 'docx') { let params = { attId: file.id, - standName: file.title, - standNumber: file.serial_number, + title: file.title, + fileName:file.file_name, + serialNumber: file.serial_number, connectId: file.connect_id } if (file.text_info == '发布稿(必读)') { @@ -235,10 +236,10 @@ this.$message.warning(this.$t('operationFailed')) } }) - // this.$emit('exportVisible',true) - // } else { - // this.$message.warning(this.$t('OnlyWord')) - // } + this.$emit('exportVisible',true) + } else { + this.$message.warning(this.$t('OnlyWord')) + } } } } diff --git a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue index 84eda039b..b82a2248b 100644 --- a/jero-web/src/views/documentManage/tags/dialog/TagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/TagForm.vue @@ -237,20 +237,22 @@ watch:{ 'form.fieldShowType'(val){ // this.contentFlag=val - if(val===0){ + if(val==0){ this.contentOption=[...this.contentOption2] this.isTagContent=true - }else if(val===3||val===4){ + }else if(val==3||val==4){ this.contentOption=[...this.contentOption1] this.isTagContent=true - }else if(val===7) { + }else{ + this.isTagContent=false + } + if(val==7){ this.isSearch=false this.form.isQuery=0 }else{ - this.isTagContent=false this.isSearch=true } - if(val===1||val===8||val===9||val===10||val===11||val==='sel_user'){ + if(val==1||val==8||val==9||val==10||val==11||val=='sel_user'){ this.isLength=true }else{ this.isLength=false