diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index 1552e4f2..97d350d6 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -35,40 +35,22 @@
{{ $t('recycleBin') }}
-
-
-
-
- {{ $t('edit') }}
-
-
-
-
- {{ $t('more') }}
-
-
-
-
- {{ $t('dict.dictConfiguration') }}
-
-
- handleDelete(record.id)">
- {{ $t('delete') }}
-
-
-
-
-
-
-
+ :scroll="{x: '100%'}"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange"
+ >
+
+
@@ -86,11 +68,12 @@ import JInput from '@/components/jero/JInput'
import { getAction } from '@/api/manage'
import { UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
import Vue from 'vue'
+import JTable from '../../components/jero/JTable'
export default {
name: 'DictList',
mixins: [JeroListMixin],
- components: { DictModal, DictItemList, DictDeleteList, JInput },
+ components: { DictModal, DictItemList, DictDeleteList, JInput, JTable },
data () {
return {
description: '这是数据字典页面',
@@ -106,7 +89,7 @@ export default {
title: '#',
dataIndex: '',
key: 'rowIndex',
- width: 120,
+ width: 60,
align: 'center',
customRender: function (t, r, index) {
return parseInt(index) + 1
@@ -115,27 +98,36 @@ export default {
{
title: this.$t('dict.dictionaryName'),
align: 'left',
- dataIndex: 'dictName'
+ width: 100,
+ dataIndex: 'dictName',
+ scopedSlots: { customRender: 'text' }
},
{
title: this.$t('dict.dictionaryEnglishName'),
align: 'left',
- dataIndex: 'dictEnglishName'
+ width: 100,
+ dataIndex: 'dictEnglishName',
+ scopedSlots: { customRender: 'text' }
},
{
title: this.$t('dict.dictionaryNumber'),
align: 'left',
- dataIndex: 'dictCode'
+ width: 100,
+ dataIndex: 'dictCode',
+ scopedSlots: { customRender: 'text' }
},
{
title: this.$t('description'),
align: 'left',
- dataIndex: 'description'
+ dataIndex: 'description',
+ width: 200,
+ scopedSlots: { customRender: 'text' }
},
{
title: this.$t('operation'),
- dataIndex: 'action',
- align: 'center',
+ // dataIndex: 'action',
+ align: 'left',
+ width: 170,
scopedSlots: { customRender: 'action' }
}
],
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 5a9c574e..a26a6684 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -132,7 +132,7 @@ export default {
},
columns: [
{
- title: this.$t('message.my.MessageContent'),
+ title: this.$t('message.my.messageContent'),
align: 'left',
dataIndex: 'msgContent',
ellipsis: true,