Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_xcx into dev

Component/selectDate_two/selectDate_two.acss

@@ -24,7 +24,7 @@
     height: 100%;
 }
 .selectDateType{
-  width: 300rpx;
+  width: 400rpx;
   margin: 0rpx auto;
   border: 1px solid #26a2ff;
   border-radius: 6rpx;

Component/selectDate_two/selectDate_two.axml

@@ -11,6 +11,7 @@
         <view 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 data-index="3"  class="{{dateIndex == '3' ? 'dateActive':''}} flex-1" catchTap="activeDate">月</view>
+        <view data-index="4"  class="{{dateIndex == '4' ? 'dateActive':''}} flex-1" catchTap="activeDate">自定义</view>
       </block>
     </view>
     <view class="data-main">
@@ -36,6 +37,23 @@
           <!--<text class="dateVal" onTap="selectDay2">{{jdji}}</text> -->
         </view>
       </block>
+
+      
+      <block a:if="{{dateIndex=='4'}}">
+        <text data-index="customIndOn" class="dateVal" onTap="customDate">{{customIndOn}}</text>
+        <text class="fontColorT" style="margin:0 20rpx;">--</text>
+        <text data-index="customIndTw" class="dateVal" onTap="customDate">{{customIndTw}}</text>
+        <!-- <view class="flex-box flex-center-center">
+          <picker onChange="selectYear2" value="{{customIndOn}}" range="{{customArr}}">
+            <view class="dateVal">{{customArr[customInd]}}</view>
+          </picker>
+          <text class="fontColorT" style="margin:0 20rpx;">--</text>
+          <picker onChange="setjdji" value="{{customIndOnTw}}" range="{{customArr}}">
+            <view class="dateVal">{{customArr[jdji]}}</view>
+          </picker>
+        </view> -->
+      </block>
+
     </view>
     <view class="flex-box date-btn">
       <view class="flex-1" catchTap="onClose">取消</view>

Component/selectDate_two/selectDate_two.js

@@ -10,6 +10,7 @@ Component({
   mixins: [],
   data: {
     dateIndex: "1",
+    day: app.globalData.day,//日
     year: app.globalData.year,//年
     month: app.globalData.month,//月
     jdYear: app.globalData.year,//季度年
@@ -20,6 +21,9 @@ Component({
     jdYearIndex:yearIndex,
     isShowArr:[true,true,true],
     showSelect:false,
+    customIndOn: app.globalData.day,
+    customIndTw: app.globalData.day,
+    // custom: '',
   },
   props: {
     onClose: (data) => console.log(data),
@@ -56,6 +60,11 @@ Component({
           this.setData({
             jdji:data.substr(data.length-1,1)-1
           })
+      }else if(this.props.dateObj.type==4){
+          this.setData({
+            customIndOn: this.props.dateObj.date.start_date,
+            customIndTw: this.props.dateObj.date.end_date,
+          })
       }else{
           this.setData({
             month:this.props.dateObj.date,
@@ -109,6 +118,27 @@ Component({
             date: this.data.month
           }
           break
+        case "4":
+          function tsTamp(ydm) {
+            return new Date(ydm).getTime()
+          }
+          let timeC = (tsTamp(this.data.customIndOn) - tsTamp(this.data.customIndTw)) / (60 * 60 * 24 * 1000)
+          if(timeC > 0){
+            app.globalData.showToast("开始时间不能大于结束时间")
+            return
+          }
+          if(Math.abs(timeC) > 31) {
+            app.globalData.showToast("自定义事件区间不能大于一个月")
+            return
+          }
+          obj = {
+            type: this.data.dateIndex,
+            date: {
+              start_date: this.data.customIndOn,
+              end_date: this.data.customIndTw
+            }
+          }
+          break
       };
       this.props.onConfirm(obj);
       this.props.onClose();
@@ -142,6 +172,21 @@ Component({
         },
       });
     },
+    customDate(e) {
+      console.log(e)
+      let cust = e.target.dataset.index
+      dd.datePicker({
+        format: 'yyyy-MM-dd',
+        currentDate: this.data[cust],
+        success : res =>{
+          console.log(res)
+          this.setData({
+            [cust]: res.date
+          })
+        },
+      })
+    },
+    
     activeDate(e) {
       this.setData({ dateIndex: e.target.dataset.index })
     },

pages/statistics/sectionRanking/sectionRanking.js

@@ -50,6 +50,9 @@ Page({
       data.year=that.data.year;
     }else if(that.data.dateIndex=='2'){
       data.quarter=that.data.quarter
+    }else if(that.data.dateIndex=='4'){
+      data.start_date=that.data.custom.start_date
+      data.end_date=that.data.custom.end_date
     }else{
       data.month=that.data.month||app.globalData.month;
     }
@@ -129,6 +132,12 @@ Page({
         quarter: data.date,
         dateIndex:data.type
       })
+    } else if(data.type == '4'){
+      this.setData({
+        selectDateVal: data.date.start_date + '--' + data.date.end_date,
+        custom: data.date,
+        dateIndex:data.type
+      })
     }else{
        this.setData({
         selectDateVal: data.date,

pages/workbench/apply/apply.axml

@@ -14,15 +14,15 @@
         <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;" data-index="{{index}}">
           <view class="label">指定规则</view>
           <view class="flex-1"></view>
-          <switch onChange="switchChange" disabled checked="{{ruleOnoff}}" data-index="{{index}}" color="#26A2FF"></switch>
+          <switch onChange="switchChange" disabled="{{ruleOnoff}}"  checked="{{item.checked}}" data-index="{{index}}" color="#26A2FF"></switch>
         </view>
-        <view class="flex-box flex-v-ce li" a:if="{{ruleOnoff}}" data-ruleId="{{item.selectRule.id}}" data-index="{{index}}" data-num="1" catchTap="openSelect">
+        <view class="flex-box flex-v-ce li" a:if="{{item.checked}}" data-ruleId="{{item.selectRule.id}}" data-index="{{index}}" data-num="1" catchTap="openSelect">
           <view class="label isBt">选择规则</view>
           <view class="flex-1" a:if="{{item.selectRule}}">已选择1条</view>
           <view class="flex-1" a:else></view>
           <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
         </view>
-        <view a:if="{{item.selectRule&&ruleOnoff}}" class="selectRule">
+        <view a:if="{{item.selectRule&&item.checked}}" class="selectRule">
           <view class="flex-box flex-v-ce">
               <view  a:if="{{item.selectRule.range_type=='1'}}">
                 <text class="red" a:if="{{item.selectRule.min_point>0}}">{{item.selectRule.min_point}}</text>

pages/workbench/apply/apply.js

@@ -342,7 +342,6 @@ Page({
 
   formSubmit() {
     var items = this.data.items;
-    var ruleOnoff = this.data.ruleOnoff
     var arr = [];
     var isTg = true;
     for (var i = 0; i < items.length; i++) {
@@ -359,14 +358,14 @@ Page({
         break;
       }
       obj.employee_id = item.employee_id;
-      if (ruleOnoff) {
+      if (item.checked) {
         obj.rule_id = item.selectRule ? item.selectRule.rule_id : 0;
         obj.item_id = item.selectRule ? item.selectRule.id : 0;
       } else {
         obj.rule_id = 0;
         obj.item_id = 0;
       }
-      if (ruleOnoff) {
+      if (item.checked) {
         if (!obj.rule_id) {
           app.globalData.showToast(`第${i + 1}项必须选择规则`);
           isTg = false;

pages/workbench/jk_B/jk_B.axml

@@ -18,9 +18,9 @@
         <view class="flex-box flex-v-ce li border-bottom" style="padding:26rpx 28rpx;" data-index="{{index}}">
           <view class="label">指定规则</view>
           <view class="flex-1"></view>
-          <switch onChange="switchChange" disabled checked="{{ruleOnoff}}" data-index="{{index}}" color="#26A2FF"></switch>
+          <switch onChange="switchChange" disabled="{{ruleOnoff}}" checked="{{item.checked}}" data-index="{{index}}" color="#26A2FF"></switch>
         </view>
-        <view class="flex-box flex-v-ce li" a:if="{{ruleOnoff}}" data-ruleId="{{item.item_id}}" data-index="{{index}}" data-num="1" catchTap="openSelect">
+        <view class="flex-box flex-v-ce li" a:if="{{item.checked}}" data-ruleId="{{item.item_id}}" data-index="{{index}}" data-num="1" catchTap="openSelect">
           <view class="label isBt">选择规则</view>
           <view class="flex-1" a:if="{{item.selectRule}}">已选择1条</view>
           <view class="flex-1" a:else></view>
@@ -32,7 +32,7 @@
           <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
         </view>
 
-        <view class="flex-box li" style="padding:15rpx 28rpx;" a:if="{{ruleOnoff}}">
+        <view class="flex-box li" style="padding:15rpx 28rpx;" a:if="{{item.checked}}">
           <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
           <text class="red" style="position: relative;top:8rpx;" a:if="{{item.isArrindex==true}}">+</text>
           <text class="green" a:else style="position: relative;top:8rpx;">-</text>

pages/workbench/jk_B/jk_B.js

@@ -353,7 +353,6 @@ Page({
   },
   formSubmit() {
     var items = this.data.items;
-    var ruleOnoff = this.data.ruleOnoff
     var userData = this.data.users;
     var arr = [];
     var isTg = true;
@@ -365,9 +364,9 @@ Page({
     for (var i = 0; i < items.length; i++) {
       var obj = {};
       var item = items[i];
-      var num = ruleOnoff ? item.point : item.point2
+      var num = item.checked ? item.point : item.point2
       var point;
-      if (ruleOnoff) {
+      if (item.checked) {
         if (item.isArrindex != true) {
           point = 0 - num;
         } else {
@@ -384,7 +383,7 @@ Page({
           point = num;
         }
       }
-      if (ruleOnoff) {
+      if (item.checked) {
         if (!item.rule_id) {
           this.showToast(`第${i + 1}条请选择规则`);
           isTg = false;
@@ -408,8 +407,8 @@ Page({
         isTg = false;
         break;
       }
-      obj.rule_id = ruleOnoff ? item.rule_id : item.rule_id2;
-      obj.item_id = ruleOnoff ? item.item_id : 0;
+      obj.rule_id = item.checked ? item.rule_id : item.rule_id2;
+      obj.item_id = item.checked ? item.item_id : 0;
       obj.point = point;
       obj.remark = item.remark;
       obj.event_time = item.event_time;