From 265cb484fcd98512a1599ae34f914617cb69ff61 Mon Sep 17 00:00:00 2001 From: caoyang Date: Thu, 3 Mar 2022 10:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tags/dialog/OnlCgformTagForm.vue | 4 +- .../documentManage/tags/dialog/areaManage.vue | 33 +++-- .../documentManage/tags/dialog/dicList.vue | 111 +++++++++++----- .../documentManage/tags/dialog/treeTable.vue | 119 ++++++++---------- .../documentManage/tags/tabs/tagContent.vue | 2 +- .../documentManage/tags/tabs/tagItem.vue | 14 +-- 6 files changed, 164 insertions(+), 119 deletions(-) diff --git a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue index a11c9b1cc..d7c06f66a 100644 --- a/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue +++ b/jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue @@ -25,8 +25,8 @@ - - + + diff --git a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue index a95922239..0367e57c0 100644 --- a/jero-web/src/views/documentManage/tags/dialog/areaManage.vue +++ b/jero-web/src/views/documentManage/tags/dialog/areaManage.vue @@ -173,16 +173,28 @@ sort:[ { required: true, message: '请输入排序号', trigger: 'change' }, ] - } + }, + areaTable:[] } }, props:{ - areaTable:Array + // areaTable:Array }, mounted() { - + this.loadData() }, methods:{ + loadData(){ + let params={ + ...this.queryParams + } + getAction(`tag/onlCgformArea/page`,params).then(res=>{ + if(res.success){ + this.areaTable=res.result.records + this.total=res.result.total + } + }) + }, onSelectChange(selectedRowKeys) { console.log('selectedRowKeys changed: ', selectedRowKeys); this.selectedRowKeys = selectedRowKeys; @@ -202,7 +214,7 @@ putAction(`tag/onlCgformArea/edit`,this.form).then((res)=>{ if(res.success){ this.$message.success(res.result); - this.$emit('updateOk',res.result) + this.loadData() this.form={ isModel:'', showArea:'', @@ -216,7 +228,7 @@ postAction(`/tag/onlCgformArea/add`,this.form).then(res=>{ if(res.success){ this.$message.success( res.result,); - this.$emit('submitOk',res.result) + this.loadData() this.form={ isModel:'', showArea:'', @@ -243,10 +255,8 @@ deleteArea(val){ deleteAction(`tag/onlCgformArea/delete`, {id: val}).then((res) => { if(res.success){ - this.$notification.success({ - message: res.result, - }); - this.$emit('deleteOk',res.result) + this.$message.success(res.result); + this.loadData() } }) @@ -262,19 +272,18 @@ this.form={...res.result} // this.$emit('updateOk',res.result) - } }) }, //点击页数 onChangePage(page,pageSize){ this.queryParams.pageNo = page - this.$emit('Ok') + this.loadData() }, //一页显示条数 SizeChange(page,pageSize){ this.queryParams.pageSize = pageSize - this.$emit('Ok') + this.loadData() }, //正则替换小数点 limitNumber(value) { diff --git a/jero-web/src/views/documentManage/tags/dialog/dicList.vue b/jero-web/src/views/documentManage/tags/dialog/dicList.vue index c1464c259..a3152621d 100644 --- a/jero-web/src/views/documentManage/tags/dialog/dicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/dicList.vue @@ -17,7 +17,7 @@
- +
- - + + - - + + - - - - Child Node1 {{ value }} - - + + + + {{item.name}} + + + + + + + + + + + + + + @@ -87,11 +92,11 @@ form:{}, newVisible:false, rules:{ - itemText:[ + name:[ { required: true, message: '请输入名称', trigger: 'blur' }, { min:1, max: 30, message: '长度在 1 - 30字符', trigger: 'blur' }, ], - itemValue:[ + enName:[ { required: true, message: '请输入英文名称', trigger: 'blur' }, { min:1, max: 100, message: '长度在 1 - 100字符', trigger: 'blur' }, ], @@ -161,14 +166,7 @@ methods:{ //获取父级列表 getParents(){ - let params={ - sysDictId:this.record.id - } - getAction(`sys/dict/loadDictItem`,params).then(res=>{ - if(res.success){ - } - }) }, //获取列表数据 loadData(){ @@ -188,15 +186,49 @@ }) }else if(this.dictVal=='tree'){ - getAction(`sys/category/rootList`,{ - sysDictId:this.record.id, + getAction(`sys/category/queryBySysDictId`,{ + id:this.record.id, isTagDict:1 }).then(res=>{ + let parentNode=[] + this.tabletreeData=[...res.result] + let data = this.toTree(this.tabletreeData) + this.tabletreeData=data + this.dataFlag=true }) } - + }, + //将数据拼成树形结构 + toTree(config) { + // 删除 所有 children,以防止多次调用 + config.forEach(function(item) { + delete item.children; + }); + // 将数据存储为 以 id 为 KEY 的 map 索引数据列 + let map = {}; + config.forEach((item) => { + // 树 的label + item.label = item.name; + item.key=item.id; + map[item.id] = item; + }); + let val = []; + config.forEach((item) => { + // 以当前遍历项，的pid,去map对象中找到索引的id + let parent = map[item.pid]; + // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中 + if (parent) { + (parent.children || (parent.children = [])).push(item); + } else { + //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级 + val.push(item); + } + }); + return val; + }, + //搜索 search(){ this.loadData() @@ -248,6 +280,25 @@ } }) } + }else if(this.dictVal=='tree'){ + let params = { + ...this.form, + sysDictId: this.record.id + } + if (this.isEdit) { + + }else{ + //新增 + postAction(`sys/category/add`, params).then(res => { + if (res.success) { + this.$message.success(res.message) + this.loadData() + this.newVisible = false + } else { + this.$message.warning(res.message) + } + }) + } } }, //取消 diff --git a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue index c1ff66d3a..28acdb20c 100644 --- a/jero-web/src/views/documentManage/tags/dialog/treeTable.vue +++ b/jero-web/src/views/documentManage/tags/dialog/treeTable.vue @@ -5,13 +5,15 @@ class="tree-table-con" :columns="columns" :data-source="tabData" + :pagination="false" + :loading="loading" :row-selection="{selectedRowKeys: selectedRowKeys, onSelectAll: onSelectAll, onSelect: onSelect}" >