diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index b36a8a66b..cc11a4884 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -4,9 +4,9 @@ {{record.iterms_conditions&&record.iterms_conditions!=='null'?record.iterms_conditions.replace(/<.*?>/ig, ' ') : ''}} + @@ -28,6 +29,11 @@ + + + {{text && text.length > 18?text.slice(0,17)+'...':text}} + +
@@ -156,8 +162,13 @@ customRender: 'showContent' } } + if (res.urlClick) { + this.columns[index].scopedSlots = { + customRender: 'urlClick' + } + } }) - // console.log('columns',this.columns) + let width = 0 if (this.OperationList.length > 0) { for (let i = 0; i < this.OperationList.length; i++) { @@ -173,7 +184,7 @@ scopedSlots: { customRender: 'operation' } }) } - + console.log('columns',this.columns) } }) }, @@ -183,7 +194,7 @@ this.getTableList() }, getTableList() { - console.log('this.searchParmestable',this.searchParmes) + // console.log('this.searchParmestable',this.searchParmes) let pageNo = JSON.parse(JSON.stringify(this.pageNo)) let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let params = { @@ -235,6 +246,9 @@ }, showContent(item, index) { this.$emit('showContent', item) + }, + urlClick(item) { + window.open(item) } } } diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue index 9ce33e721..2308936a7 100644 --- a/jero-web/src/components/SplitImport/index.vue +++ b/jero-web/src/components/SplitImport/index.vue @@ -17,7 +17,7 @@ :showUploadList="false" @change="handleChange"> - {{ $t('import') }} + {{ $t('import') }} @@ -96,12 +96,17 @@ // console.log('rrr',this.myfileList) }, handleChange(info) { - console.log('info',info) + // console.log('info',info) let { file } = info; const status = info.file.status; info.fileList.forEach((val,index)=>{ if(val.response && !val.response.result){ - this.$message.success(val.response.message); + if(val.response.success){ + this.$message.success(val.response.message); + }else{ + this.$message.error(val.response.message); + } + info.fileList.splice(index,1) } }) diff --git a/jero-web/src/components/SplitSearch/index.vue b/jero-web/src/components/SplitSearch/index.vue index b8bc4c5be..b31f9fbd0 100644 --- a/jero-web/src/components/SplitSearch/index.vue +++ b/jero-web/src/components/SplitSearch/index.vue @@ -44,7 +44,7 @@ {{item.db_field_txt}}
@@ -104,13 +104,13 @@ :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'" :triggerChange="false" :dictCode="item.dict_field"/> -
-
- {{item.db_field_txt}} -
- -
+ + + + + + + @@ -137,7 +137,7 @@ {{$t('query')}} {{$t('reset')}} - {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{ !toggleSearchStatus ? $t('open') : $t('away') }} @@ -238,7 +238,7 @@ } - \ No newline at end of file diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 9a8004888..4209a9f4f 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -187,7 +187,7 @@ pageNo: pageNo + '', pageSize: pageSize + '' } - console.log('parmsss',params) + // console.log('parmsss',params) this.loading = true getAction(this.url.tableList, params).then((res) => { if (res.success) { diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 33678def2..886219a30 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -133,14 +133,14 @@ - - {{$t('query')}} - {{$t('reset')}} - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - - + + {{$t('query')}} + {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index a776fb2a3..b318fdd80 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -315,7 +315,10 @@ detailClick(val){ this.$router.push({ path:'/docManage/splitting/splitDetail', - query: { infoId:val.id } + query: { + infoId:val.id, + infoNumber:val.serialNumber + } }) }, diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index bf1f6474c..5a99e78ce 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -93,7 +93,6 @@
- +
{{$t('Add')}} + {{$t('edit')}} {{$t('delete')}}
@@ -541,6 +541,7 @@ ] }, numberFlag:false, + itemVal:{} } }, props:{ @@ -572,10 +573,10 @@ type:String, default:'' }, - itemVal:{ - type:Object, - default:{} - } + // itemVal:{ + // type:Object, + // default:{} + // } }, watch:{ selected(val){ @@ -635,6 +636,14 @@ this.addIndex=val } }, + //编辑按钮 + splitEdit(index,item){ + this.tableVisible=true + this.$nextTick(() => { + this.$refs.ueditor.setContent(item.itemContent) + }) + console.log('ineciem',index,item) + }, //删除按钮 splitDelete(item,index){ // console.log('itme',item,this.contentList) @@ -663,6 +672,7 @@ } else { url = this.url.addInfo } + let params = JSON.parse(JSON.stringify(this.formInline)) Object.keys(params).forEach(res => { @@ -671,12 +681,19 @@ } }) - if(JSON.stringify(this.itemVal)=="{}"){ params.info_id=this.infoId params.menu_id=this.menuId - } - // params.menuId=this.menuId - params.itemValEOList=this.contentList + + let contentList=JSON.parse(JSON.stringify(this.contentList)) + contentList.forEach((item,index)=>{ + if(item.type==='IMG'){ + // console.log('img',item) + this.$delete(item,'thumbUrl') + // contentList[index]= { ...item } + } + }) + // console.log('contentList',contentList) + params.itemValEOList=contentList // console.log('paramsformInline',params) params.delItemIds=this.deleteIds.join(',') axios({ @@ -767,7 +784,7 @@ }, //上传文件 uploadSuccess1(data,imgs) { - console.log('dataimg',data,imgs) + // console.log('dataimg',data,imgs) let lengthImg=imgs.length for(let i = this.contentList.length;i>this.addIndex;i--){ this.contentList[i+lengthImg-1]=this.contentList[i-1] @@ -803,6 +820,8 @@ type:'TABLE', itemContent:this.ueContent } + // this.uEditorChange() + // console.log('this.contentList',this.contentList) }, //表格取消按钮 handleCancelTable(){ @@ -816,6 +835,7 @@ type:'TABLE', itemContent:val } + this.ueContent=val }, //取消行数列数按钮 @@ -989,6 +1009,7 @@ edit(item) { this.visible=true this.type = 'edit' + this.itemVal=item // this.getForm(() => { // this.formInline=item // }) @@ -996,7 +1017,7 @@ getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => { if (res.success) { this.formInline = res.result - console.log('form11111',this.formInline) + // console.log('form11111',this.formInline) } }) @@ -1006,6 +1027,7 @@ this.getForm() this.visible=true this.formInline = {} + this.contentList=[] this.type = 'add' }, @@ -1104,7 +1126,7 @@ .row-right{ min-width: 150px; margin-left: 20px; - .row-btn-add{ + .row-btn-add, .row-btn-edit{ margin-right: 20px; } } @@ -1182,7 +1204,10 @@ table.word-table { width: 100%; height: 100%; - + .wordImg{ + width:40px; + height: auto; + } } } } diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 04db16b6f..639f7c958 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -8,7 +8,7 @@ -