diff --git a/src/api/crm/activity/activity.js b/src/api/crm/activity/activity.js
index 6d80b6d..6ab67d4 100644
--- a/src/api/crm/activity/activity.js
+++ b/src/api/crm/activity/activity.js
@@ -211,3 +211,84 @@ export function addMapForReport(data) {
isTransformResponse:false
});
}
+
+
+//新增请假申请
+export function addLeaveApply(data) {
+ return request.post({
+ url: "/crm/jys/app/appLeaveApply/add",
+ data,
+ },{
+ isTransformResponse:false
+ });
+}
+
+//我的表单
+export function getLeaveApplyList(data) {
+ return request.get({
+ url: "/crm/jys/app/appLeaveApply/list",
+ data
+ },{
+ isTransformResponse:false
+ });
+}
+
+//可销假表单
+export function getBackList(data) {
+ return request.get({
+ url: "/crm/jys/app/appLeaveApply/getBackList",
+ data
+ },{
+ isTransformResponse:false
+ });
+}
+
+//我的审批
+export function getMyReviewList(data) {
+ return request.get({
+ url: "/crm/jys/app/appLeaveApply/myReview",
+ data
+ },{
+ isTransformResponse:false
+ });
+}
+
+//可销假表单
+export function getBackLeaveList(data) {
+ return request.get({
+ url: "/crm/jys/app/appLeaveApply/myBackLeave",
+ data
+ },{
+ isTransformResponse:false
+ });
+}
+
+//提交审批
+export function addReviewLeave(data) {
+ return request.post({
+ url: "/crm/jys/app/appLeaveApply/addReview",
+ data,
+ },{
+ isTransformResponse:false
+ });
+}
+
+//新增销假申请
+export function addBackApply(data) {
+ return request.post({
+ url: "/crm/jys/app/appLeaveApply/addBackApply",
+ data,
+ },{
+ isTransformResponse:false
+ });
+}
+
+//可销假表单
+export function getDelLeaveApply(data) {
+ return request.get({
+ url: "/crm/jys/app/appLeaveApply/delLeaveApply",
+ data
+ },{
+ isTransformResponse:false
+ });
+}
diff --git a/src/pages.json b/src/pages.json
index 42976f0..6c5a27c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -665,6 +665,71 @@
},
{
"path": "pages/business/polling/nfcTest/index",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //************************考勤管理请假功能
+ //请假申请
+ {
+ "path": "pages/business/CRM/leave/askLeave",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //添加请假申请
+ {
+ "path": "pages/business/CRM/leave/addApply",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //我的申请表单
+ {
+ "path": "pages/business/CRM/leave/myApply",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //我的申请表单详情
+ {
+ "path": "pages/business/CRM/leave/myApplyDetail",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //可销假列表
+ {
+ "path": "pages/business/CRM/leave/backApply",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //添加销假申请
+ {
+ "path": "pages/business/CRM/leave/addBackApply",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //请假审批
+ {
+ "path": "pages/business/CRM/leave/reviewLeave",
+
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ //审批详情
+ {
+ "path": "pages/business/CRM/leave/reviewDetail",
+
"style": {
"navigationBarTitleText": ""
}
diff --git a/src/pages/business/CRM/leave/addApply.vue b/src/pages/business/CRM/leave/addApply.vue
new file mode 100644
index 0000000..6a22414
--- /dev/null
+++ b/src/pages/business/CRM/leave/addApply.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/addBackApply.vue b/src/pages/business/CRM/leave/addBackApply.vue
new file mode 100644
index 0000000..e2461f2
--- /dev/null
+++ b/src/pages/business/CRM/leave/addBackApply.vue
@@ -0,0 +1,316 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ applyData.startDate }}
+ 至
+ {{ applyData.endDate }}
+
+
+ {{ applyData.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/askLeave.vue b/src/pages/business/CRM/leave/askLeave.vue
new file mode 100644
index 0000000..dfdef2a
--- /dev/null
+++ b/src/pages/business/CRM/leave/askLeave.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请假申请
+
+
+
+ 销假申请
+
+
+
+ 我的表单
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/backApply.vue b/src/pages/business/CRM/leave/backApply.vue
new file mode 100644
index 0000000..65dc938
--- /dev/null
+++ b/src/pages/business/CRM/leave/backApply.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.typeval == '1' ? '全天' : item.typeval == '2' ? '前半个班次' : '后半个班次' }}
+
+
+
+
+
+
+ 申请日期 {{ item.applyDate }}
+
+
+
+ 休假日期
+ {{ item.startDate }} 至 {{ item.endDate }}
+ ( )
+
+
+
+ 详细说明
+ {{ item.reason }}
+
+
+
+ {{ item.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/myApply.vue b/src/pages/business/CRM/leave/myApply.vue
new file mode 100644
index 0000000..3621e03
--- /dev/null
+++ b/src/pages/business/CRM/leave/myApply.vue
@@ -0,0 +1,237 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.typeval=="1"?'全天':item.typeval=="2"?'前半个班次':'后半个班次' }}
+
+
+
+
+
+ 申请日期:{{ item.applyDate }}
+ (
+
+
+ )
+
+
+
+ 休假日期
+ {{ item.startDate }} 至 {{ item.endDate }}
+ (
+ )
+
+
+
+ 详细说明
+ {{ item.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/myApplyDetail.vue b/src/pages/business/CRM/leave/myApplyDetail.vue
new file mode 100644
index 0000000..75fc539
--- /dev/null
+++ b/src/pages/business/CRM/leave/myApplyDetail.vue
@@ -0,0 +1,313 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.rejectReason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/reviewDetail.vue b/src/pages/business/CRM/leave/reviewDetail.vue
new file mode 100644
index 0000000..269c761
--- /dev/null
+++ b/src/pages/business/CRM/leave/reviewDetail.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ baseFormData.startDate }}
+ 至
+ {{ baseFormData.endDate }}
+
+
+ {{ baseFormData.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/business/CRM/leave/reviewLeave.vue b/src/pages/business/CRM/leave/reviewLeave.vue
new file mode 100644
index 0000000..27842a5
--- /dev/null
+++ b/src/pages/business/CRM/leave/reviewLeave.vue
@@ -0,0 +1,376 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.typeval == '1' ? '全天' : item.typeval == '2' ? '前半个班次' : '后半个班次' }}
+
+
+
+
+
+ 姓名
+ {{ item.applyUserName }}
+
+
+ {{ item.applyType }}日期
+ {{ item.startDate }} 至 {{ item.endDate }}
+ (
+ )
+
+
+
+
+ 详细说明
+ {{ item.reason
+ }}
+
+
+ {{ item.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file