Browse Source

部分地方

Crazy 3 days ago
parent
commit
95d9fd0853

+ 7 - 1
src/api/system/studentSelectSupervisorRecord/index.ts

@@ -62,10 +62,16 @@ export const studentSelectSupervisorRecordApi = {
   refuseStudentSelectSupervisorRecord: async (data: studentSelectSupervisorRecordVO) => {
     return await request.put({ url: `/system/student-select-supervisor-record/refuse`, data })
   },
-  //撤回
+  //撤回 // 撤回(志愿填报里面)
   withdrawStudentSelectSupervisorRecord: async (data: studentSelectSupervisorRecordVO) => {
     return await request.put({ url: `/system/student-select-supervisor-record/withdraw`, data })
   },
+
+  // 撤回(互选记录里面)
+  withdrawRecord: async (data: studentSelectSupervisorRecordVO) => {
+    return await request.put({ url: `/system/student-select-supervisor-record/withdrawRecord` , data })
+  },
+
   // 互选表打印数据列表
   getSelectionBookList: async (data: studentSelectSupervisorRecordVO) => {
     return await request.put({ url: `/system/student-select-supervisor-record/getSelectionBookList`, data })

+ 0 - 5
src/api/system/studentSelectionProject/index.ts

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

+ 19 - 18
src/views/system/studentSelectSupervisorRecord/record.vue

@@ -247,6 +247,22 @@ const queryParams = reactive({
   projectName:"",
   studentGrade:""
 })
+
+const recordData = ref({
+  id: undefined,
+  projectId: undefined,
+  studentId: undefined,
+  supervisorId: undefined,
+  selectType: undefined,
+  studentSignature: "",
+  supervisorApproveTime: undefined,
+  supervisorSignature: "",
+  externalSupervisorId: undefined,
+  masterType:undefined,
+  studentSignDate:[],
+  supervisorSignDate:[],
+})
+
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 //导师类型
@@ -288,9 +304,9 @@ const openForm = (type: string, projectId?: number,supervisorId? :number,id?:num
 const handelWithdraw = async (id) => {
   try {
     await message.confirm('是否确定撤回申请?')
-    queryParams.id = id
-    const data = recordData.value as unknown as studentSelectionProjectVO
-    await studentSelectionProjectApi.withdrawRecord(data)
+    recordData.value.id = id
+    const data =recordData.value as unknown as studentSelectSupervisorRecordVO
+    await studentSelectSupervisorRecordApi.withdrawRecord(data)
     message.success("撤回了申请")
     await getRecordList()
   } catch {}
@@ -477,21 +493,6 @@ const exportWordTemplate = async () => {
 //   }
 // };
 
-const recordData = ref({
-  id: undefined,
-  projectId: undefined,
-  studentId: undefined,
-  supervisorId: undefined,
-  selectType: undefined,
-  studentSignature: "",
-  supervisorApproveTime: undefined,
-  supervisorSignature: "",
-  externalSupervisorId: undefined,
-  masterType:undefined,
-  studentSignDate:[],
-  supervisorSignDate:[],
-})
-
 const selectionList = ref<studentSelectSupervisorRecordVO[]>([]) //下面的选择记录列表
 /** 查询互选记录列表 */
 const getRecordList = async () => {