哥哥玩剑魂呢 3 năm trước cách đây
mục cha
commit
9441751cc3

+ 2 - 1
app.acss

@@ -180,7 +180,8 @@
 		background-color: #909399;
 		color: #fff;
 		text-align: center;
-		line-height: 40rpx;
+		/* line-height: 40rpx; */
+		line-height: 34rpx;
 		margin: 0 10rpx;
 	}
 

+ 17 - 110
package-lock.json

@@ -86,31 +86,23 @@
         "regenerator-runtime": "^0.13.4"
       }
     },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz",
-      "integrity": "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=",
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
     "axios": {
-      "version": "0.21.1",
-      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1608611162952&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.1.tgz",
-      "integrity": "sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
+      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
       "requires": {
-        "follow-redirects": "^1.10.0"
+        "follow-redirects": "^1.14.0"
       }
     },
     "decode-uri-component": {
       "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
     "dingtalk-design-libs": {
-      "version": "0.0.15",
-      "resolved": "https://registry.nlark.com/dingtalk-design-libs/download/dingtalk-design-libs-0.0.15.tgz",
-      "integrity": "sha1-n0mQUINDNZdp7ZeYyn0knyjIhXM=",
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/dingtalk-design-libs/-/dingtalk-design-libs-0.0.20.tgz",
+      "integrity": "sha512-PojsAOMSquSnzdc4K8sNtKn6uCeIzII2fH8qnQn6nDdGjR5ZFwWKyyDNwPsL5eGBQI+tzoC2wz9Ot2PdfP4T6w==",
       "requires": {
         "axios": "^0.21.1",
         "dingtalk-jsapi": "*",
@@ -126,29 +118,10 @@
         "promise-polyfill": "^7.1.0"
       }
     },
-    "duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz",
-      "integrity": "sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY="
-    },
-    "event-stream": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npm.taobao.org/event-stream/download/event-stream-4.0.1.tgz",
-      "integrity": "sha1-QJKAjsmV0N116kWAwd9qdNss3mU=",
-      "requires": {
-        "duplexer": "^0.1.1",
-        "from": "^0.1.7",
-        "map-stream": "0.0.7",
-        "pause-stream": "^0.0.11",
-        "split": "^1.0.1",
-        "stream-combiner": "^0.2.2",
-        "through": "^2.3.8"
-      }
-    },
     "eventemitter2": {
       "version": "6.4.4",
-      "resolved": "https://registry.npm.taobao.org/eventemitter2/download/eventemitter2-6.4.4.tgz",
-      "integrity": "sha1-qpboJ1xNvrAXpdDgN4DGVhKhICs="
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz",
+      "integrity": "sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="
     },
     "fecha": {
       "version": "2.3.3",
@@ -156,53 +129,20 @@
       "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.nlark.com/follow-redirects/download/follow-redirects-1.14.1.tgz?cache=0&sync_timestamp=1620555300559&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.14.1.tgz",
-      "integrity": "sha1-2RFN7Qoc/dM04WTmZirQK/2R/0M="
-    },
-    "from": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npm.taobao.org/from/download/from-0.1.7.tgz",
-      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4="
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
     },
     "hammerjs": {
       "version": "2.0.8",
       "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1613835838133&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz",
-      "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw="
-    },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
-    },
-    "map-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npm.taobao.org/map-stream/download/map-stream-0.0.7.tgz",
-      "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg="
-    },
-    "mingo": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npm.taobao.org/mingo/download/mingo-1.3.3.tgz",
-      "integrity": "sha1-aSLE0Ufvx3GgFCWixMj3eER4xUY="
-    },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz?cache=0&sync_timestamp=1571657171505&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-assign%2Fdownload%2Fobject-assign-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
-    "pause-stream": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npm.taobao.org/pause-stream/download/pause-stream-0.0.11.tgz",
-      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
-      "requires": {
-        "through": "~2.3"
-      }
-    },
     "promise-polyfill": {
       "version": "7.1.2",
       "resolved": "https://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz",
@@ -210,8 +150,8 @@
     },
     "query-string": {
       "version": "5.1.1",
-      "resolved": "https://registry.npm.taobao.org/query-string/download/query-string-5.1.1.tgz",
-      "integrity": "sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s=",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+      "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
       "requires": {
         "decode-uri-component": "^0.2.0",
         "object-assign": "^4.1.0",
@@ -223,44 +163,11 @@
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.5.tgz?cache=0&sync_timestamp=1584052481783&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.5.tgz",
       "integrity": "sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc="
     },
-    "save": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npm.taobao.org/save/download/save-2.4.0.tgz",
-      "integrity": "sha1-r5P/mz16QdCv9JojQzhwYTpGD5s=",
-      "requires": {
-        "async": "^2.6.2",
-        "event-stream": "^4.0.1",
-        "lodash.assign": "^4.2.0",
-        "mingo": "1"
-      }
-    },
-    "split": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/split/download/split-1.0.1.tgz",
-      "integrity": "sha1-YFvZvjA6pZ+zX5Ip++oN3snqB9k=",
-      "requires": {
-        "through": "2"
-      }
-    },
-    "stream-combiner": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npm.taobao.org/stream-combiner/download/stream-combiner-0.2.2.tgz",
-      "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=",
-      "requires": {
-        "duplexer": "~0.1.1",
-        "through": "~2.3.4"
-      }
-    },
     "strict-uri-encode": {
       "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
     "tslib": {
       "version": "1.13.0",
       "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.13.0.tgz?cache=0&sync_timestamp=1589411820927&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.13.0.tgz",

+ 2 - 2
pages/statistics/assaign/assaign.axml

@@ -5,7 +5,7 @@
       <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="{{items.checked}}" color="#26A2FF"></switch>
+        <switch onChange="switchChange"  checked="{{items.checked}}" color="#26A2FF"></switch>
       </view>
       <view class="flex-box flex-v-ce li" data-ruleId="{{items.item_id}}" a:if="{{items.checked}}"  data-num="3" catchTap="openSelect">
         <view class="label isBt">选择规则</view>
@@ -14,7 +14,7 @@
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
       <view class="li">
-        <textarea class="textarea" maxlength="100" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容"></textarea>
+        <textarea class="textarea" maxlength="20" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容"></textarea>
         <image mode="scaleToFill" src="../../../image/addImg.png" class="addImg" catchTap="openImg"/>
       </view>
       <view style="background:#fff;padding:0 28rpx;" a:if="{{items.file_list[0]}}" class="flex-box flex-v-ce">

+ 2 - 0
pages/statistics/assaign/assaign.js

@@ -80,6 +80,7 @@ Page({
   },
 
   switchChange(e) {
+    console.log(e)
     that.setData({
       [`items.checked`]: e.detail.value
     })
@@ -203,6 +204,7 @@ Page({
   },
   //选择弹窗
   openSelect(e) {
+    console.log(e)
     var num = e.target.dataset.num;
     if (e.target.dataset.item) {
       if (e.target.dataset.item.id) {

+ 1 - 0
pages/statistics/assaign_set/assaign_set.acss

@@ -69,6 +69,7 @@ textarea{
   width: 100%;
   border-top: 1px solid #f1f1f1;
   padding: 10rpx;
+  z-index: 2
 }
 .defBtn{
   width: 90%;

+ 7 - 1
pages/statistics/my_task/my_task.js

@@ -62,6 +62,7 @@ Page({
       searchName: e.detail.value ? e.detail.value : '',
     })
     this.getData(this.data.activeIndex);
+    this.getToDay()
   },
   //显示选择员工
   selectSx() {
@@ -88,7 +89,7 @@ Page({
   },
   //今天完成的任务
   getToDay() {
-    app.$get('api/integral/work/list', { status: 'running', today: '1', page: '1', page_size: '50', sort: 'publish', source_type: 0, pt_id: 0 }).then((res) => {
+    app.$get('api/integral/work/list', { status: 'running', today: '1', page: '1', page_size: '50', sort: 'publish', source_type: 0, pt_id: 0 ,content: that.data.searchName,}).then((res) => {
       this.setData({
         toList: res.data.data.list
       })
@@ -111,6 +112,11 @@ Page({
       data.forEach(item => {
         item.isCs = item.expire_time < app.globalData.allDate;
       })
+      if(that.data.page==1){
+        this.setData({
+            list: []
+        })
+      }
       var list = that.data.list;
       data.forEach(element => {
         if (element.pt_id) {

+ 27 - 11
pages/statistics/prizeBuckleDetail/prizeBuckleDetail.axml

@@ -10,11 +10,19 @@
     </view>
     <view class="header-main">
       <view class="flex-box" a:if="{{dataDetail.remark.customize!=''||dataDetail.remark.rule!=''}}">
-        <view class="laber">事件内容</view>
+        <view class="laber">任务描述</view>
         <view class="flex-1">{{dataDetail.remark.customize || dataDetail.remark.rule}}</view>
       </view>
+      <!-- <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">
+            <image class="imgs" catchTap="showImg" mode="scaleToFill" src="{{imgs}}" data-index="{{idx}}" data-item="{{dataDetail.files}}"/>
+          </block>
+        </view>
+      </view> -->
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.rule_list}}">
-        <view class="laber">事件分类</view>
+        <view class="laber">规则分类</view>
         <view class="flex-1">{{dataDetail.rule_list }}</view>
       </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.source_type_mark}}">
@@ -22,21 +30,29 @@
         <view class="flex-1">{{dataDetail.source_type_mark }}</view>
       </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.date}}">
-        <view class="laber">时间</view>
+        <view class="laber">事件时间</view>
         <view class="flex-1">{{dataDetail.date }}</view>
       </view>
-      <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">
-            <image class="imgs" catchTap="showImg" mode="scaleToFill" src="{{imgs}}" data-index="{{idx}}" data-item="{{dataDetail.files}}"/>
-          </block>
-        </view>
-      </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.recorder_name}}">
         <view class="laber">记录人</view>
         <view class="flex-1">{{dataDetail.recorder_name}}</view>
       </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>
+        <view class="flex-1">{{dataDetail.complete_task.remark}}</view>
+      </view>
+      <view class="flex-box" a:if="{{dataDetail.complete_task.files.length>0}}">
+        <view class="laber"></view>
+        <view class="flex-1 flex-box flex-d-wrap">
+          <block a:for="{{dataDetail.complete_task.files}}" a:for-item="imgs" a:for-index="idx">
+            <image class="imgs" catchTap="showImg" mode="scaleToFill" src="{{imgs}}" data-index="{{idx}}" data-item="{{dataDetail.complete_task.files}}"/>
+          </block>
+        </view>
+      </view>
     </view>
   </view>
   <view class="main margin-bottom">

+ 16 - 0
pages/statistics/repetitive_tasks_detail/repetitive_tasks_detail.acss

@@ -80,3 +80,19 @@
     font-size: 24rpx;
     text-align: center;
 }
+
+.mian-title{
+  padding:16rpx 32rpx;
+  background: #fff;
+  font-size: 36rpx;
+  color: #222;
+  font-weight: 600;
+}
+.mian-title text{
+  color: #909399;
+  font-weight: 500;
+  position: relative;
+  top: -3rpx;
+  padding-left: 20rpx;
+  font-size: 32rpx;
+}

+ 25 - 0
pages/statistics/repetitive_tasks_detail/repetitive_tasks_detail.axml

@@ -64,6 +64,31 @@
         </view>
       </view>
     </view>
+    <view class="main margin-bottom">
+      <block a:if="{{dataDetail.point_config}}">
+        <view class="mian-title border-bottom" a:if="{{dataDetail.point_config&&dataDetail.point_config.item_info}}">规则依据1
+          <text>此事件打分参考以下积分规则</text>
+        </view>
+        <view class="header-main" a:if="{{dataDetail.point_config&&dataDetail.point_config.item_info}}">
+          <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.rule_info.name}}">
+            <view class="laber">规则分类</view>
+            <view class="flex-1">{{dataDetail.point_config.rule_info.name }}</view>
+          </view>
+          <view class="flex-box" a:if="{{dataDetail.point_config.item_info&&dataDetail.point_config.item_info.remark}}">
+            <view class="laber">积分规则</view>
+            <view class="flex-1">{{dataDetail.point_config.item_info.remark}}</view>
+          </view>
+          <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.item_info.min_point}}">
+            <view class="laber">规则积分</view>
+            <view class="flex-1">
+              <text a:if="{{dataDetail.point_config.item_info.range_type == 1}}">{{ dataDetail.point_config.item_info.min_point }}</text>
+              <text a:if="{{dataDetail.point_config.item_info.range_type == 2}}">{{ dataDetail.point_config.item_info.min_point }} ~ {{ dataDetail.point_config.item_info.max_point }}</text>
+              <text>{{dataDetail.pt_name}}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
     <view class="main">
       <view class="margin-top main-item">
         <view class="margin-bottom">审批者</view>

+ 16 - 0
pages/statistics/taskDetail/taskDetail.acss

@@ -67,4 +67,20 @@
 }
 .btn-area{
   margin-top: 1.5rem;
+}
+
+.mian-title{
+  padding:16rpx 32rpx;
+  background: #fff;
+  font-size: 36rpx;
+  color: #222;
+  font-weight: 600;
+}
+.mian-title text{
+  color: #909399;
+  font-weight: 500;
+  position: relative;
+  top: -3rpx;
+  padding-left: 20rpx;
+  font-size: 32rpx;
 }

+ 61 - 4
pages/statistics/taskDetail/taskDetail.axml

@@ -21,14 +21,41 @@
         <view class="laber">任务内容</view>
         <view class="flex-1">{{dataDetail.task_name}}</view>
       </view>
+      <view class="flex-box" a:if="{{dataDetail.status==3 && dataDetail.receiver_id != 0}}">
+        <view class="laber">完成人</view>
+        <view class="flex-1">{{dataDetail.receiver_name}}</view>
+      </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.task_remark}}">
-        <view class="laber">任务描述</view>
+        <view class="laber">任务备注</view>
         <view class="flex-1">{{dataDetail.task_remark}}</view>
       </view>
+      <view class="flex-box" a:if="{{dataDetail.task_file_list.length>0}}">
+        <view class="laber"></view>
+        <view class="flex-1 flex-box flex-v-ce imgs">
+          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.task_file_list}}" data-item="{{dataDetail.task_file_list}}" src="{{item}}" catchTap="showImg"/>
+        </view>
+      </view>
+
       <view class="flex-box flex-v-ce">
         <view class="laber">任务类型</view>
         <view class="flex-1">{{dataDetail.pt_name}}</view>
       </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">任务积分</view>
+        <view class="flex-1">{{dataDetail.point_config.base_point}}{{dataDetail.pt_name}}</view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">审批人</view>
+        <view class="flex-1">{{dataDetail.reviewer_name}}</view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">发布人</view>
+        <view class="flex-1">{{dataDetail.owner_name}}</view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">发布时间</view>
+        <view class="flex-1">{{dataDetail.create_time}}</view>
+      </view>
       <view class="flex-box flex-v-ce">
         <view class="laber">截止时间</view>
         <view class="flex-1">{{dataDetail.expire_time}}</view>
@@ -47,13 +74,43 @@
             <text a:for="{{dataDetail.department_info}}">{{item.name}},</text>
         </view>
       </view>
-      <view class="flex-box" a:if="{{dataDetail.task_file_list.length>0}}">
-        <view class="laber">任务图片</view>
+      <view class="flex-box flex-v-ce" a:if="{{dataDetail.complete_task&&dataDetail.complete_task.remark}}">
+        <view class="laber">完成备注</view>
+        <view class="flex-1">{{dataDetail.complete_task.remark}}</view>
+      </view>
+      <view class="flex-box" a:if="{{dataDetail.complete_task&&dataDetail.complete_task.files&&dataDetail.complete_task.files.length>0}}">
+        <view class="laber"></view>
         <view class="flex-1 flex-box flex-v-ce imgs">
-          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.task_file_list}}" data-item="{{dataDetail.task_file_list}}" src="{{item}}" catchTap="showImg"/>
+          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.complete_task.files}}" data-item="{{dataDetail.complete_task.files}}" src="{{item}}" catchTap="showImg"/>
         </view>
       </view>
     </view>
