0.0

.kaitian/launch.json

@@ -1,9 +0,0 @@
-{
-  // 使用 IntelliSense 了解相关属性。 
-  // 悬停以查看现有属性的描述。
-  // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    
-  ]
-}

.mini-ide/compileMode.json

@@ -0,0 +1,8 @@
+{
+  "modes": [
+    {
+      "title": "日志分",
+      "page": "pages/statistics/log_rank/log_rank"
+    }
+  ]
+}

app.js

@@ -332,10 +332,5 @@ App({
     that.getTypes(function () { });
     that.getCorp(options.query.corpId);
     that.globalData.corpId = options.query.corpId;
-    
-    // dd.setTabBarBadge({
-    //   index: 0,
-    //   text: '新'
-    // })
   },
 });

app.json

@@ -58,7 +58,9 @@
     "pages/demo/demo",
     "pages/statistics/my_sp/my_sp",
     "pages/statistics/allTask/allTask",
-    "pages/deploy/buy/buy"
+    "pages/deploy/buy/buy",
+    "pages/statistics/log_rank/log_rank",
+    "pages/statistics/task_rank/task_rank"
   ],
   "window": {
     "defaultTitle": "功道云",
@@ -90,4 +92,4 @@
       }
     ]
   }
-}
+}

pages/deploy/buy/buy.acss

@@ -7,7 +7,7 @@
   left: 0;
   right: 0;
   bottom: 0;
-  background: #232d48;
+  background: #201C19;
   padding: 10rpx;
   /* border-top: 1px solid #f1f1f1; */
   box-sizing: border-box;
