Merge branch 'dev'

Component/selectEnevt/selectEnevt.acss

@@ -8,11 +8,14 @@
   z-index:3
 }
 .close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }
 .search{
     background-color: #f1f1f1;

Component/selectEnevt/selectEnevt.axml

@@ -1,5 +1,7 @@
 <view class="all">
-  <image mode="scaleToFill" catchTap="onClose" class="close" src="../../../image/close.png"></image>
+  <view class="close">
+      <image mode="scaleToFill" catchTap="plusOne"  src="../../../image/close.png"/>
+  </view>
   <form onReset="onReset">
     <view class="search flex-box flex-v-ce">
       <image mode="scaleToFill" src="../../../image/ss.png"></image>

Component/selectRule/selectRule.acss

@@ -8,11 +8,14 @@
   z-index: 999
 }
 .close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }
 .left{
   background: #f1f1f1;

Component/selectRule/selectRule.axml

@@ -1,5 +1,7 @@
 <view class="all">
-  <image mode="scaleToFill" catchTap="plusOne" class="close" src="../../../image/close.png"/>
+  <view class="close">
+    <image mode="scaleToFill" catchTap="plusOne" src="../../../image/close.png"/>
+  </view>
   <form onReset="onReset">
     <view class="search flex-box flex-v-ce">
       <image mode="scaleToFill" src="../../../image/ss.png"/>
@@ -9,10 +11,12 @@
   </form>
   <view class="flex-box content">
     <scroll-view class="flex-2 left" scroll-y="{{true}}" a:if="{{isItem}}">
-      <view class="tree" a:for="{{rule_tree}}">
-        <view class="{{item.id == activeIndex ? 'active':''}} yi" catchTap="activeTree" data-item="{{item}}">{{item.name}}</view>
-        <view catchTap="activeItem" data-item="{{child}}" class="{{child.id == activeItemIndex ? 'itemActive':''}} er" a:if="{{item.child&&item.child.length>0&&item.id == activeIndex}}" a:for="{{item.child}}" a:for-index="idx" a:for-item="child">
+      <view style="height: 100%">
+        <view class="tree" a:for="{{rule_tree}}">
+          <view class="{{item.id == activeIndex ? 'active':''}} yi" catchTap="activeTree" data-item="{{item}}">{{item.name}}</view>
+          <view catchTap="activeItem" data-item="{{child}}" class="{{child.id == activeItemIndex ? 'itemActive':''}} er" a:if="{{item.child&&item.child.length>0&&item.id == activeIndex}}" a:for="{{item.child}}" a:for-index="idx" a:for-item="child">
               {{child.name}}
+          </view>
         </view>
       </view>
     </scroll-view>

Component/selectSectionBottom/selectSectionBottom.acss

@@ -8,11 +8,14 @@
   z-index:3
 }
 .close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }
 .content{
     margin-top: 16rpx;

Component/selectSectionBottom/selectSectionBottom.axml

@@ -1,5 +1,7 @@
 <view class="all">
-  <image mode="scaleToFill" catchTap="onClose" class="close" src="../../../image/close.png"></image>
+  <view class="close">
+      <image mode="scaleToFill" catchTap="onClose"  src="../../../image/close.png"/>
+  </view>
   <view class="content">
     <view>
       <view class="flex-box flex-v-ce shu" a:if="{{terr.length>1}}">

Component/selectSectionStaff/selectSectionStaff.acss

@@ -8,11 +8,14 @@
   z-index:3
 }
 .close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }
 .search{
     background-color: #f1f1f1;

Component/selectSectionStaff/selectSectionStaff.axml

@@ -1,5 +1,7 @@
 <view class="all">
-  <image mode="scaleToFill" catchTap="onClose" class="close" src="../../../image/close.png"></image>
+  <view class="close">
+      <image mode="scaleToFill" catchTap="onClose"  src="../../../image/close.png"/>
+  </view>
   <form onReset="onReset">
     <view class="search flex-box flex-v-ce">
       <image mode="scaleToFill" src="../../../image/ss.png"></image>

Component/selectSectionStaff_tow/selectSectionStaff_tow.acss

@@ -8,11 +8,14 @@
   z-index:3
 }
 .close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }
 .search{
     background-color: #f1f1f1;

Component/selectSectionStaff_tow/selectSectionStaff_tow.axml

@@ -1,12 +1,14 @@
 <view class="all">
-  <image mode="scaleToFill" catchTap="onClose" class="close" src="../../../image/close.png"/>
-    <form onReset="onReset">
-  <view class="search flex-box flex-v-ce">
-    <image mode="scaleToFill" src="../../../image/ss.png"/>
-    <input placeholder="请输入姓名搜索" onInput="bindKeyInput" class="flex-1"/>
-    <button a:if="{{isVal}}" class="delVal" formType="reset">×</button>
+  <view class="close">
+    <image mode="scaleToFill" catchTap="onClose" src="../../../image/close.png"/>
   </view>
-   </form>
+  <form onReset="onReset">
+    <view class="search flex-box flex-v-ce">
+      <image mode="scaleToFill" src="../../../image/ss.png"/>
+      <input placeholder="请输入姓名搜索" onInput="bindKeyInput" class="flex-1"/>
+      <button a:if="{{isVal}}" class="delVal" formType="reset">×</button>
+    </view>
+  </form>
   <view class="content">
     <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}}">
@@ -15,28 +17,27 @@
       </view>
     </view>
     <scroll-view class="staff-ul" scroll-y="{{true}}" style="{{terr.length>1? 'height: calc(100vh - 390rpx);':'height: calc(100vh - 320rpx);'}}">
-        <view class="ul2">
-          <view class="flex-box flex-v-ce li" a:for="{{rule_tree}}">
-            <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"/> 
-               <text class="flex-1">{{item.name}}</text>
-            </view>
-            <view class="xia" a:if="{{item._child.length>0}}" data-item="{{item}}" catchTap="openDown">| 下级</view>
+      <view class="ul2">
+        <view class="flex-box flex-v-ce li" a:for="{{rule_tree}}">
+          <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"/>
+            <text class="flex-1">{{item.name}}</text>
           </view>
+          <view class="xia" a:if="{{item._child.length>0}}" data-item="{{item}}" catchTap="openDown">| 下级</view>
         </view>
-        <view a:if="{{item.name.indexOf(keyVal)>= 0}}" class="flex-box flex-v-ce userItem" a:for="{{userList}}" a:key="{{index}}">
-          <view class="{{item.checked? 'active':''}} flex-box flex-v-ce flex-1" catchTap="bindtap1" data-index="{{index}}" data-item="{{item}}">
-            <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>
-            <view class="radio_"></view>
-          </view>
+      </view>
+      <view a:if="{{item.name.indexOf(keyVal)>= 0}}" class="flex-box flex-v-ce userItem" a:for="{{userList}}" a:key="{{index}}">
+        <view class="{{item.checked? 'active':''}} flex-box flex-v-ce flex-1" catchTap="bindtap1" data-index="{{index}}" data-item="{{item}}">
+          <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>
+          <view class="radio_"></view>
         </view>
-        <view a:if="{{userList.length==0}}">
-          <view class="fontColorF" style="margin-top:200rpx;text-align: center;">
-              <view>您暂无相关审批人</view>
-          </view>
+      </view>
+      <view a:if="{{userList.length==0}}">
+        <view class="fontColorF" style="margin-top:200rpx;text-align: center;">
+          <view>您暂无相关审批人</view>
         </view>