+    
+    <view class="main margin-bottom">
+      <block a:if="{{dataDetail.source_type!=10}}">
+        <view class="mian-title border-bottom" a:if="{{dataDetail.point_config&&dataDetail.point_config.item_info}}">规则依据1
+          <text>此事件打分参考以下积分规则</text>
+        </view>
+        <view class="header-main" a:if="{{dataDetail.point_config&&dataDetail.point_config.item_info}}">
+          <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.rule_info.name}}">
+            <view class="laber">规则分类</view>
+            <view class="flex-1">{{dataDetail.point_config.rule_info.name }}</view>
+          </view>
+          <view class="flex-box" a:if="{{dataDetail.point_config.item_info&&dataDetail.point_config.item_info.remark}}">
+            <view class="laber">积分规则</view>
+            <view class="flex-1">{{dataDetail.point_config.item_info.remark}}</view>
+          </view>
+          <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.item_info.min_point}}">
+            <view class="laber">规则积分</view>
+            <view class="flex-1">
+              <text a:if="{{dataDetail.point_config.item_info.range_type == 1}}">{{ dataDetail.point_config.item_info.min_point }}</text>
+              <text a:if="{{dataDetail.point_config.item_info.range_type == 2}}">{{ dataDetail.point_config.item_info.min_point }} ~ {{ dataDetail.point_config.item_info.max_point }}</text>
+              <text>{{dataDetail.pt_name}}</text>
+            </view>
+          </view>
+        </view>
+      </block>
+    </view>
     <view class="btn-area" a:if="{{dataDetail.status == '1' && userId != dataDetail.owner_id && dataDetail.reviewer_id != userId&&!isCreator}}">
       <button type="default" loading="{{disabled}}" class="defBtn" disabled="{{disabled}}" catchTap="formSubmit">领取任务</button>
     </view>

