1.1.1

Component/selectSectionStaff/selectSectionStaff.axml

@@ -54,8 +54,8 @@
           <view  style="font-size:0.28rem">为员工【启用积分管理】</view>
         </view>
         <view class="fontColorF" style="margin-top:0rpx;text-align: center;" a:else>
-          <view style="font-size:0.28rem">您当前没有可管理人员，请联系主管理员“{{creatorName}}”</view>
-          <view  style="font-size:0.28rem" >或积分管理员前往钉钉电脑端为您设置【管理范围】</view>
+          <view style="font-size:0.28rem">您当前没有可管理人员，请前往钉钉电脑端</view>
+          <view  style="font-size:0.28rem" >设置【管理范围】</view>
         </view>
       </view>
     </scroll-view>

Component/selectSectionStaff/selectSectionStaff.js

@@ -32,18 +32,18 @@ Component({
   didMount() {
     that = this;
     this.setData({ isCreator: app.globalData.isCreator, creatorName: app.globalData.corpMessage.creators })
-    app.login(app.globalData.corpId, function (is) {
-      if (is) {
+    // app.login(app.globalData.corpId, function (is) {
+      // if (is) {
         that.setData({
           selectUserId: that.props.selectUser[0] ? that.props.selectUser : [],
           isAll: that.props.isAllSelect,
           userData:app.globalData.userData.employee_detail.manage_scope,
           terr: [{ name: '全部', id: 0 }]
         })
-      }
+      // }
       that.getData(0);
       that.getBmData();
-    })
+    // })
   },
   didUpdate() { },
   didUnmount() {
@@ -268,6 +268,8 @@ Component({
             })
           }
         })
