|
@@ -57,7 +57,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="校内导师">
|
|
|
+ <el-form-item label="校内导师" v-if="supervisorData.userType == '5'">
|
|
|
<el-input v-model="studentData.supervisor" placeholder="" disabled />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -248,7 +248,8 @@ const supervisorData = ref({
|
|
|
major:'',
|
|
|
studentAchievementRequirement:"",
|
|
|
title:"",
|
|
|
- workSupervisor:""
|
|
|
+ workSupervisor:"",
|
|
|
+ userType : ''
|
|
|
})
|
|
|
|
|
|
const studentData = ref({
|
|
@@ -258,7 +259,8 @@ const studentData = ref({
|
|
|
major:"",
|
|
|
mobile:"",
|
|
|
introduction:"",
|
|
|
- supervisor:""
|
|
|
+ supervisor:"",
|
|
|
+ userType : ''
|
|
|
})
|
|
|
const formRules = reactive({
|
|
|
// projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
|
|
@@ -324,6 +326,8 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
|
|
|
console.log(supervisorId)
|
|
|
console.log(projectId)
|
|
|
const supervisor = await supervisorSelectionSettingApi.getSupervisorInfo(supervisorId,projectId);
|
|
|
+ consooe.log(supervisorId,"wozaizheli")
|
|
|
+ const supervisorResult = await UserApi.getUser(supervisorId)
|
|
|
//需要传的
|
|
|
formData.value.supervisorId =supervisorId;
|
|
|
formData.value.projectId = projectId;
|
|
@@ -333,6 +337,7 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
|
|
|
supervisorData.value.studentAchievementRequirement = supervisor.studentAchievementRequirement;
|
|
|
supervisorData.value.major = supervisor.major;
|
|
|
supervisorData.value.workSupervisor = supervisor.workSupervisor;
|
|
|
+ supervisorData.value.userType = supervisorResult.userType;
|
|
|
} finally {
|
|
|
formLoading.value = false
|
|
|
}
|
|
@@ -362,6 +367,7 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
|
|
|
studentData.value.major=result.major
|
|
|
studentData.value.mobile=result.mobile
|
|
|
studentData.value.introduction=result.introduction
|
|
|
+ studentData.value.userType = result.userType
|
|
|
const supervisor = await supervisorSelectionSettingApi.getSupervisorInfo(supervisorId,projectId);
|
|
|
//显示的
|
|
|
supervisorData.value.nickname = supervisor.supervisorName;
|
|
@@ -525,7 +531,7 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
|
|
|
studentData.value.mobile=result.mobile
|
|
|
studentData.value.introduction=result.introduction
|
|
|
studentData.value.supervisorId = result.supervisorId
|
|
|
-
|
|
|
+ const supervisorResult = await UserApi.getUser(supervisorId)
|
|
|
const supervisor = await supervisorSelectionSettingApi.getSupervisorInfo(supervisorId,projectId);
|
|
|
//显示的
|
|
|
supervisorData.value.nickname = supervisor.supervisorName;
|
|
@@ -533,6 +539,7 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
|
|
|
supervisorData.value.studentAchievementRequirement = supervisor.studentAchievementRequirement;
|
|
|
supervisorData.value.major = supervisor.major;
|
|
|
supervisorData.value.workSupervisor = supervisor.workSupervisor;
|
|
|
+ supervisorData.value.userType = supervisorResult.userType;
|
|
|
formData.value = await studentSelectSupervisorRecordApi.getStudentSelectSupervisorRecord(id)
|
|
|
} finally {
|
|
|
formLoading.value = false
|