diff --git a/src/pages.json b/src/pages.json
index c7fe08e..d2a803c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,136 +1,149 @@
{
- "pages": [
- //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
- // {
- // "path": "pages/index/index",
- // "style": {
- // "navigationBarTitleText": "uni-app"
- // }
- // },
- // 首页
- {
- "path": "pages/login/index",
- "style": {
- "navigationBarTitleText": "登录"
- }
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "首页"
- }
- },
- {
- "path": "pages/face/index",
- "style": {
- "navigationBarTitleText": "人脸录入",
- "navigationBarBackgroundColor": "#ffffff"
- }
- },
- {
- "path": "pages/clock/index",
- "style": {
- "navigationBarTitleText": "考勤打卡",
- "navigationBarBackgroundColor": "#ffffff"
- }
- },
- // 我的
- {
- "path": "pages/my/index",
- "style": {
- "navigationBarTitleText": "我的"
- }
- },
- // 出差报备
- {
- "path": "pages/evection/index",
- "style": {
- "navigationBarTitleText": "出差报备"
- }
- },
- // 报备记录列表
- {
- "path": "pages/evection/recordList",
- "style": {
- "navigationBarTitleText": "报备记录"
- }
- },
- // 报备记录列表
- {
- "path": "pages/evection/details",
- "style": {
- "navigationBarTitleText": "出差报备详情"
- }
- },
- // 休假报备
- {
- "path": "pages/holiday/index",
- "style": {
- "navigationBarTitleText": "休假报备"
- }
- },
- // 报备记录列表
- {
- "path": "pages/holiday/recordList",
- "style": {
- "navigationBarTitleText": "报备记录"
- }
- },
- // 报备记录列表
- {
- "path": "pages/holiday/details",
- "style": {
- "navigationBarTitleText": "休假报备详情"
- }
- },
- //修改密码
- {
- "path": "pages/password/index",
- "style": {
- "navigationBarTitleText": "修改密码"
- }
- },
- {
- "path" : "pages/panel/index",
- "style" :
- {
- "navigationBarTitleText" : "面板",
- "navigationBarBackgroundColor": "#ffffff"
- }
- },
- {
- "path" : "pages/clock/detail",
- "style" :
- {
- "navigationBarTitleText" : "人脸考勤",
- "navigationBarBackgroundColor": "#ffffff"
- }
- }
- ],
- "tabBar": {
- "color": "#2c2c2c",
- "selectedColor": "#1296db",
- "borderStyle": "black",
- "backgroundColor": "#FFFFFF",
- "iconWidth": "24px",
- "list": [{
- "pagePath": "pages/index/index",
- "text": "首页",
- "iconPath": "static/home.png",
- "selectedIconPath": "static/homeSelected.png"
- },
- {
- "pagePath": "pages/my/index",
- "text": "我的",
- "iconPath": "static/workSpace.png",
- "selectedIconPath": "static/workSpaceSelected.png"
- }
- ]
- },
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
- }
-}
\ No newline at end of file
+ "pages": [
+ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+ // {
+ // "path": "pages/index/index",
+ // "style": {
+ // "navigationBarTitleText": "uni-app"
+ // }
+ // },
+ // 首页
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationBarTitleText": "登录"
+ }
+ },
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "首页"
+ }
+ },
+ {
+ "path": "pages/face/index",
+ "style": {
+ "navigationBarTitleText": "人脸录入",
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ },
+ {
+ "path": "pages/clock/index",
+ "style": {
+ "navigationBarTitleText": "考勤打卡",
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ },
+ // 我的
+ {
+ "path": "pages/my/index",
+ "style": {
+ "navigationBarTitleText": "我的"
+ }
+ },
+ // 出差报备
+ {
+ "path": "pages/evection/index",
+ "style": {
+ "navigationBarTitleText": "出差报备"
+ }
+ },
+ // 报备记录列表
+ {
+ "path": "pages/evection/recordList",
+ "style": {
+ "navigationBarTitleText": "报备记录"
+ }
+ },
+ // 报备记录列表
+ {
+ "path": "pages/evection/details",
+ "style": {
+ "navigationBarTitleText": "出差报备详情"
+ }
+ },
+ // 休假报备
+ {
+ "path": "pages/holiday/index",
+ "style": {
+ "navigationBarTitleText": "休假报备"
+ }
+ },
+ // 报备记录列表
+ {
+ "path": "pages/holiday/recordList",
+ "style": {
+ "navigationBarTitleText": "报备记录"
+ }
+ },
+ // 报备记录列表
+ {
+ "path": "pages/holiday/details",
+ "style": {
+ "navigationBarTitleText": "休假报备详情"
+ }
+ },
+ //修改密码
+ {
+ "path": "pages/password/index",
+ "style": {
+ "navigationBarTitleText": "修改密码"
+ }
+ },
+ {
+ "path": "pages/panel/index",
+ "style": {
+ "navigationBarTitleText": "面板",
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ },
+ {
+ "path": "pages/clock/detail",
+ "style": {
+ "navigationBarTitleText": "人脸考勤",
+ "navigationBarBackgroundColor": "#ffffff"
+ }
+ },
+ // 轮休申请
+ {
+ "path": "pages/stagger-holidays/index",
+ "style": {
+ "navigationBarTitleText": "轮休申请"
+ }
+ },
+ // 临时外出申请
+ {
+ "path": "pages/temporary-outing/index",
+ "style": {
+ "navigationBarTitleText": "临时外出申请"
+ }
+ }
+ ],
+ "tabBar": {
+ "color": "#2c2c2c",
+ "selectedColor": "#1296db",
+ "borderStyle": "black",
+ "backgroundColor": "#FFFFFF",
+ "iconWidth": "24px",
+ "list": [
+ {
+ "pagePath": "pages/index/index",
+ "text": "首页",
+ "iconPath": "static/home.png",
+ "selectedIconPath": "static/homeSelected.png"
+ },
+ {
+ "pagePath": "pages/my/index",
+ "text": "我的",
+ "iconPath": "static/workSpace.png",
+ "selectedIconPath": "static/workSpaceSelected.png"
+ }
+ ]
+ },
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "uni-app",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "backgroundColor": "#F8F8F8"
+ }
+}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 9910f70..6a7bd4a 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,217 +1,233 @@
-
-
-
-
-
- {{userInfo.name}}
- {{userInfo.phone}}
-
-
+
+
+
+
+
+ {{ userInfo.name }}
+ {{ userInfo.phone }}
+
+
-
-
-
-
+
+
+
+
-
-
- 申请报备
-
-
-
- 出差报备
-
-
-
- 休假报备
-
-
-
+
+
+ 申请报备
+
+
+
+ 出差报备
+
+
+
+ 休假报备
+
+
+
+ 轮休申请
+
+
+
+ 临时外出申请
+
+
+
-
-
- 考勤打卡
-
-
-
- 考勤打卡
-
-
-
-
+
+
+ 考勤打卡
+
+
+
+ 考勤打卡
+
+
+
+
-
\ No newline at end of file
+ .grid-item:nth-child(2n) {
+ margin-right: 0;
+ }
+ }
+ }
+
+ .centered-text {
+ text-align: center;
+ display: block;
+ }
+
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index e9141f1..8c24d8a 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -1,440 +1,454 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
+
-
+
-
-
-
+
+
+
-
- {{version}}
-
+
+ {{ version }}
+
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index 052713d..ae26160 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -1,260 +1,271 @@
-
-
-
-
-
- {{userInfo.name}}
- {{userInfo.phone}}
-
-
+
+
+
+
+
+ {{ userInfo.name }}
+ {{ userInfo.phone }}
+
+
-
-
-
+
+
diff --git a/src/pages/stagger-holidays/details.vue b/src/pages/stagger-holidays/details.vue
new file mode 100644
index 0000000..cfea40b
--- /dev/null
+++ b/src/pages/stagger-holidays/details.vue
@@ -0,0 +1,241 @@
+
+
+
+
+ 姓名
+
+
+
+
+ 休假类型
+
+
+
+
+ 休假开始时间
+
+
+
+
+ 休假结束时间
+
+
+
+
+ 休假时长(天)
+
+
+
+
+ 地点
+
+
+
+
+ 是否请示领导同意
+
+
+
+
+ 代理主持工作人员
+
+
+
+
+ 休假事由
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/stagger-holidays/index.vue b/src/pages/stagger-holidays/index.vue
new file mode 100644
index 0000000..55d28f8
--- /dev/null
+++ b/src/pages/stagger-holidays/index.vue
@@ -0,0 +1,659 @@
+
+
+
+
+
+ 轮休申请
+
+
+ 轮休记录
+
+
+
+
+
+
+ 请确认填写信息是否准确,保存后不可修改;若修改可联系相关工作人员在统计报表核对时修改
+
+
+
+ 申请人
+
+ {{ errors.userName }}
+
+
+ 职务
+
+
+
+ 所属部门
+
+
+
+
+ 休假类型
+
+
+ {{ formData.leaveType ? formData.leaveType : '请选择休假类型' }}
+
+
+ {{ errors.leaveType }}
+
+
+
+ 轮休开始时间
+
+ {{ formData.leaveStartDate }}
+
+
+ {{ errors.leaveStartDate }}
+
+
+
+
+ 轮休结束时间
+
+ {{ formData.leaveEndDate }}
+
+
+ {{ errors.leaveEndDate }}
+
+
+
+
+ 休假时长(天)
+
+
+
+
+
+
+ 是否请示领导同意
+
+
+
+
+
+
+
+
+ 代理主持工作人员
+
+
+ {{ hostUserNames }}
+
+
+ {{ isCheckboxGroupVisibles ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/stagger-holidays/recordList.vue b/src/pages/stagger-holidays/recordList.vue
new file mode 100644
index 0000000..78442a5
--- /dev/null
+++ b/src/pages/stagger-holidays/recordList.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+ 休假类型:
+ {{ record.leaveType }}
+
+
+ 休假开始时间:
+ {{ record.leaveStartDate }}
+
+
+ 休假结束时间:
+ {{ record.leaveEndDate }}
+
+
+ 休假时长:
+ {{ record.leaveDuration }}天
+
+
+
+ 详情
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/temporary-outing/details.vue b/src/pages/temporary-outing/details.vue
new file mode 100644
index 0000000..cfea40b
--- /dev/null
+++ b/src/pages/temporary-outing/details.vue
@@ -0,0 +1,241 @@
+
+
+
+
+ 姓名
+
+
+
+
+ 休假类型
+
+
+
+
+ 休假开始时间
+
+
+
+
+ 休假结束时间
+
+
+
+
+ 休假时长(天)
+
+
+
+
+ 地点
+
+
+
+
+ 是否请示领导同意
+
+
+
+
+ 代理主持工作人员
+
+
+
+
+ 休假事由
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/temporary-outing/index.vue b/src/pages/temporary-outing/index.vue
new file mode 100644
index 0000000..b5d4639
--- /dev/null
+++ b/src/pages/temporary-outing/index.vue
@@ -0,0 +1,666 @@
+
+
+
+
+
+ 外出申请
+
+
+ 外出记录
+
+
+
+
+
+
+ 请确认填写信息是否准确,保存后不可修改;若修改可联系相关工作人员在统计报表核对时修改
+
+
+
+ 申请人
+
+ {{ errors.userName }}
+
+
+ 职务
+
+ {{ errors.userName }}
+
+
+ 所属部门
+
+ {{ errors.userName }}
+
+
+
+
+
+ 外出开始时间
+
+ {{ formData.leaveStartDate }}
+
+
+ {{ errors.leaveStartDate }}
+
+
+
+
+ 外出结束时间
+
+ {{ formData.leaveEndDate }}
+
+
+ {{ errors.leaveEndDate }}
+
+
+
+
+ 外出时长(天)
+
+
+
+
+ 地点
+
+
+
+
+ 是否请示领导同意
+
+
+
+
+
+
+
+
+ 代理主持工作人员
+
+
+ {{ hostUserNames }}
+
+
+ {{ isCheckboxGroupVisibles ? '收起' : '展开' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 休假事由
+
+
+ {{ errors.leaveReason }}
+
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/temporary-outing/recordList.vue b/src/pages/temporary-outing/recordList.vue
new file mode 100644
index 0000000..35721bc
--- /dev/null
+++ b/src/pages/temporary-outing/recordList.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+ 休假类型:
+ {{ record.leaveType }}
+
+
+ 休假开始时间:
+ {{ record.leaveStartDate }}
+
+
+ 休假结束时间:
+ {{ record.leaveEndDate }}
+
+
+ 休假时长:
+ {{ record.leaveDuration }}天
+
+
+
+
+ 详情
+ 修改
+ 删除
+
+
+
+
+
+
+
+
diff --git a/src/static/go_out.png b/src/static/go_out.png
new file mode 100644
index 0000000..ef31d24
Binary files /dev/null and b/src/static/go_out.png differ
diff --git a/src/static/lx_icon.png b/src/static/lx_icon.png
new file mode 100644
index 0000000..7286efc
Binary files /dev/null and b/src/static/lx_icon.png differ