merge

src/spdm/config.ts

@@ -14,6 +14,7 @@ export const TENANT_NAME = 'lyric'; // 租户：利元亨
 // export const TENANT_NAME = 'lyric'; // 租户：利元亨
 
 // // 本地环境
-// export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址
+// export const SPDM_URL = 'http://192.168.65.64:3001'; // SPDM项目地址（李靖本地）
+// // export const SPDM_URL = 'http://192.168.65.61:3001'; // SPDM项目地址（董志欢本地）
 // export const BASE_URL = '/spdmApi/honeycom-spdm'; // baseUrl
 // export const TENANT_NAME = 'lyric'; // 租户：利元亨

src/stores/userInfo.ts

@@ -191,7 +191,9 @@ export const useUserInfo = defineStore('userInfo', {
 			await getUserInfo()
 				.then((res) => {
 					// SPDM CODE
-					Cookies.set('cid_user_info', JSON.stringify(res.data.sysUser));
+					const userInfoData = res.data.sysUser;
+					userInfoData.roleCodes = res.data.roleCodes;
+					Cookies.set('cid_user_info', JSON.stringify(userInfoData));
 					Cookies.set('cid_user_id', res.data.sysUser.userId);
 					Cookies.set('cid_tenant_id', res.data.sysUser.tenantId);
 					loginHeartbeat();

src/views/admin/system/user/i18n/en.ts

@@ -75,5 +75,6 @@ export default {
 		inviteSuccessText: 'Invite Success',
 		lockSuccessText: 'Lock Success',
 		unlockSuccessText: 'Unlock Success',
+		username: 'Staff Number', // SPDM CODE
 	},
 };

src/views/admin/system/user/i18n/zh-cn.ts

@@ -75,5 +75,6 @@ export default {
 		inviteSuccessText: '邀请成功',
 		lockSuccessText: '锁定成功',
 		unlockSuccessText: '解锁成功',
+		username: '工号', // SPDM CODE
 	},
 };

src/views/admin/system/user/staffTable.vue

@@ -160,10 +160,14 @@ const tableColumns = computed<ITableRenderColumn<IStaff & Audit>[]>(() => [
 		label: '',
 		type: 'index',
 	},
-	{
-		label: t('staffManage.phone'),
-		prop: 'phone',
+	{ // SPDM CODE
+		label: t('staffManage.username'),
+		prop: 'username',
 	},
+	// {
+	// 	label: t('staffManage.phone'),
+	// 	prop: 'phone',
+	// },
 	{
 		label: t('staffManage.nickname'),
 		prop: 'nickname',
@@ -280,7 +284,7 @@ const getDataList = async () => {
 		pagination.total = data.total;
 		tableData.value = data.records.map((item: any) => {
 			const {postList, roleList, email, status, staffId, userInfo, deptList} = item;
-			const {phone, nickname} = userInfo;
+			const {phone, nickname, username} = userInfo;
 			const posts = postList.map((post: any) => post.postId);
 			const roles = roleList.map((role: any) => role.roleId);
 			const depts = deptList;
@@ -293,6 +297,7 @@ const getDataList = async () => {
 				depts,
 				phone,
 				nickname,
+				username,
 			};
 		});
 		console.log(toRaw(tableData.value));