From da109a468d7065fb1a0201cc2a81fb189e3f62cd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 08 八月 2025 10:46:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/Permission/OperationUserManage.vue | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/views/Permission/OperationUserManage.vue b/src/views/Permission/OperationUserManage.vue
index 11b80ee..b66c8c3 100644
--- a/src/views/Permission/OperationUserManage.vue
+++ b/src/views/Permission/OperationUserManage.vue
@@ -7,7 +7,7 @@
<SearchInput
v-model="extraParamState.keywords"
style="width: 250px"
- placeholder="濮撳悕/璐﹀彿"
+ placeholder="濮撳悕/璐﹀彿/鎵嬫満鍙�"
@on-click-search="getList"
@keyup.enter="getList()"
>
@@ -24,8 +24,8 @@
v-model="row.status"
active-text="鍚敤"
inactive-text="绂佺敤"
- :active-value="EnumUserInfoStatus.Normal"
- :inactive-value="EnumUserInfoStatus.Disabled"
+ :active-value="EnumUserStatus.Normal"
+ :inactive-value="EnumUserStatus.Disabled"
:before-change="() => setStatus(row)"
/>
</template>
@@ -50,9 +50,9 @@
} from '@bole-core/components';
import { useAccess } from '@/hooks';
import { formatRoleName } from '@/utils';
-import * as userInfoServices from '@/services/api/userInfo';
+import * as userServices from '@/services/api/user';
import { Message } from '@bole-core/core';
-import { EnumUserInfoStatus } from '@/constants';
+import { EnumUserStatus } from '@/constants';
import SetOperationUserRoleDialog from './components/SetOperationUserRoleDialog.vue';
defineOptions({
@@ -95,7 +95,7 @@
},
keywords: extraParamState.keywords,
};
- let res = await userInfoServices.getOperationUserInfos(params, {
+ let res = await userServices.getOperationUserInfos(params, {
showLoading: !state.loading,
});
return res;
@@ -106,7 +106,7 @@
keywords: '',
orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
},
- queryKey: ['userInfoServices/getOperationUserInfos'],
+ queryKey: ['userServices/getOperationUserInfos'],
columnsRenderProps: {},
}
);
@@ -114,16 +114,14 @@
async function setStatus(row: API.GetOperationUserInfosQueryResultItem) {
try {
await Message.tipMessage(
- `纭瑕�${row.status === EnumUserInfoStatus.Normal ? '绂佺敤' : '鍚敤'}璇ヨ处鍙峰悧锛焋
+ `纭瑕�${row.status === EnumUserStatus.Normal ? '绂佺敤' : '鍚敤'}璇ヨ处鍙峰悧锛焋
);
let params: API.SetUserInfoStatusCommand = {
ids: [row.id],
status:
- row.status === EnumUserInfoStatus.Normal
- ? EnumUserInfoStatus.Disabled
- : EnumUserInfoStatus.Normal,
+ row.status === EnumUserStatus.Normal ? EnumUserStatus.Disabled : EnumUserStatus.Normal,
};
- let res = await userInfoServices.setUserInfoStatus(params);
+ let res = await userServices.setUserInfoStatus(params);
return !!res;
} catch (error) {}
}
@@ -154,7 +152,7 @@
userInfoId: editForm.userInfoId,
roleIds: editForm.roleIds,
};
- let res = await userInfoServices.setUserInfoRoles(params);
+ let res = await userServices.setUserInfoRoles(params);
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList(paginationState.pageIndex);
@@ -168,7 +166,7 @@
userInfoId: row.id,
// clientType: row.clientType,
};
- let res = await userInfoServices.getUserInfoRoles(params);
+ let res = await userServices.getUserInfoRoles(params);
return res;
} catch (error) {}
}
--
Gitblit v1.9.1