cfy777/Situation-Awareness-Platform-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

可信代码库-成员管理成员类型取消创建者选项。加入的组织接口传递username

Browse Source
This commit is contained in:
付民康
2025-04-01 14:17:18 +08:00
parent 11bad14c5e
commit 145f768284
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue
View File

@@ -259,10 +259,10 @@ const inviteMemberModalCtrl = ref(false);
const inviteMemberLoading = ref(false); const inviteMemberLoading = ref(false);
const inviteMemberFormData = reactive({ const inviteMemberFormData = reactive({
userName: '', userName: '',
role: '' role: 'MEMBER'
}); });
const inviteMemberSelectOptions = [ const inviteMemberSelectOptions = [
{ name: '创建者', value: OrganizationMemberRoleEnum.OWNER }, // { name: '创建者', value: OrganizationMemberRoleEnum.OWNER },
{ name: '成员', value: OrganizationMemberRoleEnum.MEMBER } { name: '成员', value: OrganizationMemberRoleEnum.MEMBER }
]; ];
const memberRoleMap = { const memberRoleMap = {
@@ -300,7 +300,7 @@ async function queryUserInfo() {
organizationProfile: res.data?.data.data.groupDesc as string, organizationProfile: res.data?.data.data.groupDesc as string,
}; };
getMemberList(); getMemberList();
getOrgList(res.data?.data.data.nickname); getOrgList(res.data?.data.data.username);
} else { } else {
hasOrganization.value = false; hasOrganization.value = false;
} }
@@ -431,7 +431,7 @@ async function getOrgList(username) {
originMemberList = []; originMemberList = [];
pager.total = 0; pager.total = 0;
try { try {
const res = await getGroupjoinedListApi({ username: 'hugaowei' }); const res = await getGroupjoinedListApi({ username });
if (res.data?.code === 200) { if (res.data?.code === 200) {
originOrgList = res.data?.data.map(item => { originOrgList = res.data?.data.map(item => {
return { ...item, createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }; return { ...item, createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') };

12
src/views/OAuth/callback.vue
View File

@@ -99,12 +99,12 @@ const emitEvents = (type: 'success' | 'fail' = 'success', error_info?: string, p
url && localStorage.removeItem('loginReturnUrl'); url && localStorage.removeItem('loginReturnUrl');
url ? window.location.href = url : router.replace('/'); url ? window.location.href = url : router.replace('/');
} }
Message.success({ // Message.success({
message: '欢迎来到GitCode!', // message: '欢迎来到GitCode!',
onClose: () => { // onClose: () => {
emitEvent('notice'); // emitEvent('notice');
} // }
}); // });
} else { } else {
router.replace('/login'); router.replace('/login');
Message.warning(error_info || '授权失败'); Message.warning(error_info || '授权失败');