diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index 64e56ff2d..5c62311ef 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -34,6 +34,11 @@ {{text && text.length > 18?text.slice(0,17)+'...':text}} + + + {{text && text.length > 18?text.slice(0,17)+'...':text}} + +
@@ -156,19 +161,23 @@ ellipsis: true, sorter: res.sort }) - if(res.db_field_name=='iterms_conditions'){ - this.columns[index].width='500' - this.columns[index].scopedSlots = { - customRender: 'showContent' - } - } + if (res.urlClick) { this.columns[index].scopedSlots = { customRender: 'urlClick' } + }else if(res.db_field_name=='iterms_conditions'){ + this.columns[index].width='500' + this.columns[index].scopedSlots = { + customRender: 'showContent' + } + }else{ + this.columns[index].scopedSlots = { + customRender: 'detailText' + } } }) - + // console.log('this.columns',this.columns) let width = 0 if (this.OperationList.length > 0) { for (let i = 0; i < this.OperationList.length; i++) { diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue index 2308936a7..4074322b6 100644 --- a/jero-web/src/components/SplitImport/index.vue +++ b/jero-web/src/components/SplitImport/index.vue @@ -21,6 +21,15 @@ + + {{errValue}} +
@@ -44,7 +53,9 @@ accept:'application/zip', uploadData:{ }, - cut:'' + cut:'', + preErrVisible:false, + errValue:'' } }, computed:{ @@ -76,13 +87,16 @@ // console.log(this.thisFileType,this.thisFileSize,this.thisFileUploadUrl); }, methods:{ + handleErrCancel(){ + this.preErrVisible=false + }, beforeUpload(file,fileList) { if(this.myfileList&&this.myfileList.length>=1){ this.$message.warning('只能上传一个文件') return false }else{ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); - console.log('typeee',file.type) + // console.log('typeee',file.type) if(file.type==this.accept){ this.fileTypeSatus = true; this.$message.destroy() @@ -104,7 +118,14 @@ if(val.response.success){ this.$message.success(val.response.message); }else{ - this.$message.error(val.response.message); + if(val.response.code==1){ + this.$message.error(val.response.message); + }else{ + this.preErrVisible=true + this.errValue=val.response.message + } + + } info.fileList.splice(index,1) @@ -167,7 +188,7 @@ }) if(this.myfileList.length > 0){ - console.log('file1111',this.fileList) + // console.log('file1111',this.fileList) this.$emit('uploadSuccess', this.fileList,'success') this.$message.destroy() this.$message.success(`${info.file.name} 文件上传成功。`); @@ -197,5 +218,9 @@ z-index: 1002; } } - +.split-error{ + .err-value{ + margin-top: 10px; + } +} \ No newline at end of file diff --git a/jero-web/src/components/SplitTable/DocTable.vue b/jero-web/src/components/SplitTable/DocTable.vue index 51462cae6..2f26cadf0 100644 --- a/jero-web/src/components/SplitTable/DocTable.vue +++ b/jero-web/src/components/SplitTable/DocTable.vue @@ -29,7 +29,11 @@ - + + + {{text && text.length > 18?text.slice(0,17)+'...':text}} + +
diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 4209a9f4f..9ec6716b6 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -29,6 +29,11 @@ + + + {{text && text.length > 18?text.slice(0,17)+'...':text}} + +
@@ -143,16 +148,12 @@ if(res.db_field_name==''){ // scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' } - if (res.click) { - this.columns[index].scopedSlots = { - customRender: 'showContent' - } - } else { + this.columns[index].scopedSlots = { customRender: 'detailText' } - } }) + let width = 0 if (this.OperationList.length > 0) { for (let i = 0; i < this.OperationList.length; i++) { diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue index 67cb2e17e..c3d11e8fd 100644 --- a/jero-web/src/components/importSplitUpload/index.vue +++ b/jero-web/src/components/importSplitUpload/index.vue @@ -1,5 +1,5 @@ - - - - - - - - - - - - - - - - - -
@@ -1100,7 +1082,7 @@ .split-detail-left{ width: 260px; padding-right: 20px; - border-right: 1px solid #666666; + border-right: 1px solid #E6E7EC; .split-detail-left-tree{ width: 240px; } diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index 96e47f140..48099d62a 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -54,29 +54,6 @@ @onSelectChange="onSelectChange" />
- - - - - - - - - - - - - - - - - - - - - - -