2020 9 24

.tea/entryFiles-development/index$.web.js

@@ -23,7 +23,7 @@ require('../../pages/workbench/statistics_B/statistics_B?hash=bdb0bce92eecbc6877
 require('../../pages/workbench/jk_A/jk_A?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/jk_B/jk_B?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/apply/apply?hash=d6c7dd492570a1846aaa083a4b95c7f8e87c3de3');
-require('../../pages/workbench/prize_buckle/prize_buckle?hash=b9588c2921fd8a20182363116ba32f0ef391d03c');
+require('../../pages/workbench/prize_buckle/prize_buckle?hash=b2df3178c7f27fc758e81068e507e63d7ff1508d');
 require('../../pages/workbench/my_approve/my_approve?hash=f2d76cc77e7717f6ce2c6c23de78140ccd3a6eb5');
 require('../../pages/workbench/approveDetail/approveDetail?hash=627f1b90505b489ef5bc84d3aa0a2614f1ee320e');
 require('../../pages/statistics/my_PrizeBuckle/my_PrizeBuckle?hash=515236f8c96af7bcc38156941a11817af0611c88');
@@ -46,3 +46,4 @@ require('../../pages/deploy/integralRule/integralRule?hash=32d7d2807ed4e666ef03b
 require('../../pages/workbench/approve/approve?hash=d0f7b9c3ec6457c02f205337e1fdf44d2d143adc');
 require('../../pages/statistics/C_ranking/C_ranking?hash=bcd8e1c05053f01c7126b59e3990df8bcf9058aa');
 require('../../pages/workbench/noJurisdiction/noJurisdiction?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/init/init?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

.tea/entryFiles-development/index$.worker.js

@@ -51,7 +51,7 @@ require('../../pages/workbench/statistics_B/statistics_B?hash=bdb0bce92eecbc6877
 require('../../pages/workbench/jk_A/jk_A?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/jk_B/jk_B?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/apply/apply?hash=d6c7dd492570a1846aaa083a4b95c7f8e87c3de3');
-require('../../pages/workbench/prize_buckle/prize_buckle?hash=b9588c2921fd8a20182363116ba32f0ef391d03c');
+require('../../pages/workbench/prize_buckle/prize_buckle?hash=b2df3178c7f27fc758e81068e507e63d7ff1508d');
 require('../../pages/workbench/my_approve/my_approve?hash=f2d76cc77e7717f6ce2c6c23de78140ccd3a6eb5');
 require('../../pages/workbench/approveDetail/approveDetail?hash=627f1b90505b489ef5bc84d3aa0a2614f1ee320e');
 require('../../pages/statistics/my_PrizeBuckle/my_PrizeBuckle?hash=515236f8c96af7bcc38156941a11817af0611c88');
@@ -74,6 +74,7 @@ require('../../pages/deploy/integralRule/integralRule?hash=32d7d2807ed4e666ef03b
 require('../../pages/workbench/approve/approve?hash=d0f7b9c3ec6457c02f205337e1fdf44d2d143adc');
 require('../../pages/statistics/C_ranking/C_ranking?hash=bcd8e1c05053f01c7126b59e3990df8bcf9058aa');
 require('../../pages/workbench/noJurisdiction/noJurisdiction?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/init/init?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 }
 self.bootstrapApp ? self.bootstrapApp({ success }) : success();
 }

.tea/entryFiles-production/index$.web.js

@@ -23,7 +23,7 @@ require('../../pages/workbench/statistics_B/statistics_B?hash=bdb0bce92eecbc6877
 require('../../pages/workbench/jk_A/jk_A?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/jk_B/jk_B?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/apply/apply?hash=d6c7dd492570a1846aaa083a4b95c7f8e87c3de3');
-require('../../pages/workbench/prize_buckle/prize_buckle?hash=b9588c2921fd8a20182363116ba32f0ef391d03c');
+require('../../pages/workbench/prize_buckle/prize_buckle?hash=b2df3178c7f27fc758e81068e507e63d7ff1508d');
 require('../../pages/workbench/my_approve/my_approve?hash=f2d76cc77e7717f6ce2c6c23de78140ccd3a6eb5');
 require('../../pages/workbench/approveDetail/approveDetail?hash=627f1b90505b489ef5bc84d3aa0a2614f1ee320e');
 require('../../pages/statistics/my_PrizeBuckle/my_PrizeBuckle?hash=515236f8c96af7bcc38156941a11817af0611c88');
@@ -46,3 +46,4 @@ require('../../pages/deploy/integralRule/integralRule?hash=32d7d2807ed4e666ef03b
 require('../../pages/workbench/approve/approve?hash=d0f7b9c3ec6457c02f205337e1fdf44d2d143adc');
 require('../../pages/statistics/C_ranking/C_ranking?hash=bcd8e1c05053f01c7126b59e3990df8bcf9058aa');
 require('../../pages/workbench/noJurisdiction/noJurisdiction?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/init/init?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');

.tea/entryFiles-production/index$.worker.js

@@ -76,7 +76,7 @@ require('../../pages/workbench/statistics_B/statistics_B?hash=bdb0bce92eecbc6877
 require('../../pages/workbench/jk_A/jk_A?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/jk_B/jk_B?hash=8cf75aeeb0de84d404849da1debaa3fdae13f0d2');
 require('../../pages/workbench/apply/apply?hash=d6c7dd492570a1846aaa083a4b95c7f8e87c3de3');
-require('../../pages/workbench/prize_buckle/prize_buckle?hash=b9588c2921fd8a20182363116ba32f0ef391d03c');
+require('../../pages/workbench/prize_buckle/prize_buckle?hash=b2df3178c7f27fc758e81068e507e63d7ff1508d');
 require('../../pages/workbench/my_approve/my_approve?hash=f2d76cc77e7717f6ce2c6c23de78140ccd3a6eb5');
 require('../../pages/workbench/approveDetail/approveDetail?hash=627f1b90505b489ef5bc84d3aa0a2614f1ee320e');
 require('../../pages/statistics/my_PrizeBuckle/my_PrizeBuckle?hash=515236f8c96af7bcc38156941a11817af0611c88');
@@ -99,6 +99,7 @@ require('../../pages/deploy/integralRule/integralRule?hash=32d7d2807ed4e666ef03b
 require('../../pages/workbench/approve/approve?hash=d0f7b9c3ec6457c02f205337e1fdf44d2d143adc');
 require('../../pages/statistics/C_ranking/C_ranking?hash=bcd8e1c05053f01c7126b59e3990df8bcf9058aa');
 require('../../pages/workbench/noJurisdiction/noJurisdiction?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
+require('../../pages/init/init?hash=32d7d2807ed4e666ef03b4b3fe8c38ecf2e34e68');
 }
 self.bootstrapApp ? self.bootstrapApp({ success }) : success();
 }

Component/selectDate/selectDate.acss

@@ -6,13 +6,17 @@
   right:0;
   top:80rpx;
   z-index: 5;
-  background-color: rgba(0,0,0,.7);
+  /* background-color: rgba(0,0,0,.7); */
 }
 .date-header{
   background-color: #fff;
   z-index: 3;
   box-shadow:inset 0px 0px 5px #ccc;
   padding-top: 28rpx;
+  position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 8;
 }
 .date-bottom{
     animation-duration: 0.2s;

Component/selectDate/selectDate.axml

@@ -22,4 +22,5 @@
       <view class="flex-1" catchTap="onConfirm">确定</view>
     </view>
   </view>
+  <view class="meng" catchTap="onClose"></view>
 </view>

Component/selectDate_two/selectDate_two.acss

@@ -6,13 +6,17 @@
   right:0;
   top:80rpx;
   z-index: 5;
-  background-color: rgba(0,0,0,.7);
+  /* background-color: rgba(0,0,0,.7); */
 }
 .date-header{
   background-color: #fff;
   z-index: 3;
   box-shadow:inset 0px 0px 5px #ccc;
   padding-top: 28rpx;
+    position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 8;
 }
 .date-bottom{
     animation-duration: 0.2s;

Component/selectDate_two/selectDate_two.axml

@@ -35,4 +35,5 @@
       <view class="flex-1" catchTap="onConfirm">确定</view>
     </view>
   </view>
+   <view class="meng" catchTap="onClose"></view>
 </view>

Component/selectRule_two/selectRule_two.acss

@@ -6,61 +6,101 @@
   right:0;
   top:80rpx;
   z-index: 5;
-  background-color: rgba(0,0,0,.7);
+  /* background-color: rgba(0,0,0,.7); */
 }
-.staff-header{
+.date-header{
   background-color: #fff;
   box-shadow:inset 0px 0px 5px #ccc;
   padding-top: 28rpx;
   margin-top: 0rpx;
   transform: translateY(-100%);
+  position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 8;
+}
+.date-bottom{
+    animation-duration: 0.2s;
+    background-color: rgba(0,0,0,.7);
+    height: 100%;
 }
 
-.staff-btn view{
+.date-btn view{
   text-align: center;
   padding: 20rpx 0;
 }
-.staff-btn view:nth-child(1){
+.date-btn view:nth-child(1){
   background-color: #f1f1f1;
 }
-.staff-btn view:nth-child(2){
+.date-btn view:nth-child(2){
   background-color: #26a2ff;
   color: #fff;
 }
+.data-main{
+  margin: 32rpx 0;
+  text-align: center;
+}
 
-.rule-ul{
+.data-main .dateVal{
+  color: #26a2ff;
+  width: 200rpx;
+  padding: 16rpx 0;
+  border-bottom: 1px solid #26a2ff;
+  display: inline-block;
+}
+
+
+.all2{
+  background-color: #fff;
+  height: 100%;
+  margin-top: 40rpx;
+  border-radius: 50rpx 50rpx 0 0; 
+  padding-top: 80rpx;
+  z-index: 999
+}
+.close{
+  width: 40rpx;
+  height: 40rpx;
+  position: absolute;
+  right: 30rpx;
+  top: 70rpx;
+}
+
+.search{
+    background-color: #f1f1f1;
+    border-radius: 20rpx;
+    width: 80%;
+    margin: 0 auto;
+    padding:6rpx 10rpx;
+}
+.search input{
+    background-color: #f1f1f1;
+}
+.search image{
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 10rpx;
+}
+.ul{
   width: 100%;
   background-color: #fff;
-  height: 700rpx;
+  height: 500rpx;
   box-sizing: border-box;
 }
-.rule-title{
-  margin-bottom: 20rpx;
-  padding:0 28rpx;
+.li{
+    padding: 24rpx;
+    border-bottom: 1px solid #f1f1f1;
 }
-.rule-item{
-  margin-bottom: 20rpx;
+.ul .li .xia{
+  color: #26A2FF !important;
 }
-.ruleGe{
-  background: #f5f7fa;
-  padding: 16rpx;
+.shu{
+  padding: 14rpx 24rpx;
+  background: #fff;
   font-size: 28rpx;
-  width: 22%;
-  text-align: center;
-  box-sizing: border-box;
-  margin: 0rpx  1.5%  20rpx 1.5%;
+  color: #26A2FF;
+  border-bottom: 1px solid #f1f1f1;
+}
+.shu view:last-child{
+  color: #ccc;
 }
-.rule-all-text{
-  font-size: 28rpx;
-  color: #999;
-  position: relative;
-  right: 10rpx;
-  bottom: 5rpx;
-}
-.rule-items{
-  padding: 0 14rpx;
-}
-.ruleActive{
-    color: #26a2ff!important;
-    background: #26a2ff33!important;
-}

Component/selectRule_two/selectRule_two.axml

@@ -1,24 +1,29 @@
 <view class="all-date">
   <view class="data-tier" catchTap="onClose"></view>
-  <view class="staff-header {{isShow?'showPop':''}}">
-    <scroll-view class="rule-ul" scroll-y="{{true}}">
-      <view a:for="{{rule_tree}}" class="rule-item">
-        <view class="flex-box flex-v-ce rule-title">
-          <view class="flex-1">{{item.name}}</view>
-          <label>
-            <text class="rule-all-text">全选</text>
-            <checkbox onChange="ruleActiveAll" data-index="{{index}}" checked="{{item.checked}}" disabled="{{item.disabled}}" />
-          </label>
+  <view class="date-header {{isShow?'showPop':''}}">
+    <view>
+      <view class="flex-box flex-v-ce shu" a:if="{{terr.length>1}}">
+        <view a:for="{{terr}}" class="flex-box flex-v-ce" data-index="{{index}}" catchTap="activeItem" data-item="{{item}}">
+          <image mode="scaleToFill" src="../../../image/right.png" style="width:20rpx;height:20rpx;margin:0 6rpx;" a:if="{{index!=0}}"/>
+                {{item.name}}
         </view>
-        <view class="flex-box flex-d-wrap rule-items" a:if="{{item.child.length>0}}">
-          <view catchTap="ruleActive" data-index="{{index}}" data-indexChild="{{idx}}" class="{{itemName.checked==true? 'ruleActive':''}} ruleGe font-flex-word" a:for="{{item.child}}" a:for-index="idx" a:for-item="itemName">{{itemName.name}}</view>
-        </view>
-        <view style="text-align: center;font-size:22rpx;" class="fontColorT" a:else>暂无相关规则</view>
       </view>
-    </scroll-view>
-    <view class="flex-box staff-btn">
+      <scroll-view class="ul" scroll-y="{{true}}">
+        <radio-group class="radio-group" onChange="radioChange">
+          <view class="flex-box flex-v-ce li" a:for="{{rule_tree}}">
+            <label class="flex-box flex-v-ce" style="width:88%;height:56rpx">
+              <radio value="{{item}}" checked="{{item.checked}}" name="{{item.id}}"/>
+              <view class="font-flex-word" style="margin-left:10rpx;width:90%">{{item.name}}</view>
+            </label>
+            <view class="xia" data-item="{{item}}" catchTap="openDown" a:if="{{item.child.length>0}}">| 下级</view>
+          </view>
+        </radio-group>
+      </scroll-view>
+    </view>
+    <view class="flex-box date-btn">
       <view class="flex-1" catchTap="onClose">取消</view>
       <view class="flex-1" catchTap="onConfirm">确定</view>
     </view>
   </view>
+  <view class="meng" catchTap="onClose"></view>
 </view>

Component/selectRule_two/selectRule_two.js

@@ -3,76 +3,85 @@ var that;
 Component({
   mixins: [],
   data: {
-    all_user_list: {},
+    all_rule_list: [],
     isShow: false,
+    terr: [
+      { name: '全部', id: 0 }
+    ],
+    rule_tree: []
   },
   props: {
     onConfirm: (data) => console.log(data),
     onClose: (data) => console.log(data),
+    defaultSection: '',
   },
   didMount() {
     that = this;
-    this.setData({ isShow: this.props.isShow })
+    this.setData({
+      isShow: this.props.isShow,
+      terr: [{ name: '全部', id: 0 }],
+      selectTissue: { name: '全部分类', id: '' }
+    })
     this.getData();
   },
   didUpdate() { },
   didUnmount() { },
   methods: {
-    //全
-    ruleActiveAll(e) {
-      var index = e.target.dataset.index;
-      var items = this.data.rule_tree[index].child;
-      var elem = `rule_tree[${index}].checked`;
-      var elemChild = `rule_tree[${index}].child`;
-      items.map((item) => {
-        item.checked = e.detail.value
-      })
-      this.setData({
-        [elem]: e.detail.value,
-        [elemChild]:items
-      });
-    },
-    //单
-    ruleActive(e) {
-      var index = e.target.dataset.index;
-      var indexChild = e.target.dataset.indexChild;
-      var isChecked = this.data.rule_tree[index].child[indexChild].checked;
-      var elem = `rule_tree[${index}].child[${indexChild}].checked`;
-      this.setData({
-        [elem]: !isChecked
-      })
-    },
     onConfirm() {
-      var rule_tree=this.data.rule_tree;
-      var arr=[];
-      rule_tree.forEach(item => {
-        if(item.child.length>0){
-          item.child.forEach((a)=>{
-              if(a.checked==true){
-                arr.push(a.id);
-              }
-          })
-        }
-      });
-      this.props.onConfirm(arr);
+      this.props.onConfirm(this.data.selectTissue);
       this.props.onClose();
     },
-    radioChange: function (e) {
-      if (e.detail.value) {
-        var arr = e.detail.value;
+    //点击导航栏
+    activeItem(e) {
+      var item = e.target.dataset.item;
+      var index = e.target.dataset.index;
+      var terr = this.data.terr;
+      if ((index + 1) == terr.length) { return false };
+      this.setData({ rule_tree: [] });
+      if (index == 0) {
         this.setData({
-          selectUserId: e.detail.value
+          terr: [{ name: '全部', id: 0 }],
+          rule_tree: this.data.all_rule_list
         })
       } else {
+        var arr = terr.slice(0, index + 1);
         this.setData({
-          selectUserId: []
+          rule_tree: item._child,
+          terr: arr
         })
       }
     },
-
+    // 点击下一级
+    openDown(e) {
+      this.setData({ rule_tree: [] });
+      var item = e.target.dataset.item;
+      var terr = this.data.terr;
+      terr.push(item);
+      if (item.child.length > 0) {
+        item.child.map(item => {
+          if (item.id == this.props.defaultSection) {
+            item.checked = true;
+          }
+        })
+        that.setData({
+          rule_tree: item.child,
+          terr: terr
+        })
+      }
+    },
+    radioChange: function (e) {
+      this.setData({
+        selectTissue: e.detail.value
+      })
+    },
     getData() {
       app.$get("api/integral/rule/trees", { pt_id: 3 }).then((res) => {
         var rule_tree = res.data.data.rule_tree;
+        rule_tree.unshift({
+          name:'全部分类',
+          id:'',
+          child:[]
+        })
         rule_tree.map((item) => {
           item.checked = false;
           item.disabled = false
@@ -80,15 +89,12 @@ Component({
             item.child.map((a) => {
               a.checked = false;
             })
-          } else {
-            // item.disabled = true;
           }
         })
         that.setData({
-          rule_tree: rule_tree
+          rule_tree: rule_tree,
+          all_rule_list:rule_tree
         })
-      }, (err) => {
-
       })
     },
     //关闭

Component/selectSection/selectSection.acss

@@ -6,7 +6,7 @@
   right:0;
   top:80rpx;
   z-index: 5;
-  background-color: rgba(0,0,0,.7);
+  /* background-color: rgba(0,0,0,.7); */
 }
 .date-header{
   background-color: #fff;
@@ -14,6 +14,10 @@
   padding-top: 28rpx;
   margin-top: 0rpx;
   transform: translateY(-100%);
+  position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 8;
 }
 .date-bottom{
     animation-duration: 0.2s;
@@ -99,4 +103,4 @@
 }
 .shu view:last-child{
   color: #ccc;
-}
+}

Component/selectSection/selectSection.axml

@@ -24,4 +24,5 @@
       <view class="flex-1" catchTap="onConfirm">确定</view>
     </view>
   </view>
+  <view class="meng" catchTap="onClose"></view>
 </view>

Component/selectSection/selectSection.js

@@ -81,7 +81,7 @@ Component({
     //获取部门列表
     getBmData() {
       app.$get("api/department/tree", {}).then((res) => {
-        var list = res.data.data.list;
+        var list = res.data.data.list||[];
         list.unshift({
           name:'全公司',
           id:''

Component/selectSectionStaff/selectSectionStaff.axml

@@ -1,45 +1,53 @@
 <view class="all">
-  <image mode="scaleToFill" catchTap="onClose" class="close" src="../../../image/close.png"/>
+  <image mode="scaleToFill" catchTap="onClose" class="close" src="../../../image/close.png"></image>
   <view class="search flex-box flex-v-ce">
-    <image mode="scaleToFill" src="../../../image/ss.png"/>
-    <input placeholder="请输入姓名搜索" onInput="bindKeyInput"/>
+    <image mode="scaleToFill" src="../../../image/ss.png"></image>
+    <input placeholder="请输入姓名搜索" onInput="bindKeyInput"></input>
   </view>
   <view class="content">
-    <view class="flex-box flex-v-ce shu" a:if="{{terr.length>1}}">
+    <view a:if="{{terr.length>1}}" class="flex-box flex-v-ce shu">
       <view a:for="{{terr}}" class="flex-box flex-v-ce" data-index="{{index}}" catchTap="activeItem" data-item="{{item}}">
-        <image mode="scaleToFill" src="../../../image/right.png" style="width:20rpx;height:20rpx;margin:0 6rpx;" a:if="{{index!=0}}"/>{{item.name}}
+        <image a:if="{{index!=0}}" mode="scaleToFill" src="../../../image/right.png" style="width:20rpx;height:20rpx;margin:0 6rpx;"></image>
+        {{item.name}}
       </view>
     </view>
     <scroll-view class="staff-ul" scroll-y="{{true}}" style="{{terr.length>1? 'height: calc(100vh - 390rpx);':'height: calc(100vh - 320rpx);'}}">
       <block a:if="{{isItem}}">
         <view class="ul2">
-          <view class="flex-box flex-v-ce li" a:for="{{rule_tree}}">
+          <view a:for="{{rule_tree}}" class="flex-box flex-v-ce li">
             <view class="flex-box flex-v-ce flex-1" data-item="{{item}}" catchTap="changeSection">
-              <image mode="scaleToFill" style="width:50rpx;height:50rpx; margin:0 10rpx;" src="../../../image/BM.png"/> {{item.name}}
+              <image mode="scaleToFill" style="width:50rpx;height:50rpx; margin:0 10rpx;" src="../../../image/BM.png"></image>
+              {{item.name}}
             </view>
-            <view class="xia" a:if="{{item._child.length>0}}" data-item="{{item}}" catchTap="openDown">| 下级</view>
+            <view a:if="{{item._child.length>0}}" class="xia" data-item="{{item}}" catchTap="openDown">| 下级</view>
           </view>
         </view>
         <view class="flex-box flex-v-ce staff-all">
           <view class="flex-1"></view>
           <label a:if="{{isAll}}">
             <text class="rule-all-text">全选</text>
-            <checkbox onChange="ruleActiveAll" disabled="{{item.disabled}}" checked="{{isAllChecked}}"/>
+            <checkbox onChange="ruleActiveAll" disabled="{{item.disabled}}" checked="{{isAllChecked}}"></checkbox>
           </label>
         </view>
-        <view class="flex-box flex-v-ce userItem" a:for="{{userList}}">
+        <view a:if="{{userList.length>0}}" a:for="{{userList}}"  class="flex-box flex-v-ce userItem">
           <label class="flex-box flex-v-ce flex-1">
             <img-box name="{{item.name}}" imgUrl="{{item.img_url}}" height="70rpx" width="70rpx"></img-box>
             <text style="margin-left:20rpx;" class="flex-1">{{item.name}}</text>
-            <checkbox onChange="radioChange" data-index="{{index}}" data-item="{{item}}" checked="{{item.checked}}" name="{{item.id}}"/>
+            <checkbox onChange="radioChange" data-index="{{index}}" data-item="{{item}}" checked="{{item.checked}}" name="{{item.id}}"></checkbox>
           </label>
         </view>
+        <view a:if="{{userList.length==0}}">
+          <view class="fontColorF" style="margin-top:200rpx;text-align: center;">
+              <view>您当前没有可管理人员，请联系公司管理员</view>
+              <view>设置对应管理范围</view>
+          </view>
+        </view>
       </block>
-      <view class="flex-box flex-v-ce userItem" a:for="{{searchVal}}" a:else>
+      <view a:else a:for="{{searchVal}}" class="flex-box flex-v-ce userItem">
         <label class="flex-box flex-v-ce flex-1">
           <img-box name="{{item.name}}" imgUrl="{{item.img_url}}" height="70rpx" width="70rpx"></img-box>
           <text style="margin-left:20rpx;" class="flex-1">{{item.name}}</text>
-          <checkbox onChange="radioChange" data-index="{{index}}" data-item="{{item}}" checked="{{item.checked}}" name="{{item.id}}"/>
+          <checkbox onChange="radioChange" data-index="{{index}}" data-item="{{item}}" checked="{{item.checked}}" name="{{item.id}}"></checkbox>
         </label>
       </view>
     </scroll-view>
@@ -47,10 +55,8 @@
   <view class="StaffFooter flex-box flex-v-ce">
     <view class="flex-1 f-left flex-box flex-v-ce">
       <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 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>

Component/selectSectionStaff/selectSectionStaff.js

@@ -28,13 +28,15 @@ Component({
   },
   didMount() {
     that = this;
-    app.login(app.globalData.corpId, function () {
-      that.setData({
-        selectUserId: that.props.selectUser,
-        isAll: that.props.isAllSelect,
-        userData:app.globalData.userData.employee_detail.manage_scope,
-        terr:[{name: '全部', id:0}]
-      })
+    app.login(app.globalData.corpId, function (is) {
+      if(is){
+        that.setData({
+          selectUserId: that.props.selectUser,
+          isAll: that.props.isAllSelect,
+          userData:app.globalData.userData.employee_detail.manage_scope,
+          terr:[{name: '全部', id:0}]
+        })
+      }
       that.getData(0);
       that.getBmData();
     })
@@ -236,7 +238,7 @@ Component({
       })
     },
     //获取部门列表
-    getBmData(dept_id) {
+    getBmData() {
       app.$get("api/department/tree", {}).then((res) => {
         var list = res.data.data.list;
         this.setData({

Component/selectSectionStaff_tow/selectSectionStaff_tow.axml

@@ -27,6 +27,11 @@
             <view class="radio_"><text a:if="{{item.checked}}"></text></view>
           </view>
         </view>
+        <view a:if="{{userList.length==0}}">
+          <view class="fontColorF" style="margin-top:200rpx;text-align: center;">
+              <view>您暂无相关审批人</view>
+          </view>
+        </view>
       </block>
       <view class="flex-box flex-v-ce userItem" a:for="{{searchVal}}" a:else a:key="{{index}}">
           <view class="{{item.checked? 'active':''}} flex-box flex-v-ce flex-1" catchTap="bindtap2" data-index="{{index}}" data-item="{{item}}">

Component/selectSectionStaff_tow/selectSectionStaff_tow.js

@@ -28,15 +28,17 @@ Component({
   },
   didMount() {
     that = this;
-    if(this.props.selectUser.length>0){//当有默认的审批人
-        var arr=app.globalData.userData.employee_detail.superior_list;
-        arr.forEach(item=>{
-          if(item.id==this.props.selectUser[0].id){
-            this.setData({selectUserId:[item]})
-          }
-        })
-    }
-    var superior_list=[];//将传进来的上级集合，转成集合里变成对象（原先是对象）
+    // if(this.props.selectUser.length>0){//当有默认的审批人
+    //     var arr=app.globalData.userData.employee_detail.superior_list;
+    //     arr.forEach(item=>{
+    //       if(item.id==this.props.selectUser[0].id){
+    //         this.setData({selectUserId:[item]})
+    //       }
+    //     })
+    // }
+    // console.log(this.props.selectUser);/
+    this.setData({selectUserId:this.props.selectUser[0]? this.props.selectUser:[]})
+    var superior_list=[];//将传进来的上级集合，转成集合里变成对象（原先是数组）
     this.props.superior_list.forEach(item=>{
         superior_list.push({id:item});
     })
@@ -45,6 +47,7 @@ Component({
         userData:this.props.isLeadership ? userData.manage_scope:superior_list.length>0? superior_list:userData.superior_list ,
         terr:[{name: '全部', id:0}]
     })
+
     this.getBmData();
     this.getData(0);
   },
@@ -201,10 +204,7 @@ Component({
     },
     //获取人员列表
     getData(dept_id) {
-      this.setData({
-          userList: [],
-          all_user_list: []
-      })
+      this.setData({userList: [], all_user_list: []})
       app.$get("api/employee/list", { dept_id: dept_id }).then((res) => {
         var list = res.data.data.list;
         var selectUserId = this.data.selectUserId;
@@ -237,7 +237,7 @@ Component({
       })
     },
     //获取部门列表
-    getBmData(dept_id) {
+    getBmData() {
       app.$get("api/department/tree", {}).then((res) => {
         var list = res.data.data.list;
         this.setData({

Component/selectStaff/selectStaff.acss

@@ -6,7 +6,7 @@
   right:0;
   top:80rpx;
   z-index: 5;
-  background-color: rgba(0,0,0,.7);
+  /* background-color: rgba(0,0,0,.7); */
 }
 .staff-header{
   background-color: #fff;
@@ -14,6 +14,10 @@
   padding-top: 28rpx;
   margin-top: 0rpx;
   transform: translateY(-100%);
+    position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 8;
 }
 
 .staff-btn view{

Component/selectStaff/selectStaff.axml

@@ -15,10 +15,15 @@
           </label>
         </view>
       </checkbox-group>
+      <view a:if="{{userList.length==0}}" class="fontColorF" style="margin-top:200rpx;text-align: center;">
+          <view>暂无相关人员</view>
+      </view>
     </scroll-view>
     <view class="flex-box flex-v-ce selectUsers" a:if="{{selectUserId.length>0}}">
       <view a:for="{{selectUserId}}" style="margin-right:10rpx;height:70rpx;">
-         <img-box name="{{item.name}}" imgUrl="{{item.img_url}}"  height="70rpx" width="70rpx"></img-box>
+        <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>
+         <!-- <img-box name="{{item.name}}" imgUrl="{{item.img_url}}"  height="70rpx" width="70rpx"></img-box> -->
       </view>
     </view>
     <view class="flex-box date-btn">
@@ -26,4 +31,5 @@
         <view class="flex-1" catchTap="onConfirm">确定</view>
     </view>
   </view>
+  <view class="meng" catchTap="onClose"></view>
 </view>

Component/selectSx/selectSx.acss

@@ -6,7 +6,7 @@
   right:0;
   top:80rpx;
   z-index: 5;
-  background-color: rgba(0,0,0,.7);
+  /* background-color: rgba(0,0,0,.7); */
 }
 .staff-header{
   background-color: #fff;
@@ -14,6 +14,10 @@
   padding-top: 28rpx;
   margin-top: 0rpx;
   transform: translateY(-100%);
+    position: fixed;
+  left: 0;
+  right: 0;
+  z-index: 8;
 }
 
 .staff-btn view{

Component/selectSx/selectSx.axml

@@ -17,4 +17,5 @@
       <view class="flex-1" catchTap="onConfirm">确定</view>
     </view>
   </view>
+   <view class="meng" catchTap="onClose"></view>
 </view>

Component/selectUser/selectUser.axml

@@ -22,4 +22,5 @@
       </view>
     </view>
   </view>
+   <view class="meng" catchTap="onClose"></view>
 </view>

app.acss

@@ -114,7 +114,9 @@
 		opacity: .8;
 		content: '';
 	}
-
+  .tab .activeView{
+		color: #26a2ff;
+	}
 	.tab .activeView::after {
 		margin-top: -0.02rem;
 		-webkit-transform: rotate(135deg);
@@ -131,6 +133,14 @@
 		background: rgba(0, 0, 0, 0.4);
 		z-index: 999;
 	}
+	.meng{
+		position: fixed;
+		bottom: 0;
+		background-color: rgba(0,0,0,.5);
+		left: 0;
+		right: 0;
+		top: 80rpx;
+	}
 
 	/* 弹窗过程 */
 

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;
@@ -32,89 +32,114 @@ App({
       this.globalData.types = res.data.data.list;
     })
   },
-  //封装post
-  $post(url, data={}) {
-    const promise = new Promise(function (resolve, reject) {
+ routerGet(url,data={},Accept){
+    return new Promise(function (resolve, reject) {
+      dd.showLoading();
       dd.httpRequest({
         url: baseUrl + url,
-        method: 'POST',
+        method: 'GET',
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
-          'A-Token': that.globalData.token
+          'A-Token': that.globalData.token,
+          'Accept': Accept ? Accept:''
         },
         data: data,
         dataType: 'json',
         success: function (res) {
           if (res.data.code == 1) {
-            if (res.refresh_token && res.data.refresh_token != that.globalData.token) {
+            if (res.data.refresh_token && res.data.refresh_token != that.globalData.token) {
               that.globalData.token = res.data.refresh_token
             }
             resolve(res);
           } else if (res.data.code == 401) {
             that.globalData.showToast("登录已过期");
-             reject(res);
+            // reject(res);
           } else {
-            that.globalData.showToast(res.data.msg);
-             reject(res);
+            that.globalData.showToast(res.data.msg)
+            // reject(res);
           }
         },
         fail: function (res) {
           reject(res);
+        },
+        complete:function(){
+            dd.hideLoading();
         }
       });
     })
-    return promise;
   },
-  //封装get
-  $get(url,data={},Accept) {
-    const promise = new Promise(function (resolve, reject) {
-      dd.showLoading();
+ routerPost(url,data={}){
+    return new Promise(function (resolve, reject) {
       dd.httpRequest({
         url: baseUrl + url,
-        method: 'GET',
+        method: 'POST',
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
-          'A-Token': that.globalData.token,
-          'Accept': Accept ? Accept:''
+          'A-Token': that.globalData.token
         },
         data: data,
         dataType: 'json',
         success: function (res) {
-          dd.hideLoading();
           if (res.data.code == 1) {
-            if (res.data.refresh_token && res.data.refresh_token != that.globalData.token) {
+            if (res.refresh_token && res.data.refresh_token != that.globalData.token) {
               that.globalData.token = res.data.refresh_token
             }
             resolve(res);
           } else if (res.data.code == 401) {
             that.globalData.showToast("登录已过期");
-            // reject(res);
+             reject(res);
           } else {
-            that.globalData.showToast(res.data.msg)
-            // reject(res);
+            that.globalData.showToast(res.data.msg);
+             reject(res);
           }
         },
         fail: function (res) {
-          dd.hideLoading();
           reject(res);
-        },
+        }
       });
     })
-    return promise;
+  },
+  //封装post
+ $post(url, data={}) {
+    if(url=='api/ding/login'){
+      return  that.routerPost(url,data);
+    }
+    if(!that.globalData.token){
+        dd.navigateTo({
+             url:'../../init/init'
+        })
+        return Promise.reject("登录中")
+    }else{
+       return that.routerPost(url,data);
+    }
+  },
+  //封装get
+  $get(url,data={},Accept) {
+    if(url=='api/integral/types'){
+      return that.routerGet(url,data,Accept);
+    }
+    if(!that.globalData.token){
+        dd.navigateTo({
+             url:'../../init/init'
+        })
+         return Promise.reject("登录中")
+    }else{
+      return that.routerGet(url,data,Accept);
+    }
   },
   //免登
   login(corpId, callBack) {
-    dd.getAuthCode({
+      dd.getAuthCode({
       success: function (res) {
-        that.$post('api/ding/login', { authCode: res.authCode, corpId: corpId }).then(res => {
+       that.$post('api/ding/login', { authCode: res.authCode, corpId: corpId }).then(res => {
           if (res.data.code == 1) {
             var { token, user } = res.data.data;
             if(user.is_official==1){
               that.globalData.token = token;
               that.globalData.userData = user;
-              callBack(true);
+             callBack(true);
             }else{
-              callBack(false);
+             callBack(false);
             }
           } else {
             that.globalData.showToast(res.msg)
@@ -128,6 +153,8 @@ App({
       }
     });
   },
+
+
   getTypesItem(id){
       return getTypeItem(this.globalData.types,id);
   },

app.json

@@ -30,7 +30,8 @@
     "pages/deploy/integralRule/integralRule",
     "pages/workbench/approve/approve",
     "pages/statistics/C_ranking/C_ranking",
-    "pages/workbench/noJurisdiction/noJurisdiction"
+    "pages/workbench/noJurisdiction/noJurisdiction",
+    "pages/init/init"
   ],
   "window": {
     "defaultTitle": "功道云",
@@ -38,7 +39,7 @@
     "pullRefresh": "false"
   },
   "tabBar": {
-    "textColor": "#dddddd",
+    "textColor": "#606266",
     "selectedColor": "#49a9ee",
     "backgroundColor": "#ffffff",
     "items": [

pages/deploy/addMoney/addMoney.axml

@@ -1,4 +1,8 @@
 <view>
+  <image mode="scaleToFill" src="../../../image/money.png" style="width:100%;height:1500rpx"/>
+  <view style="height:100rpx">
+    
+  </view>
   <view class="footer">
     <view>续费升级</view>
   </view>

pages/deploy/index/index.acss

@@ -11,7 +11,7 @@
   right: 32rpx;
   border-radius: 20rpx;
   background-color: #fff;
-  box-shadow: 0rpx 0rpx 10rpx #ccc;
+   box-shadow: 0rpx 4rpx 10rpx rgba(0, 0, 0, 0.05);
   height: 140rpx;
 }
 .head .flex-box{

pages/deploy/index/index.axml

@@ -44,4 +44,6 @@
       </view>
     </view>
   </view>
+  <!-- <view class="fontColorF" style="text-align: center">正式1.0</view> -->
+  <view class="fontColorF" style="text-align: center">测试1.0</view>
 </view>

pages/deploy/integralRule/integralRule.acss

@@ -18,19 +18,23 @@
   height: 30rpx;
   margin-left: 10rpx;
 }
-.tree,.item-list{
+.tree{
   background: #fff;
 }
 .tree-item{
-  padding:20rpx 28rpx;
+  padding:34rpx 28rpx;
   border-bottom: 1px solid #f1f1f1; 
 }
+.main .tree-item:last-child{
+    border: none;
+}
 .main{
   height: calc(100vh - 132rpx);
 } 
 .list-items{
-  padding:10rpx 28rpx;
-  border-bottom: 1px solid #f1f1f1; 
+  background: #fff;
+  padding:16rpx 28rpx;
+  margin-bottom: 14rpx
 }
 .remark{
   font-weight: 600;

pages/deploy/integralRule/integralRule.axml

@@ -11,7 +11,7 @@
     </view>
   </view>
   <scroll-view a:if="{{isItem}}" class="main" scroll-y="{{true}}" style="{{terr.length>1? 'height: calc(100vh - 206rpx)':'height: calc(100vh - 142rpx)'}}">
-    <view class="margin-bottom tree">
+    <view class="margin-bottom tree" a:if="{{rule_tree.length}}">
       <view a:for="{{rule_tree}}" class="flex-box flex-v-ce tree-item" data-item="{{item}}" catchTap="activeTree">
         <view class="rule-name flex-1">{{item.name}}</view>
         <image mode="scaleToFill" src="../../../image/right.png" style="width:24rpx;height:24rpx;"/>

pages/deploy/integralRule/integralRule.js

@@ -20,7 +20,7 @@ Page({
       { name: '全部', id: 0 }
     ],
     })
-    dd.setNavigationBar({ title: "积分规则" });
+    dd.setNavigationBar({ title: "积分分类" });
     this.setData({ types: app.globalData.types })
     this.getData();
   },
@@ -102,8 +102,6 @@ Page({
         allItems: list,
         allTree:rule_tree,
       })
-      console.log(item_list)
-      console.log(rule_tree)
     }, (err) => {
 
     })

pages/init/init.acss

@@ -0,0 +1,13 @@
+	.noData{
+		text-align: center;
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+    background-color: #fff;
+	}
+  .initImg{
+    width: 200rpx;
+    height: 200rpx;
+  }

pages/init/init.axml

@@ -1,3 +1,5 @@
 <view>
-  初始化
+  <view class="noData flex-box-v flex-center-center">
+    <image mode="scaleToFill" src="../../image/init.gif" class="initImg"/>
+  </view>
 </view>

pages/init/init.js

@@ -1,6 +1,20 @@
+var app = getApp();
+var that;
 Page({
   data: {},
   onLoad() {
-    
-  },
+    dd.hideLoading();
+    app.login(app.globalData.corpId, function (is) {
+
+        if(is){
+        dd.navigateBack({
+          delta: 1
+        })
+        }else{
+          dd.reLaunch({
+            url:'../noJurisdiction/noJurisdiction'
+          })
+        }
+      })
+   },
 });

pages/statistics/B_ranking/B_ranking.axml

@@ -21,7 +21,7 @@
         <view a:elif="{{index==2}}" class="index">
           <image mode="scaleToFill" src="../../../image/3.png"></image>
         </view>
-        <view a:else class="index">{{index}}</view>
+        <view a:else class="index">{{index+1}}</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>

pages/statistics/B_ranking/B_ranking.js

@@ -11,7 +11,7 @@ Page({
   },
   onLoad() {
     that = this;
-    dd.setNavigationBar({ title: "B分累计排名" });
+    dd.setNavigationBar({ title: "累计B分排名" });
     this.getData();
   },
     getData(is){
@@ -48,8 +48,6 @@ Page({
     if(!that.data.isData){
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    }else{
-       app.globalData.showToast("已无更多咯");
     }
   },
   selectIsPx(){

pages/statistics/C_ranking/C_ranking.axml

@@ -1,7 +1,7 @@
 <view>
   <view class="flex-box flex-v-ce tab">
     <view class="flex-1" catchTap="selectDay">
-      <text class="dateVal">{{month}}</text>
+      <text class="{{showDate? 'activeView':''}} dateVal">{{month}}</text>
     </view>
     <view class="flex-1" catchTap="selectRule">
       <text class="{{showRuleTwo? 'activeView blue':''}}">{{ruleVal}}</text>

pages/statistics/C_ranking/C_ranking.js

@@ -35,7 +35,6 @@ Page({
       var data = res.data.data.list;
       if (is) {
         if (data.length == 0) {
-          app.globalData.showToast("已无更多咯");
           return;
         }
         var list = that.data.list;
@@ -55,6 +54,7 @@ Page({
     this.getData(true);
   },
   selectDay() {
+    this.setData({ showDate:true })
     dd.datePicker({
       format: 'yyyy-MM',
       currentDate: this.data.month,
@@ -64,6 +64,11 @@ Page({
         })
         this.getData();
       },
+      complete:(res)=>{
+        that.setData({
+           showDate: false
+        })
+      }
     });
   },
     //显示规则组件
@@ -94,7 +99,7 @@ Page({
   },
   //选择规则
   onConfirmRule(data) {
-    this.setData({ rule_id: data.join(','), page: 1 })
+    this.setData({ rule_id: data.id, page: 1,ruleVal:data.name })
     this.getData();
   },
 });

pages/statistics/addCustom/addCustom.js

@@ -14,8 +14,10 @@ Page({
     if (e.id) {
       this.getData(e.id);
       this.setData({ isbj: e.id, });
+      dd.setNavigationBar({ title: "编辑分组" });
+    }else{
+      dd.setNavigationBar({ title: "新建分组" });
     }
-    dd.setNavigationBar({ title: "新建分组" });
   },
   onShow() {
     animation = dd.createAnimation({
@@ -58,12 +60,12 @@ Page({
     this.data.selectUser.forEach(element => {
       arr.push(element.id);
     });
-    if(arr.length==0){
+    if (arr.length == 0) {
       app.globalData.showToast("至少选择一名员工参与");
       return
     }
     var data = {
-      group_id:that.data.isbj,
+      group_id: that.data.isbj,
       group_name: this.data.title,
       employees: arr.join(',')
     }
@@ -91,7 +93,7 @@ Page({
       employees: arr.join(',')
     }
     app.$post("api/integral/statistics/groups/create", data).then((res) => {
-      app.globalData.showToast("保存成功");
+      app.globalData.showToast("新建分组成功");
       setTimeout(() => {
         dd.navigateBack({
           delta: 1
@@ -101,14 +103,25 @@ Page({
   },
   //删除
   delete() {
-    app.$post("api/integral/statistics/groups/drop", { group_id: that.data.isbj }).then((res) => {
-      app.globalData.showToast("已删除");
-      setTimeout(() => {
-        dd.navigateBack({
-          delta: 1
-        })
-      }, 1000);
-    })
+    dd.confirm({
+      title: '温馨提示',
+      content: '确定删除该分组吗?',
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      success: (result) => {
+        if (result.confirm) {
+          app.$post("api/integral/statistics/groups/drop", { group_id: that.data.isbj }).then((res) => {
+            app.globalData.showToast("已删除");
+            setTimeout(() => {
+              dd.navigateBack({
+                delta: 1
+              })
+            }, 1000);
+          })
+        }
+      },
+    });
+
   },
   getData(id) {
     app.$get("api/integral/statistics/groups/info", { group_id: id }).then((res) => {

pages/statistics/checkDetail/checkDetail.js

@@ -26,8 +26,6 @@ Page({
     if (!that.data.isData) {
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    } else {
-      app.globalData.showToast("已无更多咯");
     }
   },
   getData(is) {

pages/statistics/check_top/check_top.js

@@ -90,8 +90,6 @@ Page({
     if (!that.data.isData) {
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    } else {
-      app.globalData.showToast("已无更多咯");
     }
   },
 
@@ -145,6 +143,7 @@ Page({
           arr.push({ id: k, name: data[k] })
         }
       // }
+      arr.unshift({id:'',name:'全部分组'})
       this.setData({
         tisrrArr: arr
       })

pages/statistics/glz_execute/glz_execute.axml

@@ -1,14 +1,14 @@
 <view>
   <view class="flex-box flex-v-ce tab">
     <view class="flex-1" onTap="openDate">
-      <text>{{month}}</text>
+      <text class="{{showDate? 'activeView':''}}">{{month}}</text>
     </view>
     <view class="flex-1" onTap="selectTissue">
       <text class="{{showTissue? 'activeView':''}}" a:if="{{tissueValName}}">{{tissueValName}}</text>
     </view>
     <view class="flex-1">
       <picker onChange="bindPickerChange" value="{{activeIndex}}" range="{{array}}" range-key="name">
-        <text class="picker">{{array[activeIndex].name}}</text>
+        <text  class="picker">{{array[activeIndex].name}}</text>
       </picker>
     </view>
   </view>

pages/statistics/glz_execute/glz_execute.js

@@ -62,8 +62,6 @@ Page({
     if(!that.data.isData){
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    }else{
-       app.globalData.showToast("已无更多咯");
     }
   },
   openDetail(e) {
@@ -72,6 +70,11 @@ Page({
       url: '../../workbench/prize_buckle/prize_buckle?id='+item.id+'&month='+that.data.month
     })
   },
+  // showPicker(){
+  //  this.setData({
+  //     showPicker: true
+  //   });
+  // },
   bindPickerChange(e) {
     var list=that.data.list;
     if (e.detail.value == 0) {
@@ -81,10 +84,12 @@ Page({
     }
    this.setData({
       activeIndex: e.detail.value,
-      list:list
+      list:list,
+      showPicker: false
     });
   },
   openDate() {
+    this.setData({ showDate:true })
     dd.datePicker({
       format: 'yyyy-MM',
       currentDate: this.data.month,
@@ -95,6 +100,11 @@ Page({
         })
         that.getData();
       },
+     complete:(res)=>{
+        that.setData({
+           showDate: false
+        })
+      }
     });
 
   },

pages/statistics/index/index.js

@@ -14,8 +14,8 @@ Page({
   openView(e) {
     var index = e.target.dataset.index-1;
     var urls = [
-      { url: '../my_PrizeBuckle/my_PrizeBuckle', query: '' },
-      { url: '../my_apply/my_apply', query: '' },
+      { url: '../my_PrizeBuckle/my_PrizeBuckle', query: "index=" },
+      { url: '../my_apply/my_apply', query: "index=" },
       { url: '../glz_execute/glz_execute', query: '' },
       { url: '../integralEvent/integralEvent', query: '' },
       { url: '../check_top/check_top', query: '' },

pages/statistics/integralEvent/integralEvent.axml

@@ -11,7 +11,7 @@
     </view>
     <view class="flex-1">
       <picker onChange="bingIntegralType" value="{{typesIndex}}" range="{{types}}" range-key="name">
-        <text a:if="{{types[typesIndex].name=='全部'}}">积分分类</text>
+        <text a:if="{{types[typesIndex].name=='全部'}}">积分类型</text>
         <text a:else>{{types[typesIndex].name}}</text>
       </picker>
     </view>
@@ -23,12 +23,12 @@
         <view class="flex-1 main-right">
           <view class="flex-box flex-v-ce">
             <view class="name flex-1">{{item.employee_name}}</view>
-            <view class="red da" a:if="{{item.point>0}}">+{{item.point}}</view>
-            <view class="green da" a:else>{{item.point}}</view>
+            <view class="red da" a:if="{{item.point>0}}">+{{item.point}}{{item.ptObj.name}}</view>
+            <view class="green da" a:else>{{item.point}}{{item.ptObj.name}}</view>
           </view>
           <view class="context" a:if="{{item.remark}}">{{item.remark}}</view>
           <view class="flex-box flex-v-ce">
-            <view class="date flex-1">{{item.create_time}}</view>
+            <view class="date flex-1">{{item.event_time}}</view>
           </view>
         </view>
       </view>

pages/statistics/integralEvent/integralEvent.js

@@ -31,6 +31,7 @@ Page({
     that = this;
     typeArr=[{ id: 0, name: '全部' }];
     var arr=typeArr.concat(app.globalData.types);
+    arr=app.globalData.arrRemoveObj(arr,arr[1]);
     this.setData({types:arr})
     var userData=app.globalData.userData;
     dd.setNavigationBar({ title: "积分事件" });
@@ -70,6 +71,9 @@ Page({
     }
     app.$get('api/integral/statistics/integral', data).then((res) => {
       var data = res.data.data.list;
+      data.map((item)=>{
+        item.ptObj=app.getTypesItem(item.pt_id);
+      })
       if (is) {
         if (data.length == 0) {
           this.setData({
@@ -95,8 +99,6 @@ Page({
     if (!that.data.isData) {
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    } else {
-      app.globalData.showToast("已无更多咯");
     }
   },
   //打开兴趣
@@ -180,10 +182,10 @@ Page({
   },
   //选择规则
   onConfirmRule(e) {
-    var data = e.join(',');
     this.setData({
-      rule_id: data ? data : '',
-      page: 1
+      rule_id: e.id ? e.id : '',
+      page: 1,
+      ruleVal:e.name
     })
     this.getData();
   },

pages/statistics/my_PrizeBuckle/my_PrizeBuckle.js

@@ -7,7 +7,12 @@ Page({
     activeIndex: 1,
     page: 1,
   },
-  onLoad() {
+  onLoad(e) {
+    if(e.index){
+      this.setData({
+          activeIndex:e.index,
+      })
+    }
     that = this;
     dd.setNavigationBar({ title: "我奖扣的" });
     that.getData(1);
@@ -33,7 +38,7 @@ Page({
     } else if (index == 2) {
       data = {
         page: that.data.page,
-                page_size:20,
+        page_size:20,
         type: 'waiting',
         pt_id: 0,
         keyword: that.data.keyword
@@ -41,7 +46,7 @@ Page({
     } else {
       data = {
         page: that.data.page,
-                page_size:20,
+        page_size:20,
         type: 'refuse',
         pt_id: 0,
         keyword: that.data.keyword
@@ -92,8 +97,6 @@ Page({
     if(!that.data.isData){
       this.setData({ page: ++that.data.page })
       this.getData(that.data.activeIndex, true);
-    }else{
-       app.globalData.showToast("已无更多咯");
     }
   },
 });

pages/statistics/my_apply/my_apply.js

@@ -6,7 +6,12 @@ Page({
     activeIndex: 1,
     page: 1
   },
-  onLoad() {
+  onLoad(e) {
+    if(e.index){
+      this.setData({
+          activeIndex:e.index,
+      })
+    }
     that = this;
     dd.setNavigationBar({ title: "我申请的" });
     that.getData();
@@ -74,8 +79,6 @@ Page({
     if (!that.data.isData) {
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    } else {
-      app.globalData.showToast("已无更多咯");
     }
   },
 });

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -39,7 +39,7 @@
       </view>
     </view>
   </view>
-  <view class="main">
+  <view class="main margin-bottom">
     <view class="mian-title border-bottom" a:if="{{dataDetail.rule_item_id}}">规则依据
       <text>此事件打分参考以下积分规则</text>
     </view>
@@ -61,7 +61,9 @@
         </view>
       </view>
     </view>
-    <!-- 调用过程组件 -->
-    <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>
   </view>
+      <!-- 调用过程组件 -->
+    <view class="">
+      <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>
+    </view>
 </view>

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.js

@@ -8,7 +8,6 @@ Page({
   },
   onLoad(e) {
     that = this;
-    console.log(e);
     dd.setNavigationBar({ title: "事件详情" });
     if(e.id){
         that.getDetail(e.id);

pages/statistics/sectionRanking/sectionRanking.axml

@@ -10,7 +10,7 @@
       <text class="{{showRuleTwo? 'activeView blue':''}}">{{ruleVal}}</text>
     </view>
     <view class="flex-1" catchTap="selectSx">
-      <text class="{{showx? 'activeView blue':''}}">{{sxVal}}</text>
+      <text class="{{showSx? 'activeView blue':''}}">{{sxVal}}</text>
     </view>
   </view>
   <view class="fontColorF" style="font-size:28rpx;padding:10rpx 28rpx;">排名不包含初始分和工龄分</view>

pages/statistics/sectionRanking/sectionRanking.js

@@ -78,8 +78,6 @@ Page({
     if(!that.data.isData){
       this.setData({ page: ++that.data.page })
       this.getData(true);
-    }else{
-       app.globalData.showToast("已无更多咯");
     }
   },
   // //打开兴趣

pages/workbench/apply/apply.axml

@@ -42,7 +42,7 @@
         <view style="background:#fff;padding:0 28rpx;" a:if="{{item.files[0]}}" class="flex-box flex-v-ce">
           <view a:for="{{item.files}}" key="index" a:for-item="imgs" a:for-index="imgIndex" style="position:relative">
             <text class="detele" data-itemIndx="{{index}}" data-index="{{imgIndex}}" catchTap="deteleImg">×</text>
-            <image mode="scaleToFill" class="showImg" src="{{imgs}}"/>
+            <image mode="scaleToFill" class="showImg" src="{{imgs}}"  data-index="{{imgIndex}}" data-item="{{item.files}}" catchTap="showImg"/>
           </view>
         </view>
          <view class="flex-box flex-v-ce li" catchTap="openDate" data-index="{{index}}">

pages/workbench/apply/apply.js

@@ -43,6 +43,15 @@ Page({
       duration: 200,
       timeFunction: "linear",
     });
+  },
+    //显示图片
+  showImg(e){
+      var index=e.target.dataset.index;
+      var item=e.target.dataset.item
+      dd.previewImage({
+        current: index,
+        urls: item
+      });
   },
   //关闭规则
   onClose() {

pages/workbench/approve/approve.axml

@@ -218,14 +218,12 @@
           </view>
         </view>
       </block>
-
-
-      <view class="fontColorF" style="font-size:24rpx;padding-left:28rpx">奖票多用于优秀表现和重要事项的表彰</view>
+      <!-- <view class="fontColorF" style="font-size:24rpx;padding-left:28rpx">奖票多用于优秀表现和重要事项的表彰</view>
       <view class="flex-box flex-v-ce li margin-bottom" style="padding:26rpx 28rpx;">
         <view class="label">发放奖票</view>
         <view class="flex-1"></view>
         <switch onChange="switchChange2" disabled="{{item.pid}}" checked="{{item.ticket_count}}" color="#26A2FF"></switch>
-      </view>
+      </view> -->
       <view class="flex-box flex-v-ce li margin-bottom" data-num="3" catchTap="openSelect">
         <view class="label">递交审批</view>
         <view class="flex-1">{{users.name}}</view>
@@ -242,6 +240,6 @@
   <view class="box" animation="{{animationInfo}}">
     <select-rule  defaultId="{{defaultRuleId}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='1'}}"/>
     <select-type  defaultId="{{defaultRuleId}}" onConfirm="onSelectType" onClose="onClose" a:if="{{isShowType=='2'}}"/>
-    <select-section-staff-two onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='3'}}"/>
+    <select-section-staff-two onClose="onClose" selectUser="{{reviewerObj}}" onConfirm="onSelectUser" a:if="{{isShowType=='3'}}"/>
   </view>
 </view>

pages/workbench/approve/approve.js

@@ -19,6 +19,7 @@ Page({
       ticket_count: false,//奖票数量
       disabled:false,
       defaultRuleId:'',
+      reviewerObj:[],
     },
     users: {
       id:''
@@ -54,8 +55,10 @@ Page({
     });
   },
   onSelectUser(item) {
+  
     this.setData({
-      users: item[0]
+      users: item[0],
+      reviewerObj:item
     })
   },
 
@@ -115,7 +118,7 @@ Page({
       point: Number(point),
       reviewer_id: that.data.users.id ? that.data.users.id : 0,
       remark: item.remark,
-      ticket_count: item.ticket_count ? 1 : 0,
+      // ticket_count: item.ticket_count ? 1 : 0,
     }
     this.setData({disabled:true});
     app.$post("api/integral/review", data).then((res) => {
@@ -252,7 +255,6 @@ Page({
         ['item.point']: getPoint == 0 ? '' : getPoint,
         ['item.isArrindex']: data.point >= 0 ? true : false,
       })
-      console.log(this.data.item);
     })
   },
 });

pages/workbench/approveDetail/approveDetail.axml

@@ -1,26 +1,22 @@
 <view>
   <view class="header margin-bottom">
     <view class="header-top flex-box flex-v-ce border-bottom" a:if="{{dataDetail.status==0}}">
-      <img-box a:if="{{dataDetail.process[0].name}}" imgUrl="{{dataDetail.process[0].img_url}}" name="{{dataDetail.process[0].name}}" height="90rpx" width="90rpx" fSize="24rpx"></img-box>
+      <img-box a:if="{{dataDetail.employee_name}}" imgUrl="{{dataDetail.employee_img}}" name="{{dataDetail.employee_name}}" height="90rpx" width="90rpx" fSize="24rpx"></img-box>
       <view class="header-top-right">
-        <view class="name">{{dataDetail.process[0].name}}</view>
+        <view class="name">{{dataDetail.employee_name}}</view>
         <view class="yellow" a:if="{{dataDetail.review_status==0}}">{{dataDetail.status_mark}}</view>
         <view class="red" a:if="{{dataDetail.review_status==1}}">{{dataDetail.status_mark}}</view>
         <view class="green" a:if="{{dataDetail.review_status==2}}">{{dataDetail.status_mark}}</view>
       </view>
     </view>
     <view class="header-top flex-box-v flex-center-center border-bottom" a:if="{{dataDetail.status==1||dataDetail.status==2}}">
-      <img-box a:if="{{dataDetail.process[0].name}}" imgUrl="{{dataDetail.process[0].img_url}}" name="{{dataDetail.process[0].name}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
-      <view style="font-weight: 600;margin: 10rpx 0">{{dataDetail.process[0].name}}</view>
-      <view class="green" style="font-weight: 600;margin-bottom: 10rpx" a:if="{{dataDetail.status==1}}">
-        <text a:if="{{dataDetail.item_range_type==1}}">
-          <text a:if="{{dataDetail.item_prize_type == 1}}">+</text> 
-            {{ dataDetail.item_min_point }}
-        </text>
-        <text a:if="{{dataDetail.item_range_type==2}}">
-          <text a:if="{{dataDetail.item_prize_type == 1}}">+</text> 
-            {{ dataDetail.item_min_point }} ~ {{ dataDetail.item_max_point }}
+      <img-box a:if="{{dataDetail.employee_name}}" imgUrl="{{dataDetail.employee_img}}" name="{{dataDetail.employee_name}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
+      <view style="font-weight: 600;margin: 10rpx 0">{{dataDetail.employee_name}}</view>
+      <view style="font-weight: 600;margin-bottom: 10rpx" a:if="{{dataDetail.status==1}}">
+        <text class="red" a:if="{{dataDetail.review_point>0}}">
+          <text>+</text>{{ dataDetail.review_point }}
         </text>
+        <text a:else class="green">{{ dataDetail.review_point }}</text>
         <text style="margin-left:10rpx;">{{dataDetail.typeName}}</text>
       </view>
       <view>{{dataDetail.status_mark}}</view>
@@ -40,7 +36,7 @@
       </view>
     </view>
   </view>
-  <view class="main">
+  <view class="margin-bottom">
     <block a:if="{{dataDetail.rule_id}}">
       <view class="main-title border-bottom">规则依据
         <text>此事件打分参考以下积分规则</text></view>
@@ -69,7 +65,9 @@
         </view>
       </view>
     </block>
-    <!-- 调用过程组件 -->
+  </view>
+  <view class="main">
+        <!-- 调用过程组件 -->
     <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>
   </view>
   <view class="bottom flex-box flex-flex-center-center" a:if="{{!is}}">

pages/workbench/index/index.acss

@@ -11,9 +11,10 @@
   right: 32rpx;
   border-radius: 20rpx;
   background-color: #fff;
-  box-shadow: 0rpx 0rpx 10rpx #ccc;
+  box-shadow: 0rpx 4rpx 10rpx rgba(0, 0, 0, 0.05);
   height: 140rpx;
   text-align: center;
+  
 }
 .head .flex-1 view:nth-child(1){
   color: #26A2FF;
@@ -22,7 +23,7 @@
   font-size: 44rpx;
 }
 .head .flex-1 view:nth-child(2){
-  color: #C0C4CC;
+  color: #909399;
   margin-bottom: 5rpx;
   font-size: 28rpx;
 }
@@ -85,11 +86,11 @@
   font-size: 44rpx;
 }
 .main-main .flex-1 view:nth-child(2){
-  color: #909399;
+  color: #303133;
   margin-bottom: 5rpx;
 }
 .main-main .flex-1 view:nth-child(3){
-  color: #C0C4CC;
+  color: #909399;;
   margin-bottom: 5rpx;
   font-size: 24rpx;
 }
@@ -121,7 +122,7 @@
 .num{
   color: #F56C6C;
   margin-right: 28rpx;
-  font-size: 40rpx;
+  font-size: 44rpx;
   font-weight: 600
 }
 .text{
@@ -141,30 +142,25 @@
 }
 .windows-box{
   background: #fff;
-  margin: 0 32rpx;
-  margin-top: 30%;
+  margin: 0 10%;
+  margin-top: 50%;
   border-radius: 20rpx; 
 }
 .windows-title{
-  text-align: center;
-  padding: 28rpx 0;
-  border-bottom: 1px solid #f1f1f1;
+  padding: 32rpx;
+  color: #999;
+  font-size: 24rpx;
 }
 .windows-btn{
-   border-top: 1px solid #f1f1f1;
+   /* border-top: 1px solid #f1f1f1; */
 }
 .windows-btn view:nth-child(1){
-  text-align: center;
-  padding: 28rpx 0;
-  border-right: 1px solid #f1f1f1;
-}
-.windows-btn view:nth-child(2){
-  text-align: center;
-  padding: 28rpx 0;
+  text-align: right;
+  padding: 32rpx;
   color: #26A2FF;
 }
 .windows-content{
   height: 100rpx;
-  padding: 28rpx;
-  text-align: center
+  padding:0 28rpx;
+  font-size: 32rpx;
 }

pages/workbench/index/index.axml

@@ -59,28 +59,28 @@
         </view>
         <view class="flex-1">
             <view>{{userData.task.exec.count}}</view>
-            <view>奖扣人数</view>
+            <view>奖扣人次</view>
             <view>目标{{userData.task.exec.target_count}}</view>
         </view>
       </view>
   </view>
   <view class="bottom">
     <view class="bottom-title">积分事件</view>
-    <view class="flex-box bottom-time" a:for="{{incidentLsit.list}}" data-item="{{item}}" data-index="8" onTap="openView"> 
+    <view class="flex-box bottom-time" a:for="{{incidentLsit}}" data-item="{{item}}" data-index="8" onTap="openView"> 
         <img-box name="{{item.employee_name}}" imgUrl="{{item.employee_img_url}}"/>
         <view class="flex-1 bottom-right">
           <view class="flex-box">
             <text class="flex-1 name">{{item.employee_name}}</text>
-            <text class="num" a:if="{{item.point>0}}">+{{item.point}}</text>
-            <text class="num green" a:else>{{item.point}}</text>
+            <text class="num" a:if="{{item.point>0}}">+{{item.point}} {{item.ptObj.name}}</text>
+            <text class="num green" a:else>{{item.point}} {{item.ptObj.name}}</text>
           </view>
           <view class="text">{{item.remark}}</view>
           <view class="date">{{item.event_time}}</view>
         </view>
     </view>
-    <no-data a:if="{{incidentLsit.list.length==0}}"/>
+    <no-data a:if="{{incidentLsit.length==0}}"/>
   </view>
-  <view data-index="9" onTap="openView" a:if="{{incidentLsit.total>5}}" class="more">查看更多</view>
+  <view data-index="9" onTap="openView" a:if="{{incidentLsitTotal>5}}" class="more">查看更多</view>
   <view class="windows" a:if="{{isBh}}">
     <view class="windows-box">
       <view class="windows-title">温馨提示</view>

pages/workbench/index/index.js

@@ -10,6 +10,9 @@ Page({
     that = this;
   },
   onShow(query) {
+    // that.getUserData();
+    // that.getIncidentLsit();
+    // that.getIncidentNum();
     if (app.globalData.userData) {
       that.getUserData();
       that.getIncidentLsit();
@@ -64,9 +67,11 @@ Page({
       url: urls[index].url + '?' + urls[index].query
     })
   },
+
+
   //获取个人统计
   getUserData() {
-    app.$get("api/integral/statistics", { employee_id: 0, month: app.globalData.month }).then((res) => {
+ app.$get("api/integral/statistics", { employee_id: 0, month: app.globalData.month }).then((res) => {
       var data = res.data.data;
       var task = data.task;
       dd.setNavigationBar({ title: data.name });
@@ -82,11 +87,15 @@ Page({
     }, (err) => { })
   },
   //获取积分事件
-  getIncidentLsit() {
-    app.$get("api/integral/statistics/integral", { month: app.globalData.month, page: 1, page_size: 5 }).then((res) => {
-      var data = res.data.data;
+   getIncidentLsit() {
+      app.$get("api/integral/statistics/integral", { month: app.globalData.month, page: 1, page_size: 5 }).then((res) => {
+      var data = res.data.data.list;
+       data.map((item)=>{
+        item.ptObj=app.getTypesItem(item.pt_id);
+      })
       this.setData({
-        incidentLsit: data
+        incidentLsit: data,
+        incidentLsitTotal:res.data.data.total
       })
     }, (err) => { })
   },

pages/workbench/jk_B/jk_B.acss

@@ -34,7 +34,6 @@
 textarea{
   padding-left: 10rpx;
   padding-right: 0;
-  font-size: 28rpx;
   height: 200rpx;
   position: relative;
 }
@@ -88,7 +87,7 @@ textarea::before{
   border-radius: 100%;
   background-color: #969799;
   text-align: center;
-  line-height: 44rpx;
+  line-height: 40rpx;
   right: 10rpx;
   top: 10rpx;
 }

pages/workbench/jk_B/jk_B.axml

@@ -1,7 +1,7 @@
 <view>
   <form>
     <view class="flex-box flex-v-ce form-top" catchTap="openSelect"  data-num="3">
-      <view class="label isBt">录入对象</view>
+      <view class="label isBt">奖扣对象</view>
       <view class="flex-1 font-flex-word userList">
           <block a:for="{{users}}">
               <text style="font-size:32rpx">{{item.name}},</text>
@@ -90,7 +90,7 @@
         <view style="background:#fff;padding:0 28rpx;" a:if="{{item.files[0]}}" class="flex-box flex-v-ce">
           <view a:for="{{item.files}}" key="index" a:for-item="imgs" a:for-index="imgIndex" style="position:relative">
             <text class="detele" data-itemIndx="{{index}}" data-index="{{imgIndex}}" catchTap="deteleImg">×</text>
-            <image mode="scaleToFill" class="showImg" src="{{imgs}}"/>
+            <image mode="scaleToFill" class="showImg" src="{{imgs}}"  data-index="{{imgIndex}}" data-item="{{item.files}}" catchTap="showImg"/>
           </view>
         </view>
       </view>

pages/workbench/jk_B/jk_B.js

@@ -49,7 +49,6 @@ Page({
     }else{
        dd.setNavigationBar({ title: "奖扣A分" });
     }
-    that.getEmployeeList();
   },
   onShow() {
     animation = dd.createAnimation({
@@ -57,6 +56,15 @@ Page({
       timeFunction: "linear",
     });
   },
+  //显示图片
+  showImg(e){
+      var index=e.target.dataset.index;
+      var item=e.target.dataset.item
+      dd.previewImage({
+        current: index,
+        urls: item
+      });
+  },
   //选择奖还是扣(细则)
   bindPickerChange(e) {
     var index = e.target.dataset.index;
@@ -90,7 +98,7 @@ Page({
     var superior_list = this.data.superior_list;
     if(num==4){
         if(userData.length==0){
-          this.showToast('请先录入对象')
+          this.showToast('请先选择奖扣对象')
           return;
         }
         if(superior_list.length==0){
@@ -103,7 +111,11 @@ Page({
        that.setData({ defaultRuleId:e.target.dataset.ruleId});
     }
     if(e.target.dataset.item){
-       that.setData({ reviewerObj: [e.target.dataset.item] });
+       if(e.target.dataset.item.id){
+          that.setData({ reviewerObj: [e.target.dataset.item] });
+       }else{
+          that.setData({ reviewerObj: [] });
+       }
     }
     that.setData({
       isShowType: num,
@@ -305,7 +317,7 @@ Page({
     var isTg = true;
     var pt_id =app.getTypesItem(this.data.isGzType).id
     if(userData.length==0){
-      this.showToast('请输入录入对象')
+      this.showToast('请输入奖扣对象')
       return;
     }
     for (var i = 0; i < items.length; i++) {
@@ -320,7 +332,7 @@ Page({
           point = num;
         }
         if (point < item.selectRule.min_point || point > item.selectRule.max_point) {
-          this.showToast(`第${i + 1}项,积分超出可输入范围`);
+          this.showToast(`第${i + 1}条,积分超出可输入范围`);
           isTg = false;
         }
       } else {
@@ -332,25 +344,25 @@ Page({
       }
       if (item.checked) {
         if (!item.rule_id) {
-          this.showToast(`第${i + 1}项请选择规则`);
+          this.showToast(`第${i + 1}条请选择规则`);
           isTg = false;
           break;
         }
       } else {
         if (!item.rule_id2) {
-          this.showToast(`第${i + 1}项请选择规则分类`);
+          this.showToast(`第${i + 1}条请选择规则分类`);
           isTg = false;
           break;
         }
       }
       if (point == 0 || !point) {
-        this.showToast(`第${i + 1}项积分不能为0或者为空`);
+        this.showToast(`第${i + 1}条积分不能为0或者为空`);
         isTg = false;
         break;
       }
 
       if (!item.remark) {
-        this.showToast(`第${i + 1}项事件内容不能为空`);
+        this.showToast(`第${i + 1}条事件内容不能为空`);
         isTg = false;
         break;
       }
@@ -441,27 +453,23 @@ Page({
         });
       }
     })
-    this.setData({
-        users: elm,
-        superior_list:[]
-    })
-    var elm=item.length>0? item:[];
-    var arr=[],employeeList=this.data.employeeList;
+    this.setData({superior_list:[]});
+    var userIdArr=[];
     if(item.length>0){
-      if(employeeList.length>0){
-        employeeList.forEach(item=>{
-          elm.forEach(item2=>{
-            if(item.id==item2.id){
-              arr.push(item.superior_list)
-            }
-          })
-        })
-      }
-      var superior_list=this.intersection(arr);
-      this.setData({
-          users: elm,
-          superior_list:superior_list
+      item.forEach(el=>{
+         userIdArr.push(el.id)
       })
+     var employee_ids = userIdArr.join(',');
+      this.getEmployeeList(employee_ids,function(res){
+        var arr=[]
+        res.forEach(el=>{
+          arr.push(el.id)
+        })
+        that.setData({
+          users: item.length>0? item:[],
+          superior_list:arr
+        })
+      });
     }
 
   },
@@ -489,7 +497,6 @@ Page({
   },
   //选择规则
   onSelectItem(item) {
-    console.log(item);
     var index = this.data.activeIndex;
     var point = `items[${index}].point`
     var isArrindex = `items[${index}].isArrindex`
@@ -513,12 +520,10 @@ Page({
       [item_id]: item.id,
     });
   },
-      //获取人员列表
-  getEmployeeList() {
-      app.$get("api/employee/list").then((res) => {
-      this.setData({
-          employeeList:res.data.data.list
-        })
+  //获取人员（上级人员）
+  getEmployeeList(userIdArr,callBack) {
+      app.$get("api/employee/superior",{employee_id:userIdArr}).then((res) => {
+          callBack(res.data.data.list)
       })
   },
   intersection (arr) {
@@ -528,7 +533,6 @@ Page({
         arrSet.push(new Set(items.map(item => item.id)))
         items.forEach(item => intersectionSet.add(item.id))
       })
-
       return [...intersectionSet].filter(item => arrSet.every(set => set.has(item)))
   },
 });

pages/workbench/my_approve/my_approve.axml

@@ -17,10 +17,10 @@
       <view class="flex-box li border-bottom" data-item="{{item}}" catchTap="openDetail" a:for="{{dataList}}">
         <img-box name="{{item.employee_name}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
         <view class="flex-1 main-right">
-          <view class="name" a:if="{{item.source_type == 2}}">{{item.employee_name}}提交的积分申请</view>
-          <view class="name" a:if="{{item.source_type == 1}}">{{item.employee_name}}完成的积分任务</view>
-          <view class="name" a:if="{{item.source_type == 3}}">{{item.employee_name}}提交的积分奖扣</view>
-          <view class="name" a:if="{{item.source_type == 4}}">{{item.employee_name}}提交的绩效工作</view>
+          <view class="name" a:if="{{item.source_type == 2}}">{{item.employee_name}}的积分申请</view>
+          <view class="name" a:if="{{item.source_type == 1}}">{{item.employee_name}}的积分任务</view>
+          <view class="name" a:if="{{item.source_type == 3}}">{{item.employee_name}}的积分奖扣</view>
+          <view class="name" a:if="{{item.source_type == 4}}">{{item.employee_name}}的绩效工作</view>
           <view class="context" a:if="{{item.remark.customize}}">{{item.remark.customize}}</view>
           <view class="context" a:else>{{item.remark.rule}}</view>
           <view class="flex-box flex-v-ce">
@@ -50,7 +50,7 @@
           </view>
           <view class="context" a:if="{{item.remark.customize}}">{{item.remark.customize}}</view>
           <view class="context" a:else>{{item.remark.rule}}</view>
-          <view class="flex-box flex-v-ce">
+          <view class="flex-box flex-v-ce" style="margin-bottom:28rpx">
             <view class="date flex-1">{{item.event_time}}</view>
             <view class="greenBox" a:if="{{item.status==1}}">审批通过</view>
             <view class="redBox" a:if="{{item.status==2}}">审批驳回</view>

pages/workbench/my_approve/my_approve.js

@@ -102,8 +102,6 @@ Page({
     if (!that.data.isData) {
       this.setData({ page: ++that.data.page })
       this.getData("2");
-    } else {
-      app.globalData.showToast("已无更多咯");
     }
   },
 });

pages/workbench/noJurisdiction/noJurisdiction.acss

@@ -1,4 +1,4 @@
 .noJ{
   text-align: center;
-  margin-top: 30%
+  padding-top: 30%
 }

pages/workbench/prize_buckle/prize_buckle.acss

@@ -117,17 +117,22 @@
   color: #909399;
   font-size: 24rpx;
 }
-/* .jiangfen::after{
-  position: absolute;
-  content: "?";
-  color: #909399;
-  width: 20rpx;
-  height: 20rpx;
-  font-size: 20rpx;
-  top: 50%;
-  border-radius: 50rpx;
-  right: 0rpx;
-  margin-top: -10rpx;
-  line-height: 20rpx;
-  border:1px solid #909399;
-} */
+.date view::after{
+  	position: absolute;
+    /* position: relative; */
+		top: 50%;
+		right: -20rpx;
+		margin-top: -0.1rem;
+		border: 0.06rem solid;
+		border-color: transparent transparent #dcdee0 #dcdee0;
+		-webkit-transform: rotate(-45deg);
+		transform: rotate(-45deg);
+		opacity: .8;
+		content: '';
+}
+.date .activeView::after {
+		margin-top: -0.02rem;
+		-webkit-transform: rotate(135deg);
+		transform: rotate(135deg);
+		border-color: transparent transparent #26a2ff #26a2ff;
+	}

pages/workbench/prize_buckle/prize_buckle.axml

@@ -3,7 +3,7 @@
     <view class="top flex-box flex-center-center">
       <view class="date flex-box flex-v-ce" catchTap="openDate">
         <image mode="scaleToFill" src="../../../image/date2.png"></image>
-        <view style="font-size:32rpx">{{date}}</view>
+        <view style="font-size:32rpx;position: relative;" class="{{showDate? 'activeView':''}}">{{date}}</view>
       </view>
     </view>
     <view class="headed-box margin-bottom" a:if="{{userData.task}}">

pages/workbench/prize_buckle/prize_buckle.js

@@ -8,10 +8,13 @@ Page({
     date: app.globalData.month,
     employee_id:0,
     isDb:false,
+    showtu:false,
+    chartData:[]
   },
   onLoad(e) {
     that = this;
     dd.setNavigationBar({ title: "奖扣统计" });
+    chart1,chart2='';
     if (e.id && e.month) {
       that.setData({
         date: e.month,
@@ -19,24 +22,18 @@ Page({
       })
     }
     that.getUserData();
-    that.getIncidentLsit();
   },
   onInitChart(F2, config) {
     chart1 = new F2.Chart(config);
     chart1.source(that.data.chartData, {
       time: {
-        type: 'timeCat',
-        tickCount: 4,
+        // type: 'timeCat',
+        tickCount: 5,
         range: [0, 1]
       }
     });
     chart1.legend(false);
     chart1.axis('time', {
-      // line: {
-      //   lineWidth: 2,
-      //   stroke: '#F56C6C',
-      //   top: true, // 展示在最上层
-      // },
       label: function label(text, index, total) {
         const textCfg = {};
         if (index === 0) {
@@ -55,18 +52,13 @@ Page({
     chart2 = new F2.Chart(config);
     chart2.source(that.data.chartData, {
       time: {
-        type: 'timeCat',
-        tickCount: 4,
+        // type: 'timeCat',
+        tickCount: 5,
         range: [0, 1]
       }
     });
     chart2.legend(false);
     chart2.axis('time', {
-      // line: {
-      //   lineWidth: 2,
-      //   // stroke: '#F56C6C',
-      //   top: true, // 展示在最上层
-      // },
       label: function label(text, index, total) {
         const textCfg = {};
         if (index === 0) {
@@ -79,64 +71,35 @@ Page({
     });
     chart2.line().position('time*value').color('type', [ '#F56C6C', '#67C23A']);
     chart2.render();
+    that.getIncidentLsit();
     return chart2;
   },
-  //获取个人统计
-  getUserData() {
-    app.$get("api/integral/statistics", { employee_id: that.data.employee_id, month: that.data.date }).then((res) => {
-      var data = res.data.data;
-      var task = data.task;
-      dd.setNavigationBar({ title: data.name });
-      var ratio = task.reward.point === 0 || task.deduction.point === 0 ? '-' : `${task.ratio.ratio}:1`
-      var target_ratio = task.ratio.target_ratio <= 0 ? '0:0' : `${task.ratio.target_ratio}:1`
-      if(data.task.reward.point>=data.task.reward.target_point&&data.task.deduction.point>=data.task.deduction.target_point&&data.task.exec.count>=data.task.exec.target_count){
-          if(task.ratio.ratio>=task.ratio.target_ratio){
-              this.setData({
-                isDb: true
-              }) 
-          }
-      }
-      data.ratio = {
-        ratio: ratio,
-        target_ratio: target_ratio
-      }
-      this.setData({
-        userData: data
-      })
-    })
-  },
+
   getIncidentLsit() {
     app.$get("api/integral/statistics/prize", { employee_id: that.data.employee_id, month: that.data.date }).then((res) => {
-      const { img_url, name, chart } = res.data.data;
+      const {chart } = res.data.data;
       const { reward, deduct } = chart;
       var rewardArr = reward.map((item) => {
-        return { time: item.date, value: item.point, type: '奖扣' };
+        return { time: item.date, value: item.point, type: '奖分' };
       })
       var deductArr = deduct.map((item) => {
         return { time: item.date, value: item.point, type: '扣分' };
       })
       var rewardArrCount = reward.map((item) => {
-        return { time: item.date, value: item.count, type: '奖扣' };
+        return { time: item.date, value: item.count, type: '奖分人次' };
       })
       var deductArrCount = deduct.map((item) => {
-        return { time: item.date, value: item.count, type: '扣分' };
+        return { time: item.date, value: item.count, type: '扣分人次' };
       })
       var charData = rewardArr.concat(deductArr);
       var charData2 = rewardArrCount.concat(deductArrCount);
-    //  console.log(charData)
-    //   console.log(charData2)
-      setTimeout(() => {
-        chart1.changeData(charData);
-        chart2.changeData(charData2);
-      }, 1000);
-      that.setData({
-        img_url: img_url,
-        name: name
-      });
+      chart1.changeData(charData);
+      chart2.changeData(charData2);
     })
   },
   //时间选择
   openDate() {
+    that.setData({showDate: true});
     dd.datePicker({
       format: 'yyyy-MM',
       currentDate: that.data.date,
@@ -147,6 +110,35 @@ Page({
           that.getUserData();
           that.getIncidentLsit();
       },
+      complete:(res)=>{
+        that.setData({
+           showDate: false
+        })
+      }
     });
-  }
+  },
+    //获取个人统计
+  getUserData() {
+    app.$get("api/integral/statistics", { employee_id: that.data.employee_id, month: that.data.date }).then((res) => {
+      var data = res.data.data;
+      var task = data.task;
+      dd.setNavigationBar({ title: data.name });
+      var ratio = task.reward.point === 0 || task.deduction.point === 0 ? '-' : `${task.ratio.ratio}:1`
+      var target_ratio = task.ratio.target_ratio <= 0 ? '0:0' : `${task.ratio.target_ratio}:1`
+      if(data.task.reward.point>=data.task.reward.target_point&&data.task.deduction.point>=data.task.deduction.target_point&&data.task.exec.count>=data.task.exec.target_count){
+          if(task.ratio.ratio>=task.ratio.target_ratio){
+              this.setData({
+                isDb: true
+              }) 
+          }
+      }
+      data.ratio = {
+        ratio: ratio,
+        target_ratio: target_ratio
+      }
+      this.setData({
+        userData: data
+      })
+    })
+  },
 });

pages/workbench/prize_buckle/prize_buckle.json

@@ -1,6 +1,6 @@
 {
     "usingComponents": {
-     "img-box":"/Component/img-box/index",
-    "f2": "@antv/my-f2"
+        "f2": "@antv/my-f2",
+        "img-box": "/Component/img-box/index"
     }
-} 
+}

pages/workbench/statistics_A/statistics_A.acss

@@ -14,7 +14,7 @@
   top: 6rpx;
 }
 .dates{
-  width: 180rpx;
+  width: 200rpx;
   margin: 0 auto;
   text-align: center;
 }
@@ -25,7 +25,7 @@
   right: 32rpx;
   border-radius: 20rpx;
   background-color: #fff;
-  box-shadow: 0rpx 0rpx 10rpx #ccc;
+   box-shadow: 0rpx 4rpx 10rpx rgba(0, 0, 0, 0.05);
   height: 140rpx;
   text-align: center;
 }
@@ -93,4 +93,23 @@
 }
 .num{
   font-size: 40rpx;
-}
+}
+.dates text::after{
+  	position: absolute;
+    /* position: relative; */
+		top: 50%;
+		right: -20rpx;
+		margin-top: -0.1rem;
+		border: 0.06rem solid;
+		border-color: transparent transparent #fff #fff;
+		-webkit-transform: rotate(-45deg);
+		transform: rotate(-45deg);
+		opacity: .8;
+		content: '';
+}
+.dates .activeView::after {
+		margin-top: -0.02rem;
+		-webkit-transform: rotate(135deg);
+		transform: rotate(135deg);
+		border-color: transparent transparent #fff #fff;
+	}

pages/workbench/statistics_A/statistics_A.axml

@@ -17,7 +17,7 @@
     <view class="top">
       <view class="dates" style="padding:10rpx 0" catchTap="openDate">
             <image mode="scaleToFill" src="../../../image/date.png"/>
-            <text style="font-size:32rpx">{{date}}</text>
+             <text style="font-size:32rpx;position: relative;" class="{{showDate? 'activeView':''}}">{{date}}</text>
       </view>
     </view>
     <view class="headed-box">

pages/workbench/statistics_A/statistics_A.js

@@ -27,6 +27,16 @@ Page({
         tickCount: 5
       }
     });
+    chart1.tooltip({
+    showCrosshairs: true,
+    showItemMarker: false,
+    onShow: function onShow(ev) {
+      console.log(ev.items);
+      const items = ev.items;
+      items[0].name ="月份:"+items[0].origin.date;
+      items[0].value ="分值："+items[0].value;
+    }
+  });
     chart1.line().position('date*value');
     chart1.point().position('date*value').style({
       stroke: '#fff',
@@ -36,8 +46,9 @@ Page({
     that.getIncidentLsit();
     return chart1;
   },
-  //时间选择
+  
   openDate() {
+     that.setData({showDate: true});
     dd.datePicker({
       format: 'yyyy-MM',
       currentDate: that.data.date,
@@ -47,6 +58,11 @@ Page({
         })
         that.getIncidentLsit();
       },
+      complete:(res)=>{
+        that.setData({
+           showDate: false
+        })
+      }
     });
   },
   //获取积分事件

pages/workbench/statistics_B/statistics_B.acss

@@ -14,7 +14,7 @@
   top: 6rpx;
 }
 .dates{
-  width: 180rpx;
+  width: 200rpx;
   margin: 0 auto;
   text-align: center;
 }
@@ -25,7 +25,7 @@
   right: 32rpx;
   border-radius: 20rpx;
   background-color: #fff;
-  box-shadow: 0rpx 0rpx 10rpx #ccc;
+  box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.05);
   height: 140rpx;
   text-align: center;
 }
@@ -94,3 +94,22 @@
 .num{
   font-size: 40rpx;
 }
+.dates text::after{
+  	position: absolute;
+    /* position: relative; */
+		top: 50%;
+		right: -20rpx;
+		margin-top: -0.1rem;
+		border: 0.06rem solid;
+		border-color: transparent transparent #fff #fff;
+		-webkit-transform: rotate(-45deg);
+		transform: rotate(-45deg);
+		opacity: .8;
+		content: '';
+}
+.dates .activeView::after {
+		margin-top: -0.02rem;
+		-webkit-transform: rotate(135deg);
+		transform: rotate(135deg);
+		border-color: transparent transparent #fff #fff;
+	}

pages/workbench/statistics_B/statistics_B.axml

@@ -17,7 +17,7 @@
     <view class="top">
       <view class="dates" style="padding:10rpx 0" catchTap="openDate">
             <image mode="scaleToFill" src="../../../image/date.png"/>
-            <text style="font-size:32rpx">{{date}}</text>
+            <text style="font-size:32rpx;position: relative;" class="{{showDate? 'activeView':''}}">{{date}}</text>
       </view>
     </view>
     <view class="headed-box">

pages/workbench/statistics_B/statistics_B.js

@@ -14,7 +14,6 @@ Page({
     that = this;
     chart1,chart2='';
     dd.setNavigationBar({ title: "我的B分统计" });
-  
   },
     //打开更多
   openMore(){
@@ -31,6 +30,15 @@ Page({
         tickCount: 5
       }
     });
+    chart1.tooltip({
+        showCrosshairs: true,
+        showItemMarker: false,
+        onShow: function onShow(ev) {
+          const items = ev.items;
+          items[0].name ="月份:"+items[0].origin.date;
+          items[0].value ="分值："+items[0].value;
+        }
+      });
     chart1.line().position('date*value');
     chart1.point().position('date*value').style({
       stroke: '#fff',
@@ -81,6 +89,7 @@ Page({
   },
   //时间选择
   openDate() {
+     that.setData({showDate: true});
     dd.datePicker({
       format: 'yyyy-MM',
       currentDate: that.data.date,
@@ -90,6 +99,11 @@ Page({
         })
         that.getIncidentLsit();
       },
+      complete:(res)=>{
+        that.setData({
+           showDate: false
+        })
+      }
     });
   },
   //获取积分事件