diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 75661187..73a14212 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -133,7 +133,7 @@ public class LoginController { @ApiOperation("获取验证码") @GetMapping(value = "/randomImage/{key}") public Result randomImage(HttpServletResponse response,@PathVariable String key){ - return randomImage(response,key); + return loginService.randomImage(response,key); } /** diff --git a/jero-web/src/components/jero/JInput.vue b/jero-web/src/components/jero/JInput.vue index 8774ee89..5ebfb84a 100644 --- a/jero-web/src/components/jero/JInput.vue +++ b/jero-web/src/components/jero/JInput.vue @@ -37,7 +37,7 @@ trim: { type: Boolean, required: false, - default: false + default: true }, }, data(){ diff --git a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue index 2b8922cc..33a0ded3 100644 --- a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue +++ b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizComponentModal.vue @@ -15,13 +15,13 @@ - + - 查询 - 重置 + 查询 + 重置 {{ showMoreQueryItems ? '收起' : '展开' }} diff --git a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizQueryItem.js b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizQueryItem.js index c47df3ae..1c41a596 100644 --- a/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizQueryItem.js +++ b/jero-web/src/components/jerobiz/JSelectBizComponent/JSelectBizQueryItem.js @@ -36,7 +36,7 @@ export default { } else if (dictCode) { input = } else { - input = + input = } return {input} }) diff --git a/jero-web/src/components/jerobiz/JSelectMultiUser.vue b/jero-web/src/components/jerobiz/JSelectMultiUser.vue index 20d04754..599a2c4a 100644 --- a/jero-web/src/components/jerobiz/JSelectMultiUser.vue +++ b/jero-web/src/components/jerobiz/JSelectMultiUser.vue @@ -28,10 +28,15 @@ return { url: { list: '/sys/user/page' }, columns: [ - { title: '姓名', align: 'center', width: '25%', widthRight: '70%', dataIndex: 'realname' }, - { title: '账号', align: 'center', width: '25%', dataIndex: 'username' }, + { title: '用户账号', align: 'center', width: '25%', dataIndex: 'username' }, + { title: '用户姓名', align: 'center', width: '25%', widthRight: '70%', dataIndex: 'realname' }, + { title: '性别', align: 'center', dataIndex: 'sex_dictText', }, { title: '电话', align: 'center', width: '20%', dataIndex: 'phone' }, - { title: '出生日期', align: 'center', width: '20%', dataIndex: 'birthday' } + { + title: '部门', + align: 'center', + dataIndex: 'orgCodeTxt' + } ], // 定义在这里的参数都是可以在外部传递覆盖的,可以更灵活的定制化使用的组件 default: { @@ -43,21 +48,16 @@ }, // 多条件查询配置 queryConfigDefault: [ + { + key: 'realname', + label: '姓名', + }, { key: 'sex', label: '性别', // 如果包含 dictCode,那么就会显示成下拉框 dictCode: 'sex', }, - { - key: 'birthday', - label: '生日', - placeholder: '请选择出生日期', - // 如果想要使用局部注册的组件,就必须要使用箭头函数 - customRender: ({key, queryParam, options}) => { - return - }, - }, ], } }, diff --git a/jero-web/src/components/jerobiz/JSelectRole.vue b/jero-web/src/components/jerobiz/JSelectRole.vue index 5c40321a..beab1e3f 100644 --- a/jero-web/src/components/jerobiz/JSelectRole.vue +++ b/jero-web/src/components/jerobiz/JSelectRole.vue @@ -1,15 +1,12 @@