diff --git a/src/api/modular/main/DjyApiAuth.js b/src/api/modular/main/DjyApiAuth.js index 9528e3a..2b7488f 100644 --- a/src/api/modular/main/DjyApiAuth.js +++ b/src/api/modular/main/DjyApiAuth.js @@ -38,16 +38,39 @@ export function GetApiDetail (parameter) { export function ResetApi (parameter) { return axios({ - url: '/DjyApiAuth/SecretReset', - method: 'post', - data: parameter + url: `/DjyApiAuth/SecretReset?id=${parameter.id}`, + method: 'post' }) } export function DisableApi (parameter) { return axios({ - url: '/DjyApiAuth/SetDisable', - method: 'post', - data: parameter + url: `/DjyApiAuth/SetDisable?id=${parameter.id}&disable=${parameter.disable}`, + method: 'post' }) +} + +/** + * 用户查询 + * @params Name + */ +export function GetSysUserPage(parameter) { + return axios({ + url: '/sysUser/GetTenantUser', + method: 'get', + params: parameter + }) +} + +/** + * 分页查询租户 + * + * @author Myshipping + */ +export function SysTenantPage(parameter) { + return axios({ + url: '/sysTenant/page', + method: 'get', + params: parameter + }) } \ No newline at end of file diff --git a/src/views/main/BookingLedger/detail/modules/billInfo.vue b/src/views/main/BookingLedger/detail/modules/billInfo.vue index 5b7cf7f..4f56739 100644 --- a/src/views/main/BookingLedger/detail/modules/billInfo.vue +++ b/src/views/main/BookingLedger/detail/modules/billInfo.vue @@ -26,7 +26,7 @@ /> --> - - + + - - + + - - - - - - + + - + + - - + + + + + 启用 + + + 禁用 + + + 全部 + + - --> - + + 查询 重置 @@ -75,9 +94,9 @@
- + +
- + - \ No newline at end of file + diff --git a/src/views/main/DjyApiAuth/modules/addForm.vue b/src/views/main/DjyApiAuth/modules/addForm.vue new file mode 100644 index 0000000..9017c21 --- /dev/null +++ b/src/views/main/DjyApiAuth/modules/addForm.vue @@ -0,0 +1,296 @@ + + + diff --git a/src/views/main/DjyApiAuth/modules/addFrom.vue b/src/views/main/DjyApiAuth/modules/addFrom.vue deleted file mode 100644 index 9995c30..0000000 --- a/src/views/main/DjyApiAuth/modules/addFrom.vue +++ /dev/null @@ -1,170 +0,0 @@ - - - diff --git a/src/views/main/DjyApiAuth/modules/initData.js b/src/views/main/DjyApiAuth/modules/initData.js index 08cf1d5..be81193 100644 --- a/src/views/main/DjyApiAuth/modules/initData.js +++ b/src/views/main/DjyApiAuth/modules/initData.js @@ -3,11 +3,11 @@ export default { { type: 'seq', width: 60, noDraggable: true }, { field: 'apiCode', title: '接口代码', showHeaderOverflow: true, sortable: true }, { field: 'apiName', title: '接口名称', showHeaderOverflow: true, sortable: true }, - { field: 'isDisable', title: '是否禁用', showHeaderOverflow: true, sortable: true }, + { field: 'isDisable', title: '是否禁用', showHeaderOverflow: true, sortable: true, slots: { default: 'isDisable' } }, { field: 'tenantName', title: '租户名称', showHeaderOverflow: true, sortable: true }, { field: 'userCode', title: '用户代码', showHeaderOverflow: true, sortable: true }, { field: 'userName', title: '用户名', showHeaderOverflow: true, sortable: true }, { field: 'createdTime', title: '创建时间', showHeaderOverflow: true, sortable: true }, - { field: 'operate', title: '操作', width: 150, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false } + { field: 'operate', title: '操作', width: 230, noDraggable: true, slots: { default: 'operate' }, fixed: 'right', resizable: false } ] }