diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts index eea44dd..724310e 100644 --- a/src/api/admin/user.ts +++ b/src/api/admin/user.ts @@ -112,15 +112,13 @@ export const resetUserPassword = (userInfo: object) => { } export function validateUsername(rule: any, value: any, callback: any, isEdit: boolean) { + if (isEdit) { + return callback() + } const flag = new RegExp(/^([a-z\d]+?)$/).test(value) if (!flag) { callback(new Error("用户名支持小写英文、数字")) } - - if (isEdit) { - return callback() - } - getDetails({ username: value }).then((response) => { const result = response.data if (result !== null) { diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts index 9ad8815..ead8f8c 100644 --- a/src/api/hard/hard-total.ts +++ b/src/api/hard/hard-total.ts @@ -1,5 +1,13 @@ import request from "/@/utils/request" +export function pageListDept(query?: Object) { + return request({ + url: "/hard/hard-total/page-list-dept", + method: "get", + params: query, + }) +} + export function pageListSb(query?: Object) { return request({ url: "/hard/hard-total/page-list-sb", diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue new file mode 100644 index 0000000..02544fe --- /dev/null +++ b/src/views/hard/hard-dept-total/index.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue index 43b1e01..f5d15f9 100644 --- a/src/views/wallet/wallet-recharge-water/index.vue +++ b/src/views/wallet/wallet-recharge-water/index.vue @@ -150,9 +150,6 @@ const multiple = ref(true) // 表格变量 const state: BasicTableProps = reactive({ queryForm: {}, - pagination: { - pageSizes: [10, 20, 50, 100, 200, 500, 1000, 2000], - }, pageList: walletRechargeImportApi.pageJoin, })