Merge branch 'dev'

Component/aParse/aParse.js

@@ -43,7 +43,6 @@ function aParse(bindName = 'aParseData', type = 'html', data = '<div class="colo
 }
 // 图片点击事件
 function aParseImgTap(e) {
-  console.log(e);
   var that = this;
   var nowImgUrl = e.target.dataset.idx;
   var tagFrom = e.target.dataset.from;

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;

app.json

@@ -52,7 +52,8 @@
     "pages/statistics/repetitive_tasks_detail/repetitive_tasks_detail",
     "pages/statistics/getTask/getTask",
     "pages/statistics/assaign_set/assaign_set",
-    "pages/statistics/offerAreward_set/offerAreward_set"
+    "pages/statistics/offerAreward_set/offerAreward_set",
+    "pages/statistics/logDetail/logDetail"
   ],
   "window": {
     "defaultTitle": "功道云",
@@ -84,4 +85,4 @@
       }
     ]
   }
-}
+}

pages/statistics/assaign/assaign.acss

@@ -69,6 +69,7 @@ textarea{
   width: 100%;
   border-top: 1px solid #f1f1f1;
   padding: 10rpx;
+  z-index: 2
 }
 .defBtn{
   width: 90%;
@@ -161,7 +162,6 @@ textarea{
     height: .48rem;
     background: #f5f7fa;
     border-radius: .28rem;
-    z-index: 1;
     color: #222;
     line-height: 0.48rem;
     font-size: 0.24rem;

pages/statistics/logDetail/logDetail.acss

@@ -0,0 +1,27 @@
+.box{
+  background: #fff;
+  padding:0 32rpx;
+  min-height: 100vh;
+}
+.title{
+  text-align: center;
+  font-size: 36rpx;
+  font-weight: 700;
+  max-width: 70%;
+  margin: 40rpx auto;
+}
+.key{
+  font-weight: 700;
+  font-size: 34rpx;
+}
+.value{
+  font-size: 30rpx;
+  margin: 20rpx 0;
+  margin-bottom: 40rpx;
+}
+.imgs{
+  width: 120rpx;
+  height: 120rpx;
+  margin-right: 10rpx;
+  margin-bottom: 10rpx;
+}

pages/statistics/logDetail/logDetail.axml

@@ -0,0 +1,20 @@
+<view class="box">
+    <view class="title font-flex-word">{{obj.creator_name}}的{{obj.template_name}}</view>
+    <view a:if="{{obj.contents.length>0}}">
+        <view class="contents" a:for="{{obj.contents}}">
+            <view class="key">{{item.key}}</view>
+            <view class="value fontColorF">
+                <text a:if="{{item.value}}">{{item.value}}</text>
+                <text a:else>未填写</text>
+            </view>
+        </view>  
+    </view>
+    <view  a:if="{{obj.images.length>0}}">
+      <view class="key" style="margin-bottom:40rpx;">图片</view>
+      <view class="flex-box flex-d-wrap">
+        <block a:for="{{obj.images}}" a:for-item="imgs" a:for-index="idx">
+          <image class="imgs" catchTap="showImg" mode="scaleToFill" src="{{imgs}}" data-index="{{idx}}" data-item="{{obj.images}}"/>
+        </block>
+      </view>
+    </view>
+</view>

pages/statistics/logDetail/logDetail.js

@@ -0,0 +1,33 @@
+var app = getApp()
+var that;
+Page({
+  data: {
+      obj:{}
+  },
+  onLoad(e) {
+    dd.setNavigationBar({ title: "日志内容" });
+     that = this;
+     if(e.id){
+        this.getDetail(e.id)
+     }
+  },
+  getDetail(id) {
+    app.$get("api/integral/statistics/integral/info", { event_id: id }).then((res) => {
+      var data = res.data.data;
+      app.globalData.types.forEach(item => {
+        if (item.id == data.pt_id) {
+          data.typeName = item.name
+        }
+      });
+      this.setData({ obj: data.remark.ding_report })
+    })
+  },
+  showImg(e){
+    var index=e.target.dataset.index;
+    var item=e.target.dataset.item
+    dd.previewImage({
+      current: index,
+      urls: item
+    });
+  },
+});

pages/statistics/logDetail/logDetail.json

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

pages/statistics/my_task/my_task.axml

@@ -16,7 +16,8 @@
       <view class="li border-bottom" a:for="{{toList}}" a:if="{{toList.length>0}}">
         <view class="flex-box li-top" catchTap="openDetail" data-item="{{item}}">
           <view class="flex-1">{{item.task_name}}</view>
-          <text class="fontColorX">{{item.point_config.base_point}}</text>
+          <text class="red" a:if="{{item.point_config.base_point>0}}">+{{item.point_config.base_point}}  {{item.pt_name}}</text>
+          <text a:else>{{item.point_config.base_point}}  {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
           <text class="flex-1 fontColorX" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
@@ -30,7 +31,8 @@
       <view class="li border-bottom" a:for="{{list}}">
         <view class="flex-box li-top" catchTap="openDetail" data-item="{{item}}">
           <view class="flex-1">{{item.task_name}}</view>
-          <text class="fontColorX">{{item.point_config.base_point}}</text>
+          <text class="red" a:if="{{item.point_config.base_point>0}}">+{{item.point_config.base_point}}  {{item.pt_name}}</text>
+          <text a:else>{{item.point_config.base_point}}  {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
           <text class="flex-1 fontColorX {{item.isCs? 'red':''}}" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>
@@ -46,7 +48,8 @@
       <view class="li border-bottom" a:for="{{list}}">
         <view class="flex-box li-top" catchTap="openDetail" data-item="{{item}}">
           <view class="flex-1">{{item.task_name}}</view>
-          <text class="fontColorX">{{item.point_config.base_point}}</text>
+          <text class="red" a:if="{{item.point_config.base_point>0}}">+{{item.point_config.base_point}}  {{item.pt_name}}</text>
+          <text a:else>{{item.point_config.base_point}}  {{item.pt_name}}</text>
         </view>
         <view class="flex-box li-bottom">
           <text class="flex-1 fontColorX" catchTap="openDetail" data-item="{{item}}">{{item.expire_time}} 截止</text>

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.acss

@@ -108,4 +108,10 @@
   height: 120rpx;
   margin-right: 10rpx;
   margin-bottom: 10rpx;
+}
+.log{
+  padding:32rpx;
+  color: #26A2FF;
+  text-align: center;
+  background: #fff;
 }

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -9,7 +9,7 @@
         <text>{{dataDetail.typeName}}</text></view>
     </view>
     <view class="header-main">
-      <view class="flex-box" a:if="{{dataDetail.remark!=null}}">
+      <view class="flex-box" a:if="{{dataDetail.remark.customize!=''||dataDetail.remark.rule!=''}}">
         <view class="laber">事件内容</view>
         <view class="flex-1">{{dataDetail.remark.customize || dataDetail.remark.rule}}</view>
       </view>
@@ -28,7 +28,7 @@
       <view class="flex-box" a:if="{{dataDetail.files.length>0}}">
         <view class="laber">图片</view>
         <view class="flex-1 flex-box flex-d-wrap">
-          <block a:for="{{dataDetail.files}}" a:for-item="imgs"  a:for-index="idx">
+          <block a:for="{{dataDetail.files}}" a:for-item="imgs" a:for-index="idx">
             <image class="imgs" catchTap="showImg" mode="scaleToFill" src="{{imgs}}" data-index="{{idx}}" data-item="{{dataDetail.files}}"/>
           </block>
         </view>
@@ -40,32 +40,37 @@
     </view>
   </view>
   <view class="main margin-bottom">
-    <view class="mian-title border-bottom" a:if="{{dataDetail.rule_item_id}}">规则依据
-      <text>此事件打分参考以下积分规则</text>
-    </view>
-    <view class="header-main" a:if="{{dataDetail.rule_item_id}}">
-      <view class="flex-box flex-v-ce" a:if="{{dataDetail.rule_list}}">
-        <view class="laber">规则分类</view>
-        <view class="flex-1">{{dataDetail.rule_list }}</view>
-      </view>
-      <view class="flex-box" a:if="{{dataDetail.remark&&dataDetail.remark.rule}}">
-        <view class="laber">积分规则</view>
-        <view class="flex-1">{{dataDetail.remark.rule}}</view>
+    <block a:if="{{dataDetail.source_type!=10}}">
+      <view class="mian-title border-bottom" a:if="{{dataDetail.rule_item_id}}">规则依据
+        <text>此事件打分参考以下积分规则</text>
       </view>
-      <view class="flex-box flex-v-ce" a:if="{{dataDetail.rule_item}}">
-        <view class="laber">规则积分</view>
-        <view class="flex-1">
-          <text a:if="{{dataDetail.rule_item.range_type == 1}}">{{ dataDetail.rule_item.min_point }}</text>
-          <text a:if="{{dataDetail.rule_item.range_type == 2}}">{{ dataDetail.rule_item.min_point }} ~ {{ dataDetail.rule_item.max_point }}</text>
-          <text>{{dataDetail.typeName}}</text>
+      <view class="header-main" a:if="{{dataDetail.rule_item_id}}">
+        <view class="flex-box flex-v-ce" a:if="{{dataDetail.rule_list}}">
+          <view class="laber">规则分类</view>
+          <view class="flex-1">{{dataDetail.rule_list }}</view>
+        </view>
+        <view class="flex-box" a:if="{{dataDetail.remark&&dataDetail.remark.rule}}">
+          <view class="laber">积分规则</view>
+          <view class="flex-1">{{dataDetail.remark.rule}}</view>
+        </view>
+        <view class="flex-box flex-v-ce" a:if="{{dataDetail.rule_item}}">
+          <view class="laber">规则积分</view>
+          <view class="flex-1">
+            <text a:if="{{dataDetail.rule_item.range_type == 1}}">{{ dataDetail.rule_item.min_point }}</text>
+            <text a:if="{{dataDetail.rule_item.range_type == 2}}">{{ dataDetail.rule_item.min_point }} ~ {{ dataDetail.rule_item.max_point }}</text>
+            <text>{{dataDetail.typeName}}</text>
+          </view>
         </view>
       </view>
-    </view>
+    </block>
+    <block a:else>
+        <view class="log" catchTap="openLog">查看日志详情内容 <text style="font-size: 36rpx;padding-left:10rpx;">»</text></view>
+    </block>
   </view>
   <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>
+    <text class="flex-2 fontColorF">撤销后数据将不可恢复</text>
+    <view></view>
+    <view class="flex-1 blueBtn" catchTap="openCx">撤销奖扣</view>
   </view>
   <!-- 调用过程组件 -->
   <view class="">

pages/statistics/prizeBuckleDetail/prizeBuckleDetail.js

@@ -45,6 +45,12 @@ Page({
       },
     });
   },
+  // 查看日志详情
+  openLog(){
+    dd.navigateTo({
+      url: '../logDetail/logDetail?id=' + this.data.review_id
+    })
+  },
   showImg(e){
       var index=e.target.dataset.index;
       var item=e.target.dataset.item

pages/statistics/workDetail/workDetail.axml

@@ -18,6 +18,30 @@
         <view>最终分</view>
       </view>
     </view>
+    <view class="header-main" a:if="{{dataDetail.review_status==2}}">
+      <view class="flex-box flex-v-ce">
+        <view class="laber">审批状态</view>
+        <view class="flex-1 red">已驳回</view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">驳回理由</view>
+        <view class="flex-1">{{dataDetail.review_remark}}</text>
+        </view>
+      </view>
+      <view style="height:20rpx;background: rgba(245, 247, 250, 1);"></view>
+    </view>
+    <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>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">备注</view>
+        <view class="flex-1">{{dataDetail.review_remark}}</text>
+        </view>
+      </view>
+      <view style="height:20rpx;background: rgba(245, 247, 250, 1);"></view>
+    </view>
     <view class="header-main">
       <view class="flex-box flex-v-ce">
         <view class="laber">工作内容</view>
@@ -57,6 +81,7 @@
       </view>
     </view>
   </view>
+  
   <view class="main border-bottom">
     <view class="flex-box flex-v-ce titles">
       <view class="title flex-1">任务进度</view>

pages/workbench/jk_B/jk_B.js

@@ -404,7 +404,7 @@ Page({
             }
           })
         } else {
-          res.data.data.forEach(item => {
+          res.data.data.list.forEach(item => {
             if (item.status != 1) {
               is = false;
               msg = item.rule_item;