+ 16 - 0
pages/statistics/workDetail/workDetail.acss

@@ -156,4 +156,20 @@
 }
 .footer{
   margin-bottom: 2rem
+} 
+
+.mian-title{
+  padding:16rpx 32rpx;
+  background: #fff;
+  font-size: 36rpx;
+  color: #222;
+  font-weight: 600;
+}
+.mian-title text{
+  color: #909399;
+  font-weight: 500;
+  position: relative;
+  top: -3rpx;
+  padding-left: 20rpx;
+  font-size: 32rpx;
 }

+ 68 - 29
pages/statistics/workDetail/workDetail.axml

@@ -44,27 +44,30 @@
     </view>
     <view class="header-main">
       <view class="flex-box flex-v-ce">
-        <view class="laber">工作内容</view>
+        <view class="laber">任务内容</view>
         <view class="flex-1">{{dataDetail.task_name}}</view>
       </view>
-      <view class="flex-box flex-v-ce">
-        <view class="laber">截止时间</view>
-        <view class="flex-1">{{dataDetail.expire_time}}
-        <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>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.task_remark}}">
         <view class="laber">任务备注</view>
         <view class="flex-1">{{dataDetail.task_remark}}</view>
       </view>
+      <view class="flex-box" a:if="{{dataDetail.task_file_list.length>0}}">
+        <view class="laber"></view>
+        <view class="flex-1 flex-box flex-v-ce imgs">
+          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.task_file_list}}" data-item="{{dataDetail.task_file_list}}" src="{{item}}" catchTap="showImg"/>
+        </view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">积分种类</view>
+        <view class="flex-1">{{dataDetail.pt_name}}</view>
+      </view>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">任务积分</view>
+        <view class="flex-1">
+          {{dataDetail.point_config.base_point}}
+          {{dataDetail.pt_name}}
+        </view>
+      </view>
       <view class="flex-box flex-v-ce">
         <view class="laber">审批人</view>
         <view class="flex-1">{{dataDetail.reviewer_name}}</view>
