From a84847c36913c5967860cf68593cdb1a65cd3f72 Mon Sep 17 00:00:00 2001 From: z_yu <1534695664@qq.com> Date: Mon, 23 May 2022 10:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Crud/crud.js | 4 ++-- src/views/archivesConfig/dict/dictDetail.vue | 25 ++++++++++---------- src/views/archivesConfig/dict/index.vue | 13 ++++++---- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/components/Crud/crud.js b/src/components/Crud/crud.js index 6d8bbb7..7161e00 100644 --- a/src/components/Crud/crud.js +++ b/src/components/Crud/crud.js @@ -138,7 +138,7 @@ function CRUD(options) { table.store.states.treeData = {} table.store.states.lazyTreeNodeMap = {} } - crud.page.total = data.totalElements + crud.page.total = data.totalElements ? data.totalElements : data.length crud.data = data.content ? data.content : data crud.resetDataStatus() // time 毫秒后显示表格 @@ -349,7 +349,7 @@ function CRUD(options) { if (crud.params[item] === null || crud.params[item] === '') crud.params[item] = undefined }) return { - page: crud.page.page, + page: crud.page.page - 1, 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 b1b64bb..a23d3df 100644 --- a/src/views/archivesConfig/dict/dictDetail.vue +++ b/src/views/archivesConfig/dict/dictDetail.vue @@ -15,14 +15,14 @@
- - + + - - + + - - + +
@@ -34,9 +34,9 @@ - - - + + + @@ -50,7 +50,7 @@ import CRUD, { presenter, header, form } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' -const defaultForm = { id: null, dic_name: null, dic_code: null, dic_explain: null, dic_type: false } +const defaultForm = { id: null, dicName: null, dicCode: null, dicExplain: null, dicType: false } export default { components: { crudOperation, pagination }, @@ -67,7 +67,8 @@ export default { download: false, group: false }, - queryOnPresenterCreated: false + queryOnPresenterCreated: false, + sort: ['dic_sequence,asc'] }) ] }, @@ -75,7 +76,7 @@ export default { presenter(), header(), form(function() { - return Object.assign({ dic_pid: this.dicPid }, defaultForm) + return Object.assign({ dicPid: this.dicPid }, defaultForm) })], props: { activeAddBtn: { diff --git a/src/views/archivesConfig/dict/index.vue b/src/views/archivesConfig/dict/index.vue index 090f571..b52ca65 100644 --- a/src/views/archivesConfig/dict/index.vue +++ b/src/views/archivesConfig/dict/index.vue @@ -38,7 +38,7 @@ - + @@ -67,7 +67,8 @@ export default { del: true, download: false, group: false - } + }, + sort: ['dic_sequence,asc'] }) ] }, @@ -125,17 +126,19 @@ export default { // 将角色的菜单清空，避免日志入库数据过长 form.dictDetails = null }, - treeRefresh() { + updateKeyChildren() { this.crud.refresh() + console.log(this.crud.selections[0]) + // this.$refs.tree.updateKeyChildren(this.crud.selections[0]) } } }