diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8cdb80ac4..189827cb1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -170,6 +170,8 @@ module.exports = { DataRules:'Data rules', menuMnagementPage:'This is the menu management page', MenuName:'Menu name', + MenuEnName:'Menu En name', + enterMenuEnName:'Please enter menu En name', MenuType:'Menu type', menu:'menu', ButtonsPermissions:'Buttons / permissions', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e7d483113..8922f5048 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -363,5 +363,6 @@ module.exports = { BatchCancel:'批量取消收藏', SubscriptionManagement:'订阅领域管理', BatchCancellation:'批量取消', - + enterMenuEnName:'请输入菜单英文名称', + MenuEnName:'菜单英文名称', } \ No newline at end of file diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index d2eef9bb4..72164bcc9 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -143,7 +143,7 @@ handleSubmit() { let content = [] this.content.forEach(res => { - content.push(res.name) + content.push(res.title) }) this.$emit('input', content.join(',')) this.visible = false @@ -152,15 +152,15 @@ this.$emit('input', event.target.value) }, onSelectChange(value) { + this.selectedRowKeys = value this.content = [] value.forEach(val => { - this.data.forEach((res) => { - if (res.key === val) { + this.dataList.forEach((res) => { + if (res.id === val) { this.content.push(res) } }) }) - this.selectedRowKeys = value }, searchQuery() { this.replacePage() diff --git a/jero-web/src/views/system/PermissionList.vue b/jero-web/src/views/system/PermissionList.vue index cf5439299..3f782d524 100644 --- a/jero-web/src/views/system/PermissionList.vue +++ b/jero-web/src/views/system/PermissionList.vue @@ -87,7 +87,6 @@ import JEllipsis from '@/components/jero/JEllipsis' - export default { name: 'PermissionList', mixins: [JeroListMixin], @@ -105,16 +104,19 @@ title: this.$t('MenuName'), dataIndex: 'name', key: 'name' - }, { + }, + { + title: this.$t('MenuEnName'), + dataIndex: 'menuEn', + key: 'menuEn' + }, + { title: this.$t('MenuType'), dataIndex: 'menuType', key: 'menuType', customRender: this.text - },/*{ - title: '权限编码', - dataIndex: 'perms', - key: 'permissionCode', - },*/{ + }, + { title: 'icon', dataIndex: 'icon', key: 'icon' @@ -155,18 +157,17 @@ } } }, - computed:{ - text:function(){ - if (text == 0) { - return this.$t('menu') - } else if (text == 1) { - return this.$t('menu') - } else if (text == 2) { - return this.$t('ButtonsPermissions') - } else { - return text - } - + computed: { + text: function() { + if (text == 0) { + return this.$t('menu') + } else if (text == 1) { + return this.$t('menu') + } else if (text == 2) { + return this.$t('ButtonsPermissions') + } else { + return text + } } }, methods: { @@ -184,14 +185,14 @@ this.$refs.PermissionDataRuleList.edit(record) }, handleAddSub(record) { - this.$refs.modalForm.title = this.$t('AddSubmenu'); - this.$refs.modalForm.localMenuType = 1; - this.$refs.modalForm.disableSubmit = false; - this.$refs.modalForm.edit({status:'1',permsType:'1',route:true,'parentId':record.id}); + this.$refs.modalForm.title = this.$t('AddSubmenu') + this.$refs.modalForm.localMenuType = 1 + this.$refs.modalForm.disableSubmit = false + this.$refs.modalForm.edit({ status: '1', permsType: '1', route: true, 'parentId': record.id }) }, handleExpandedRowsChange(expandedRows) { this.expandedRowKeys = expandedRows - }, + } } } diff --git a/jero-web/src/views/system/modules/PermissionModal.vue b/jero-web/src/views/system/modules/PermissionModal.vue index f531996c6..0453dc837 100644 --- a/jero-web/src/views/system/modules/PermissionModal.vue +++ b/jero-web/src/views/system/modules/PermissionModal.vue @@ -26,6 +26,14 @@ + + + + { this.form.setFieldsValue(fieldsVal) });