diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue index 964b7f4..a5d62ba 100644 --- a/src/views/system/dict/dictDetail.vue +++ b/src/views/system/dict/dictDetail.vue @@ -3,7 +3,11 @@
- + + +
@@ -14,7 +18,7 @@ - + @@ -42,7 +46,7 @@ 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, dictSort: 999 } +const defaultForm = { id: null, label: null, value: null, description: null, dictSort: 999 } export default { components: { crudOperation, pagination }, @@ -52,7 +56,7 @@ export default { title: '字典内容', url: 'api/dictDetail', query: { dictName: '' }, sort: ['dictSort,asc', 'id,desc'], crudMethod: { ...crudDictDetail }, optShow: { - add: true, + add: false, edit: true, del: true, reset: false, @@ -69,15 +73,20 @@ export default { form(function() { return Object.assign({ dict: { id: this.dictId }}, defaultForm) })], + props: { + activeAddBtn: { + type: Boolean + } + }, data() { return { dictId: null, rules: { label: [ - { required: true, message: '请输入字典标签', trigger: 'blur' } + { required: true, message: '请输入字典名称', trigger: 'blur' } ], value: [ - { required: true, message: '请输入字典值', trigger: 'blur' } + { required: true, message: '请输入字典代码', trigger: 'blur' } ] }, permission: { @@ -86,6 +95,30 @@ export default { del: ['admin', 'dict:del'] } } + }, + methods: { + // 获取数据前设置好接口地址 + [CRUD.HOOK.afterDelete]() { + console.log(this.$parent) + if (this.$parent) { + this.$emit('treeRefresh') + } + return true + }, + [CRUD.HOOK.afterToEdit]() { + console.log(this.$parent) + if (this.$parent) { + this.$emit('treeRefresh') + } + return true + }, + [CRUD.HOOK.afterToAdd]() { + console.log(this.$parent) + if (this.$parent) { + this.$emit('treeRefresh') + } + return true + } } } diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index cacb8d9..e842f63 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -6,10 +6,10 @@ - + - + @@ -24,13 +24,13 @@ - + - + @@ -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, description: null, dictDetails: [] } +const defaultForm = { id: null, name: null, code: null, description: null, dictDetails: [] } export default { name: 'Dict', @@ -73,6 +73,9 @@ export default { rules: { name: [ { required: true, message: '请输入字典名称', trigger: 'blur' } + ], + code: [ + { required: true, message: '请输入字典代码', trigger: 'blur' } ] }, permission: { @@ -83,7 +86,8 @@ export default { defaultProps: { children: 'dictDetails', label: (data, node) => { return data.description ? data.description : data.label } - } + }, + activeAddBtn: false } }, methods: { @@ -112,12 +116,16 @@ export default { } else { this.crud.selectionChangeHandler([]) } + this.activeAddBtn = true } }, // 编辑前将字典明细临时清空,避免日志入库数据过长 [CRUD.HOOK.beforeToEdit](crud, form) { // 将角色的菜单清空,避免日志入库数据过长 form.dictDetails = null + }, + treeRefresh() { + this.crud.refresh() } } }