5

src/api/system/studentSelectSupervisorRecord/index.ts

@@ -70,5 +70,6 @@ export const studentSelectSupervisorRecordApi = {
   getSelectionBookList: async (data: studentSelectSupervisorRecordVO) => {
     return await request.put({ url: `/system/student-select-supervisor-record/getSelectionBookList`, data })
   },
+  
 
 }

src/api/system/studentSelectionProject/index.ts

@@ -53,9 +53,9 @@ export const studentSelectionProjectApi = {
     return await request.get({ url: `/system/student-selection-project/getProjectSupervisors`, params: { projectId: projectId }})
   },
 
-  // /withdrawRecord
-  withdrawRecord: async (id: number) => {
-    return await request.delete({ url: `/system/student-selection-project/withdrawRecord?id=` + id })
+  // /withdrawRecord撤回申请
+  withdrawRecord: async (data: studentSelectionProjectVO) => {
+    return await request.put({ url: `/system/student-selection-project/withdrawRecord` , data })
   },
 
 }

src/views/system/studentSelectSupervisorRecord/record.vue

@@ -186,7 +186,7 @@
               <el-button
                 link
                 type="primary"
-                @click="handelWithdraw( scope.row.supervisorId)"
+                @click="handelWithdraw(scope.row.id)"
                 v-hasPermi="['system:student-select-supervisor-record:withdraw']"
                 v-if="userInfo?.userType === '1'&& scope.row.selectType === 1"
               >
@@ -217,13 +217,13 @@ import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
 import {studentSelectSupervisorRecordApi, studentSelectSupervisorRecordVO} from "@/api/system/studentSelectSupervisorRecord";
 import {DICT_TYPE} from "@/utils/dict";
 import studentSelectSupervisorRecordForm from './studentSelectSupervisorRecordForm.vue'
-import {studentSelectionProjectApi} from "@/api/system/studentSelectionProject"
+import {studentSelectionProjectApi, studentSelectionProjectVO} from "@/api/system/studentSelectionProject"
 import ExportWord  from '@/utils/doc.ts';
 import { selectionBookApi } from '@/api/system/studentSelectSupervisorRecord/selectionBook';
 import { saveAs } from "file-saver";
-
 import JSZip from "jszip"
 
+
 /** 导师学硕专硕名额设置 列表 */
 defineOptions({ name: 'RecordList' })
 
@@ -236,6 +236,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
+  id: undefined,
   projectId: undefined,
   supervisorId: undefined,
   externalSupervisorId:undefined,
@@ -284,15 +285,14 @@ const formRef = ref()
 const openForm = (type: string, projectId?: number,supervisorId? :number,id?:number,studentId?:number) => {
   formRef.value.open(type, projectId,supervisorId,id,studentId)
 }
-
-const handelWithdraw = async (supervisorId:number) => {
+const handelWithdraw = async (id) => {
   try {
     await message.confirm('是否确定撤回申请？')
-    recordData.value.supervisorId = supervisorId
-    const data =recordData.value as unknown as studentSelectSupervisorRecordVO
-    await studentSelectSupervisorRecordApi.withdrawStudentSelectSupervisorRecord(data)
+    queryParams.id = id
+    const data = recordData.value as unknown as studentSelectionProjectVO
+    await studentSelectionProjectApi.withdrawRecord(data)
     message.success("撤回了申请")
-    await getList()
+    await getRecordList()
   } catch {}
 }
 

src/views/system/supervisorSelectionSetting/index.vue

@@ -157,7 +157,7 @@
       </el-table-column>
 
 
-      <el-table-column label="操作" align="center" min-width="120px">
+      <el-table-column label="操作" align="center" min-width="120px" v-if="userInfo?.userType === '4'" >
         <template #default="scope">
           <!--学院查看招生详情-->
           <el-button 
@@ -170,15 +170,15 @@
             招生详情
           </el-button>
           <!--志愿填报修改-->
-          <el-button
+          <!-- <el-button
             link
             type="primary"
             @click="handelWithdraw( scope.row.supervisorId)"
             v-hasPermi="['system:student-select-supervisor-record:withdraw']"
-            v-if="userInfo?.userType === '1'&&scope.row.selectType ==1"
+            v-if="userInfo?.userType === '1' && scope.row.selectType ==1"
           >
             撤回
-          </el-button>
+          </el-button> -->
 
 <!--名额设置-->
           <el-button
@@ -436,7 +436,7 @@ const recordData = ref({
 })
 const handelWithdraw = async (supervisorId:number) => {
   try {
-    await message.confirm()
+    await message.confirm('是否确定撤回申请？')
     recordData.value.supervisorId=supervisorId
     const data =recordData.value as unknown as studentSelectSupervisorRecordVO
     await studentSelectSupervisorRecordApi.withdrawStudentSelectSupervisorRecord(data)