ss

src/views/system/studentSelection/studentSelectSupervisorRecord/record.vue

@@ -131,7 +131,6 @@
             </template>
           </el-table-column>
             <el-table-column label="导师姓名" align="center" prop="supervisor" />
-        
             <el-table-column
               label="导师类型"
               align="center"

src/views/system/studentSelection/studentSelectSupervisorRecord/studentSelectSupervisorRecordForm.vue

@@ -426,7 +426,8 @@ const open = async (type: string, projectId?: number, supervisorId?:number, id?:
       formLoading.value = true
       try {
         const result =await UserApi.getUser(id)
-        formData.value.studentId =id
+        formData.value.supervisorId = supervisorId
+        formData.value.studentId = id
         studentData.value.nickname=result.nickname
         studentData.value.userNumber=result.userNumber
         studentData.value.major=result.major

src/views/system/studentSelection/studentSelectionNo/index.vue

@@ -101,7 +101,7 @@
           <!-- 待处理 -->
           <el-button
             type="text"
-            @click="openForm('updateone',  scope.row.projectId,scope.row.supervisorId,scope.row.id,scope.row.recordId)"
+            @click="openForm('updateone',  scope.row.projectId,scope.row.selectSupervisorId,scope.row.id,scope.row.recordId)"
             v-hasPermi="['system:student-select-supervisor-record:update']"
             v-if="scope.row.selectStatus === 1"
           >
@@ -110,7 +110,7 @@
           <!-- 未提交 -->
           <el-button
             type="text"
-            @click="openForm('updatetwo',  scope.row.projectId,null,scope.row.id,scope.row.recordId)"
+            @click="openForm('updatetwo',  scope.row.projectId,scope.row.selectSupervisorId,scope.row.id,scope.row.recordId)"
             v-hasPermi="['system:student-select-supervisor-record:collegeCreate']"
             v-if="scope.row.selectStatus === 0"
           >

src/views/system/studentSelection/studentSelectionWait/index.vue

@@ -113,7 +113,7 @@
           <el-button
             link
             type="danger"
-            @click="handelRefuse(scope.row.id)"
+            @click="handelRefuse(scope.row.id,scope.row.projectId)"
             v-hasPermi="['system:student-select-supervisor-record:refuse']"
           >
             退回
@@ -218,10 +218,11 @@ const resetQuery = () => {
   handleQuery()
 }
 
-const handelRefuse = async (id:number) => {
+const handelRefuse = async (id:number,projectId:number) => {
   try {
     await message.confirm("是否确定退回申请?")
     queryForm.value.id = id
+    queryForm.value.projectId = projectId
     const data = queryForm.value as unknown as studentSelectSupervisorRecordVO
     await studentSelectSupervisorRecordApi.refuseStudentSelectSupervisorRecord(data)
     message.success("拒绝了申请")

src/views/system/supervisorSelectionSetting/index.vue

@@ -422,11 +422,11 @@ const getUser = async () => {
 }
 //志愿填报弹窗
 const studentSelectSupervisorPop= ref()
-const openStudentSelectSupervisorPop =  (id:number,studentId:number,type: string, projectId?: number,supervisorId? :number) => {
+const openStudentSelectSupervisorPop =  (type: string,id:number,studentId:number,projectId?: number,supervisorId? :number) => {
   if(selectStatus.value !== 0){
     message.error("已存在申请")
   }else{
-    studentSelectSupervisorPop.value.open(id,studentId,type, projectId ,supervisorId)
+    studentSelectSupervisorPop.value.open(type,id,studentId,projectId ,supervisorId)
   } 
 }