1

app.js

@@ -3,8 +3,8 @@ import { formatTime, arrRemoveObj, getTypeItem } from './utils/util'
 import * as socketApi from './utils/websocket'
 import { onSubscribeAppBack} from 'dingtalk-service-window-libs/lib/openSubscribeMiniApp'
 
-const baseUrl = "https://test-ding.g107.com/";//测试
-// const baseUrl = "https://app55493.eapps.dingtalkcloud.com/";//正式
+// const baseUrl = "https://test-ding.g107.com/";//测试
+const baseUrl = "https://app55493.eapps.dingtalkcloud.com/";//正式
 var that;
 var yearArr = [];
 var year = formatTime(new Date()).year;
@@ -15,8 +15,8 @@ App({
   //自定义全局变量
   globalData: {
     baseUrl:baseUrl,
-    webScoketUrl: "test-ding.g107.com",//webScoket测试
-    // webScoketUrl: "app55493.eapps.dingtalkcloud.com",//webScoket正式
+    // webScoketUrl: "test-ding.g107.com",//webScoket测试
+    webScoketUrl: "app55493.eapps.dingtalkcloud.com",//webScoket正式
     showToast: showToast,//提示框
     arrRemoveObj: arrRemoveObj,//删除数组的某一项
     year: formatTime(new Date()).year,//当前年

pages/deploy/organization/organization.acss

@@ -66,11 +66,15 @@
 }
 
 .name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
   padding-right: 20rpx;
   font-size: 36rpx;
+  overflow: hidden;    
+  text-overflow: ellipsis;   
+   word-break: break-all;    
+   display: -webkit-box;    
+   -webkit-line-clamp: 2;   
+   -webkit-box-orient: vertical;
+   width: 4.3rem;
 }
 
 .title2 {

pages/deploy/organization/organization.axml

@@ -11,7 +11,7 @@
       <view class="flex-1 flex-box flex-v-ce">
         <image a:if="{{gsData.logo_ur}}" mode="scaleToFill" src="{{gsData.logo_url}}" class="logo"/>
         <image a:else mode="scaleToFill" src="../../../image/gs_logo.png" class="logo"/>
-        <view class="name flex-1">{{gsData.name}}</view>
+        <view class="name">{{gsData.name}}</view>
       </view>
       <view a:if="{{ isSuperAdministrator }}" class="flex-box-v flex-center-center" style="border-left:1px solid #f1f1f1;padding-left:28rpx" catchTap="tbDd">
         <view><image mode="scaleToFill" src="../../../image/tb.png" class="tbImg"/></view>

pages/statistics/workDetail/workDetail.axml

@@ -68,14 +68,10 @@
           <text style="padding-left: 10px;" class="red" a:if="{{dataDetail.expire_day > 0}}">逾期{{dataDetail.expire_day}}天</text>
         </view>
       </view>
-      
-      <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.ahead_award_point}}">
-        <view class="laber">提前奖分</view>
-        <view class="flex-1">{{dataDetail.point_config.ahead_award_point}}B分/天</view>
-      </view>
-      <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.timeout_deduction_point}}">
-        <view class="laber">逾期扣分</view>
-        <view class="flex-1">{{dataDetail.point_config.timeout_deduction_point}}B分/天</view>
+      <view class="flex-box flex-v-ce" a:if="{{dataDetail.complete_task.time}}">
+        <view class="laber">完成时间</view>
+        <view class="flex-1">{{dataDetail.complete_task.time}}
+        </view>
       </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.complete_task.remark}}">
         <view class="laber">完成备注</view>
@@ -88,6 +84,14 @@
             src="{{item}}" catchTap="showImg" />
         </view>
       </view>
+      <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.ahead_award_point}}">
+        <view class="laber">提前奖分</view>
+        <view class="flex-1">{{dataDetail.point_config.ahead_award_point}}B分/天</view>
+      </view>
+      <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.timeout_deduction_point}}">
+        <view class="laber">逾期扣分</view>
+        <view class="flex-1">{{dataDetail.point_config.timeout_deduction_point}}B分/天</view>
+      </view>
     </view>
     
     <view class="main margin-bottom">

pages/statistics/workDetail/workDetail.js

@@ -1,6 +1,7 @@
 
 var app = getApp()
 var that;
+import moment from 'moment' // 时间库
 Page({
   data: {
     date: app.globalData.month,
@@ -203,8 +204,12 @@ Page({
           data.jf.push(item)
         } else {
           data.gc.push(item)
-        }
+        }complete_task.time
       })
+      if(data.complete_task.time){
+        data.complete_task.time=moment(data.complete_task.time).format('YYYY-MM-DD HH:mm')
+      }
+
       this.employee_me(data)
       this.setData({
         dataDetail: data,

pages/workbench/approval_batch/approval_batch.js

@@ -304,7 +304,8 @@ Page({
       page: that.data.page,
       pt_id: 0,
       page_size: 20,
-      keyword: that.data.keyword
+      keyword: that.data.keyword,
+	    reviewer_id:app.globalData.userData.id
     }
     if (that.data.target_id) {
       data.target_id = that.data.target_id;

pages/workbench/approveDetail/approveDetail.axml

@@ -92,6 +92,9 @@
   <view class="main">
     <!-- 调用过程组件 -->
     <process process="{{dataDetail.process}}" a:if="{{dataDetail.process.length>0}}"/>
+  </view>
+  <view style="height:2rem">
+    
   </view>
   <!-- 积分任务 -->
   <view class="bottom flex-box flex-flex-center-center" a:if="{{!is&&dataDetail.review_status!=1&&dataDetail.source_type==1}}">

pages/workbench/index/index.js

@@ -568,7 +568,7 @@ Page({
 	    order_key:'update_time',
       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 http3 = app.$get2("api/integral/review/list", { type: 'waiting', source_type: 0, page: 1, pt_id: 0,reviewer_id:app.globalData.userData.id })
     var ranking = app.$get2('api/integral/statistics/ranking/list', { page: 1, page_size: 100 })// 获取排行榜
     var task = app.$get2('api/integral/statistics/task/pie', { month: app.globalData.month })// 管理者奖扣任务柱状图
     var work = app.$get2('api/integral/work/list', { status: 'running', page: 1, pt_id: 0, source_type: 0 })// 管理者奖扣任务柱状图

pages/workbench/my_approve/my_approve.js

@@ -151,7 +151,7 @@ Page({
     })
   },
   getData(type) {
-    app.$get("api/integral/review/list", {source_type:that.data.arrIndex,type: that.data.httpType, page: that.data.page, pt_id: 0, page_size: 20, keyword: that.data.keyword }).then((res) => {
+    app.$get("api/integral/review/list", {source_type:that.data.arrIndex,type: that.data.httpType, page: that.data.page, pt_id: 0, page_size: 20, keyword: that.data.keyword,reviewer_id:app.globalData.userData.id }).then((res) => {
       var list = res.data.data.list || [];
       list.forEach(element => {
         if (element.pt_id) {