diff --git a/src/components/uploadImage/index.vue b/src/components/uploadImage/index.vue index 93559574..1897cd08 100644 --- a/src/components/uploadImage/index.vue +++ b/src/components/uploadImage/index.vue @@ -6,12 +6,18 @@ custom-class="upload-dialog" :before-close="beforeClose" > - {{ $t("trials:uploadImage:title:uploadImages") }} + {{ title }} {{ $t("trials:uploadImage:button:uploadTableTitle1") }} - + { +const doResize = async (el, binding, vnode) => { // 获取表格Dom对象 const { componentInstance: $table } = await vnode // 获取调用传递过来的数据 const { value } = binding + if (value && value.notAdaptive) return; // 获取距底部距离(用于展示页码等信息) const bottomOffset = (value && value.bottomOffset) || 40 if (!$table) return @@ -24,7 +25,7 @@ export default { // 初始化设置 bind(el, binding, vnode) { // 设置resize监听方法 - el.resizeListener = async() => { + el.resizeListener = async () => { await doResize(el, binding, vnode) } // 绑定监听方法到addResizeListener diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index f347279f..76bf7489 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -68,9 +68,9 @@ const searchDataDefault = () => { UserType: null, PageIndex: 1, PageSize: 20, - Asc: true, + Asc: false, RealName: '', - SortField: '' + SortField: 'CreateTime' } } export default { @@ -163,6 +163,13 @@ export default { minWidth: 100, sortable: 'custom', showOverflowTooltip: true }, + { + prop: "CreateTime", + label: this.$t("system:userlist:table:createTime"), + minWidth: 200, + sortable: "custom", + showOverflowTooltip: true, + }, { type: 'operate', label: this.$t('common:action:action'), minWidth: 200, @@ -193,6 +200,13 @@ export default { width: '120px', placeholder: '' }, + { + type: "Input", + label: this.$t("system:userlist:label:EMail"), + prop: "EMail", + width: "120px", + placeholder: "", + }, { type: 'Input', label: this.$t('system:userlist:label:Organization'), @@ -247,7 +261,14 @@ export default { options: [], // 下拉选项 props: { label: 'UserType', value: 'Id' }, // 下拉选项配置信息,必填 placeholder: '' - } + }, + { + type: "Daterange", + label: this.$t("system:userlist:label:CreateTime"), + prop: "CreateTimeArr", + width: "400px", + placeholder: "", + }, ], searchHandle: [ { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' },