@@ -74,29 +77,65 @@
         <view class="flex-1">{{dataDetail.publisher_name}}</view>
       </view>
       <view class="flex-box flex-v-ce">
-        <view class="laber">积分种类</view>
-        <view class="flex-1">{{dataDetail.pt_name}}</view>
+        <view class="laber">发布时间</view>
+        <view class="flex-1">{{dataDetail.create_time}}
+        </view>
       </view>
-      <view class="flex-box" a:if="{{dataDetail.task_file_list.length>0}}">
-        <view class="laber">任务图片</view>
-        <view class="flex-1 flex-box flex-v-ce imgs">
-          <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.task_file_list}}" data-item="{{dataDetail.task_file_list}}" src="{{item}}" catchTap="showImg"/>
+      <view class="flex-box flex-v-ce">
+        <view class="laber">截止时间</view>
+        <view class="flex-1">{{dataDetail.expire_time}}
+        <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.complete_task.remark}}" style="border-top:1px solid #f1f1f1">
+
+      <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 class="flex-box flex-v-ce" a:if="{{dataDetail.complete_task.remark}}">
         <view class="laber">完成备注</view>
         <view class="flex-1">{{dataDetail.complete_task.remark}}</view>
       </view>
       <view class="flex-box" a:if="{{dataDetail.complete_task.files.length>0}}">
