From 3eb10efc5eee7b7e1db596b6fa336654e437c9ac Mon Sep 17 00:00:00 2001 From: z_yu <1534695664@qq.com> Date: Wed, 18 May 2022 15:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dict.js | 8 ++-- src/api/system/dictDetail.js | 8 ++-- src/components/Crud/crud.js | 4 +- src/views/archivesConfig/dict/dictDetail.vue | 25 ++++++------ src/views/archivesConfig/dict/index.vue | 42 +++++++++----------- 5 files changed, 41 insertions(+), 46 deletions(-) diff --git a/src/api/system/dict.js b/src/api/system/dict.js index 99170f7..4e8a150 100644 --- a/src/api/system/dict.js +++ b/src/api/system/dict.js @@ -17,16 +17,16 @@ export function add(data) { export function del(ids) { return request({ - url: 'api/dict/', - method: 'delete', + url: 'api/dictrionary/delete', + method: 'post', data: ids }) } export function edit(data) { return request({ - url: 'api/dict', - method: 'put', + url: 'api/dictrionary/edit', + method: 'post', data }) } diff --git a/src/api/system/dictDetail.js b/src/api/system/dictDetail.js index e8dc512..ab63fcb 100644 --- a/src/api/system/dictDetail.js +++ b/src/api/system/dictDetail.js @@ -36,15 +36,15 @@ export function add(data) { export function del(id) { return request({ - url: 'api/dictDetail/' + id, - method: 'delete' + url: 'api/dictrionary/delete', + method: 'post' }) } export function edit(data) { return request({ - url: 'api/dictDetail', - method: 'put', + url: 'api/dictrionary/edit', + method: 'post', data }) } diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js index 428bb90..de7f91e 100644 --- a/src/components/Crud/crud.js +++ b/src/components/Crud/crud.js @@ -139,7 +139,7 @@ function CRUD(options) { table.store.states.lazyTreeNodeMap = {} } crud.page.total = data.totalElements - crud.data = data.content + crud.data = data.content ? data.content : data crud.resetDataStatus() // time 毫秒后显示表格 setTimeout(() => { @@ -349,7 +349,7 @@ function CRUD(options) { if (crud.params[item] === null || crud.params[item] === '') crud.params[item] = undefined }) return { - page: crud.page.page - 1, + page: crud.page.page, size: crud.page.size, sort: crud.sort, ...crud.query, diff --git a/src/views/archivesConfig/dict/dictDetail.vue b/src/views/archivesConfig/dict/dictDetail.vue index a5d62ba..c916f93 100644 --- a/src/views/archivesConfig/dict/dictDetail.vue +++ b/src/views/archivesConfig/dict/dictDetail.vue @@ -12,14 +12,14 @@ - - + + - - + + - - + +
@@ -30,9 +30,9 @@ - - - + + + @@ -46,14 +46,14 @@ import CRUD, { presenter, header, form } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' -const defaultForm = { id: null, label: null, value: null, description: null, dictSort: 999 } +const defaultForm = { id: null, dic_name: null, dic_code: null, dic_explain: null } export default { components: { crudOperation, pagination }, cruds() { return [ CRUD({ - title: '字典内容', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'], + title: '字典内容', url: 'api/dictrionary/findSubsetById', query: { id: '' }, crudMethod: { ...crudDictDetail }, optShow: { add: false, @@ -63,7 +63,8 @@ export default { download: false, group: false }, - queryOnPresenterCreated: false + queryOnPresenterCreated: false, + debug: true }) ] }, diff --git a/src/views/archivesConfig/dict/index.vue b/src/views/archivesConfig/dict/index.vue index e842f63..1022986 100644 --- a/src/views/archivesConfig/dict/index.vue +++ b/src/views/archivesConfig/dict/index.vue @@ -3,14 +3,14 @@ - - + + - - + + - +
@@ -24,7 +24,7 @@ - + @@ -43,7 +43,7 @@ import crudDict from '@/api/system/dict' import CRUD, { presenter, header, form } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' -const defaultForm = { id: null, name: null, code: null, description: null, dictDetails: [] } +const defaultForm = { id: null, dic_name: null, dic_code: null, dic_explain: null, dictDetails: [] } export default { name: 'Dict', @@ -51,7 +51,7 @@ export default { cruds() { return [ CRUD({ - title: '字典', url: 'api/dict', + title: '字典', url: 'api/dictrionary/menu', crudMethod: { ...crudDict }, optShow: { add: true, @@ -71,10 +71,10 @@ export default { { key: 'description', display_name: '描述' } ], rules: { - name: [ + dic_name: [ { required: true, message: '请输入字典名称', trigger: 'blur' } ], - code: [ + dic_code: [ { required: true, message: '请输入字典代码', trigger: 'blur' } ] }, @@ -84,8 +84,8 @@ export default { del: ['admin', 'dict:del'] }, defaultProps: { - children: 'dictDetails', - label: (data, node) => { return data.description ? data.description : data.label } + children: 'child_menus', + label: 'dic_name' }, activeAddBtn: false } @@ -94,28 +94,22 @@ export default { // 获取数据前设置好接口地址 [CRUD.HOOK.beforeRefresh]() { if (this.$refs.dictDetail) { - this.$refs.dictDetail.query.dictName = '' + this.$refs.dictDetail.query.id = '' } return true }, // 选中字典后，设置字典详情数据 - handleCurrentChange(val) { - if (val) { - this.$refs.dictDetail.query.dictName = val.name - this.$refs.dictDetail.dictId = val.id - this.$refs.dictDetail.crud.toQuery() - } - }, handleNodeClick(val) { if (val) { - if (val.name) { - this.$refs.dictDetail.query.dictName = val.name - this.$refs.dictDetail.dictId = val.id - this.$refs.dictDetail.crud.toQuery() + if (val.dic_type === 'true') { this.crud.selectionChangeHandler([val]) } else { this.crud.selectionChangeHandler([]) } + this.$refs.dictDetail.query.id = val.id + console.log(1) + this.$refs.dictDetail.dictId = val.id + this.$refs.dictDetail.crud.toQuery() this.activeAddBtn = true } },