diff --git a/src/components/CommonItemItem/CommonItem.vue b/src/components/CommonItemItem/CommonItem.vue
new file mode 100644
index 0000000..4412ef5
--- /dev/null
+++ b/src/components/CommonItemItem/CommonItem.vue
@@ -0,0 +1,56 @@
+
+
+
+ *
+ {{ text }}
+
+
+ {{ hint }}
+ {{ value }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/attendance-statistics/attendance-statistics.vue b/src/pages/attendance-statistics/attendance-statistics.vue
deleted file mode 100644
index e7206fa..0000000
--- a/src/pages/attendance-statistics/attendance-statistics.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-{
- layout: 'default',
- style: {
- navigationStyle: 'custom'
- }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/attendance-clockIn/attendance-clockIn.vue b/src/pages/attendance/AttendanceClockIn.vue
similarity index 92%
rename from src/pages/attendance-clockIn/attendance-clockIn.vue
rename to src/pages/attendance/AttendanceClockIn.vue
index 9de8137..b53c8d2 100644
--- a/src/pages/attendance-clockIn/attendance-clockIn.vue
+++ b/src/pages/attendance/AttendanceClockIn.vue
@@ -8,7 +8,6 @@
-
diff --git a/src/pages/attendance-set/attendance-set.vue b/src/pages/attendance/AttendanceSet.vue
similarity index 87%
rename from src/pages/attendance-set/attendance-set.vue
rename to src/pages/attendance/AttendanceSet.vue
index 2a1f00f..9d7863d 100644
--- a/src/pages/attendance-set/attendance-set.vue
+++ b/src/pages/attendance/AttendanceSet.vue
@@ -8,9 +8,11 @@
-
-
+
添加考勤组
@@ -77,10 +79,13 @@
icon: '/static/tabbar/home.png'
}
])
+ function goAddGroup() {
+ // todo goAddGroup
+ console.log('goAddGroup')
+ uni.navigateTo({
+ url: '/pages/attendance/attendance-add-group/attendance-add-group'
+ })
+ }
-
+
diff --git a/src/pages/attendance/AttendanceStatistics.vue b/src/pages/attendance/AttendanceStatistics.vue
new file mode 100644
index 0000000..f18f772
--- /dev/null
+++ b/src/pages/attendance/AttendanceStatistics.vue
@@ -0,0 +1,113 @@
+
+{
+ layout: 'default',
+ style: {
+ navigationStyle: 'custom'
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ new Date(teamDateTime).getFullYear() }}年{{ new Date(teamDateTime).getMonth() + 1 }}月
+
+
+ 查看/导出月报
+
+
+
+
+
+ 0/13
+ 打卡人数/应到人数
+
+
+ {{ item.value }}
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+ {{ new Date(teamDateTime).getFullYear() }}年{{ new Date(teamDateTime).getMonth() + 1 }}月
+
+
+ 查看月报
+
+
+
+
+
+
+ {{ new Date(myDateTime).getFullYear() }}年{{ new Date(myDateTime).getMonth() + 1 }}月{{
+ new Date(myDateTime).getDate()
+ }}日
+
+ 休息
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/attendance/attendance-add-group/attendance-add-group.vue b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
new file mode 100644
index 0000000..aa85ee2
--- /dev/null
+++ b/src/pages/attendance/attendance-add-group/attendance-add-group.vue
@@ -0,0 +1,58 @@
+
+{
+ layout: 'default',
+ style: {
+ navigationStyle: 'custom'
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
diff --git a/src/pages/attendance/attendance.vue b/src/pages/attendance/attendance.vue
index 881f1bb..755a32c 100644
--- a/src/pages/attendance/attendance.vue
+++ b/src/pages/attendance/attendance.vue
@@ -8,19 +8,21 @@
-
+
+
-
+