@@ -15,7 +15,7 @@
 .footer view{
   border-radius: 50rpx;
   background-image: linear-gradient(to bottom, #ffeab2 0%, #e1bf66 100%);
-  color: #232d48;
+  color: #201C19;
   height: 88rpx;
   text-align: center;
   line-height: 88rpx;
@@ -23,7 +23,7 @@
 .icon{
   width: 24rpx;
   height: 24rpx;
-  margin-right: 28rpx;
+  margin-right: 10rpx;
 }
 .msg{
   background: #FFF5CE;

pages/deploy/buy/buy.axml

@@ -1,8 +1,8 @@
 <view style="line-height: 0rpx;">
-  <view class="flex-box-ce flex-center-center msg" a:if="{{vipData.status==2}}">
-    <image mode="scaleToFill" class="icon" src="../../../image/xf.png"/>
+  <!-- <view class="flex-box-ce flex-center-center msg" a:if="{{vipData.status==2}}">
+    <image mode="scaleToFill" class="icon" src="../../../image/lb.png"/>
     <text>{{vipData.msg}}</text>     
-  </view>
+  </view> -->
   <image src="{{item}}" class="vip" mode='widthFix' a:for="{{vipData.banner}}"/>
   <view style="height:100rpx"></view>
   <view class="footer" onTap="openUrl">

pages/deploy/buy/buy.js

@@ -8,7 +8,7 @@ Page({
   },
   onLoad(e) {
     that = this;
-    dd.setNavigationBar({ title: "vip" });
+    dd.setNavigationBar({ title: "功道云尊享会员" });
     dd.setStorage({
       key: 'isShowNew',
       data: true,
@@ -26,6 +26,10 @@ Page({
   },
   //跳转
   openUrl() {
+    if(this.data.vipData.charge_type==1&&this.data.vipData.status==2){
+         app.globalData.showToast("你已是尊享会员，请勿重复购买");
+         return false;
+    }
     app.$get("api/order/goods/sku", { callback: "pages/deploy/sku/sku", goods_code: this.data.vipData.goods_code }).then((res) => {
       openLink({
           url: res.data.data.url

pages/deploy/index/index.axml

@@ -21,9 +21,10 @@
           <view class="xusj" data-index="1" onTap="openView">续费升级</view>
         </view>
       </view>
-      <view class="vip margin-bottom" a:if="{{vipData}}">
+      <view class="vip margin-bottom" a:if="{{vipData}}"  onTap="openView2">
         <image mode="scaleToFill" src="../../../image/vip.png"></image>
-        <view class="btn"  onTap="openView2">{{vipText}}</view>
+        <!-- <view class="btn">{{vipText}}</view> -->
+        <view class="btn">立即开通</view>
       </view>
 
       <!-- <view class="flex-box flex-v-ce li " data-index="2" onTap="openView">

pages/deploy/index/index.js

@@ -15,6 +15,7 @@ Page({
     dd.setNavigationBar({ title: "我的" });
     this.setData({userData:app.globalData.userData,corpMessage:app.globalData.corpMessage});
     this.getVip();
+    // console.log("123")
   },
   getVip(){
     app.$get("api/order/goods/special").then((res) => {

pages/statistics/C_ranking/C_ranking.js

@@ -157,7 +157,7 @@ Page({
     var data = {
       date: that.data.month,
       page: that.data.page,
-      page_size: 10,
+      page_size: 20,
       sort: that.data.isPx ? 'asc' : 'desc',
       // type: 'normal',
       group_id: that.data.id,

pages/statistics/assaign/assaign.axml

@@ -1,7 +1,6 @@
 <view>
   <view class="{{popupCx}}">
     <view class="inputs">
-    
       <!-- <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
         <view class="label">指定规则</view>
         <view class="flex-1"></view>
@@ -13,7 +12,6 @@
         <view class="flex-1" a:else></view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view> -->
-
       <view class="li">
         <textarea class="textarea" maxlength="20" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容"></textarea>
         <image mode="scaleToFill" src="../../../image/addImg.png" class="addImg" catchTap="openImg"/>
@@ -33,18 +31,24 @@
           </view>
         </view>
       </view>
+
       <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
         <view class="label">指定规则</view>
         <view class="flex-1"></view>
         <switch onChange="switchChange"  checked="{{items.checked}}" color="#26A2FF"></switch>
       </view>
 
-      <view class="flex-box flex-v-ce li" data-ruleId="{{items.item_id}}" a:if="{{items.checked}}" data-num="3" catchTap="openSelect">
+      <view class="flex-box flex-v-ce li"  data-ruleId="{{items.item_id}}" a:if="{{items.checked}}" data-num="3" catchTap="openSelect">
         <view class="label isBt">选择规则</view>
         <view class="flex-1" a:if="{{selectRule}}">已选择1条</view>
         <view class="flex-1" a:else></view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
+      <view class="flex-box flex-v-ce li" a:else data-ruleId="{{items.rule_id2}}"  data-num="4" catchTap="openSelect">
+        <view class="label isBt">选择分类</view>
+        <view class="flex-1">{{items.rule_name}}</view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
       
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
@@ -56,7 +60,7 @@
             <input a:else value="{{items.base_point}}" placeholder="0" type="number" onInput="bindKeyInput1"  class="flex-1"/>
             <view class="picker-box" catchTap="bindPickerChange" a:if="{{selectRule.range_type!=1}}">
               <view class="{{isArrindex==true? 'picker-right':'picker-left'}} yuan"></view>
-              <view class="flex-box flex-v-ce" class="picker">
+              <view class="flex-box flex-v-ce">
                 <text class="red flex-1">奖</text>
                 <text class="green flex-1">扣</text>
               </view>
@@ -69,6 +73,7 @@
           </block>
         </view>
       </view>
+      
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:else>
         <view class="label isBt" style="position: relative;top:10rpx;">任务积分</view>
         <text class="red" style="position: relative;top:10rpx;">+</text>
@@ -137,6 +142,7 @@
   </view>
   <view class="box" animation="{{animationInfo}}">
     <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-type defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectType" onClose="onClose" a:if="{{isShowType=='4'}}"/>
     <select-section-staff isLeadership="{{true}}" isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two islead="{{true}}" selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/assaign/assaign.js

@@ -23,12 +23,13 @@ Page({
       ahead_award_point_limit: '',//提前奖分上限
       qualified: '',//
       cate_id: 0,// 共组分类id   
-
       task_cycle: 0,//任务发布周期 1-天 2-周 3-月
       task_expire_day: 1,//任务截至天数
 
       checked: false,//是否选择规则
       rule_id: '',//积分分类id
+      rule_id2: '',
+      rule_name: '',//积分分类名称
       item_id: '',//积分细则id 不选可以为0
 
 			tree_echo: [],//用于PC编辑任务时的规则回显
@@ -86,6 +87,13 @@ Page({
     that.setData({
       [`items.checked`]: e.detail.value
     })
+  },
+    //选择规则分类
+  onSelectType(item) {
+    this.setData({
+      [`items.rule_id2`]: item.id,
+      [`items.rule_name`]: item.name,
+    });
   },
   //选择规则
   onSelectItem(item) {
@@ -339,8 +347,6 @@ Page({
       [`items.task_remark`]: e.detail.value,
     });
   },
-
-
   showToast(text) {
     app.globalData.showToast(text);
   },
@@ -374,13 +380,17 @@ Page({
       items.base_point=point;
       items.qualified=point;
     }else{
+      if (!items.rule_id2) {
+        this.showToast('请选择分类')
+        return;
+      }
       if (!items.base_point2) {
         this.showToast('请输入任务积分')
         return;
       }
       items.base_point=items.base_point2
       items.qualified=items.base_point2;
-      delete items.rule_id
+      items.rule_id=items.rule_id2;
       delete items.item_id
     }
 

pages/statistics/assaign/assaign.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "select-rule": "/Component/selectRule/selectRule",
+    "select-type": "/Component/selectType/selectType",
     "select-section-staff-two":"/Component/selectSectionStaff_tow/selectSectionStaff_tow",
     "select-section-staff":"/Component/selectSectionStaff/selectSectionStaff"
   },

pages/statistics/assaign_set/assaign_set.axml

@@ -19,12 +19,20 @@
         <view class="flex-1"></view>
         <switch onChange="switchChange" checked="{{items.checked}}" color="#26A2FF"></switch>
       </view>
+
       <view class="flex-box flex-v-ce li" data-ruleId="{{items.item_id}}" a:if="{{items.checked}}"  data-num="3" catchTap="openSelect">
         <view class="label isBt">选择规则</view>
         <view class="flex-1" a:if="{{selectRule}}">已选择1条</view>
         <view class="flex-1" a:else></view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
+      <view class="flex-box flex-v-ce li" a:else data-ruleId="{{items.rule_id2}}"  data-num="4" catchTap="openSelect">
+        <view class="label isBt">选择分类</view>
+        <view class="flex-1">{{items.rule_name}}</view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
+
+
 
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
@@ -36,7 +44,7 @@
             <input a:else value="{{items.base_point}}" placeholder="0" type="number" onInput="bindKeyInput1"  class="flex-1"/>
             <view class="picker-box" catchTap="bindPickerChange" a:if="{{selectRule.range_type!=1}}">
               <view class="{{isArrindex==true? 'picker-right':'picker-left'}} yuan"></view>
-              <view class="flex-box flex-v-ce" class="picker">
+              <view class="flex-box flex-v-ce">
                 <text class="red flex-1">奖</text>
                 <text class="green flex-1">扣</text>
               </view>
@@ -103,6 +111,7 @@
   </view>
   <view class="box" animation="{{animationInfo}}">
     <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-type defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectType" onClose="onClose" a:if="{{isShowType=='4'}}"/>
     <select-section-staff isLeadership="{{true}}" isAllSelect="{{false}}" isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two  islead="{{true}}" selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/assaign_set/assaign_set.js

@@ -100,6 +100,8 @@ Page({
           task_expire_day: 1,
           pt_name:item.pt_name,
 
+          rule_id2: (item.rule_id&&!item.item_id)? item.rule_id:'',//积分分类id
+          rule_name: (item.rule_id&&!item.item_id)? '已选择一条分类':'',//积分分类名称
           rule_id: item.rule_id,//积分分类id
           item_id: item.item_id,//积分细则id 不选可以为0
           checked: item.item_id? true:false,//是否选择规则
@@ -117,6 +119,13 @@ Page({
       isArrindex: !that.data.isArrindex,
     });
   },
+  //选择规则分类
+  onSelectType(item) {
+    this.setData({
+      [`items.rule_id2`]: item.id,
+      [`items.rule_name`]: item.name,
+    });
+  },
   //选择规则
   onSelectItem(item) {
     var strMin;
@@ -379,13 +388,17 @@ Page({
       items.base_point=point;
       items.qualified=point;
     }else{
+      if (!items.rule_id2) {
+        this.showToast('请选择分类')
+        return;
+      }
       if (!items.base_point2) {
         this.showToast('请输入任务积分')
         return;
       }
       items.base_point=items.base_point2
       items.qualified=items.base_point2;
-      delete items.rule_id
+      items.rule_id=items.rule_id2;
       delete items.item_id
     }
     if (items.targets.length == 0) {

pages/statistics/assaign_set/assaign_set.json

@@ -1,7 +1,9 @@
 {
   "usingComponents": {
     "select-rule": "/Component/selectRule/selectRule",
+    "select-type": "/Component/selectType/selectType",
     "select-section-staff-two":"/Component/selectSectionStaff_tow/selectSectionStaff_tow",
     "select-section-staff":"/Component/selectSectionStaff/selectSectionStaff"
-  }
+  },
+  "allowsBounceVertical": "NO"
 }

pages/statistics/index/index.js

@@ -31,7 +31,9 @@ Page({
       {
         code: '统计分析', child: [
           { name: '排行榜', imgUrl: '../../../image/att_statistics.png', url: '../userRamking/userRamking', code: 'creator admin ' },
-          { name: '考勤分排名', imgUrl: '../../../image/att_statistics.png', url: '../check_top/check_top', code: 'creator admin employee' },
+          { name: '考勤分', imgUrl: '../../../image/att_statistics.png', url: '../check_top/check_top', code: 'creator admin employee' },
+          { name: '日志分', imgUrl: '../../../image/log1.png', url: '../log_rank/log_rank', code: 'creator admin employee' },
+          { name: '任务分', imgUrl: '../../../image/log2.png', url: '../task_rank/task_rank', code: 'creator admin employee' },
           { name: '积分事件', imgUrl: '../../../image/event_list_a.png', url: '../integralEvent/integralEvent', code: 'creator admin employee' },
         ]
       },

pages/statistics/log_rank/log_rank.acss

@@ -0,0 +1,31 @@
+
+.main{
+  background: #fff;
+}
+.item{
+  padding: 16rpx 0;
+}
+.item .flex-2{
+    padding-left: 28rpx; 
+}
+.users{
+  margin-left: 20rpx;
+}
+.num{
+  font-size: 24rpx;
+  color: #909399;
+}
+.index{
+  width: 90rpx;
+  text-align: center;
+}
+.index image{
+  width: 40rpx;
+  height: 40rpx;
+}
+.scroll{
+  height: calc(100vh - 140rpx);
+}
+.name{
+  margin-left: 20rpx;
+}

pages/statistics/log_rank/log_rank.axml

@@ -0,0 +1,42 @@
+<view>
+  <view class="{{popupCx}}">
+    <view class="flex-box flex-v-ce tab">
+      <view class="flex-1" catchTap="selectTissue">
+        <text class="{{showTissue? 'activeView blue':''}}">{{TissueVal}}</text>
+      </view>
+      <view class="flex-1" catchTap="selectStaff">
+        <text class="{{showStaff? 'activeView blue':''}}">{{staffVal}}</text>
+      </view>
+      <view class="flex-1" catchTap="selectDate">
+        <text class="{{showDate? 'activeView blue':''}}">{{selectDateVal}}</text>
+      </view>
+    </view>
+    <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名包含初始分和工龄分</view>
+    <view class="main scroll">
+      <scroll-view lower-threshold="100" class="scroll" scroll-y="{{true}}" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
+        <view a:for="{{list}}" data-item="{{item}}" class="flex-box flex-v-ce item border-bottom">
+          <view a:if="{{item.rank==1}}" class="index">
+            <image mode="scaleToFill" src="../../../image/1.png"></image>
+          </view>
+          <view a:elif="{{item.rank==2}}" class="index">
+            <image mode="scaleToFill" src="../../../image/2.png"></image>
+          </view>
+          <view a:elif="{{item.rank==3}}" class="index">
+            <image mode="scaleToFill" src="../../../image/3.png"></image>
+          </view>
+          <view a:else class="index">{{item.rank}}</view>
+          <view class="flex-1 flex-box flex-v-ce">
+            <img-box name="{{item.employee_name}}" imgUrl="{{item.employee_img_url}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
+            <view class="name">{{item.employee_name}}</view>
+          </view>
+          <view class="blue" style="margin-right:28rpx;">{{item.point}}</view>
+        </view>
+        <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
+      </scroll-view>
+      <no-data a:if="{{list.length==0}}"></no-data>
+    </view>
+  </view>
+  <select-staff defaultUser="{{employee_ids}}" isShow="{{showStaff}}" a:if="{{showStaff==true}}" onClose="onClose" onConfirm="onConfirmStaff"></select-staff>
+  <select-date defaultDate="{{defaultDate}}" isShow="{{showDate}}" a:if="{{showDate==true}}" onClose="onClose" onConfirm="onConfirmDate"></select-date>
+  <select-section defaultSection="{{dept_id}}" a:if="{{showTissue==true}}" isShow="{{showTissue}}" onClose="onClose" onConfirm="onConfirmTissue"></select-section>
+</view>

pages/statistics/log_rank/log_rank.js

@@ -0,0 +1,143 @@
+
+var app = getApp()
+var that;
+Page({
+  data: {
+    showTissue: false,//显示部门组件
+    TissueVal: '全公司',
+    
+    isPx: true,
+    page: 1,
+    scroll_top: 0,
+    popupCx: '',
+
+    showDate: false,//是否显示时间组件
+    selectDateVal: '本月',
+
+    showStaff: false,//显示员工选择
+    staffVal: '员工',
+  },
+  onLoad() {
+    that = this;
+    dd.setNavigationBar({ title: "日志分排名" });
+    // this.getData();
+  },
+  //选择时间
+  onConfirmDate(data) {
+    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 ? '本月' : '月') : '日',
+    })
+    this.getData();
+  },
+  //选择员工
+  onConfirmStaff(data) {
+    if (!data) {
+      this.setData({ staffVal: '员工', employee_ids: '', page: 1 })
+      this.getData();
+      return false;
+    }
+    if (data.length > 0) {
+      if (data.length > 1) {
+        var str = "";
+        var arr = [];
+        data.forEach((item) => {
+          str += item.name + ','
+          arr.push(item.id);
+        })
+        var employee_ids = arr.join(',');
+        this.setData({ staffVal: str.substring(0, str.length - 1), employee_ids: employee_ids, page: 1 })
+      } else {
+        this.setData({ staffVal: data[0].name, employee_ids: [data[0].id], page: 1 })
+      }
+    } else {
+      this.setData({ staffVal: '员工', employee_ids: [], page: 1 })
+    }
+    this.getData();
+  },
+  //显示选择时间组件
+  selectDate() {
+    this.setData({
+      popupCx: 'container__mask',
+      showDate: true
+    })
+  },
+  //显示选择员工
+  selectStaff() {
+    this.setData({
+      popupCx: 'container__mask',
+      showStaff: true
+    })
+  },
+  getData(is) {
+    var data = {
+      page: that.data.page,
+      page_size: 20,
+      dept_id: that.data.dept_id,
+      pt_id: app.getTypesItem('BF').id,
+      sort: that.data.isPx ? 'DESC' : 'ASC',
+      type: 'all',
+    }
+    app.$get('api/integral/statistics/ranking', data, 'application/vnd.test.v2+json').then((res) => {
+      var data = res.data.data.list;
+      if (is) {
+        if (data.length == 0) {
+          this.setData({ isData: true })
+          return;
+        }
+        var list = that.data.list;
+        this.setData({
+          list: list.concat(data)
+        })
+      } else {
+        this.setData({ list: [] });
+        this.setData({
+          list: data,
+          isData: false,
+        })
+      }
+    })
+  },
+  //上啦加载
+  onScrollToLower() {
+    if (!that.data.isData) {
+      this.setData({ page: ++that.data.page })
+      this.getData(true);
+    }
+  },
+  selectIsPx() {
+    this.setData({
+      isPx: !this.data.isPx,
+      page: 1
+    })
+    this.getData();
+  },
+  //打开兴趣
+  openDetail(e) {
+    var item = e.target.dataset.item;
+    dd.navigateTo({
+      url: '../prizeBuckleDetail/prizeBuckleDetail?item=' + item
+    })
+  },
+  //关闭弹窗
+  onClose() {
+    this.setData({
+      showTissue: false,
+      showDate: false,
+      showStaff: false,
+      popupCx: '',
+    })
+  },
+  //显示部门选择组件
+  selectTissue() {
+    this.setData({ showTissue: !this.data.showTissue, popupCx: 'container__mask', })
+  },
+  //选择部门
+  onConfirmTissue(data) {
+    this.setData({ dept_id: data.id, page: 1, TissueVal: data.name })
+    this.getData();
+  },
+});

pages/statistics/log_rank/log_rank.json

@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+     "img-box": "/Component/img-box/index",
+    "select-section": "/Component/selectSection/selectSection",
+    "select-date": "/Component/selectDate/selectDate",
+    "select-staff": "/Component/selectStaff/selectStaff",
+    "no-data": "/Component/noData/noData"
+  }
+}

pages/statistics/offerAreward/offerAreward.axml

@@ -32,6 +32,11 @@
         <view class="flex-1" a:else></view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
+      <view class="flex-box flex-v-ce li" a:else data-ruleId="{{items.rule_id2}}"  data-num="4" catchTap="openSelect">
+        <view class="label isBt">选择分类</view>
+        <view class="flex-1">{{items.rule_name}}</view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
 
         <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
@@ -43,7 +48,7 @@
             <input a:else value="{{items.base_point}}" placeholder="0" type="number" onInput="bindKeyInput1"  class="flex-1"/>
             <view class="picker-box" catchTap="bindPickerChange" a:if="{{selectRule.range_type!=1}}">
               <view class="{{isArrindex==true? 'picker-right':'picker-left'}} yuan"></view>
-              <view class="flex-box flex-v-ce" class="picker">
+              <view class="flex-box flex-v-ce">
                 <text class="red flex-1">奖</text>
                 <text class="green flex-1">扣</text>
               </view>
@@ -123,6 +128,7 @@
   </view>
   <view class="box" animation="{{animationInfo}}">
     <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-type defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectType" onClose="onClose" a:if="{{isShowType=='4'}}"/>
     <select-section-bottom defaultSection="{{defaultSection}}" onClose="onClose" onConfirm="onSelectSection" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two islead="{{true}}"  selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/offerAreward/offerAreward.js

@@ -25,6 +25,8 @@ Page({
 
       checked: false,//是否选择规则
       rule_id: '',//积分分类id
+      rule_id2: '',
+      rule_name: '',//积分分类名称
       item_id: '',//积分细则id 不选可以为0
     },
     reviewerObj: [],//默认审批人
@@ -70,6 +72,13 @@ Page({
       [`items.expire_time`]: app.globalData.day + ' 18:00',
       point_limit: app.globalData.userData.point_config.point_limit
     })
+  },
+      //选择规则分类
+  onSelectType(item) {
+    this.setData({
+      [`items.rule_id2`]: item.id,
+      [`items.rule_name`]: item.name,
+    });
   },
   //选择奖还是扣(细则)
   bindPickerChange() {
@@ -380,13 +389,17 @@ Page({
       items.base_point = point;
       items.qualified = point;
     } else {
+      if (!items.rule_id2) {
+        this.showToast('请选择分类')
+        return;
+      }
       if (!items.base_point2) {
         this.showToast('请输入任务积分')
         return;
       }
-      items.base_point = items.base_point2
-      items.qualified = items.base_point2;
-      delete items.rule_id
+      items.base_point=items.base_point2
+      items.qualified=items.base_point2;
+      items.rule_id=items.rule_id2;
       delete items.item_id
     }
 

pages/statistics/offerAreward/offerAreward.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "select-rule": "/Component/selectRule/selectRule",
+    "select-type": "/Component/selectType/selectType",
     "select-section-staff-two":"/Component/selectSectionStaff_tow/selectSectionStaff_tow",
     "select-section-bottom":"/Component/selectSectionBottom/selectSectionBottom"
   }

pages/statistics/offerAreward_set/offerAreward_set.axml

@@ -32,6 +32,11 @@
         <view class="flex-1" a:else></view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
+      <view class="flex-box flex-v-ce li" a:else data-ruleId="{{items.rule_id2}}"  data-num="4" catchTap="openSelect">
+        <view class="label isBt">选择分类</view>
+        <view class="flex-1">{{items.rule_name}}</view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
 
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
@@ -43,7 +48,7 @@
             <input a:else value="{{items.base_point}}" placeholder="0" type="number" onInput="bindKeyInput1"  class="flex-1"/>
             <view class="picker-box" catchTap="bindPickerChange" a:if="{{selectRule.range_type!=1}}">
               <view class="{{isArrindex==true? 'picker-right':'picker-left'}} yuan"></view>
-              <view class="flex-box flex-v-ce" class="picker">
+              <view class="flex-box flex-v-ce">
                 <text class="red flex-1">奖</text>
                 <text class="green flex-1">扣</text>
               </view>
@@ -112,6 +117,7 @@
   </view>
   <view class="box" animation="{{animationInfo}}">
     <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-type defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectType" onClose="onClose" a:if="{{isShowType=='4'}}"/>
     <select-section-bottom defaultSection="{{defaultSection}}" onClose="onClose" onConfirm="onSelectSection" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two islead="{{true}}"  selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/offerAreward_set/offerAreward_set.js

@@ -99,7 +99,8 @@ Page({
           task_expire_day: 1,
           task_type:1,
 
-          
+          rule_id2: (item.rule_id&&!item.item_id)? item.rule_id:'',//积分分类id
+          rule_name: (item.rule_id&&!item.item_id)? '已选择一条分类':'',//积分分类名称
           rule_id: item.rule_id,//积分分类id
           item_id: item.item_id,//积分细则id 不选可以为0
           checked: item.item_id? true:false,//是否选择规则
@@ -110,7 +111,13 @@ Page({
       })
     }
   },
-
+  //选择规则分类
+  onSelectType(item) {
+    this.setData({
+      [`items.rule_id2`]: item.id,
+      [`items.rule_name`]: item.name,
+    });
+  },
   //选择奖还是扣(细则)
   bindPickerChange() {
     this.setData({
@@ -402,13 +409,17 @@ Page({
       items.base_point=point;
       items.qualified=point;
     }else{
+      if (!items.rule_id2) {
+        this.showToast('请选择分类')
+        return;
+      }
       if (!items.base_point2) {
         this.showToast('请输入任务积分')
         return;
       }
       items.base_point=items.base_point2
       items.qualified=items.base_point2;
-      delete items.rule_id
+      items.rule_id=items.rule_id2;
       delete items.item_id
     }
     if (!items.reviewer_id) {

pages/statistics/offerAreward_set/offerAreward_set.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "select-rule": "/Component/selectRule/selectRule",
+    "select-type": "/Component/selectType/selectType",
     "select-section-staff-two":"/Component/selectSectionStaff_tow/selectSectionStaff_tow",
     "select-section-bottom":"/Component/selectSectionBottom/selectSectionBottom"
   }

pages/statistics/task_rank/task_rank.axml

@@ -0,0 +1,3 @@
+<view>
+  New Page
+</view>

pages/statistics/task_rank/task_rank.js

@@ -0,0 +1,4 @@
+Page({
+  data: {},
+  onLoad() {},
+});

pages/statistics/task_rank/task_rank.json

@@ -0,0 +1 @@
+{}

pages/workbench/index/index.acss

@@ -59,6 +59,7 @@
   box-shadow: 0rpx 4rpx 10rpx rgba(0, 0, 0, 0.05);
   height: 150rpx;
   text-align: center;
+  z-index: 999;
 }
 
 .head .flex-1 view:nth-child(1) {

pages/workbench/jk_B/jk_B.axml

@@ -20,6 +20,7 @@
           <view class="flex-1"></view>
           <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="{{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>
@@ -55,6 +56,7 @@
             </block>
           </view>
         </view>
+        
         <view class="flex-box li" style="padding:15rpx 28rpx;" a:else>
           <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
           <text class="red" style="position: relative;top:8rpx;" a:if="{{item.isArrindex2==true}}">+</text>
@@ -64,7 +66,7 @@
               <input value="{{item.point2}}" name="{{index}}" placeholder="0" type="number" onInput="bindKeyInput2" data-index="{{index}}" class="flex-1"/>
               <view class="picker-box" data-index="{{index}}" catchTap="bindPickerChange2">
                 <view class="{{item.isArrindex2==true? 'picker-right':'picker-left'}} yuan"></view>
-                <view class="flex-box flex-v-ce" class="picker">
+                <view class="flex-box flex-v-ce">
                   <text class="red flex-1">奖</text>
                   <text class="green flex-1">扣</text>
                 </view>