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 @@
-
+
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 @@
-
+
@@ -50,21 +50,33 @@
},
methods:{
beforeUpload(file,fileList) {
- // console.log('file',this.accept,file,fileList)
+ console.log('file',this.accept,file,fileList,this.myfileList)
this.fileTypeSatus=false
- // if(this.myfileList&&this.myfileList.length>=1){
- // this.$message.warning('只能上传一个文件')
- // return false
- // }else{
+ if(this.myfileList&&this.myfileList.length>=1){
+ // console.log()
+ this.$message.warning('只能上传一个文件')
+ return false
+ }else{
// let thisFileType = this.thisFileType.replace(/\s+/g, "");
- if(file.type==this.accept){
+ // 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限制, 请压缩或降低文件质量!";
}
- // }
+ }
},
remove(){
this.fileTypeSatus = true;
@@ -81,6 +93,7 @@
info.fileList.splice(index,1)
}
})
+ console.log('fileStatue',this.fileTypeSatus)
if (this.fileTypeSatus) {
if (file.size > 100000000) {
this.$message.error(this.errorMessage)
@@ -134,10 +147,10 @@
this.fileList.push(res)
}
})
- let fileList1=[]
- fileList1[0]=this.fileList[this.fileList.length-1]
+ // let fileList1=[]
+ // fileList1[0]=this.fileList[this.fileList.length-1]
if(this.myfileList.length > 0){
- this.$emit('uploadSuccess', fileList1)
+ this.$emit('uploadSuccess', this.fileList)
this.$message.destroy()
this.$message.success(`${info.file.name} 文件上传成功。`);
// console.log('fileList111',file,this.fileList,fileList1)
@@ -148,7 +161,7 @@
// this.$message.success(`${info.file.name} 文件上传成功。`);
}
}
- }else{
+ }else if( !this.fileTypeSatus&&this.myfileList.length<1){
this.$message.warning('不支持上传该类型的文件!')
}
},
@@ -167,5 +180,26 @@
z-index: 1002;
}
}
+ .split-import-upload{
+ .ant-upload-list-item-info{
+ span{
+ display: flex;
+ justify-content: start;
+ text-align: right;
+ .ant-upload-list-item-name{
+ margin-right: 20px;
+ max-width: 800px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
+ }
+ }
+ .ant-upload-list-text{
+ position: absolute;
+ top: 140px;
+ right: 240px;
+ }
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index f0591dda3..264f3abac 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -35,29 +35,7 @@
@onSelectChange="onSelectChange"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-