diff --git a/src/api/base/jsApi.ts b/src/api/base/jsApi.ts new file mode 100644 index 0000000..c5e28f5 --- /dev/null +++ b/src/api/base/jsApi.ts @@ -0,0 +1,6 @@ +import { get, post } from "@/utils/request"; + +// 根据教师ID查询教师信息 +export const jsFindByIdApi = async (param: { id: string }) => { + return await get("/api/js/findById", param); +}; \ No newline at end of file diff --git a/src/api/base/server.ts b/src/api/base/server.ts index c3c4709..8078ba6 100644 --- a/src/api/base/server.ts +++ b/src/api/base/server.ts @@ -105,20 +105,6 @@ export const relayFinishApi = async (params: any) => { return await post('/mobile/jl/relay/finish', params); }; -/** - * 发起学生请假 - */ -export const jzAddXsQjApi = async (params: any) => { - return await post("/api/xsQj/save", params); -}; - -/** - * 查询学生请假列表 - */ -export const jzXsQjListApi = async (params: any) => { - return await get("/api/xsQj/findPage", params); -}; - /** * 查询学生请假流程处理历史 */ diff --git a/src/api/base/xsQjApi.ts b/src/api/base/xsQjApi.ts index 96f5334..1cc9a06 100644 --- a/src/api/base/xsQjApi.ts +++ b/src/api/base/xsQjApi.ts @@ -3,92 +3,73 @@ import { get, post } from "@/utils/request"; // 学生请假相关接口 /** - * 家长添加学生请假申请 + * 添加/修改学生请假申请 + * @param data 请假数据 */ export const jzAddXsQjApi = (data: any) => { - return post("/xsQj/jzAdd", data); + return post("/api/xsQj/save", data); }; /** - * 家长获取学生请假列表 + * 教师审批学生请假申请 + * @param data 审批数据 + */ +export const approveXsQjApi = (data: any) => { + return post("/api/xsQj/sp", data); +}; + +/** + * 分页查询学生请假列表 + * @param params 查询参数 + */ +export const findXsQjPageApi = (params: any) => { + return get("/api/xsQj/findPage", params); +}; + +/** + * 导出学生请假数据 + * @param params 导出参数 + */ +export const exportXsQjApi = (params: any) => { + return post("/api/xsQj/export", params); +}; + +/** + * 获取导出字段选择 + */ +export const getExportFieldChooseApi = () => { + return get("/api/xsQj/exportFieldChoose"); +}; + +/** + * 导入学生请假数据 + * @param file 文件数据 + */ +export const importXsQjDataApi = (file: any) => { + return post("/api/xsQj/importData", file); +}; + +/** + * 家长查询学生请假列表 + * @param params 查询参数 */ export const jzXsQjListApi = (params: any) => { - return get("/xsQj/jzList", params); + return get("/api/xsQj/findPage", params); }; /** * 获取学生请假详情 + * @param id 请假ID */ export const getXsQjDetailApi = (id: string) => { - return get("/xsQj/detail", { id }); + return get("/api/xsQj/findById", { id }); }; /** * 获取请假审批流程 + * @param ywId 业务ID + * @param ywType 业务类型 */ export const getXsQjApprovalProcessApi = (ywId: string, ywType: string = 'XS_QJ') => { - return get("/gzlSp/getByYwIdAndYwType", { ywId, ywType }); -}; - -/** - * 教师审批学生请假 - */ -export const approveXsQjApi = (data: any) => { - return post("/xsQj/approve", data); -}; - -/** - * 获取请假类型列表 - */ -export const getQjTypeListApi = () => { - return get("/xsQj/qjTypeList"); -}; - -/** - * 获取请假统计信息 - */ -export const getQjStatisticsApi = (params: any) => { - return get("/xsQj/statistics", params); -}; - -/** - * 导出请假数据 - */ -export const exportXsQjApi = (params: any) => { - return get("/xsQj/export", params); -}; - -/** - * 批量操作请假申请 - */ -export const batchOperateXsQjApi = (data: any) => { - return post("/xsQj/batchOperate", data); -}; - -/** - * 获取请假审批历史 - */ -export const getXsQjApprovalHistoryApi = (qjId: string) => { - return get("/xsQj/approvalHistory", { qjId }); -}; - -/** - * 获取请假待办列表 - */ -export const getXsQjTodoListApi = (params: any) => { - return get("/xsQj/todoList", params); -}; - -/** - * 获取请假已办列表 - */ -export const getXsQjDoneListApi = (params: any) => { - return get("/xsQj/doneList", params); -}; - -/** - * 获取请假抄送列表 - */ -export const getXsQjCcListApi = (params: any) => { - return get("/xsQj/ccList", params); + return get("/api/gzlSp/getByYwIdAndYwType", { ywId, ywType }); }; diff --git a/src/pages/base/home/glxs.vue b/src/pages/base/home/glxs.vue index 5dd4410..b9ef6c0 100644 --- a/src/pages/base/home/glxs.vue +++ b/src/pages/base/home/glxs.vue @@ -115,7 +115,6 @@ import { attachmentUpload } from "@/api/system/upload"; import CustomUpload from "/src/components/BasicUpload/CustomUpload.vue"; import { useForm } from "@/components/BasicForm/hooks/useForm"; -import { dicApi } from "@/api/system/dic"; import { glxsApi } from "@/api/base/server"; import { useUserStore } from "@/store/modules/user"; import { useDataStore } from "@/store/modules/data"; diff --git a/src/pages/base/qj/components/progressList.vue b/src/pages/base/qj/components/progressList.vue index 5704e97..59c4453 100644 --- a/src/pages/base/qj/components/progressList.vue +++ b/src/pages/base/qj/components/progressList.vue @@ -53,11 +53,8 @@ const loadApprovalProcess = async () => { const res = await getXsQjApprovalProcessApi(props.qjId, 'XS_QJ'); if (res.resultCode === 1 && res.result) { - // 按sort字段排序 - const sortedList = res.result.sort((a: any, b: any) => a.sort - b.sort); - - // 转换为前端显示格式 - approvalList.value = sortedList.map((item: any) => ({ + // 转换为前端显示格式(后端已按sort字段排序) + approvalList.value = res.result.map((item: any) => ({ userName: item.userName || getDefaultUserName(item.spType), spType: item.spType, approveStatus: item.approveStatus, @@ -121,6 +118,7 @@ const getSpTypeText = (spType: string) => { // 获取状态文本 const getStatusText = (status: string) => { switch (status) { + case 'apply': return '已申请'; case 'pending': return '待处理'; case 'approved': return '已同意'; case 'rejected': return '已拒绝'; diff --git a/src/pages/base/qj/components/xsQjEdit.vue b/src/pages/base/qj/components/xsQjEdit.vue index 1966d54..51d73ce 100644 --- a/src/pages/base/qj/components/xsQjEdit.vue +++ b/src/pages/base/qj/components/xsQjEdit.vue @@ -39,12 +39,16 @@