提交

Component/selectDate/selectDate.axml

@@ -2,8 +2,8 @@
   <view class="data-tier" catchTap="onClose"></view>
   <view class="date-header {{isShow?'showPop':''}}" >
     <view class="flex-box selectDateType">
-      <view data-index="1" class="{{dateIndex == 1 ? 'dateActive':''}} flex-1" catchTap="activeDate">月</view>
-      <view a:if="{{notDate}}" data-index="2" class="{{dateIndex == 2 ? 'dateActive':''}} flex-1" catchTap="activeDate">日</view>
+      <view a:if="{{notDate}}" data-index="1" class="{{dateIndex == 1 ? 'dateActive':''}} flex-1" catchTap="activeDate">月</view>
+      <view data-index="2" class="{{dateIndex == 2 ? 'dateActive':''}} flex-1" catchTap="activeDate">日</view>
     </view>
     <view class="data-main">
         <block a:if="{{dateIndex==1}}">

Component/selectDate/selectDate.js

@@ -16,6 +16,11 @@ Component({
     notDate:true,
   },
   didMount() {
+    if(!this.props.defaultDate){
+           this.setData({
+              dateIndex:"2",
+          })
+    }
     if(this.props.defaultDate.type==1){
           this.setData({
               dateIndex:"1",

Component/selectDate_two/selectDate_two.js

@@ -1,5 +1,11 @@
 var app = getApp()
-var that;
+var that,yearIndex;
+// 设置默认年份
+app.globalData.yearArr.forEach((item,index)=>{
+    if(item==app.globalData.year){
+     yearIndex=index
+  }
+})
 Component({
   mixins: [],
   data: {
@@ -9,7 +15,7 @@ Component({
     jdYear: app.globalData.year,//季度年
     jdji: 0,//季度季
     jdArr: ['一季度', '二季度', '三季度', '四季度'],
-    yearIndex:0,
+    yearIndex:yearIndex,
     yearArr:app.globalData.yearArr,
     jdYearIndex:0,
   },

Component/selectSectionStaff/selectSectionStaff.axml

@@ -58,10 +58,6 @@
         <image a:if="{{item.img_url}}" class="img-url" style="width:70rpx;height:70rpx;display: inline-block;  position: relative;top: 6rpx;" src="{{item.img_url}}"></image>
         <view a:else style="width: 70rpx;height: 70rpx;border-radius: 100%;background: #26A2FF;color: #fff;text-align: center;line-height: 70rpx;font-size: 24rpx;">{{item.name.substr(item.name.length-2)}}</view>
       </view>
-      <view a:for="{{selectUserId}}" style="margin-right:10rpx;">
-        <image a:if="{{item.img_url}}" class="img-url" style="width:70rpx;height:70rpx;display: inline-block;  position: relative;top: 6rpx;" src="{{item.img_url}}"></image>
-        <view a:else style="width: 70rpx;height: 70rpx;border-radius: 100%;background: #26A2FF;color: #fff;text-align: center;line-height: 70rpx;font-size: 24rpx;">{{item.name.substr(item.name.length-2)}}</view>
-      </view>
     </view>
     <view class="staffBtn" onTap="onConfirm">确定</view>
   </view>

pages/deploy/setCheck/setCheck.axml

@@ -1,12 +1,12 @@
 <view>
   <view class="yellow">以下分数皆为B分，请前往电脑端（PC）钉钉设置</view>
   <view class="ul margin-bottom">
-    <view class="flex-box li">
+    <!-- <view class="flex-box li">
       <view class="li-left">
         <view>月度全勤</view>
         <view >当月加分{{data.month_full_ad}}分</view>
       </view>
-    </view>
+    </view> -->
     <view class="flex-box li">
       <view class="li-left">
         <view>正常打卡</view>
@@ -41,18 +41,14 @@
       </view>
     </view>
   </view>
-  <!-- <view class="ul margin-bottom">
+  <view class="ul margin-bottom">
     <view class="flex-box li">
       <view class="li-left">
         <view>加班</view>
-        <view>每小时加{{data.ot_per_hour}}分</view>
-      </view>
-    </view>
-    <view class="flex-box li">
-      <view class="li-left">
-        <view>请假</view>
-        <view>每小时扣{{data.leave_per_hour}}分</view>
+        <view>每满一天加{{data.ot_per_day}}分</view>
       </view>
     </view>
-  </view> -->
+  </view>
+  <!--<view class="flex-box li"><view class="li-left"><view>加班</view><view>每小时加{{data.ot_per_hour}}分</view></view></view><view class="flex-box li"><view class="li-left"><view>请假</view><view>每小时扣{{data.leave_per_hour}}分</view></view></view> -->
+</view>
 </view>

pages/statistics/checkDetail/checkDetail.js

@@ -5,8 +5,7 @@ Page({
   data: {
     showRuleTwo: false,//显示规则组件
     ruleVal: "规则分类",
-
-    page:1,
+    page: 1,
   },
   onLoad(e) {
     that = this;
@@ -21,7 +20,7 @@ Page({
       this.getData();
     }
   },
-    //上啦加载
+  //上啦加载
   onScrollToLower() {
     if (!that.data.isData) {
       this.setData({ page: ++that.data.page })
@@ -29,10 +28,39 @@ Page({
     }
   },
   getData(is) {
-    var item=this.data.item;
-    item.page=this.data.page;
-    item.page_size="10";
-    app.$post('api/ad/event',item).then((res) => {
+    var item = this.data.item;
+    console.log(item);
+    //条件选择 0-全部 1-迟到 2-早退 6-准时打卡 20-上班缺卡 21-下班缺卡 16-加班 10-缺勤
+    // type-1 总分，type-2早到，type-3迟到，4-加班, 8-早退， 9-缺卡，10-缺勤 6-奖分 7-扣分
+    switch (item.type) {
+      case 0:
+        item.type = 1;
+        break
+      case 1:
+        item.type = 3;
+        break
+      case 2:
+        item.type = 8;
+        break
+      case 6:
+        item.type = 2;
+        break
+      case 20:
+        item.type = 9;
+        break
+      case 21:
+        item.type = 12;
+        break
+      case 16:
+        item.type = 4;
+        break
+      case 10:
+        item.type = 10;
+      break    
+    }
+    item.page = this.data.page;
+    item.page_size = "10";
+    app.$post('api/ad/event', item).then((res) => {
       var data = res.data.data.list;
       if (is) {
         if (data.length == 0) {
@@ -54,7 +82,7 @@ Page({
       }
     })
   },
-    //显示规则组件
+  //显示规则组件
   selectRule() {
     this.setData({
       showRuleTwo: true

pages/statistics/check_top/check_top.js

@@ -4,24 +4,25 @@ var that;
 Page({
   data: {
     date: app.globalData.month,
-    minuteIndex: 0,//条件选择
+    minuteIndex: 0,//条件选择 0-全部 1-迟到 2-早退 6-准时打卡 20-上班缺卡 21-下班缺卡 16-加班 10-缺勤
     minuteArray: [
-      { id: 1, name: '总分' },
-      // { id: 2, name: '早退' },
-      // { id: 3, name: '迟到' },
-      // { id: 4, name: '加班' },
-      // { id: 5, name: '请假' },
-      // { id: 8, name: '早退' },
-      // { id: 9, name: '缺卡' },
-      // { id: 10, name: '缺勤' },
+      { id: 0, name: '总分' },
+      { id: 1, name: '迟到' },
+      { id: 2, name: '早退' },
+      { id: 6, name: '准时打卡' },
+      { id: 20, name: '上班缺卡' },
+      { id: 21, name: '下班缺卡' },
+      { id: 16, name: '加班' },
+      { id: 10, name: '缺勤' },
     ],
     showDate: false,//是否显示时间组件
-    selectDateVal: '本月',
+    selectDateVal: '时间范围',
     TisrrIndex: 0,//条件选择
     page: 1,
-    date_type: 3,
     getData: '',
     tisrrArr:[],
+    dateObj:[],
+    defaultDate:{type:"2",date:[app.globalData.day,app.globalData.day]},
   },
   onLoad() {
     that = this;
@@ -32,16 +33,12 @@ Page({
     var item = e.target.dataset.item;
     var type = that.data.minuteArray[that.data.minuteIndex].id
     var obj={
-      employee_id:item.employee_id,
+      employee_id:item.id,
       type:type,
-      date_type:that.data.date_type,
       item:item,
-    }
-    if (that.data.date_type == 2) {
-      obj.start_date = that.data.dateObj[0];
-      obj.end_date = that.data.dateObj[1];
-    } else {
-      obj.month_date = that.data.dateObj || that.data.date;
+      date_type:'2',
+      start_date:that.data.dateObj[0],
+      end_date:that.data.dateObj[1],
     }
     dd.navigateTo({
       url: '../checkDetail/checkDetail?item='+JSON.stringify(obj),
@@ -50,18 +47,13 @@ Page({
   getData(is) {
     dd.showLoading();
     var data = {
-      type: that.data.minuteArray[that.data.minuteIndex].id,
-      date_type: that.data.date_type,
+      event_type: that.data.minuteArray[that.data.minuteIndex].id,
       page: that.data.page,
       page_size: 20,
+      start_date:that.data.dateObj[0]|| app.globalData.day,
+      end_date:that.data.dateObj[1]|| app.globalData.day,
       group_id:that.data.tisrrArr.length>0? that.data.tisrrArr[that.data.TisrrIndex].id:''
     }
-    if (that.data.date_type == 2) {
-      data.start_date = that.data.dateObj[0];
-      data.end_date = that.data.dateObj[1];
-    } else {
-      data.month_date = that.data.dateObj || that.data.date;
-    }
     app.$post('api/ad/rank', data).then((res) => {
       var data = res.data.data.list;
       dd.hideLoading();
@@ -98,9 +90,8 @@ Page({
     that.setData({
       defaultDate:data,
       dateObj: data.date,
-      date_type: data.type == 1 ? 3 : data.type,
       page: 1,
-      selectDateVal: data.type == 1 ? (data.date==that.data.date? '本月':'月') : '日',
+      selectDateVal: '时间范围',
     })
     this.getData();
   },
@@ -143,7 +134,7 @@ Page({
           arr.push({ id: k, name: data[k] })
         }
       // }
-      arr.unshift({id:'',name:'全部分组'})
+      // arr.unshift({id:'',name:'全部分组'})
       this.setData({
         tisrrArr: arr
       })

pages/statistics/index/index.axml

@@ -28,7 +28,7 @@
         <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
       </view>
     </view>
-    <view class="flex-box flex-v-ce li" data-index="5" onTap="openView">
+    <view class="flex-box flex-v-ce li" a-if="{{ding_enable}}" data-index="5" onTap="openView">
       <image class="img-left" mode="scaleToFill" src="../../../image/kq.png"></image>
       <view class="flex-box flex-v-ce flex-1 li-right border-bottom">
         <view class="title flex-1">考勤分排名</view>

pages/statistics/index/index.js

@@ -4,6 +4,7 @@ Page({
   data: {
     incidentList: [1, 2, 2, 2, 2, 2, 2, 2, 2],
     isAdministrator:false,//是否管理员角色
+    ding_enable:true,
   },
   onLoad(query) {
     that = this;
@@ -27,6 +28,13 @@ Page({
       url: urls[index].url+'?'+urls[index].query
     })
   },
+  getList() {
+    app.$get('api/ad/info').then((res) => {
+        this.setData({
+          ding_enable:res.data.data.ding_enable==1? true:false
+        })
+    })
+  },
   //打开更多
   openMore() {
 
@@ -35,6 +43,7 @@ Page({
     // 页面加载完成
   },
   onShow() {
+    this.getList();
     // 页面显示
   },
   onHide() {