-        <view class="laber">完成图片</view>
+        <view class="laber"></view>
         <view class="flex-1 flex-box flex-v-ce imgs">
           <image mode="scaleToFill" data-index="{{index}}" a:for="{{dataDetail.complete_task.files}}" data-item="{{dataDetail.complete_task.files}}" src="{{item}}" catchTap="showImg"/>
         </view>
       </view>
-
+    </view>
+    
+    <view class="main margin-bottom">
+      <block a:if="{{dataDetail.source_type!=10}}">
+        <view class="mian-title border-bottom" a:if="{{dataDetail.point_config&&dataDetail.point_config.item_info}}">规则依据1
+          <text>此事件打分参考以下积分规则</text>
+        </view>
+        <view class="header-main" a:if="{{dataDetail.point_config&&dataDetail.point_config.item_info}}">
+          <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.rule_info.name}}">
+            <view class="laber">规则分类</view>
+            <view class="flex-1">{{dataDetail.point_config.rule_info.name }}</view>
+          </view>
+          <view class="flex-box" a:if="{{dataDetail.point_config.item_info&&dataDetail.point_config.item_info.remark}}">
+            <view class="laber">积分规则</view>
+            <view class="flex-1">{{dataDetail.point_config.item_info.remark}}</view>
+          </view>
+          <view class="flex-box flex-v-ce" a:if="{{dataDetail.point_config.item_info.min_point}}">
+            <view class="laber">规则积分</view>
+            <view class="flex-1">
+              <text a:if="{{dataDetail.point_config.item_info.range_type == 1}}">{{ dataDetail.point_config.item_info.min_point }}</text>
+              <text a:if="{{dataDetail.point_config.item_info.range_type == 2}}">{{ dataDetail.point_config.item_info.min_point }} ~ {{ dataDetail.point_config.item_info.max_point }}</text>
+              <text>{{dataDetail.pt_name}}</text>
+            </view>
+          </view>
+        </view>
+      </block>
     </view>
   </view>
   
