diff --git a/public/css/vc.css b/public/css/vc.css index d9daee9d6..64b15e327 100644 --- a/public/css/vc.css +++ b/public/css/vc.css @@ -194,6 +194,14 @@ padding-right: 0; } +.padding-r-0 { + padding-right: 0; +} + +.padding-l-0 { + padding-left: 0; +} + .padding-xs { padding: 5px; } @@ -344,6 +352,10 @@ padding-bottom: 25px; } +.border { + border: 1px solid #e7eaec; +} + .border-right { border-right: 1px solid #e7eaec; } diff --git a/public/pages/property/staffAttendanceManage/staffAttendanceManage.html b/public/pages/property/staffAttendanceManage/staffAttendanceManage.html new file mode 100644 index 000000000..ecf8b6417 --- /dev/null +++ b/public/pages/property/staffAttendanceManage/staffAttendanceManage.html @@ -0,0 +1,33 @@ +
+
+
+
+ +
+
+ +
+
+
    + +
  • + {{item.name}} +
    • +
+
+
+
+
+
+
{{staffAttendanceManageInfo.curYear}}-{{staffAttendanceManageInfo.curMonth}}-{{index}}
+
考勤状态：{{_getAttendanceState(index)}}
+
考勤时间：
+
考勤时间：
+
+
+
+
+ + + +
\ No newline at end of file diff --git a/public/pages/property/staffAttendanceManage/staffAttendanceManage.js b/public/pages/property/staffAttendanceManage/staffAttendanceManage.js new file mode 100644 index 000000000..300cdd9bc --- /dev/null +++ b/public/pages/property/staffAttendanceManage/staffAttendanceManage.js @@ -0,0 +1,74 @@ +/** + 入驻小区 + **/ +(function(vc) { + var DEFAULT_PAGE = 1; + var DEFAULT_ROWS = 10; + vc.extends({ + data: { + staffAttendanceManageInfo: { + staffs: [], + classesId: '', + orgId: '', + orgName: '', + curDate: vc.dateFormat(new Date()), + curYear: '', + curMonth: '', + maxDay: '', + } + }, + _initMethod: function() { + vc.component._loadStaffs(); + $that.initStaffDate(); + }, + _initEvent: function() { + vc.on('monthAttendanceManage', 'listMonthAttendance', function(_param) { + vc.component._listMonthAttendances(DEFAULT_PAGE, DEFAULT_ROWS); + }); + vc.on('pagination', 'page_event', function(_currentPage) { + vc.component._listMonthAttendances(_currentPage, DEFAULT_ROWS); + }); + }, + methods: { + _loadStaffs: function() { + let param = { + params: { + page: 1, + row: 100, + orgId: $that.staffAttendanceManageInfo.orgId, + } + } + vc.http.apiGet('/query.staff.infos', + param, + function(json) { + let _staffInfo = JSON.parse(json); + // 员工列表 和 岗位列表匹配 + let staffList = _staffInfo.staffs; + $that.staffAttendanceManageInfo.staffs = staffList; + + }, + function() { + console.log('请求失败处理'); + } + ); + }, + initStaffDate: function() { + let _date = new Date($that.staffAttendanceManageInfo.curDate); + $that.staffAttendanceManageInfo.curMonth = _date.getMonth() + 1 + $that.staffAttendanceManageInfo.curYear = _date.getFullYear(); + $that.staffAttendanceManageInfo.maxDay = new Date(_date.getFullYear(), _date.getMonth() + 1, 0).getDate(); + }, + _getAttendanceState: function() { + + }, + _getBgColor: function(_curDay) { + + return "#fff" + }, + + _staffAttendanceChangeOrg: function() { + + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/todayAttendanceManage/todayAttendanceManage.html b/public/pages/property/todayAttendanceManage/todayAttendanceManage.html index a9848596d..7fbae13e7 100755 --- a/public/pages/property/todayAttendanceManage/todayAttendanceManage.html +++ b/public/pages/property/todayAttendanceManage/todayAttendanceManage.html @@ -11,32 +11,33 @@
- +
- +
- +
- -
+
+
+
+ +
+
+
@@ -52,39 +53,38 @@
- - - - - - - - + + + + + + + + - - - - - - - + + + + + + - + + + - - - + + +
{{attendance.classObjName}}{{attendance.staffName}}{{attendance.classesName}} - {{attendance.taskYear+'-'+attendance.taskMonth+'-'+attendance.taskDay}} - {{attendance.stateName}} -
-
{{attendance.classObjName}}{{attendance.staffName}}{{attendance.classesName}} + {{attendance.taskYear+'-'+attendance.taskMonth+'-'+attendance.taskDay}} + {{attendance.stateName}} +
+ -
-
-
    -
    +
      +
      @@ -94,4 +94,4 @@
      - + \ No newline at end of file diff --git a/public/pages/property/todayAttendanceManage/todayAttendanceManage.js b/public/pages/property/todayAttendanceManage/todayAttendanceManage.js index 057cd4da0..c79671863 100755 --- a/public/pages/property/todayAttendanceManage/todayAttendanceManage.js +++ b/public/pages/property/todayAttendanceManage/todayAttendanceManage.js @@ -1,7 +1,7 @@ /** 入驻小区 **/ -(function (vc) { +(function(vc) { var DEFAULT_PAGE = 1; var DEFAULT_ROWS = 10; vc.extends({ @@ -15,24 +15,25 @@ conditions: { classesName: '', departmentName: '', - date: vc.dateFormat(new Date()) + date: vc.dateFormat(new Date()), + staffName: '' } } }, - _initMethod: function () { + _initMethod: function() { vc.component._listTodayAttendances(DEFAULT_PAGE, DEFAULT_ROWS); vc.component._initDate(); }, - _initEvent: function () { - vc.on('todayAttendanceManage', 'listTodayAttendance', function (_param) { + _initEvent: function() { + vc.on('todayAttendanceManage', 'listTodayAttendance', function(_param) { vc.component._listTodayAttendances(DEFAULT_PAGE, DEFAULT_ROWS); }); - vc.on('pagination', 'page_event', function (_currentPage) { + vc.on('pagination', 'page_event', function(_currentPage) { vc.component._listTodayAttendances(_currentPage, DEFAULT_ROWS); }); }, methods: { - _initDate: function () { + _initDate: function() { $(".queryDate").datetimepicker({ language: 'zh-CN', fontAwesome: 'fa', @@ -43,7 +44,7 @@ todayBtn: true }); $('.queryDate').datetimepicker() - .on('changeDate', function (ev) { + .on('changeDate', function(ev) { var value = $(".queryDate").val(); vc.component.todayAttendanceManageInfo.conditions.date = value; }); @@ -54,7 +55,7 @@ e.currentTarget.blur(); } }, - _listTodayAttendances: function (_page, _rows) { + _listTodayAttendances: function(_page, _rows) { vc.component.todayAttendanceManageInfo.conditions.page = _page; vc.component.todayAttendanceManageInfo.conditions.row = _rows; var param = { @@ -65,7 +66,7 @@ //发送get请求 vc.http.apiGet('/attendanceClass/queryAttendanceClassesTask', param, - function (json, res) { + function(json, res) { var _todayAttendanceManageInfo = JSON.parse(json); vc.component.todayAttendanceManageInfo.total = _todayAttendanceManageInfo.total; vc.component.todayAttendanceManageInfo.records = _todayAttendanceManageInfo.records; @@ -75,26 +76,27 @@ dataCount: vc.component.todayAttendanceManageInfo.total, currentPage: _page }); - }, function (errInfo, error) { + }, + function(errInfo, error) { console.log('请求失败处理'); } ); }, - _openAttendanceDetailModel: function (_attendance) { + _openAttendanceDetailModel: function(_attendance) { vc.emit('todayAttendanceDetail', 'openTodayAttendanceDetail', _attendance); }, //查询 - _queryTodayAttendanceMethod: function () { + _queryTodayAttendanceMethod: function() { vc.component._listTodayAttendances(DEFAULT_PAGE, DEFAULT_ROWS); }, //重置 - _resetTodayAttendanceMethod: function () { + _resetTodayAttendanceMethod: function() { vc.component.todayAttendanceManageInfo.conditions.classesName = ""; vc.component.todayAttendanceManageInfo.conditions.departmentName = ""; vc.component.todayAttendanceManageInfo.conditions.date = vc.dateFormat(new Date()); vc.component._listTodayAttendances(DEFAULT_PAGE, DEFAULT_ROWS); }, - _moreCondition: function () { + _moreCondition: function() { if (vc.component.todayAttendanceManageInfo.moreCondition) { vc.component.todayAttendanceManageInfo.moreCondition = false; } else { @@ -103,4 +105,4 @@ } } }); -})(window.vc); +})(window.vc); \ No newline at end of file