diff --git a/src/api/base/server.ts b/src/api/base/server.ts index ac41464..8642ffc 100644 --- a/src/api/base/server.ts +++ b/src/api/base/server.ts @@ -140,7 +140,5 @@ export const jzXsQjListApi = async (params: any) => { * 查询学生请假流程处理历史 */ export const jzXsQjActivitiHistoryApi = async (params: any) => { - return await get("/api/activiti/history/historicFlow", params); + return await get("/activiti/history/historicFlow", params); }; - - diff --git a/src/pages.json b/src/pages.json index b941d7e..fa054c1 100644 --- a/src/pages.json +++ b/src/pages.json @@ -155,6 +155,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/base/leave-request/detail", + "style": { + "navigationBarTitleText": "请假详情", + "enablePullDownRefresh": false + } + }, { "path": "pages/base/home/detail", "style": { diff --git a/src/pages/base/leave-request/components/progressList.vue b/src/pages/base/leave-request/components/progressList.vue new file mode 100644 index 0000000..ac3ab33 --- /dev/null +++ b/src/pages/base/leave-request/components/progressList.vue @@ -0,0 +1,149 @@ + + + + + \ No newline at end of file diff --git a/src/pages/base/leave-request/components/xsQjEdit.vue b/src/pages/base/leave-request/components/xsQjEdit.vue index b2b3891..42b8f43 100644 --- a/src/pages/base/leave-request/components/xsQjEdit.vue +++ b/src/pages/base/leave-request/components/xsQjEdit.vue @@ -175,12 +175,12 @@ const validateTime = () => { return true; } -const submit = () => { - const fd = getValue(); +const submit = async () => { + const fd = await getValue(); if (!validateTime()) { return; } - const params = { ...formData, ...fd }; + const params = { ...fd }; if (props.data && props.data.id) { params.id = props.data.id; } else { @@ -191,9 +191,12 @@ const submit = () => { params.jzId = getUser.jzId; // 家长ID } params.flag = 1; + console.log('提交参数:', params); jzAddXsQjApi(params).then(() => { showToast({ title: "提交成功", icon: "success" }); - navigateBack(); + uni.reLaunch({ + url: "/pages/base/home/index" + }); }); }; diff --git a/src/pages/base/leave-request/components/xsQjList.vue b/src/pages/base/leave-request/components/xsQjList.vue index 49ab999..0aa53ec 100644 --- a/src/pages/base/leave-request/components/xsQjList.vue +++ b/src/pages/base/leave-request/components/xsQjList.vue @@ -9,15 +9,15 @@ 请假事由: - {{ data.reason }} + {{ data.qjsy }} 开始时间: - {{ data.startTime }} + {{ data.qjkstime }} 结束时间: - {{ data.endTime }} + {{ data.qjjstime }} @@ -54,14 +54,7 @@ const [register, { reload }] = useLayout({ // 查看详情或新增处理函数 const goToDetail = (item: any | null) => { setData(item); - let url = '/pages/base/leave-request/leaveApplication'; // 使用新路径 - if (item && item.id) { - console.log('View details for:', item); - url += `?id=${item.id}`; // 查看详情时传递 ID - } else { - console.log('Navigating to create new leave application.'); - // 新增时不传递 ID - } + let url = '/pages/base/leave-request/detail'; uni.navigateTo({ url }); }; diff --git a/src/pages/base/leave-request/detail.vue b/src/pages/base/leave-request/detail.vue new file mode 100644 index 0000000..fb587a8 --- /dev/null +++ b/src/pages/base/leave-request/detail.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/pages/base/leave-request/xsQjDetail.vue b/src/pages/base/leave-request/xsQjDetail.vue deleted file mode 100644 index 5895df4..0000000 --- a/src/pages/base/leave-request/xsQjDetail.vue +++ /dev/null @@ -1,385 +0,0 @@ - - - - -