+
+
         that.data.userData.map((item) => {//列表数据是否是自己的管理范围
           userList.map((item2) => {
             if (item.id == item2.id) {
@@ -275,6 +277,8 @@ Component({
             }
           })
         })
+
+        
         this.setData({
           userList: that.props.isLeadership ? arr : userList,
           all_user_list: that.props.isLeadership ? arr : userList,

app.js

@@ -1,8 +1,8 @@
 import { showToast } from './utils/feedback'
 import { formatTime, arrRemoveObj, getTypeItem } from './utils/util'
 
-// const baseUrl = "https://test-ding.g107.com/";//测试
-const baseUrl = "https://ding.insys.g107.com/";//正式
+const baseUrl = "https://test-ding.g107.com/";//测试
+// const baseUrl = "https://ding.insys.g107.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;

pages/statistics/C_ranking/C_ranking.js

@@ -26,8 +26,12 @@ Page({
         dateType: e.date_interval
       })
     } else {
+      var str=String(app.globalData.month_tow);
+      if(app.globalData.month_tow<10){
+          str="0"+String(app.globalData.month_tow)
+      }
       this.setData({
-        month:app.globalData.year+String(app.globalData.month_tow),
+        month:app.globalData.year+String(str),
         dateType: e.date_interval
       })
     }
@@ -118,7 +122,6 @@ Page({
       format: str,
       currentDate: this.data.date,
       success: (res) => {
-
         if(res.date&&that.data.dateType!=3){
         var str=res.date.substr(0,4)
         var str2=res.date.substr(res.date.length-2,2)

pages/statistics/addCustom/addCustom.acss

@@ -68,7 +68,7 @@
 }
 
 .scroll {
-  height: calc(100vh - 440rpx);
+  height: calc(100vh - 470rpx);
 }
 
 .box {

pages/statistics/customRamking/customRamking.axml

@@ -1,7 +1,7 @@
 <view>
   <view class="all">
-   <block>
-    <!-- <block a:if="{{dataList.length>0}}"> -->
+    <!-- <block> -->
+    <block a:if="{{dataList.length>0}}">
       <!-- <view class="gs margin-bottom flex-box flex-v-ce" a:if="{{isShowGs}}">
           <text class="flex-1">可自定义设置团队、项目、管理者、执行人员等分组，进行自定义排名</text>
           <text class="close" onTap="activeGs">×</text>
@@ -28,12 +28,12 @@
         </view>
       </view>
     </block>
-    <!-- <view a:else class="noDataBox">
+    <view a:else class="noDataBox">
       <view class="noDataTop fontColorF">
         <view>暂无分组</view>
         <view>通过分组你可针对性的查看对应人员的B分排名</view>
       </view>
       <button type="default" onTap="openAdd" class="addBtn">新建分组</button>
-    </view> -->
+    </view>
   </view>
 </view>

pages/statistics/userRamking/userRamking.js

@@ -53,7 +53,6 @@ Page({
   openDetail(e){
     var item = e.target.dataset.item;
     var url = '';
-    console.log(item)
     if (item.type == 'normal') {
       url = '../../statistics/sectionRanking/sectionRanking';
     } else if (item.type == 'all') {

pages/workbench/apply/apply.js

@@ -21,7 +21,7 @@ Page({
     isShowType: true,//是显示选择规则还是显示选择分类
     activeIndex: '',
     isArr: ['奖', '扣'],
-    reviewerObj: [],//选中的审批人
+    reviewerObj:[],//选中的审批人
     employeeObj:[],//选中的录入对象
     disabled: false,
     superior_list:[],//录入人的上级
@@ -36,8 +36,8 @@ Page({
         getReviewerObj:res,
         items: [{//录入选项列表
           checked: true,//判断是否开启指定规则
-          employee_id: app.globalData.userData.id,
-          employeeName: app.globalData.userData.name,
+          employee_id:app.globalData.isCreator? '':app.globalData.userData.id,
+          employeeName:app.globalData.isCreator? '': app.globalData.userData.name,
           rule_id: '',//积分分类id
           item_id: '',//积分细则id 不选可以为0
           remark: '',//备注
@@ -379,11 +379,9 @@ Page({
   },
   //添加一条
   addArr() {
-
-
     var arr = {//录入选项列表
-      employee_id: app.globalData.userData.id,
-			employeeName: app.globalData.userData.name,
+      employee_id:app.globalData.isCreator? '':app.globalData.userData.id,
+      employeeName:app.globalData.isCreator? '': app.globalData.userData.name,
       checked: true,//判断是否开启指定规则
       rule_id: '',//积分分类id
       item_id: '',//积分细则id 不选可以为0

pages/workbench/index/index.axml

@@ -22,6 +22,7 @@
           <text>奖扣A分</text>
         </view>
       </view>
+
       <view class="flex-box headed-box-item">
         <view class="flex-box  flex-center-center flex-1 left" data-index="5" onTap="openView">
           <image mode="scaleToFill" src="../../../image/sqjf.png"></image>
@@ -35,6 +36,7 @@
           </text>
         </view>
       </view>
+      
     </view>
   </view>
 

pages/workbench/index/index.js

@@ -173,6 +173,13 @@ Page({
     chart3.source(that.data.setECharts, {
       date: { tickCount: 5 }
     });
+    chart3.axis('field',{
+      grid: {
+        lineDash: null,
+        stroke: '#e8e8e8',
+        lineWidth: 1
+      }
+    });
     chart3.legend(false);
     chart3.interval().position('name*val').color('type', (type) => { // 通过回调函数
       if (type === '奖分') {

pages/workbench/jk_B/jk_B.axml

@@ -103,7 +103,7 @@
   <view class="box" animation="{{animationInfo}}">
     <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='1'}}"/>
     <select-type defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" onConfirm="onSelectType" onClose="onClose" a:if="{{isShowType=='2'}}"/>
-    <select-section-staff isLeadership="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='3'}}"/>
+    <select-section-staff isLeadership="{{true}}" isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='3'}}"/>
     <select-section-staff-two superior_list="{{superior_list}}" isLeadership="{{false}}" selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='4'}}"/>
   </view>
 </view>

pages/workbench/noJurisdiction/noJurisdiction.axml

@@ -5,7 +5,7 @@
         您当前未授权自己进入应用，请修改应用的可见范围为全部或包含自己，如需咨询客服，请到您企业专属的功道云服务群咨询
       </view>
       <view a:else>
-        请联系创始人“{{creatorName}}”为您【启用积分管理】，如需咨询客服，请到您企业专属的功道云服务群咨询
+        当前用户未授权进入系统，请联系管理员为您【启用积分管理】，如需咨询客服，请到您企业专属的功道云服务群咨询
       </view>
   </view>
 </view>