Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_xcx into dev

Component/selectRule/selectRule.axml

@@ -29,7 +29,7 @@
       </view>
       <view>
         <radio-group class="radio-group" onChange="radioChange">
-          <label class="flex-box flex-v-ce items" a:for="{{item_list}}">
+          <label class="flex-box flex-v-ce items" a:for="{{item_list}}" a:if="{{item.pt_id == if_ab || if_ab == 0}}">
             <view class="radio">
               <radio value="{{item}}" checked="{{item.checked}}"/>{{item.value}}</view>
             <view class="radio-right flex-1">
@@ -52,7 +52,7 @@
     </scroll-view>
     <scroll-view class="flex-5 right" scroll-y="{{true}}" a:else>
       <radio-group class="radio-group" onChange="radioChange" a:if="{{selectItem.length>0}}">
-        <label class="flex-box flex-v-ce items" a:for="{{selectItem}}">
+        <label class="flex-box flex-v-ce items" a:for="{{selectItem}}" a:if="{{item.pt_id == if_ab || if_ab == 0}}">
           <view class="radio">
             <radio value="{{item}}" checked="{{item.checked}}"/>{{item.value}}</view>
           <view class="radio-right flex-1">

Component/selectRule/selectRule.js

@@ -20,6 +20,7 @@ Component({
     onConfirm:(data) => console.log(data),
     isGzType:'',
     defaultId:'',//默认选中
+    if_ab: 0,
   },
   didMount() {
     that = this;
@@ -111,6 +112,7 @@ Component({
         })
     },
     radioChange: function (e) {
+      console.log(e)
       this.props.onConfirm(e.detail.value);
       this.plusOne();
     },

pages/statistics/assaign/assaign.axml

@@ -2,17 +2,18 @@
   <view class="{{popupCx}}">
     <view class="inputs">
     
-      <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
+      <!-- <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>
-      </view>
-      <view class="flex-box flex-v-ce li" data-ruleId="{{items.item_id}}" a:if="{{items.checked}}"  data-num="3" catchTap="openSelect">
+      </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>
         <view class="flex-1" a:if="{{selectRule}}">已选择1条</view>
         <view class="flex-1" a:else></view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
-      </view>
+      </view> -->
+
       <view class="li">
         <textarea class="textarea" maxlength="20" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容"></textarea>
         <image mode="scaleToFill" src="../../../image/addImg.png" class="addImg" catchTap="openImg"/>
@@ -23,6 +24,27 @@
           <image mode="scaleToFill" class="showImg" src="{{imgs}}" data-index="{{imgIndex}}" data-item="{{items.file_list}}" catchTap="showImg"/>
         </view>
       </view>
+
+      <view class="flex-box flex-v-ce li">
+        <view class="label isBt">任务类型</view>
+        <view class="flex-1 flex-box-end flex-flex-v-ce">
+          <view a:for="{{types}}">
+            <text a:if="{{item.code!=='JX'}}" catchTap="openType" data-id="{{item.id}}" class="van-radio {{items.pt_id==item.id? 'isTypes':''}}">{{item.name}}</text>
+          </view>
+        </view>
+      </view>
+      <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>
+      </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>
+        <view class="flex-1" a:if="{{selectRule}}">已选择1条</view>
+        <view class="flex-1" a:else></view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
       
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
@@ -70,14 +92,6 @@
         <view class="flex-1">{{items.revieweName}}</view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
-      <view class="flex-box flex-v-ce li">
-        <view class="label isBt">任务类型</view>
-        <view class="flex-1 flex-box-end flex-flex-v-ce">
-          <view a:for="{{types}}">
-            <text a:if="{{item.code!=='JX'}}" catchTap="openType" data-id="{{item.id}}" class="van-radio {{items.pt_id==item.id? 'isTypes':''}}">{{item.name}}</text>
-          </view>
-        </view>
-      </view>
       <view class="flex-box flex-v-ce li  margin-bottom">
         <view class="label isBt">截止时间</view>
         <view class="flex-1" a:if="{{items.task_cycle==0}}" catchTap="openDate">{{items.expire_time}}</view>
@@ -122,7 +136,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
     <select-section-staff isLeadership="{{true}}" isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two islead="{{true}}" selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/assaign/assaign.js

@@ -30,6 +30,8 @@ Page({
       checked: false,//是否选择规则
       rule_id: '',//积分分类id
       item_id: '',//积分细则id 不选可以为0
+
+			tree_echo: [],//用于PC编辑任务时的规则回显
     },
     reviewerObj: [],//默认审批人
     objectArray: [
@@ -62,6 +64,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
+    if_ab: 3,
   },
   onLoad() {
     that = this;
@@ -80,7 +83,6 @@ Page({
   },
 
   switchChange(e) {
-    console.log(e)
     that.setData({
       [`items.checked`]: e.detail.value
     })
@@ -97,7 +99,7 @@ Page({
     }
     that.setData({
       selectRule: item,
-      [`items.task_name`]: item.remark,
+      [`items.task_remark`]: item.remark,
       [`items.base_point`]: Number(strMin),
       isArrindex: item.min_point > 0 ? true : false,
       [`items.rule_id`]: item.rule_id,
@@ -128,7 +130,21 @@ Page({
   openType(e) {
     var id = e.target.dataset.id;
     that.setData({
-      [`items.pt_id`]: id
+      [`items.pt_id`]: id,
+      if_ab: id,
+    })
+    this.clearTree()
+  },
+  //清除已选规则
+  clearTree(){
+    that.setData({
+      selectRule: '',
+      ['items.task_remark']: '',
+      [`items.base_point`]: '',
+      isArrindex: true,
+      [`items.rule_id`]: '',
+      [`items.item_id`]: '',
+      defaultRuleId: ''
     })
   },
   onShow() {
@@ -204,7 +220,6 @@ Page({
   },
   //选择弹窗
   openSelect(e) {
-    console.log(e)
     var num = e.target.dataset.num;
     if (e.target.dataset.item) {
       if (e.target.dataset.item.id) {
@@ -353,7 +368,6 @@ Page({
       } else {
         point = value;
       }
-      console.log(selectRule,point)
       if (point < selectRule.min_point || point > selectRule.max_point) {
         this.showToast(`任务分值超出可输入范围`);
         return false

pages/statistics/assaign_set/assaign_set.axml

@@ -2,17 +2,6 @@
   <view class="{{popupCx}}">
     <view class="inputs">
     
-      <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>
-      </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>
-        <view class="flex-1" a:if="{{selectRule}}">已选择1条</view>
-        <view class="flex-1" a:else></view>
-        <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="请输入任务内容" data-index="{{index}}"></textarea>
@@ -25,6 +14,18 @@
         </view>
       </view>
 
+      <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>
+      </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>
+        <view class="flex-1" a:if="{{selectRule}}">已选择1条</view>
+        <view class="flex-1" a:else></view>
+        <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
+      </view>
+
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
         <text class="red" style="position: relative;top:8rpx;" a:if="{{isArrindex==true}}">+</text>
@@ -101,7 +102,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
     <select-section-staff isLeadership="{{true}}" isAllSelect="{{false}}" isBoss="{{true}}" selectUser="{{users}}" onClose="onClose" onConfirm="onSelectUser" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two  islead="{{true}}" selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/assaign_set/assaign_set.js

@@ -56,6 +56,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
+    if_ab: 3,
           popupCx: '',
   },
   onLoad(e) {
@@ -105,6 +106,7 @@ Page({
           item_id: item.item_id,//积分细则id 不选可以为0
           checked: item.item_id? true:false,//是否选择规则
         },
+        if_ab: item.pt_id,
       })
     }
     that.setData({
@@ -128,7 +130,7 @@ Page({
     }
     that.setData({
       selectRule: item,
-      [`items.task_name`]: item.remark,
+      [`items.task_remark`]: item.remark,
       [`items.base_point`]: Number(strMin),
       isArrindex: item.min_point > 0 ? true : false,
       [`items.rule_id`]: item.rule_id,
@@ -305,7 +307,6 @@ Page({
               that.setData({
                 [files_box]: files
               });
-              console.log(that.data.items);
               app.globalData.showToast("已上传");
             }
           },
@@ -373,7 +374,6 @@ Page({
       } else {
         point = value;
       }
-      console.log(selectRule,point)
       if (point < selectRule.min_point || point > selectRule.max_point) {
         this.showToast(`任务分值超出可输入范围`);
         return false

pages/statistics/offerAreward/offerAreward.axml

@@ -1,6 +1,26 @@
 <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>
+        <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">
+        <view a:for="{{items.file_list}}" key="index" a:for-item="imgs" a:for-index="imgIndex" style="position:relative">
+          <text class="detele" data-itemIndx="{{index}}" data-index="{{imgIndex}}" catchTap="deteleImg">×</text>
+          <image mode="scaleToFill" class="showImg" src="{{imgs}}" data-index="{{imgIndex}}" data-item="{{items.file_list}}" catchTap="showImg"/>
+        </view>
+      </view>
+      
+      <view class="flex-box flex-v-ce li">
+        <view class="label isBt">任务类型</view>
+        <view class="flex-1 flex-box-end flex-flex-v-ce">
+          <view a:for="{{types}}">
+            <text a:if="{{item.code!=='JX'}}" catchTap="openType" data-id="{{item.id}}" class="van-radio {{items.pt_id==item.id? 'isTypes':''}}">{{item.name}}</text>
+          </view>
+        </view>
+      </view>
+
       <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
         <view class="label">指定规则</view>
         <view class="flex-1"></view>
@@ -12,16 +32,7 @@
         <view class="flex-1" a:else></view>
         <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="请输入任务内容" data-index="{{index}}"></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">
-        <view a:for="{{items.file_list}}" key="index" a:for-item="imgs" a:for-index="imgIndex" style="position:relative">
-          <text class="detele" data-itemIndx="{{index}}" data-index="{{imgIndex}}" catchTap="deteleImg">×</text>
-          <image mode="scaleToFill" class="showImg" src="{{imgs}}" data-index="{{imgIndex}}" data-item="{{items.file_list}}" catchTap="showImg"/>
-        </view>
-      </view>
+
         <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
         <text class="red" style="position: relative;top:8rpx;" a:if="{{isArrindex==true}}">+</text>
@@ -58,14 +69,6 @@
         <view class="flex-1">{{items.revieweName}}</view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
-      <view class="flex-box flex-v-ce li">
-        <view class="label isBt">任务类型</view>
-        <view class="flex-1 flex-box-end flex-flex-v-ce">
-          <view a:for="{{types}}">
-            <text a:if="{{item.code!=='JX'}}" catchTap="openType" data-id="{{item.id}}" class="van-radio {{items.pt_id==item.id? 'isTypes':''}}">{{item.name}}</text>
-          </view>
-        </view>
-      </view>
       <view class="flex-box flex-v-ce li  margin-bottom">
         <view class="label isBt">截止时间</view>
         <view class="flex-1" a:if="{{items.task_cycle==0}}" catchTap="openDate">{{items.expire_time}}</view>
@@ -77,7 +80,7 @@
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
       <view class="li">
-        <textarea maxlength="100" value="{{item.remark}}" onInput="bindTextAreaBlur2" placeholder="请输入任务描述" data-index="{{index}}"></textarea>
+        <textarea maxlength="100" value="{{items.task_remark}}" onInput="bindTextAreaBlur2" placeholder="请输入任务描述" data-index="{{index}}"></textarea>
       </view>
       <view class="flex-box flex-v-ce li">
         <view class="label">重复周期</view>
@@ -119,7 +122,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
     <select-section-bottom defaultSection="{{defaultSection}}" onClose="onClose" onConfirm="onSelectSection" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two islead="{{true}}"  selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/offerAreward/offerAreward.js

@@ -59,6 +59,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
+    if_ab: 3,
 
   },
   onLoad() {
@@ -83,7 +84,6 @@ Page({
   },
   //选择规则
   onSelectItem(item) {
-    console.log(item)
     var strMin;
     if (item.min_point < 0) {
       var min = item.min_point.toString();
@@ -93,7 +93,7 @@ Page({
     }
     that.setData({
       selectRule: item,
-      [`items.task_name`]: item.remark,
+      [`items.task_remark`]: item.remark,
       [`items.base_point`]: Number(strMin),
       isArrindex: item.min_point > 0 ? true : false,
       [`items.rule_id`]: item.rule_id,
@@ -124,7 +124,21 @@ Page({
   openType(e) {
     var id = e.target.dataset.id;
     that.setData({
-      [`items.pt_id`]: id
+      [`items.pt_id`]: id,
+      if_ab: id,
+    })
+    this.clearTree()
+  },
+  //清除已选规则
+  clearTree(){
+    that.setData({
+      selectRule: '',
+      ['items.task_remark']: '',
+      [`items.base_point`]: '',
+      isArrindex: true,
+      [`items.rule_id`]: '',
+      [`items.item_id`]: '',
+      defaultRuleId: ''
     })
   },
   onShow() {

pages/statistics/offerAreward_set/offerAreward_set.axml

@@ -1,6 +1,26 @@
 <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>
+        <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">
+        <view a:for="{{items.file_list}}" key="index" a:for-item="imgs" a:for-index="imgIndex" style="position:relative">
+          <text class="detele" data-itemIndx="{{index}}" data-index="{{imgIndex}}" catchTap="deteleImg">×</text>
+          <image mode="scaleToFill" class="showImg" src="{{imgs}}" data-index="{{imgIndex}}" data-item="{{items.file_list}}" catchTap="showImg"/>
+        </view>
+      </view>
+
+      <view class="flex-box flex-v-ce li">
+        <view class="label isBt">任务类型</view>
+        <view class="flex-1 flex-box-end flex-flex-v-ce">
+          <view a:for="{{types}}">
+            <text a:if="{{item.code!=='JX'}}" catchTap="openType" data-id="{{item.id}}" class="van-radio {{items.pt_id==item.id? 'isTypes':''}}">{{item.name}}</text>
+          </view>
+        </view>
+      </view>
       <view class="flex-box flex-v-ce li" style="padding:26rpx 28rpx;">
         <view class="label">指定规则</view>
         <view class="flex-1"></view>
@@ -13,16 +33,6 @@
         <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="请输入任务内容" data-index="{{index}}"></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">
-        <view a:for="{{items.file_list}}" key="index" a:for-item="imgs" a:for-index="imgIndex" style="position:relative">
-          <text class="detele" data-itemIndx="{{index}}" data-index="{{imgIndex}}" catchTap="deteleImg">×</text>
-          <image mode="scaleToFill" class="showImg" src="{{imgs}}" data-index="{{imgIndex}}" data-item="{{items.file_list}}" catchTap="showImg"/>
-        </view>
-      </view>
       <view class="flex-box li margin-bottom" style="padding:15rpx 28rpx;margin-top:24rpx" a:if="{{items.checked}}">
         <view class="label isBt" style="position: relative;top:8rpx;">任务积分</view>
         <text class="red" style="position: relative;top:8rpx;" a:if="{{isArrindex==true}}">+</text>
@@ -62,14 +72,6 @@
         <view class="flex-1">{{items.revieweName}}</view>
         <image mode="scaleToFill" src="../../../image/right.png" class="rightImg"/>
       </view>
-      <view class="flex-box flex-v-ce li">
-        <view class="label isBt">任务类型</view>
-        <view class="flex-1 flex-box-end flex-flex-v-ce">
-          <view a:for="{{types}}">
-            <text a:if="{{item.code!=='JX'}}" catchTap="openType" data-id="{{item.id}}" class="van-radio {{items.pt_id==item.id? 'isTypes':''}}">{{item.name}}</text>
-          </view>
-        </view>
-      </view>
       <view class="flex-box flex-v-ce li  margin-bottom" catchTap="openDate" data-index="{{index}}">
         <view class="label isBt">截止时间</view>
         <view class="flex-1">{{items.expire_time}}</view>
@@ -109,7 +111,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
     <select-section-bottom defaultSection="{{defaultSection}}" onClose="onClose" onConfirm="onSelectSection" a:if="{{isShowType=='1'}}"/>
     <select-section-staff-two islead="{{true}}"  selectUser="{{reviewerObj}}" onClose="onClose" onConfirm="onSelectUser2" a:if="{{isShowType=='2'}}"/>
   </view>

pages/statistics/offerAreward_set/offerAreward_set.js

@@ -53,6 +53,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
+    if_ab: 3,
     popupCx: '',
   },
   onLoad(e) {
@@ -104,7 +105,8 @@ Page({
           checked: item.item_id? true:false,//是否选择规则
         },
         types: app.globalData.types,
-        point_limit:app.globalData.userData.point_config.point_limit
+        point_limit:app.globalData.userData.point_config.point_limit,
+        if_ab: item.pt_id,
       })
     }
   },
@@ -126,7 +128,7 @@ Page({
     }
     that.setData({
       selectRule: item,
-      [`items.task_name`]: item.remark,
+      [`items.task_remark`]: item.remark,
       [`items.base_point`]: Number(strMin),
       isArrindex: item.min_point > 0 ? true : false,
       [`items.rule_id`]: item.rule_id,
@@ -143,7 +145,21 @@ Page({
   openType(e) {
     var id = e.target.dataset.id;
     that.setData({
-      [`items.pt_id`]: id
+      [`items.pt_id`]: id,
+      if_ab: id,
+    })
+    this.clearTree()
+  },
+  //清除已选规则
+  clearTree(){
+    that.setData({
+      selectRule: '',
+      ['items.task_remark']: '',
+      [`items.base_point`]: '',
+      isArrindex: true,
+      [`items.rule_id`]: '',
+      [`items.item_id`]: '',
+      defaultRuleId: ''
     })
   },
   onShow() {
@@ -358,7 +374,6 @@ Page({
   },
   formSubmit() {
     var items = this.data.items;
-    console.log(items);
     if (!items.task_name) {
       this.showToast('请输入任务内容')
       return;
@@ -430,10 +445,8 @@ Page({
     })
   },
   switchChange(e) {
-    var index = e.target.dataset.index;
-    var item = `items[${index}].checked`;
     that.setData({
-      [item]: e.detail.value
+      [`items.checked`]: e.detail.value
     })
   },
   //选择时间

pages/statistics/taskDetail/taskDetail.axml

@@ -38,7 +38,7 @@
 
       <view class="flex-box flex-v-ce">
         <view class="laber">任务类型</view>
-        <view class="flex-1">{{dataDetail.pt_name}}</view>
+        <view class="flex-1">{{dataDetail.source_type_mark}}</view>
       </view>
       <view class="flex-box flex-v-ce">
         <view class="laber">任务积分</view>

pages/statistics/workDetail/workDetail.axml

@@ -167,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<3}}">
+            <view class="delete" a:if="{{item.recorder_id==userId&&dataDetail.status<3}}">
               <image mode="scaleToFill" data-index="{{index}}" src="../../../image/delete.png" class="img" catchTap="deleteItem"></image>
             </view>
           </view>
@@ -192,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="{{keepTheScore}}">
+          <view class="delete" a:if="{{item.recorder_id==userId&&dataDetail.status<3}}">
             <image mode="scaleToFill" data-index="{{index}}" src="../../../image/delete.png" class="img"  catchTap="deleteItem"></image>
           </view>
         </view>

pages/statistics/workDetail/workDetail.js

@@ -148,6 +148,8 @@ Page({
     })
   },
   deleteItem(e) {
+    console.log(e)
+    console.log(this.data.process)
     dd.confirm({
       title: '提示',
       content: '确定永久删除此项?',
@@ -166,6 +168,7 @@ Page({
           } else {
             data.process = JSON.stringify(data.process);
           }
+          console.log(data.process)
           app.$post("api/integral/work", data).then((res) => {
             app.globalData.showToast(res.data.msg);
             this.getDetail(this.data.id);
@@ -176,7 +179,8 @@ Page({
   },
   getDetail(id, fun = function () { }) {
     this.setData({
-      total: 0
+      total: 0,
+      process: []//清空数据，避免头像组件未刷新造成的视图问题
     })
     app.$get("api/integral/work", { work_id: id }).then((res) => {
       fun();
@@ -193,6 +197,7 @@ Page({
         }
       })
       this.employee_me(data)
+      console.log(process)
       this.setData({
         dataDetail: data,
         total: res.data.data.process.total,

pages/workbench/my_approve/my_approve.js

@@ -133,6 +133,7 @@ Page({
   },
   //选择规则分类
   bindKeyInput(e) {
+    console.log(e)
     this.setData({
       keyword: e.detail.value,
       page: 1,