diff --git a/src/api/base/qjApi.ts b/src/api/base/qjApi.ts
new file mode 100644
index 0000000..814a67f
--- /dev/null
+++ b/src/api/base/qjApi.ts
@@ -0,0 +1,39 @@
+// 参数接口
+
+// 响应接口
+import { get, post } from "@/utils/request";
+
+/**
+ * 发起请假
+ */
+export const addQjApi = async (params: any) => {
+ return await post("/api/jsQj/save", params);
+};
+
+/**
+ * 查询请假信息
+ */
+export const findQjById = async (params: any) => {
+ return await get("/api/jsQj/findById", params);
+};
+
+/**
+ * 查询代课信息
+ */
+export const findDkById = async (params: any) => {
+ return await get("/api/qjDk/findById", params);
+};
+
+/**
+ * 查询请假列表
+ */
+export const findQjListApi = async (params: any) => {
+ return await get("/api/jsQj/findPage", params);
+};
+
+/**
+ * 查询请假流程处理历史
+ */
+export const getQjActivitiHistoryApi = async (params: any) => {
+ return await get("/activiti/history/historicFlow", params);
+};
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 92f06fd..bbc55e7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -252,7 +252,7 @@
}
},
{
- "path": "pages/view/hr/leaveApplication/index",
+ "path": "pages/view/hr/qj/index",
"style": {
"navigationBarTitleText": "请假申请",
"enablePullDownRefresh": false
@@ -273,12 +273,47 @@
}
},
{
- "path": "pages/view/hr/leaveApplication/detail",
+ "path": "pages/view/hr/qj/detail",
"style": {
"navigationBarTitleText": "请假详情",
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/view/hr/qj/sp",
+ "style": {
+ "navigationBarTitleText": "请假审批",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/view/hr/qj/cxTj",
+ "style": {
+ "navigationBarTitleText": "请假重新提交",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/view/hr/qj/jwcQr",
+ "style": {
+ "navigationBarTitleText": "请假代课教务处确认",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/view/hr/qj/jwcXt",
+ "style": {
+ "navigationBarTitleText": "请假代课教务处协调",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "pages/view/hr/qj/dkQr",
+ "style": {
+ "navigationBarTitleText": "请假代课教师确认",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/view/hr/teacherProfile/education",
"style": {
diff --git a/src/pages/view/hr/leaveApplication/index.vue b/src/pages/view/hr/leaveApplication/index.vue
deleted file mode 100644
index 42eca6e..0000000
--- a/src/pages/view/hr/leaveApplication/index.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-
-
-
-
-
-
-
-
- 请假事由:
- {{ data.reason }}
-
-
- 开始时间:
- {{ data.startTime }}
-
-
- 结束时间:
- {{ data.endTime }}
-
-
-
-
-
-
-
- 新增请假
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/components/jsQjEdit.vue b/src/pages/view/hr/qj/components/jsQjEdit.vue
new file mode 100644
index 0000000..a4b7ab8
--- /dev/null
+++ b/src/pages/view/hr/qj/components/jsQjEdit.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/view/hr/qj/components/jsQjList.vue b/src/pages/view/hr/qj/components/jsQjList.vue
new file mode 100644
index 0000000..f78d5e4
--- /dev/null
+++ b/src/pages/view/hr/qj/components/jsQjList.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
+
+
+
+ 请假事由:
+ {{ data.qjsy }}
+
+
+ 开始时间:
+ {{ data.qjkstime }}
+
+
+ 结束时间:
+ {{ data.qjjstime }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/components/progressList.vue b/src/pages/view/hr/qj/components/progressList.vue
new file mode 100644
index 0000000..3bb2c55
--- /dev/null
+++ b/src/pages/view/hr/qj/components/progressList.vue
@@ -0,0 +1,149 @@
+
+
+
+
+ 审批进度
+
+
+
+
+
+
+
+
+
+ {{ task.name }}
+ {{ task.assignee || '' }}
+
+
+ {{ task.endTime }}
+ 待处理
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/cxTj.vue b/src/pages/view/hr/qj/cxTj.vue
new file mode 100644
index 0000000..4a155b0
--- /dev/null
+++ b/src/pages/view/hr/qj/cxTj.vue
@@ -0,0 +1,33 @@
+
+
+ 重新提交
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/leaveApplication/detail.vue b/src/pages/view/hr/qj/detail.vue
similarity index 100%
rename from src/pages/view/hr/leaveApplication/detail.vue
rename to src/pages/view/hr/qj/detail.vue
diff --git a/src/pages/view/hr/qj/dkQr.vue b/src/pages/view/hr/qj/dkQr.vue
new file mode 100644
index 0000000..0438b49
--- /dev/null
+++ b/src/pages/view/hr/qj/dkQr.vue
@@ -0,0 +1,33 @@
+
+
+ 代课教师确认
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/index.vue b/src/pages/view/hr/qj/index.vue
new file mode 100644
index 0000000..212d895
--- /dev/null
+++ b/src/pages/view/hr/qj/index.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/jwcQr.vue b/src/pages/view/hr/qj/jwcQr.vue
new file mode 100644
index 0000000..e6c8647
--- /dev/null
+++ b/src/pages/view/hr/qj/jwcQr.vue
@@ -0,0 +1,33 @@
+
+
+ 教务处确认
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/jwcXt.vue b/src/pages/view/hr/qj/jwcXt.vue
new file mode 100644
index 0000000..ab3b68a
--- /dev/null
+++ b/src/pages/view/hr/qj/jwcXt.vue
@@ -0,0 +1,33 @@
+
+
+ 教务处协调
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/view/hr/qj/sp.vue b/src/pages/view/hr/qj/sp.vue
new file mode 100644
index 0000000..e766e47
--- /dev/null
+++ b/src/pages/view/hr/qj/sp.vue
@@ -0,0 +1,33 @@
+
+
+ 负责人审批
+
+
+
+
+
+
\ No newline at end of file