1

src/api/admin/role.ts

@@ -109,3 +109,11 @@ export function validateRoleName(rule: any, value: any, callback: any, isEdit: b
 		}
 	});
 }
+
+
+export const listAllRole = () => {
+	return request({
+		url: '/admin/role/listAllRole',
+		method: 'get',
+	});
+};

src/layout/navBars/breadcrumb/user.vue

@@ -197,7 +197,6 @@ const onHandleCommandClick = (path: string) => {
 		// 打开个人页面
 		personalDrawerRef.value.open();
 	}else if(path === 'changeRole'){
-    debugger
     ChangeRoleRef.value.open()
   }
   else {

src/utils/request.ts

@@ -12,6 +12,8 @@ export enum CommonHeaderEnum {
 	'ENC_FLAG' = 'Enc-Flag',
 	'AUTHORIZATION' = 'Authorization',
 	'VERSION' = 'VERSION',
+	'ROLE_CODE'='ROLE_CODE',
+	'RRID'='RRID'
 }
 
 /**
@@ -50,6 +52,15 @@ service.interceptors.request.use(
 		if (tenantId) {
 			config.headers![CommonHeaderEnum.TENANT_ID] = tenantId;
 		}
+		//统一增加 当前角色CODE
+		const roleCode = Session.getRoleCode()
+		if(roleCode){
+			config.headers![CommonHeaderEnum.ROLE_CODE] = roleCode;
+		}
+		const roleId = Session.getRoleId()
+		if(roleId){
+			config.headers![CommonHeaderEnum.RRID] = roleId;
+		}
 
 		// 增加 gray_version 请求头
 		const version = import.meta.env.VITE_GRAY_VERSION;

src/utils/storage.ts

@@ -80,4 +80,10 @@ export const Session = {
 	getTenant() {
 		return Local.get('tenantId') ? Local.get('tenantId') : 1;
 	},
+	getRoleCode(){
+		return Local.get('roleCode') ? Local.get('roleCode') : '';
+	},
+	getRoleId(){
+		return Local.get('roleId') ? Local.get('roleId') : '';
+	}
 };

src/views/admin/system/role/change-role.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-// import {listAllRole} from '/@/api/admin/role'
+import {listAllRole} from '/@/api/admin/role'
 import {Local, Session} from '/@/utils/storage';
 import {useMessage} from "/@/hooks/message";
 // import {querySchoolName} from "/@/api/admin/tenant"
@@ -29,16 +29,16 @@ import {useMessage} from "/@/hooks/message";
 const visible=ref(false)
 const radio=ref('')
 const allRole=reactive([])
-const schoolName=ref('')
+// const schoolName=ref('')
 
 const open=()=>{
   visible.value=true
   // handleQuerySchoolName()
-  // listAllRole().then(res=>{
-  //   Object.assign(allRole,res.data)
-  //   radio.value=Local.get("roleCode")
-  //   visible.value=true
-  // })
+  listAllRole().then(res=>{
+    Object.assign(allRole,res.data)
+    radio.value=Local.get("roleCode")
+    visible.value=true
+  })
 }
 const handleChangeRole=(label:any)=>{
   let obj:any=allRole.find((v:any) => v.roleCode == label)

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

@@ -40,7 +40,7 @@
 <!--					</el-col>-->
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.role')" prop="role">
-							<el-select clearable multiple :placeholder="$t('sysuser.selectRole')" v-model="dataForm.role">
+							<el-select clearable multiple :placeholder="$t('sysuser.selectRole')" v-model="dataForm.role" filterable>
 								<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId" v-for="item in roleData" />
 							</el-select>
 						</el-form-item>

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

@@ -189,7 +189,7 @@ const validatorPassword2 = (rule: any, value: any, callback: any) => {
 	}
 };
 const validatorScore = (rule: any, value: any, callback: any) => {
-	if (score.value <= 1) {
+	if (score.value <= 2) {
 		callback(new Error(t('personal.passwordScore')));
 	} else {
 		callback();