diff --git a/src/mixins/ConfigurableTableMixin.js b/src/mixins/ConfigurableTableMixin.js index 2af8be9b..9e69dd7e 100644 --- a/src/mixins/ConfigurableTableMixin.js +++ b/src/mixins/ConfigurableTableMixin.js @@ -56,7 +56,8 @@ export const ConfigurableTableMixin = { fixed: 'right', scopedSlots: { customRender: 'operation' } }, - type: '' // 这个字段不知道什么含义 + type: '', // 这个字段不知道什么含义 + filters: {} // 固定的搜索条件 } }, mounted () { @@ -117,7 +118,7 @@ export const ConfigurableTableMixin = { customRender: 'detailClick' } } else if (item.urlClick === 'true') { - this.columns[index].scopedSlots = { + item.scopedSlots = { customRender: 'urlClick' } } @@ -159,6 +160,7 @@ export const ConfigurableTableMixin = { const pageNo = this.ipagination.current const pageSize = this.ipagination.pageSize const params = { + ...this.filters, ...this.searchParams, orderBy: this.orderBy, orderByField: this.orderByField, diff --git a/src/mixins/JeroListMixin.js b/src/mixins/JeroListMixin.js index 73182290..c6871959 100644 --- a/src/mixins/JeroListMixin.js +++ b/src/mixins/JeroListMixin.js @@ -25,7 +25,7 @@ export const JeroListMixin = { pageSize: 10, pageSizeOptions: ['10', '20', '30'], showTotal: (total, range) => { - return range[0] + '-' + range[1] + ' 共' + total + '条' + return range[0] + '-' + range[1] + ' ' + this.$t('total') + total + this.$t('strip') }, showQuickJumper: true, showSizeChanger: true, @@ -165,7 +165,7 @@ export const JeroListMixin = { return } if (this.selectedRowKeys.length <= 0) { - this.$message.warning('请选择一条记录!') + this.$message.warning(this.$t('selectARecord')) } else { let ids = '' for (let a = 0; a < this.selectedRowKeys.length; a++) { @@ -173,8 +173,8 @@ export const JeroListMixin = { } const that = this this.$confirm({ - title: '确认删除', - content: '是否删除选中数据?', + title: this.$t('confirmBatchDeletion'), + content: this.$t('deleteAData'), onOk: function () { that.loading = true postAction(that.url.deleteBatch, { ids: ids }).then((res) => { @@ -201,8 +201,8 @@ export const JeroListMixin = { } const that = this this.$confirm({ - title: '确认删除', - content: '确定要删除此条数据吗?', + title: this.$t('confirmDeletion'), + content: this.$t('areYouSure'), onOk: function () { postAction(that.url.delete, { id: id }).then((res) => { if (res.success) { @@ -264,7 +264,7 @@ export const JeroListMixin = { }, handleDetail: function (record) { this.$refs.modalForm.edit(record) - this.$refs.modalForm.title = '详情' + this.$refs.modalForm.title = this.$t('details') this.$refs.modalForm.disableSubmit = true }, /* 导出 */ diff --git a/src/views/businessSupport/DataCenter.vue b/src/views/businessSupport/DataCenter.vue index 49cd7cce..1faa2b91 100644 --- a/src/views/businessSupport/DataCenter.vue +++ b/src/views/businessSupport/DataCenter.vue @@ -111,10 +111,10 @@