-
+      </view>
     </scroll-view>
   </view>
   <view class="StaffFooter flex-box flex-v-ce">

Component/selectSx/selectSx.acss

@@ -35,7 +35,7 @@
 .sx-ul{
   width: 100%;
   background-color: #fff;
-  height: 400rpx;
+  height: 600rpx;
   box-sizing: border-box;
 }
 .rule-title{

Component/selectSx/selectSx.js

@@ -20,6 +20,13 @@ Component({
           { name: "从高到低", code: "DESC", checked: true },
           { name: "从低到高", code: "ASC", checked: false },
         ],
+      },
+      {
+        name: '积分分类',
+        child: [
+          { name: "B分", code: "3", checked: true },
+          { name: "A分", code: "2", checked: false },
+        ],
       }
     ],
     sxArr2: [
@@ -37,13 +44,20 @@ Component({
           { name: "从高到低", code: "DESC", checked: false },
           { name: "从低到高", code: "ASC", checked: false },
         ],
+      },
+      {
+        name: '积分分类',
+        child: [
+          { name: "B分", code: "3", checked: false },
+          { name: "A分", code: "2", checked: false },
+        ],
       }
     ]
   },
   props: {
     onConfirm: (data) => console.log(data),
     onClose: (data) => console.log(data),
-    defaultSx:['all','DESC'],
+    defaultSx:['all','DESC','3'],
   },
   didMount() {
     that = this;
@@ -57,6 +71,9 @@ Component({
           if(this.props.defaultSx[1]==item2.code){
              item2.checked=true;
           }
+          if(this.props.defaultSx[2]==item2.code){
+             item2.checked=true;
+          }
         })
     })
     this.setData({ isShow: this.props.isShow,sxArr:sxArr })

Component/selectType/selectType.acss

@@ -7,12 +7,15 @@
   z-index: 999
 }
 
-.close {
+.close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }
 
 .search {

Component/selectType/selectType.axml

@@ -1,5 +1,7 @@
 <view class="all2">
-   <image mode="scaleToFill" catchTap="plusOne" class="close" src="../../../image/close.png"/>
+  <view class="close">
+      <image mode="scaleToFill" catchTap="plusOne"  src="../../../image/close.png"/>
+  </view>
    <!-- <view class="search flex-box flex-v-ce">
       <image mode="scaleToFill" src="../../../image/ss.png"/>
       <input placeholder="请输入搜索关键字" onInput="bindKeyInput"/>

Component/selectUser/selectUser.acss

@@ -63,9 +63,12 @@
     background: #26a2ff33!important;
 }
 .close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+.close image{
   width: 40rpx;
   height: 40rpx;
-  position: absolute;
-  right: 30rpx;
-  top: 70rpx;
 }

Component/selectUser/selectUser.axml

@@ -1,5 +1,7 @@
 <view class="all-date">
-  <image mode="scaleToFill" catchTap="plusOne" class="close" src="../../../image/close.png"/>
+   <view class="close">
+      <image mode="scaleToFill" catchTap="plusOne"  src="../../../image/close.png"/>
+  </view>
   <view>
     <view class="search flex-box flex-v-ce">
       <image mode="scaleToFill" src="../../../image/ss.png"/>

app.acss

@@ -95,6 +95,16 @@
 		z-index: 3;
 		transform: translate(0, -100%);
 	}
