Merge branch 'dev'

package-lock.json

@@ -90,6 +90,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"
       }
@@ -107,7 +108,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/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -62,11 +62,11 @@
       </view>
     </view>
   </view>
-  <!-- <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.applyor_id==userId&&dataDetail.process.length==1&&(dataDetail.event_type==3||dataDetail.event_type==4)}}">
+  <view class="bottom flex-box flex-flex-center-center" a:if="{{dataDetail.recorder_id==userId&&dataDetail.process.length==1&&(dataDetail.event_type==3||dataDetail.event_type==4)}}">
       <text class="flex-2 fontColorF">撤销后数据将不可恢复</text>
       <view></view>
       <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
-  </view> -->
+  </view>
   <!-- 调用过程组件 -->
   <view class="">
     <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>

pages/workbench/apply/apply.js

@@ -474,7 +474,6 @@ Page({
   },
   //选择规则
   onSelectItem(item) {
-    console.log(item);
     var index = this.data.activeIndex;
     var selectRule = `items[${index}].selectRule`
     var remark = `items[${index}].remark`

pages/workbench/approveDetail/approveDetail.js

@@ -61,14 +61,14 @@ Page({
   },
   openCx() {
     dd.confirm({
-      title: '撤销审批',
-      content: '您确定撤销此项吗?',
+      title: '撤掉审批',
+      content: '您确定撤掉此项吗?',
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       success: (result) => {
         if (result.confirm) {
           app.$post("api/integral/review/destroy", { review_id: that.data.review_id }).then((res) => {
-            app.globalData.showToast("已撤销");
+            app.globalData.showToast("已撤掉");
             var pages=getCurrentPages();//当上一页的page不等于一时，执行上一页的方法
             var active=pages[pages.length-2];
             if(active.data.page!=1){

pages/workbench/index/index.axml

@@ -31,8 +31,11 @@
         <view class="ranking_name font-flex-word"> {{ item.group_name.slice(0,2)}}</view>
         <view class="ranking_num flex-1">
           <view>{{ item.group_name }}</view>
-          <text class="fontColorF" a:if="{{getRole_four}}">第 {{ item.rank }} 名:{{item.employee_name}}</text>
-          <text class="fontColorF" a:else>第 {{ item.rank }} 名</text>
+          <block a:if="{{item.rank}}">
+            <text class="fontColorF" a:if="{{getRole_four}}">第 {{ item.rank }} 名:{{item.employee_name}}</text>
+            <text class="fontColorF" a:else>第 {{ item.rank }} 名</text>
+          </block>
+           <text class="fontColorF" a:else>不参与排名</text>
         </view>
         <image mode="scaleToFill" src="../../../image/right.png" class="img-right"></image>
       </view>