+  
   <view class="main border-bottom">
     <view class="flex-box flex-v-ce titles">
       <view class="title flex-1">任务进度</view>
@@ -111,10 +150,10 @@
       <view data-index="1" class="{{activeIndex == 1? 'active':''}} flex-1" catchTap="activeItem">任务过程</view>
       <view data-index="2" class="{{activeIndex == 2? 'active':''}} flex-1" catchTap="activeItem">记分记录</view>
       <view a:if="{{activeIndex == 1}}" class="flex-box-end flex-2 blue ji">
-        <text style="padding-right:24rpx" catchTap="openJyt" a:if="{{dataDetail.employee_id == userId && (dataDetail.status < 3)}}">+记一条</text>
+        <text style="padding-right:24rpx" catchTap="openJyt" a:if="{{dataDetail.employee_id==userId&&dataDetail.status<3}}">+记一条</text>
       </view>
       <view a:if="{{activeIndex == 2}}" class="flex-box-end flex-2 blue ji">
-        <text style="padding-right:24rpx" catchTap="openJf"  a:if="{{(dataDetail.employee_id != userId) && (dataDetail.status < 3)}}">记分</text>
+        <text style="padding-right:24rpx" catchTap="openJf"  a:if="{{keepTheScore}}">记分</text>
       </view>
     </view>
     <view a:if="{{activeIndex == 1}}" style="margin-bottom:0.8rem">
