From 27016f4f0b59cfdb20506d212205a83b2eb7f1e6 Mon Sep 17 00:00:00 2001 From: caoyang Date: Wed, 6 Apr 2022 16:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E5=9B=9E=E6=98=BE=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/SplitDetailTable/index.vue | 6 ++-- .../src/components/dict/JMultiSelectTag.vue | 28 +++++++++++++++-- .../splitting/modules/SplitAddForm.vue | 31 ++++++++++++++++--- .../splitting/modules/SplitDetail.vue | 14 +++++++++ 4 files changed, 69 insertions(+), 10 deletions(-) diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index cc11a4884..7e2d9f68e 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -184,7 +184,7 @@ scopedSlots: { customRender: 'operation' } }) } - console.log('columns',this.columns) + // console.log('columns',this.columns) } }) }, @@ -206,7 +206,9 @@ pageNo: pageNo + '', pageSize: pageSize + '' } - + if(!params.info_id){ + params.info_id=this.infoId + } // console.log('parmsss',params) this.loading = true postAction(this.url.tableList, params).then((res) => { diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index 2867e7145..463626e24 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -13,13 +13,14 @@ :maxTagTextLength="2" :placeholder="placeholder" :getPopupContainer="getParentContainer" + :maxTagPlaceholder="content+'...'" optionFilterProp="children" :filterOption="filterOption"> - + {{ item.text || item.label }} @@ -54,7 +55,8 @@ return { dictOptions: [], tagType:"", - arrayValue:!this.value?[]:this.value.split(this.spliter) + arrayValue:!this.value?[]:this.value.split(this.spliter), + content:'' } }, created() { @@ -81,6 +83,19 @@ this.arrayValue = [] }else{ this.arrayValue = this.value.split(this.spliter) + let arrayValue=JSON.parse(JSON.stringify(this.arrayValue)) + let item = [] + this.dictOptions.forEach(res=>{ + arrayValue.forEach((val,index)=>{ + if (res.value == val&&index!=0){ + item.push(res.text || res.label) + } + + }) + this.content=item.join(',') + }) + + console.log('value111',this.content) } } }, @@ -106,18 +121,25 @@ }, onChange (selectedValue) { let content = [] + let item = [] this.dictOptions.forEach(res=>{ - selectedValue.forEach(val=>{ + selectedValue.forEach((val,index)=>{ if (res.value == val){ content.push(res.text || res.label) + if(index!=0){ + item.push(res.text || res.label) + } } + }) + this.content=item.join(',') }) this.$emit('change', selectedValue.join(this.spliter)); this.$emit('changeQuery', content.join(this.spliter),this.db_field_name); }, setCurrentDictOptions(dictOptions){ this.dictOptions = dictOptions + }, getCurrentDictOptions(){ return this.dictOptions diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 5a99e78ce..3be8f188d 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -200,7 +200,7 @@ -
+
* {{item.db_field_txt}} @@ -208,12 +208,14 @@ +
@@ -541,7 +543,9 @@ ] }, numberFlag:false, - itemVal:{} + itemVal:{}, + contentTrees:'', + } }, props:{ @@ -642,7 +646,7 @@ this.$nextTick(() => { this.$refs.ueditor.setContent(item.itemContent) }) - console.log('ineciem',index,item) + // console.log('ineciem',index,item) }, //删除按钮 splitDelete(item,index){ @@ -660,7 +664,6 @@ //保存 splitSave(){ // console.log('vallll',this.contentList) - console.log('formInline',this.formInline) this.$refs.splitEditForm.validate(valid=>{ if(valid){ this.submitFlag=true @@ -943,6 +946,9 @@ message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) + + + } else if (res.field_show_type === '4' || res.field_show_type === '6' || res.field_show_type === '5' || res.field_show_type === '7' ) { @@ -1017,6 +1023,7 @@ getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => { if (res.success) { this.formInline = res.result + // console.log('form11111',this.formInline) } }) @@ -1039,6 +1046,14 @@ this.formInline[value + '_id'] = id this.formInline = { ...this.formInline } }, + //树结果选择 + changeTree(value, label, extra){ + // console.log('changeValue',value, label, extra) + let labelValues = label + labelValues.shift() + this.contentTrees= labelValues.join(',') + }, + //正则替换小数点 limitNumber(value) { @@ -1269,4 +1284,10 @@ } } } + .box-tree-text{ + .ant-select-selection--multiple{ + height: 32px; + overflow-y: auto; + } + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 639f7c958..01556b404 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -293,8 +293,21 @@ deleteNode(){ } + }, + computed:{ + }, mounted() { + // let widthBrown = document.documentElement.offsetWidth || document.body.offsetWidth + // let client = document.querySelector('.split-detail-table .ant-table-content').getBoundingClientRect() + // let width = widthBrown - client.left + // console.log('width111',width) + // + // document.querySelector('.split-detail-table .ant-table-content').style.width=width+'px' + // window.fullHeight = document.documentElement.clientHeight + // that.fullHeight = window.fullHeight + + this.infoId=this.$route.query.infoId // console.log('info',this.$route.query) this.loadMenuData() @@ -1092,6 +1105,7 @@ .split-detail-right{ padding-left: 20px; flex: 1; + .split-detail-search-header{ margin-bottom: 20px; .table-page-search-submitButtons{