Browse Source

修改bug

master
王泽彦 9 months ago
parent
commit
57cb017676
  1. 6
      admin/src/app/views/campus_person_role/campus_person_role.vue
  2. 4
      admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue
  3. 1
      niucloud/app/service/api/login/LoginService.php

6
admin/src/app/views/campus_person_role/campus_person_role.vue

@ -198,7 +198,6 @@ import Edit from '@/app/views/campus_person_role/components/campus-person-role-e
import { useRoute } from 'vue-router' import { useRoute } from 'vue-router'
const route = useRoute() const route = useRoute()
const pageName = route.meta.title const pageName = route.meta.title
// ?dept_id=1
let campusPersonRoleTable = reactive({ let campusPersonRoleTable = reactive({
page: 1, page: 1,
@ -218,10 +217,9 @@ let campusPersonRoleTable = reactive({
if(pageName == '市场人员列表'){ if(pageName == '市场人员列表'){
campusPersonRoleTable.searchParam.dept_id = 1; campusPersonRoleTable.searchParam.dept_id = 1;
}else if(pageName == '销售人员列表'){ }else if(pageName == '销售人员列表'){
campusPersonRoleTable.searchParam.dept_id = 2; campusPersonRoleTable.searchParam.dept_id = 3;
// campusPersonRoleTable.searchParam.role_id = 2;
}else if(pageName == '教练管理'){ }else if(pageName == '教练管理'){
campusPersonRoleTable.searchParam.role_id = 5; campusPersonRoleTable.searchParam.role_id = 2;
} }
const searchFormRef = ref<FormInstance>() const searchFormRef = ref<FormInstance>()

4
admin/src/app/views/campus_person_role/components/campus-person-role-edit.vue

@ -160,10 +160,10 @@ const initialFormData = {
if(pageName == '市场人员列表'){ if(pageName == '市场人员列表'){
initialFormData.dept_id = 1; initialFormData.dept_id = 1;
}else if(pageName == '销售人员列表'){ }else if(pageName == '销售人员列表'){
initialFormData.dept_id = 2; initialFormData.dept_id = 3;
// campusPersonRoleTable.searchParam.role_id = 2; // campusPersonRoleTable.searchParam.role_id = 2;
}else if(pageName == '教练管理'){ }else if(pageName == '教练管理'){
initialFormData.dept_id = 3; initialFormData.dept_id = 2;
}else{ }else{
initialFormData.dept_id = 0; initialFormData.dept_id = 0;
} }

1
niucloud/app/service/api/login/LoginService.php

@ -375,6 +375,7 @@ class LoginService extends BaseApiService
//获取用户部门ids(1市场、2教师、3销售) //获取用户部门ids(1市场、2教师、3销售)
$depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id'); $depts = (new CampusPersonRole())->where('person_id', $member_info->id)->column('dept_id');
$user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : ''; $user_type = in_array($params['login_type'],$depts) ? $params['login_type'] : '';
return [ return [
'token' => $token_info['token'],//token 'token' => $token_info['token'],//token
'expires_time' => $token_info['params']['exp'],//过期时间 'expires_time' => $token_info['params']['exp'],//过期时间

Loading…
Cancel
Save