+/* 禁止滚动背景穿透 */
+	.container__mask {
+		overflow: hidden;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 0;
+}
 
 	.tab {
 		background: #fff;
@@ -160,6 +170,7 @@
 		left: 0;
 		right: 0;
 		top: 80rpx;
+		overflow: hidden;
 	}
 
 	.delVal {

app.json

@@ -53,7 +53,8 @@
     "pages/statistics/getTask/getTask",
     "pages/statistics/assaign_set/assaign_set",
     "pages/statistics/offerAreward_set/offerAreward_set",
-    "pages/statistics/logDetail/logDetail"
+    "pages/statistics/logDetail/logDetail",
+    "pages/demo/demo"
   ],
   "window": {
     "defaultTitle": "功道云",

package-lock.json

@@ -98,6 +98,7 @@
       "version": "2.13.23",
       "resolved": "https://registry.npm.taobao.org/dingtalk-jsapi/download/dingtalk-jsapi-2.13.23.tgz",
       "integrity": "sha1-O2IykfH/sPXBuJtg1vjfJ2Y2cWA=",
+      "dev": true,
       "requires": {
         "promise-polyfill": "^7.1.0"
       }
@@ -167,7 +168,8 @@
     "promise-polyfill": {
       "version": "7.1.2",
       "resolved": "https://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz",
-      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs="
+      "integrity": "sha1-qwUwHYwoU2MBYi1pInYyJppwyjs=",
+      "dev": true
     },
     "regenerator-runtime": {
       "version": "0.13.5",

pages/demo/demo.acss

@@ -0,0 +1,88 @@
+.box{
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0,0,0,0.2);
+  z-index: 999;
+  transform: translate(0,100%);
+}
+.all{
+  background-color: #fff;
+  height: 100%;
+  margin-top: 40rpx;
+  border-radius: 20rpx 20rpx 0 0; 
+  padding-top: 80rpx;
+  z-index: 999
+}
+.close{
+  position: absolute;
+  right: 10rpx !important;
+  top: 50rpx !important;
+  padding: 20rpx;
+}
+	.container__mask {
+		overflow: hidden;
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 0;
+}
+
+	/* 盒子模型 */
+
+	.flex-box {
+		display: -webkit-box;
+		display: -moz-box;
+		display: -ms-flexbox;
+		display: -webkit-flex;
+		display: flex;
+	}
+  
+	.flex-1 {
+		-webkit-box-flex: 1;
+		-moz-box-flex: 1;
+		-webkit-flex: 1;
+		-ms-flex: 1;
+		flex: 1;
+	}
+
+	.flex-2 {
+		-webkit-box-flex: 2;
+		box-flex: 2;
+		-moz-box-flex: 2;
+		-webkit-flex: 2;
+		-ms-flex: 2;
+		flex: 2;
+	}
+
+	.flex-3 {
+		-webkit-box-flex: 3;
+		box-flex: 3;
+		-moz-box-flex: 3;
+		-webkit-flex: 3;
+		-ms-flex: 3;
+		flex: 3;
+	}
+
+	.flex-4 {
+		-webkit-box-flex: 4;
+		box-flex: 4;
+		-moz-box-flex: 4;
+		-webkit-flex: 4;
+		-ms-flex: 4;
+		flex: 4;
+	}
+
+	.flex-5 {
+		-webkit-box-flex: 5;
+		box-flex: 5;
+		-moz-box-flex: 5;
+		-webkit-flex: 5;
+		-ms-flex: 5;
+		flex: 5;
+	}
+

pages/demo/demo.axml

@@ -0,0 +1,56 @@
+<view>
+  <view class="{{popupCx}}">
+    <view catchTap="onOpen" style="padding:20rpx;">打开</view>
+  </view>
+  <view class="box" animation="{{animationInfo}}">
+    <view class="all">
+      <view class="close" catchTap="onClose">关</view>
+      <view class="flex-box">
+        <scroll-view class="flex-2" scroll-y="{{true}}" style="height:500rpx;">
+          <view style="height:500rpx;background:#E6A23C">
+            // 配置用户账号信息
+            git config --global user.name 'gitHub name'
+            git config --global user.email 'gitHub email'
+
+            // 重置或者修改用户账号信息
+            // 第一种直接按上面配置，第二种就是替换(备用)，这个是全局配置
+            git config --global user.name "James"
+            git config --global user.email "1282285801@qq.com"
+
+            // 查看当前使用者的信息和邮箱
+            git config user.name
+            git config user.email
+            // 也可以通过全局查看
+            git config --global --list
+                
+            // 添加多个用户配置
+            git config --global --add user.name 'name'
+            git config --global --add user.email 'email'
+          </view>
+        </scroll-view>
+        <scroll-view class="flex-5" scroll-y="{{true}}" style="height:500rpx;">
+          <view style="height:1500rpx;background:#F56C6C">
+            // 配置用户账号信息
+            git config --global user.name 'gitHub name'
+            git config --global user.email 'gitHub email'
+
+            // 重置或者修改用户账号信息
+            // 第一种直接按上面配置，第二种就是替换(备用)，这个是全局配置
+            git config --global user.name "James"
+            git config --global user.email "1282285801@qq.com"
+
+            // 查看当前使用者的信息和邮箱
+            git config user.name
+            git config user.email
+            // 也可以通过全局查看
+            git config --global --list
+                
+            // 添加多个用户配置
+            git config --global --add user.name 'name'
+            git config --global --add user.email 'email'
+          </view>
+        </scroll-view>
+      </view>
+    </view>
+  </view>
+</view>

pages/demo/demo.js

@@ -0,0 +1,32 @@
+var app = getApp()
+var that;
+var animation;
+Page({
+  data: {
+    animationInfo:'',
+    popupCx:''
+  },
+  onLoad() {
+     that = this;
+  },
+  onShow() {
+    animation = dd.createAnimation({
+      duration: 200,
+      timeFunction: "linear",
+    });
+  },
+  onOpen(){
+    animation.translateY(0).step();
+    that.setData({
+      animationInfo: animation.export(),
+      popupCx: 'container__mask'
+    });
+  },
+  onClose() {
+    animation.translateY(1200).step();
+    that.setData({
+      animationInfo: animation.export(),
+      popupCx: ''
+    });
+  },
+});

pages/demo/demo.json

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

pages/statistics/B_ranking/B_ranking.axml

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

pages/statistics/B_ranking/B_ranking.js

@@ -7,7 +7,8 @@ Page({
     TissueVal:'全公司',
     isPx:true,
     page:1,
-    scroll_top:0
+    scroll_top:0,
+    popupCx: '',  
   },
   onLoad() {
     that = this;
@@ -21,7 +22,7 @@ Page({
       dept_id:that.data.dept_id,
       pt_id: app.getTypesItem('BF').id,
       sort: that.data.isPx?'DESC':'ASC',
-      type: 'all'
+      type: 'all',
     }
     app.$get('api/integral/statistics/ranking',data,'application/vnd.test.v2+json').then((res) => {
       var data = res.data.data.list;
@@ -67,12 +68,13 @@ Page({
     //关闭弹窗
   onClose() {
     this.setData({
-      showTissue:false
+      showTissue:false,
+      popupCx: ''  
     })
   },
     //显示部门选择组件
   selectTissue(){
-    this.setData({showTissue:!this.data.showTissue})
+    this.setData({showTissue:!this.data.showTissue,popupCx: 'container__mask',})
   },
   //选择部门
   onConfirmTissue(data) {

pages/statistics/assaign/assaign.axml

@@ -1,5 +1,5 @@
 <view>
-  <view>
+  <view class="{{popupCx}}">
     <view class="inputs">
       <view class="li">
         <textarea class="textarea" maxlength="100" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容" data-index="{{index}}"></textarea>

pages/statistics/assaign/assaign.js

@@ -41,7 +41,8 @@ Page({
         name: '每月重复',
       },
     ],
-    arrIndex: 0
+    arrIndex: 0,
+    popupCx: ''
   },
   onLoad() {
     that = this;
@@ -97,14 +98,14 @@ Page({
   onClose() {
     animation.translateY(1200).step();
     that.setData({
+      popupCx: '',
+      isShowType: '',
       animationInfo: animation.export()
     });
-    that.setData({ isShowType: '' });
   },
   //选择弹窗
   openSelect(e) {
     var num = e.target.dataset.num;
-
     if (e.target.dataset.item) {
       if (e.target.dataset.item.id) {
         that.setData({ reviewerObj: [e.target.dataset.item] });
@@ -112,11 +113,10 @@ Page({
         that.setData({ reviewerObj: [] });
       }
     }
-    that.setData({
-      isShowType: num,
-    });
     animation.translateY(0).step();
     that.setData({
+      isShowType: num,
+      popupCx: 'container__mask',
       animationInfo: animation.export()
     });
   },

pages/statistics/glz_execute/glz_execute.acss

@@ -30,3 +30,17 @@
 .scroll {
   height:  calc(100vh - 160rpx);
 }
+.text2 {
+  border-radius: 50%;
+  border: 1px solid #909399;
+  color: #909399;
+  width: 26rpx;
+  height: 26rpx;
+  font-size: 22rpx;
+  text-align: center;
+  display: inline-block;
+  margin-left: 10rpx;
+  position: relative;
+  line-height: 26rpx;
+  box-sizing: border-box;
+}

pages/statistics/glz_execute/glz_execute.axml

@@ -1,38 +1,43 @@
 <view>
-  <view class="flex-box flex-v-ce tab">
-    <view class="flex-1" onTap="openDate">
-      <text class="{{showDate? 'activeView':''}}">{{month}}</text>
-    </view>
-    <view class="flex-1" onTap="selectTissue">
-      <text class="{{showTissue? 'activeView':''}}" a:if="{{tissueValName}}">{{tissueValName}}</text>
+  <view class="{{popupCx}}">
+    <view class="flex-box flex-v-ce tab">
+      <view class="flex-1" onTap="openDate">
+        <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>
+        </picker>
+      </view>
     </view>
-    <view class="flex-1">
-      <picker onChange="bindPickerChange" value="{{activeIndex}}" range="{{array}}" range-key="name">
-        <text class="picker">{{array[activeIndex].name}}</text>
-      </picker>
+
+
+    <view class="flex-box flex-v-ce titles">
+      <view class="flex-2" style="font-size:28rpx">管理者
+      <text class="text2" catchTap="showText">?</text></view>
+      <view class="flex-1">人均奖分（次）</view>
+      <view class="flex-1">人均扣分（次）</view>
     </view>
-  </view>
-  <view class="flex-box flex-v-ce titles">
-    <view class="flex-2" style="font-size:28rpx">管理者</view>
-    <view class="flex-1">人均奖分（次）</view>
-    <view class="flex-1">人均扣分（次）</view>
-  </view>
-  <view class="main scroll">
-    <scroll-view scroll-y="{{true}}" class="scroll" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
-      <view catchTap="openDetail" data-item={{item}} class="flex-box flex-v-ce item border-bottom" a:for="{{list}}">
-        <view class="flex-2 flex-box flex-v-ce">
-          <img-box name="{{item.name}}" imgUrl="{{item.img_url}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
-          <view class="users">
-            <view class="name">{{item.name}}</view>
-            <view class="num">管理{{item.scope_count}}人</view>
+    <view class="main scroll">
+      <scroll-view scroll-y="{{true}}" class="scroll" a:if="{{list.length>0}}" onScrollToLower="onScrollToLower">
+        <view catchTap="openDetail" data-item={{item}} class="flex-box flex-v-ce item border-bottom" a:for="{{list}}">
+          <view class="flex-2 flex-box flex-v-ce">
+            <img-box name="{{item.name}}" imgUrl="{{item.img_url}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
+            <view class="users">
+              <view class="name">{{item.name}}</view>
+              <view class="num">管理{{item.scope_count}}人</view>
+            </view>
           </view>
+          <view class="flex-1">{{item.reward_count}}</view>
+          <view class="flex-1">{{item.deduct_count}}</view>
         </view>
-        <view class="flex-1">{{item.reward_count}}</view>
-        <view class="flex-1">{{item.deduct_count}}</view>
-      </view>
-      <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
-    </scroll-view>
-    <no-data a:if="{{list.length==0}}" content="未找到考勤组"></no-data>
+        <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
+      </scroll-view>
+      <no-data a:if="{{list.length==0}}" content="未找到考勤组"></no-data>
+    </view>
   </view>
   <select-section defaultSection="{{tissueVal}}" isShow="{{showTissue}}" a:if="{{showTissue==true}}" onClose="onClose" onConfirm="onConfirmTissue"></select-section>
 </view>

pages/statistics/glz_execute/glz_execute.js

@@ -8,13 +8,24 @@ Page({
     array: [{ name: '奖分次数最多', value: 1 }, { name: '扣分次数最多', value: 0 }],
     showTissue: false,
     page: 1,
-    tissueValName: '全公司'
+    tissueValName: '全公司',
+    popupCx: '',  
   },
   onLoad() {
     that = this;
     dd.setNavigationBar({ title: "管理者奖扣执行情况" });
     this.getData();
   },
+  showText() {
+    dd.alert({
+        title: '温馨提示',
+        content: '管理者奖扣任务均为B分，对A分不做要求',
+        buttonText: '我知道了',
+        success: (result) => {
+
+        },
+      });
+  },
   sotrs(str) {
     return function (a, b) {
       var val = a[str];
@@ -30,7 +41,7 @@ Page({
       month: that.data.month,
       dept_id: that.data.tissueVal,
     }
-    app.$get('api/integral/statistics/prize/list', data).then((res) => {
+    app.$get('api/integral/statistics/prize/list', data,'application/vnd.test.v3+json').then((res) => {
       var data = res.data.data.list || [];
       if (that.data.activeIndex == 0) {
         data.sort(that.sotrs('reward_count'));
@@ -94,7 +105,7 @@ Page({
       format: 'yyyy-MM',
       currentDate: this.data.month,
       success: (res) => {
-        if (res.data) {
+        if (res.date) {
           this.setData({
             month: res.date,
             page: 1
@@ -104,7 +115,8 @@ Page({
       },
       complete: (res) => {
         that.setData({
-          showDate: false
+          showDate: false,
+          popupCx: 'container__mask'
         })
       }
     });
@@ -112,11 +124,11 @@ Page({
   },
   //显示部门选择组件
   selectTissue(item) {
-    this.setData({ showTissue: !this.data.showTissue })
+    this.setData({ showTissue: !this.data.showTissue, popupCx: 'container__mask' })
   },
   //关闭弹窗
   onClose() {
-    this.setData({ showDate: false, showTissue: false })
+    this.setData({ showDate: false, showTissue: false,popupCx: '' })
   },
   //选择部门
   onConfirmTissue(data) {

pages/statistics/grant/grant.axml

@@ -1,5 +1,5 @@
 <view>
-  <form>
+  <view class="{{popupCx}}">
     <view class="flex-box flex-v-ce form-top" catchTap="openSelect" data-num="1">
       <view class="label isBt">奖扣对象</view>
       <view class="flex-1 font-flex-word userList">
@@ -18,7 +18,7 @@
     <view class="btn-area" style="margin-top:28rpx;">
         <button type="default" loading="{{disabled}}" class="defBtn" disabled="{{disabled}}" catchTap="formSubmit">提交</button>
     </view>
-  </form>
+  </view>
   <view class="box" animation="{{animationInfo}}">
     <select-section-staff isLeadership="{{true}}" isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='1'}}"/>
     <select-enevt defaultEnevt="{{item.id}}" defaultVal="{{defaultVal}}" onClose="onClose" onConfirm="onSelectEnevt" a:if="{{isShowType=='2'}}"/>

pages/statistics/grant/grant.js

@@ -9,6 +9,7 @@ Page({
       employee_id: []
     },
     defaultVal: '',
+    popupCx: ''
   },
   onLoad() {
     that = this;
@@ -75,11 +76,10 @@ Page({
   //选择弹窗
   openSelect(e) {
     var num = e.target.dataset.num;
-    that.setData({
-      isShowType: num,
-    });
     animation.translateY(0).step();
     that.setData({
+      isShowType: num,
+      popupCx: 'container__mask',
       animationInfo: animation.export()
     });
   },
@@ -93,8 +93,9 @@ Page({
   onClose() {
     animation.translateY(1200).step();
     that.setData({
+      popupCx: '',
+      isShowType: '', 
       animationInfo: animation.export()
     });
-    that.setData({ isShowType: '' });
   },
 });

pages/statistics/integralEvent/integralEvent.axml

@@ -1,40 +1,42 @@
 <view>
-  <view class="flex-box flex-v-ce tab margin-bottom">
-    <view class="flex-1" catchTap="selectDate">
-      <text class="{{showDate? 'activeView blue':''}}">{{selectDateVal}}</text>
-    </view>
-    <view class="flex-1" catchTap="selectStaff">
-      <text class="{{showStaff? 'activeView blue':''}}">{{staffVal}}</text>
-    </view>
-    <view class="flex-1" catchTap="selectRule">
-      <text class="{{showRuleTwo? 'activeView blue':''}}">{{ruleVal}}</text>
-    </view>
-    <view class="flex-1">
-      <picker onChange="bingIntegralType" value="{{typesIndex}}" range="{{types}}" range-key="name">
-        <text a:if="{{types[typesIndex].name=='全部'}}">积分类型</text>
-        <text a:else>{{types[typesIndex].name}}</text>
-      </picker>
+  <view class="{{popupCx}}">
+    <view class="flex-box flex-v-ce tab margin-bottom">
+      <view class="flex-1" catchTap="selectDate">
+        <text class="{{showDate? 'activeView blue':''}}">{{selectDateVal}}</text>
+      </view>
+      <view class="flex-1" catchTap="selectStaff">
+        <text class="{{showStaff? 'activeView blue':''}}">{{staffVal}}</text>
+      </view>
+      <view class="flex-1" catchTap="selectRule">
+        <text class="{{showRuleTwo? 'activeView blue':''}}">{{ruleVal}}</text>
+      </view>
+      <view class="flex-1">
+        <picker onChange="bingIntegralType" value="{{typesIndex}}" range="{{types}}" range-key="name">
+          <text a:if="{{types[typesIndex].name=='全部'}}">积分类型</text>
+          <text a:else>{{types[typesIndex].name}}</text>
+        </picker>
+      </view>
     </view>
-  </view>
-  <view class="main scroll">
-    <scroll-view class="scroll" a:if="{{list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
-      <view class="flex-box li border-bottom" a:for="{{list}}" catchTap="openDetail" data-item="{{item}}">
-        <img-box name="{{item.employee_name}}" imgUrl="{{item.employee_img_url}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
-        <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}}{{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.event_time}}</view>
+    <view class="main scroll">
+      <scroll-view class="scroll" a:if="{{list.length>0}}" scroll-y="{{true}}" onScrollToLower="onScrollToLower">
+        <view class="flex-box li border-bottom" a:for="{{list}}" catchTap="openDetail" data-item="{{item}}">
+          <img-box name="{{item.employee_name}}" imgUrl="{{item.employee_img_url}}" height="80rpx" width="80rpx" fSize="24rpx"></img-box>
+          <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}}{{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.event_time}}</view>
+            </view>
           </view>
         </view>
-      </view>
-      <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
-    </scroll-view>
-    <no-data a:if="{{list.length==0}}"></no-data>
+        <view class="noDatas" a:if="{{isData}}">没有更多咯</view>
+      </scroll-view>
+      <no-data a:if="{{list.length==0}}"></no-data>
+    </view>
   </view>
   <select-staff defaultUser="{{employee_ids}}" isShow="{{showStaff}}" a:if="{{showStaff==true}}" onClose="onClose" onConfirm="onConfirmStaff"></select-staff>
   <select-date defaultDate="{{defaultDate}}" isShow="{{showDate}}" a:if="{{showDate==true}}" onClose="onClose" onConfirm="onConfirmDate"></select-date>

pages/statistics/integralEvent/integralEvent.js

@@ -25,29 +25,33 @@ Page({
     ruleVal: "规则分类",
 
     page: 1,
+    popupCx: '',  
 
   },
   onLoad(e) {
+    console.log(e);
     that = this;
     var userData = app.globalData.userData;
     typeArr = [{ id: 0, name: '全部' }];
     var arr = typeArr.concat(app.globalData.types);
     arr = app.globalData.arrRemoveObj(arr, arr[1]);
     dd.setNavigationBar({ title: "积分事件" });
-    if (e.month) {
+    if (e.month||e.employee_ids) {
       var typesIndex = "0";
       if (e.type) {
-        arr.map((item, index) => {
-          if (item.code == e.type) {
-            typesIndex = index
-          }
-        })
+        if(arr){
+            arr.map((item, index) => {
+              if (item.code == e.type) {
+                typesIndex = index
+              }
+            })
+        }
       }
       this.setData({
-        date: e.month,
+        date: e.month? e.month:app.globalData.month,
         typesIndex: typesIndex,
-        employee_ids: [userData.id],
-        staffVal: userData.name,
+        employee_ids:e.employee_ids ? e.employee_ids:[userData.id],
+        staffVal:e.userName ? e.userName:userData.name,
         selectDateVal: e.month == app.globalData.month ? '本月' : '月',
         defaultDate: { type: '1', date: e.month },
       })
@@ -139,18 +143,21 @@ Page({
   //显示规则组件
   selectRule() {
     this.setData({
+      popupCx: 'container__mask',
       showRuleTwo: true
     })
   },
   //显示选择时间组件
   selectDate() {
     this.setData({
+      popupCx: 'container__mask',
       showDate: true
     })
   },
   //显示选择员工
   selectStaff() {
     this.setData({
+      popupCx: 'container__mask',
       showStaff: true
     })
   },
@@ -170,7 +177,8 @@ Page({
     this.setData({
       showDate: false,
       showStaff: false,
-      showRuleTwo: false
+      showRuleTwo: false,
+      popupCx: ''
     })
   },
   //选择积分分类

pages/statistics/offerAreward/offerAreward.axml

@@ -1,5 +1,5 @@
 <view>
-  <view>
+  <view class="{{popupCx}}">
     <view class="inputs">
       <view class="li">
         <textarea class="textarea" maxlength="100" value="{{items.remark}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容" data-index="{{index}}"></textarea>

pages/statistics/offerAreward/offerAreward.js

@@ -17,6 +17,7 @@ Page({
       task_cycle: 0,
       task_expire_day: 1,
       task_type:1,
+      popupCx: ''
     },
     reviewerObj: [],//默认审批人
     objectArray: [
@@ -93,9 +94,10 @@ Page({
   onClose() {
     animation.translateY(1200).step();
     that.setData({
+      isShowType: '',
+      popupCx: '',
       animationInfo: animation.export()
     });
-    that.setData({ isShowType: '' });
   },
   //选择部门
   onSelectSection(e) {
@@ -120,11 +122,10 @@ Page({
         that.setData({ reviewerObj: [] });
       }
     }
-    that.setData({
-      isShowType: num,
-    });
     animation.translateY(0).step();
     that.setData({
+      isShowType: num,
+      popupCx: 'container__mask',
       animationInfo: animation.export()
     });
   },

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -73,7 +73,7 @@
     <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
   </view>
   <!-- 调用过程组件 -->
-  <view class="">
+  <view class="" style="margin-bottom:140rpx">
     <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>
   </view>
 </view>

pages/statistics/sectionRanking/sectionRanking.axml

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

pages/statistics/sectionRanking/sectionRanking.js

@@ -27,16 +27,18 @@ Page({
     position:'all',
     year:app.globalData.year,
     page:1,
-    dateIndex:'3'
+    dateIndex:'3',
+    popupCx: '',
+    pt_id:'3',
   },
   onLoad() {
     that = this;
-    dd.setNavigationBar({ title: "部门B分排名" });
+    dd.setNavigationBar({ title: "阶段排名" });
     this.getData();
   },
   getData(is) {  
     var data = {
-      pt_id:app.getTypesItem('BF').id,
+      pt_id:that.data.pt_id,
       dept_id:that.data.dept_id,
       page: that.data.page,
       rule_id: that.data.rule_id,
@@ -92,18 +94,21 @@ Page({
   //显示规则组件
   selectRule() {
     this.setData({
+      popupCx: 'container__mask',
       showRuleTwo: true
     })
   },
   //显示选择时间组件
   selectDate() {
     this.setData({
+      popupCx: 'container__mask',
       showDate: true
     })
   },
   //显示选择员工
   selectSx() {
     this.setData({
+      popupCx: 'container__mask',
       showSx: true
     })
   },
@@ -141,11 +146,13 @@ Page({
       showSx: false,
       showRuleTwo: false,
       showTissue: false,
+      popupCx: ''  
     })
   },
   //选择筛选
   onConfirmSx(data) {
-   this.setData({sxObj:data, sort:data[1],position:data[0],page:1})
+    console.log(data)
+   this.setData({sxObj:data, sort:data[1],position:data[0],pt_id:data[2],page:1})
    this.getData();
   },
   //选择规则
@@ -159,7 +166,7 @@ Page({
   },
   //显示部门选择组件
   selectTissue() {
-    this.setData({ showTissue: !this.data.showTissue })
+    this.setData({ showTissue: !this.data.showTissue,popupCx: 'container__mask', })
   },
   //选择部门
   onConfirmTissue(data) {

pages/statistics/workDetail/workDetail.axml

@@ -33,7 +33,7 @@
     <view class="header-main" a:if="{{dataDetail.review_status==1}}">
       <view class="flex-box flex-v-ce">
         <view class="laber">审批状态</view>
-        <view class="flex-1 red">已通过</view>
+        <view class="flex-1 green">已通过</view>
       </view>
       <view class="flex-box flex-v-ce">
         <view class="laber">备注</view>

pages/workbench/apply/apply.axml

@@ -1,5 +1,5 @@
 <view>
-  <form onSubmit="formSubmit">
+  <form onSubmit="formSubmit" class="{{popupCx}}">
     <view a:for="{{items}}" a:for-index="index" key="{{index}}">
       <view class="flex-box flex-v-ce" style="padding-right:28rpx;">
         <view class="title flex-1">第({{index+1}})条</view>

pages/workbench/apply/apply.js

@@ -28,6 +28,7 @@ Page({
     getReviewerObj: {},//默认当前的缓存对象
     defaultRuleId: '',
     qrcodeId: '',//扫码进入
+    popupCx: ''
   },
   onLoad(e) {
     that = this;
@@ -132,10 +133,9 @@ Page({
   onClose() {
     animation.translateY(1200).step();
     that.setData({
-      animationInfo: animation.export()
-    });
-    that.setData({
-      isShowType: ''
+      animationInfo: animation.export(),
+      isShowType: '',
+      popupCx: ''
     });
   },
   showToast(text) {
@@ -181,6 +181,7 @@ Page({
         }
         animation.translateY(0).step();
         that.setData({
+          popupCx: '',
           animationInfo: animation.export()
         });
       });
@@ -188,13 +189,12 @@ Page({
       if (e.target.dataset.ruleId) {
         that.setData({ defaultRuleId: e.target.dataset.ruleId });
       }
+      animation.translateY(0).step();
       that.setData({
         employeeObj: num == 3 ? [e.target.dataset.item] : [],
         isShowType: num,
         activeIndex: index,
-      });
-      animation.translateY(0).step();
-      that.setData({
+        popupCx: '',
         animationInfo: animation.export()
       });
     }

pages/workbench/approve/approve.axml

@@ -1,242 +1,245 @@
 <view>
-  <form class="margin-bottom">
-    <view class="inputs">
-      <!-- （1）带积分，规则，分类 -->
-      <block a:if="{{isData==1}}">
-        <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
-          <view class="label">分类名称</view>
-          <view class="flex-1"></view>
-          <view class="fontColorF">{{item.rule_name}}</view>
-        </view>
-        <view class="flex-box flex-v-ce li">
-          <view class="label">选择规则</view>
-          <view class="flex-1">已选择1条</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
-        </view>
-        <view class="selectRule margin-bottom">
-          <view class="flex-box flex-v-ce">
-            <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">
-              <text class="red" a:if="{{item.selectRule.min_point>0}}">+{{item.selectRule.min_point}}</text>
-              <text class="green" a:else>{{item.selectRule.min_point}}</text>
-            </view>
-            <view class="green" a:else>
-              <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
-              <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
-            </view>
-            <view class="fontColorF" style="margin-left:10rpx;">
-                 {{item.selectRule.pt_Obj.name}}
-            </view>
+  <view class="{{popupCx}}">
+    <view class="margin-bottom">
+      <view class="inputs">
+        <!-- （1）带积分，规则，分类 -->
+        <block a:if="{{isData==1}}">
+          <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
+            <view class="label">分类名称</view>
+            <view class="flex-1"></view>
+            <view class="fontColorF">{{item.rule_name}}</view>
           </view>
-          <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
-            {{item.selectRule.remark}}
+          <view class="flex-box flex-v-ce li">
+            <view class="label">选择规则</view>
+            <view class="flex-1">已选择1条</view>
+            <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
           </view>
-        </view>
-        <view class="margin-bottom"></view>
-        <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
-          <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>
-          <view class="flex-1">
+          <view class="selectRule margin-bottom">
             <view class="flex-box flex-v-ce">
-              <view a:if="{{(item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point)||item.pid>0}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
-              <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput"  class="flex-1"/>
-              <view class="picker-box"  catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1&&item.pid==0}}">
-                <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
-                <view class="flex-box flex-v-ce" class="picker">
-                  <text class="red flex-1">奖</text>
-                  <text class="green flex-1">扣</text>
-                </view>
+              <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">
+                <text class="red" a:if="{{item.selectRule.min_point>0}}">+{{item.selectRule.min_point}}</text>
+                <text class="green" a:else>{{item.selectRule.min_point}}</text>
+              </view>
+              <view class="green" a:else>
+                <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
+                <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
+              </view>
+              <view class="fontColorF" style="margin-left:10rpx;">
+                  {{item.selectRule.pt_Obj.name}}
               </view>
-
             </view>
-            <block a:if="{{item.selectRule}}">
-              <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
-              <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
-                <text>{{item.selectRule.pt_Obj.name}}</text></view>
-            </block>
+            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
+              {{item.selectRule.remark}}
+            </view>
           </view>
-        </view>
-      </block>
-      <!-- （2）带积分，分类 -->
-      <block a:if="{{isData==2}}">
-        <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
-          <view class="label">分类名称</view>
-          <view class="flex-1"></view>
-          <view class="fontColorF">{{item.rule_name}}</view>
-        </view>
-        <view class="margin-bottom"></view>
-        <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
-          <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>
-          <view class="flex-1">
-            <view class="flex-box flex-v-ce">
-              <view  style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
-              <!-- <input  value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput" class="flex-1"/>
-              <view class="picker-box"  catchTap="bindPickerChange">
-                <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
-                <view class="flex-box flex-v-ce" class="picker">
-                  <text class="red flex-1">奖</text>
-                  <text class="green flex-1">扣</text>
+          <view class="margin-bottom"></view>
+          <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
+            <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>
+            <view class="flex-1">
+              <view class="flex-box flex-v-ce">
+                <view a:if="{{(item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point)||item.pid>0}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
+                <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput"  class="flex-1"/>
+                <view class="picker-box"  catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1&&item.pid==0}}">
+                  <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
+                  <view class="flex-box flex-v-ce" class="picker">
+                    <text class="red flex-1">奖</text>
+                    <text class="green flex-1">扣</text>
+                  </view>
                 </view>
-              </view> -->
+
+              </view>
+              <block a:if="{{item.selectRule}}">
+                <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
+                <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+                  <text>{{item.selectRule.pt_Obj.name}}</text></view>
+              </block>
             </view>
           </view>
-        </view>
-      </block>
-       <!-- （3）带分类 -->
-      <block a:if="{{isData==3}}">
-        <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
-          <view class="label">分类名称</view>
-          <view class="flex-1"></view>
-          <view class="fontColorF">{{item.rule_name}}</view>
-        </view>
-        <!-- <view class="flex-box flex-v-ce li" data-num="1" catchTap="openSelect">
-          <view class="label">选择规则</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 class="selectRule margin-bottom" a:if="{{item.selectRule}}">
-          <view class="flex-box flex-v-ce">
-            <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">
-              <text class="red" a:if="{{item.selectRule.min_point>0}}">+{{item.selectRule.min_point}}</text>
-              <text class="green" a:else>{{item.selectRule.min_point}}</text>
-            </view>
-            <view class="green" a:else>
-              <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
-              <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
-            </view>
-            <view class="fontColorF" style="margin-left:10rpx;">
-                 {{item.selectRule.pt_Obj.name}}
+        </block>
+        <!-- （2）带积分，分类 -->
+        <block a:if="{{isData==2}}">
+          <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
+            <view class="label">分类名称</view>
+            <view class="flex-1"></view>
+            <view class="fontColorF">{{item.rule_name}}</view>
+          </view>
+          <view class="margin-bottom"></view>
+          <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
+            <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>
+            <view class="flex-1">
+              <view class="flex-box flex-v-ce">
+                <view  style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
+                <!-- <input  value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput" class="flex-1"/>
+                <view class="picker-box"  catchTap="bindPickerChange">
+                  <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
+                  <view class="flex-box flex-v-ce" class="picker">
+                    <text class="red flex-1">奖</text>
+                    <text class="green flex-1">扣</text>
+                  </view>
+                </view> -->
+              </view>
             </view>
           </view>
-          <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
-            {{item.selectRule.remark}}
+        </block>
+        <!-- （3）带分类 -->
+        <block a:if="{{isData==3}}">
+          <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
+            <view class="label">分类名称</view>
+            <view class="flex-1"></view>
+            <view class="fontColorF">{{item.rule_name}}</view>
           </view>
-        </view> -->
-        <!-- <view class="margin-bottom"></view> -->
-        <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
-          <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>
-          <view class="flex-1">
+          <!-- <view class="flex-box flex-v-ce li" data-num="1" catchTap="openSelect">
+            <view class="label">选择规则</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 class="selectRule margin-bottom" a:if="{{item.selectRule}}">
             <view class="flex-box flex-v-ce">
-              <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
-              <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput"  class="flex-1"/>
-              <view class="picker-box"  catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1}}">
-                <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
-                <view class="flex-box flex-v-ce" class="picker">
-                  <text class="red flex-1">奖</text>
-                  <text class="green flex-1">扣</text>
-                </view>
+              <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">
+                <text class="red" a:if="{{item.selectRule.min_point>0}}">+{{item.selectRule.min_point}}</text>
+                <text class="green" a:else>{{item.selectRule.min_point}}</text>
+              </view>
+              <view class="green" a:else>
+                <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
+                <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
+              </view>
+              <view class="fontColorF" style="margin-left:10rpx;">
+                  {{item.selectRule.pt_Obj.name}}
               </view>
             </view>
-            <block a:if="{{item.selectRule}}">
-              <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
-              <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
-                <text>{{item.selectRule.pt_Obj.name}}</text></view>
-            </block>
-          </view>
-        </view>
-      </block>
-       <!-- （4） -->
-      <block a:if="{{isData==4}}">
-        <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
-          <view class="label">指定规则</view>
-          <view class="flex-1"></view>
-          <switch onChange="switchChange" checked="{{item.checked}}" color="#26A2FF"></switch>
-        </view>
-        <view class="flex-box flex-v-ce li" a:if="{{item.checked}}" data-num="1" data-ruleId="{{item.item_id}}" catchTap="openSelect">
-          <view class="label">选择规则</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 class="flex-box flex-v-ce li" a:else data-num="2" data-ruleId="{{item.rule_id2}}" catchTap="openSelect">
-          <view class="label isBt">选择分类</view>
-          <view class="flex-1">{{item.rule_name}}</view>
-          <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
-        </view>
-        <view a:if="{{item.selectRule&&item.checked}}" class="selectRule margin-bottom">
-          <view class="flex-box flex-v-ce">
-            <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">
-              <text class="red" a:if="{{item.selectRule.min_point>0}}">+{{item.selectRule.min_point}}</text>
-              <text class="green" a:else>{{item.selectRule.min_point}}</text>
-            </view>
-            <view class="green" a:else>
-              <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
-              <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
+            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
+              {{item.selectRule.remark}}
             </view>
-            <view class="fontColorF" style="margin-left:10rpx;">
-                 {{item.selectRule.pt_Obj.name}}
+          </view> -->
+          <!-- <view class="margin-bottom"></view> -->
+          <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;">
+            <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>
+            <view class="flex-1">
+              <view class="flex-box flex-v-ce">
+                <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
+                <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput"  class="flex-1"/>
+                <view class="picker-box"  catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1}}">
+                  <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
+                  <view class="flex-box flex-v-ce" class="picker">
+                    <text class="red flex-1">奖</text>
+                    <text class="green flex-1">扣</text>
+                  </view>
+                </view>
+              </view>
+              <block a:if="{{item.selectRule}}">
+                <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
+                <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+                  <text>{{item.selectRule.pt_Obj.name}}</text></view>
+              </block>
             </view>
           </view>
-          <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
-            {{item.selectRule.remark}}
+        </block>
+        <!-- （4） -->
+        <block a:if="{{isData==4}}">
+          <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
+            <view class="label">指定规则</view>
+            <view class="flex-1"></view>
+            <switch onChange="switchChange" checked="{{item.checked}}" color="#26A2FF"></switch>
           </view>
-        </view>
-        <view class="margin-bottom"></view>
-        <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;" a:if="{{item.checked}}">
-          <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
-          <text class="red" style="position: relative;top:8rpx;" a:if="{{item.isArrindex==true}}">+</text>
-          <text class="green" a:else style="position: relative;top:8rpx;">-</text>
-          <view class="flex-1">
+          <view class="flex-box flex-v-ce li" a:if="{{item.checked}}" data-num="1" data-ruleId="{{item.item_id}}" catchTap="openSelect">
+            <view class="label">选择规则</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 class="flex-box flex-v-ce li" a:else data-num="2" data-ruleId="{{item.rule_id2}}" catchTap="openSelect">
+            <view class="label isBt">选择分类</view>
+            <view class="flex-1">{{item.rule_name}}</view>
+            <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+          </view>
+          <view a:if="{{item.selectRule&&item.checked}}" class="selectRule margin-bottom">
             <view class="flex-box flex-v-ce">
-              <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
-              <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput" class="flex-1"/>
-              <view class="picker-box" catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1}}">
-                <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
-                <view class="flex-box flex-v-ce" class="picker">
-                  <text class="red flex-1">奖</text>
-                  <text class="green flex-1">扣</text>
+              <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}">
+                <text class="red" a:if="{{item.selectRule.min_point>0}}">+{{item.selectRule.min_point}}</text>
+                <text class="green" a:else>{{item.selectRule.min_point}}</text>
+              </view>
+              <view class="green" a:else>
+                <text class="red" a:if="{{item.selectRule.min_point>0}}"> +{{item.selectRule.min_point}}~{{item.selectRule.max_point}}</text>
+                <text class="green" a:else>{{item.selectRule.min_point}} ~ {{item.selectRule.max_point}}</text>
+              </view>
+              <view class="fontColorF" style="margin-left:10rpx;">
+                  {{item.selectRule.pt_Obj.name}}
+              </view>
+            </view>
+            <view style="font-size:24rpx;margin-left:10rpx;" class="fontColorF">
+              {{item.selectRule.remark}}
+            </view>
+          </view>
+          <view class="margin-bottom"></view>
+          <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;" a:if="{{item.checked}}">
+            <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
+            <text class="red" style="position: relative;top:8rpx;" a:if="{{item.isArrindex==true}}">+</text>
+            <text class="green" a:else style="position: relative;top:8rpx;">-</text>
+            <view class="flex-1">
+              <view class="flex-box flex-v-ce">
+                <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
+                <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput" class="flex-1"/>
+                <view class="picker-box" catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1}}">
+                  <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
+                  <view class="flex-box flex-v-ce" class="picker">
+                    <text class="red flex-1">奖</text>
+                    <text class="green flex-1">扣</text>
+                  </view>
                 </view>
               </view>
+              <block a:if="{{item.selectRule}}">
+                <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
+                <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
+                  <text>{{item.selectRule.pt_Obj.name}}</text></view>
+              </block>
             </view>
-            <block a:if="{{item.selectRule}}">
-              <view class="fontColorT input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
-              <view class="fontColorT input_text" a:else> 范围(可修改)：{{item.selectRule.min_point}}至{{item.selectRule.max_point}}
-                <text>{{item.selectRule.pt_Obj.name}}</text></view>
-            </block>
           </view>
-        </view>
-        <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;" a:else>
-          <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
-          <text class="red" style="position: relative;top:8rpx;" a:if="{{item.isArrindex2==true}}">+</text>
-          <text class="green" a:else style="position: relative;top:8rpx;">-</text>
-          <view class="flex-1">
-            <view class="flex-box flex-v-ce">
-              <input value="{{item.point2}}"  placeholder="0" type="number" onInput="bindKeyInput2" class="flex-1"/>
-              <view class="picker-box"  catchTap="bindPickerChange2">
-                <view class="{{item.isArrindex2==true? 'picker-right':'picker-left'}} yuan"></view>
-                <view class="flex-box flex-v-ce" class="picker">
-                  <text class="red flex-1">奖</text>
-                  <text class="green flex-1">扣</text>
+          <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;" a:else>
+            <view class="label isBt" style="position: relative;top:8rpx;">积分</view>
+            <text class="red" style="position: relative;top:8rpx;" a:if="{{item.isArrindex2==true}}">+</text>
+            <text class="green" a:else style="position: relative;top:8rpx;">-</text>
+            <view class="flex-1">
+              <view class="flex-box flex-v-ce">
+                <input value="{{item.point2}}"  placeholder="0" type="number" onInput="bindKeyInput2" class="flex-1"/>
+                <view class="picker-box"  catchTap="bindPickerChange2">
+                  <view class="{{item.isArrindex2==true? 'picker-right':'picker-left'}} yuan"></view>
+                  <view class="flex-box flex-v-ce" class="picker">
+                    <text class="red flex-1">奖</text>
+                    <text class="green flex-1">扣</text>
+                  </view>
                 </view>
               </view>
             </view>
           </view>
+        </block>
+        <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 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>
+          <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+        </view>
+        <view class="li">
+          <textarea  maxlength="300" value="{{item.remark}}" onInput="bindTextAreaBlur" placeholder="审批意见(选填)"></textarea>
         </view>
-      </block>
-      <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 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>
-        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
-      </view>
-      <view class="li">
-        <textarea  maxlength="300" value="{{item.remark}}" onInput="bindTextAreaBlur" placeholder="审批意见(选填)"></textarea>
       </view>
+    </form>
+    <view class="btn-seve">
+      <button type="default" loading="{{disabled}}" class="defBtn" disabled="{{disabled}}" catchTap="formSubmit">提交</button>
     </view>
-  </form>
-  <view class="btn-seve">
-    <button type="default" loading="{{disabled}}" class="defBtn" disabled="{{disabled}}" catchTap="formSubmit">提交</button>
   </view>
+
   <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'}}"/>

pages/workbench/approve/approve.js

@@ -29,6 +29,7 @@ Page({
     isShowType: "0",//是显示选择规则还是显示选择分类
     isData: false,
     isGzType:'',
+    popupCx: ''
   },
   onLoad(e) {
     that = this;
@@ -47,7 +48,8 @@ Page({
   onClose() {
     animation.translateY(1200).step();
     that.setData({
-      animationInfo: animation.export()
+      animationInfo: animation.export(),
+      popupCx: ''
     });
   },
   //备注输入
@@ -211,12 +213,11 @@ Page({
        that.setData({ defaultRuleId:e.target.dataset.ruleId});
     }
     that.setData({ activeIndex: '',isShowType:'' });
+    animation.translateY(0).step();
     that.setData({
       isShowType: e.target.dataset.num,
       activeIndex: e.target.dataset.index,
-    });
-    animation.translateY(0).step();
-    that.setData({
+      popupCx: 'container__mask',
       animationInfo: animation.export()
     });
   },

pages/workbench/index/index.js

@@ -313,7 +313,12 @@ Page({
   //获取个人统计
   getUserData() {
     var http1 = app.$get2("api/integral/statistics", { employee_id: 0, month: app.globalData.month })
-    var http2 = app.$get2("api/integral/statistics/integral", { month: app.globalData.month, page: 1, page_size: 5, employee_ids: app.globalData.userData.id })
+    var http2 = app.$get2("api/integral/statistics/integral", { 
+    month: app.globalData.month, 
+    page: 1, 
+    page_size: 5,
+    employee_ids:app.globalData.isCreator ? '':app.globalData.userData.id 
+    })
     var http3 = app.$get2("api/integral/review/list", { type: 'waiting',source_type:0, page: 1, pt_id: 0 })
     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 })// 管理者奖扣任务柱状图
@@ -371,11 +376,11 @@ Page({
               var obj = [{
                 type: '奖分',
                 name: item.employee_name,
-                val: item.deduction
+                val: item.reward
               }, {
                 type: '扣分',
                 name: item.employee_name,
-                val: item.reward
+                val: item.deduction
               }]
               employees.push(...obj)
             })
@@ -393,6 +398,7 @@ Page({
   },
   //获取积分事件
   getIncidentLsit() {
+    
     app.$get("api/integral/statistics/integral", { month: app.globalData.month, page: 1, page_size: 5, employee_ids: app.globalData.userData.id }).then((res) => {
       var data = res.data.data.list;
       data.map((item) => {

pages/workbench/jk_B/jk_B.axml

@@ -1,5 +1,5 @@
 <view>
-  <form>
+  <view class="{{popupCx}}">
     <view class="flex-box flex-v-ce form-top" catchTap="openSelect"  data-num="3">
       <view class="label isBt">奖扣对象</view>
       <view class="flex-1 font-flex-word userList">
@@ -99,7 +99,8 @@
     <view class="btn-area" style="margin-top:28rpx;">
         <button type="default" loading="{{disabled}}" class="defBtn" disabled="{{disabled}}" catchTap="formSubmit">提交</button>
     </view>
-  </form>
+  </view>
+
   <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'}}"/>

pages/workbench/jk_B/jk_B.js

@@ -17,6 +17,7 @@ Page({
     isGzType: 'BF',
     defaultRuleId: '',
     isCreator:false,//是否创始人
+    popupCx: '',
   },
   onLoad(data) {
     that = this;
@@ -89,9 +90,10 @@ Page({
   onClose() {
     animation.translateY(1200).step();
     that.setData({
-      animationInfo: animation.export()
+      isShowType: '',
+      animationInfo: animation.export(),
+      popupCx: ''
     });
-    that.setData({ isShowType: '' });
   },
   //选择弹窗
   openSelect(e) {
@@ -119,13 +121,12 @@ Page({
         that.setData({ reviewerObj: [] });
       }
     }
+    animation.translateY(0).step();
     that.setData({
       isShowType: num,
       activeIndex: e.target.dataset.index,
-    });
-    animation.translateY(0).step();
-    that.setData({
-      animationInfo: animation.export()
+      animationInfo: animation.export(),
+      popupCx: 'container__mask'
     });
   },
   //删除图片