1.5.7

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" checked="{{item.checked}}" data-index="{{index}}" color="#26A2FF"></switch>
+          <switch onChange="switchChange" disabled checked="{{ruleOnoff}}" data-index="{{index}}" color="#26A2FF"></switch>
         </view>
-        <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="flex-box flex-v-ce li" a:if="{{ruleOnoff}}" 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&&item.checked}}" class="selectRule">
+        <view a:if="{{item.selectRule&&ruleOnoff}}" 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

@@ -30,16 +30,18 @@ Page({
     qrcodeId: '',//扫码进入
     popupCx: '',
     boxTop:0,
+    ruleOnoff:false,
   },
   onLoad(e) {
     that = this;
+    this.cheakAx()
     dd.setNavigationBar({ title: "申请积分" });
     if (e.id) {
       this.setData({ //获取扫码进入参数 
         qrcodeId: e.id
       })
     } else {
-      this.getReviewerObj(app.globalData.userData.id, function (res) {
+      this.revieList(app.globalData.userData.id, function (res) {
         that.setData({
           getReviewerObj: res,
           items: [{//录入选项列表
@@ -65,6 +67,21 @@ Page({
         })
       }
   },
+  //获取系统配置
+  cheakAx() {
+    app.$get("/api/integral/site/config").then((res) => {
+        let data = res.data.data;
+        if(data.specified_rule_item){
+          this.setData({
+            ruleOnoff: data.specified_rule_item == 1 ? true : false
+          })
+        }else{
+          this.setData({
+            ruleOnoff: false
+          })
+        }
+      })
+  },
   //获取缓存的审批人
   getReviewerObj(id, fuc) {
     dd.getStorage({
@@ -78,6 +95,21 @@ Page({
       }
     });
   },
+  revieList(id, fuc) {
+    app.$get('/api/employee/info', {id :id}).then(res =>{
+      var item = res.data.data || {}
+      if(item.employee_detail.superior_list && item.employee_detail.superior_id != 0){
+        let obj = item.employee_detail.superior_list.filter(x => x.id == item.employee_detail.superior_id)[0];
+        if(obj.id == app.globalData.userData.id){
+            this.getReviewerObj(id, fuc)
+        }else{
+          fuc(obj)
+        }
+      }else{
+        this.getReviewerObj(id, fuc)
+      }
+    })
+  },
   onShow() {
     dd.hideLoading();
     animation = dd.createAnimation({
@@ -154,7 +186,7 @@ Page({
     app.globalData.showToast(text);
   },
   //选择
-  openSelect(e) {
+  async openSelect(e) {
     var index = e.target.dataset.index;
     var item = e.target.dataset.item;
     var num = e.target.dataset.num;
@@ -308,6 +340,7 @@ 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++) {
@@ -324,14 +357,14 @@ Page({
         break;
       }
       obj.employee_id = item.employee_id;
-      if (item.checked) {
+      if (ruleOnoff) {
         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 (item.checked) {
+      if (ruleOnoff) {
         if (!obj.rule_id) {
           app.globalData.showToast(`第${i + 1}项必须选择规则`);
           isTg = false;
@@ -409,22 +442,35 @@ Page({
       [employee_id]: elm.id,
       [employeeName]: elm.name,
     });
-    dd.getStorage({
-      key: String(elm.id),
-      success: function (res) {
-        if (res.data) {
-          that.setData({
-            [reviewer_id]: res.data.id,
-            [revieweName]: res.data.name
-          });
-        } else {
-          that.setData({
-            [reviewer_id]: '',
-            [revieweName]: ''
-          });
-        }
+    this.revieList(elm.id, function(res){
+      if(res.name){
+        that.setData({
+          [reviewer_id]: res.id,
+          [revieweName]: res.name
+        });
+      } else {
+        that.setData({
+          [reviewer_id]: '',
+          [revieweName]: ''
+        });
       }
-    });
+    })
+    // dd.getStorage({
+    //   key: String(elm.id),
+    //   success: function (res) {
+    //     if (res.data) {
+    //       that.setData({
+    //         [reviewer_id]: res.data.id,
+    //         [revieweName]: res.data.name
+    //       });
+    //     } else {
+    //       that.setData({
+    //         [reviewer_id]: '',
+    //         [revieweName]: ''
+    //       });
+    //     }
+    //   }
+    // });
   },
   //获取人员（上级人员）
   getEmployeeList(userIdArr, callBack) {

pages/workbench/index/index.axml

@@ -6,6 +6,10 @@
     <button type="primary" onTap="openGly">联系管理员</button>
   </view>
   <view class="head flex-box flex-center-center" style="top:{{isSubject? '138rpx':'0rpx'}}">
+    <view class="flex-1" data-index="1" onTap="openView" a:if="{{!getRole_four}}">
+      <view>{{headDayBs.b}}</view>
+      <view>今日B分</view>
+    </view>
     <view class="flex-1" data-index="1" onTap="openView">
       <view>{{userData.b.month_point}}</view>
       <view>本月B分</view>

pages/workbench/index/index.js

@@ -8,6 +8,7 @@ import 'dingtalk-jsapi/entry/union';
 import { contactAdminToUseApp } from 'dingtalk-design-libs';
 Page({
   data: {
+    headDayBs: {},
     userData: {},
     isBh: false,
     chartData: [],//折线图数据
@@ -352,7 +353,8 @@ Page({
     var ranking = app.$get('api/integral/statistics/ranking/list', { page: 1, page_size: 5 })// 获取排行榜
     var task = app.$get('api/integral/statistics/task/pie', { month: app.globalData.month })// 管理者奖扣任务柱状图
     var work = app.$get('api/integral/work/list', { status: 'running', page: 1, pt_id: 0, source_type: 0 })// 管理者奖扣任务柱状图
-    Promise.all([http1, http2, http3, ranking, task, work]).then(function (values) {
+    var headDayBs = app.$get2("api/integral/statistics", { employee_id: app.globalData.userData.id, day: app.globalData.day },'application/vnd.test.v2+json')//获取个人统计-当天B分 - V2
+    Promise.all([http1, http2, http3, ranking, task, work, headDayBs]).then(function (values) {
       if (values[0]) {
         let data = values[0].data.data;
         var task = data.task;
@@ -423,6 +425,12 @@ Page({
           workTotal: data.total
         })
       }
+      if(values[6]){
+        let data = values[6].data.data;
+        that.setData({
+          headDayBs:data
+        })
+      }
     })
   },
   //获取积分事件

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" checked="{{item.checked}}" data-index="{{index}}" color="#26A2FF"></switch>
+          <switch onChange="switchChange" disabled checked="{{ruleOnoff}}" 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="flex-box flex-v-ce li" a:if="{{ruleOnoff}}" 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="{{item.checked}}">
+        <view class="flex-box li" style="padding:15rpx 28rpx;" a:if="{{ruleOnoff}}">
           <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

@@ -19,9 +19,11 @@ Page({
     isCreator:false,//是否创始人
     popupCx: '',
     boxTop:0,
+    ruleOnoff:false,
   },
   onLoad(data) {
     that = this;
+    this.cheakAx()
     this.setData({
       type: data.type,
       isGzType: data.type == "B" ? "BF" : "AF",
@@ -76,6 +78,21 @@ Page({
       urls: item
     });
   },
+  //获取系统配置
+  cheakAx() {
+    app.$get("/api/integral/site/config").then((res) => {
+        let data = res.data.data;
+        if(data.specified_rule_item){
+          this.setData({
+            ruleOnoff: data.specified_rule_item == 1 ? true : false
+          })
+        }else{
+          this.setData({
+            ruleOnoff: false
+          })
+        }
+      })
+  },
   //选择奖还是扣(细则)
   bindPickerChange(e) {
     var index = e.target.dataset.index;
@@ -336,6 +353,7 @@ Page({
   },
   formSubmit() {
     var items = this.data.items;
+    var ruleOnoff = this.data.ruleOnoff
     var userData = this.data.users;
     var arr = [];
     var isTg = true;
@@ -347,9 +365,9 @@ Page({
     for (var i = 0; i < items.length; i++) {
       var obj = {};
       var item = items[i];
-      var num = item.checked ? item.point : item.point2
+      var num = ruleOnoff ? item.point : item.point2
       var point;
-      if (item.checked) {
+      if (ruleOnoff) {
         if (item.isArrindex != true) {
           point = 0 - num;
         } else {
@@ -366,7 +384,7 @@ Page({
           point = num;
         }
       }
-      if (item.checked) {
+      if (ruleOnoff) {
         if (!item.rule_id) {
           this.showToast(`第${i + 1}条请选择规则`);
           isTg = false;
@@ -390,8 +408,8 @@ Page({
         isTg = false;
         break;
       }
-      obj.rule_id = item.checked ? item.rule_id : item.rule_id2;
-      obj.item_id = item.checked ? item.item_id : 0;
+      obj.rule_id = ruleOnoff ? item.rule_id : item.rule_id2;
+      obj.item_id = ruleOnoff ? item.item_id : 0;
       obj.point = point;
       obj.remark = item.remark;
       obj.event_time = item.event_time;