@@ -128,7 +167,7 @@
               </view>
               <view style="color:#222;margin-right:80rpx;">{{item.remark}}</view>
             </view>
-            <view class="delete" a:if="{{dataDetail.employee_id ==userId  && (dataDetail.status == 1) && dataDetail.progress != 100}}">
+            <view class="delete" a:if="{{dataDetail.employee_id==userId&&dataDetail.status<3}}">
               <image mode="scaleToFill" data-index="{{index}}" src="../../../image/delete.png" class="img" catchTap="deleteItem"></image>
             </view>
           </view>
@@ -141,7 +180,7 @@
     <view a:else style="margin-bottom:0.8rem">
       <view class="sum" a:if="{{total&&total>0}}">合计 +{{total}}</view>
       <view class="sum" a:if="{{total&&total<0}}">合计  {{total}}</view>
-      <view class="flex-box gc_item" a:for="{{process}}" a:if="{{item.recorder_id==dataDetail.publisher_id}}">
+      <view class="flex-box gc_item" a:for="{{process}}" a:if="{{item.point!=0}}">
         <view class="flex-box flex-1">
           <img-box name="{{item.recorder}}" imgUrl="{{item.img_url}}" height="90rpx" width="90rpx" fSize="28rpx"></img-box>
           <view class="top-left flex-1">
@@ -153,7 +192,7 @@
             <view a:if="{{item.point*1 < 0}}" style="margin-bottom:10rpx;">{{item.point}}</view>
             <view style="color:#222;margin-right:80rpx;">{{item.remark}}</view>
           </view>
-          <view class="delete" a:if="{{dataDetail.employee_id !=userId  && dataDetail.status<3}}">
+          <view class="delete" a:if="{{keepTheScore}}">
             <image mode="scaleToFill" data-index="{{index}}" src="../../../image/delete.png" class="img"  catchTap="deleteItem"></image>
           </view>
         </view>

+ 27 - 1
pages/statistics/workDetail/workDetail.js

@@ -12,6 +12,7 @@ Page({
     isPublisher: true,//是不是发布者
     corpId: '',
     isNot:false,
+    keepTheScore:false,//是否展示记分
   },
   onLoad(e) {
     that = this;
@@ -123,6 +124,29 @@ Page({
       url: '../workpoints/workpoints?item=' + JSON.stringify(this.data.process) + '&id=' + this.data.dataDetail.id + '&isJf=' + true
     })
   },
+  employee_me(data){
+    let params = {
+			id: data.employee_id
+    }
+    app.$get('api/employee/info', params).then(res =>{
+      this.setData({
+        keepTheScore: this.keepTheScore(data,res.data.data)
+      })
+    })
+  },
+  keepTheScore(cer,data) {
+    if(cer.status > 2){
+      return false
+    }
+    if(this.data.userId == cer.reviewer_id){
+      return true
+    }
+    return data.employee_detail.superior_list.some(x =>{
+      if(this.data.userId == x.id){
+        return true
+      }
+    })
+  },
   deleteItem(e) {
     dd.confirm({
       title: '提示',
@@ -168,11 +192,13 @@ Page({
           data.gc.push(item)
         }
       })
+      this.employee_me(data)
       this.setData({
         dataDetail: data,
         total: res.data.data.process.total,
         process: process,
-        isPublisher: data.publisher_id == this.data.userId ? true : false
+        isPublisher: data.publisher_id == this.data.userId ? true : false,
+        // keepTheScore: that.keepTheScore(data)
       })
     })
   },