1

Component/process/process.axml

@@ -1,6 +1,7 @@
 <view>
   <view class="process-title border-bottom flex-box flex-flex-v-ce">
-      <text>审批</text><text>多人审批时，以最后一人为准</text>
+      <text>审批</text>
+	  <!-- <text>多人审批时，以最后一人为准</text> -->
   </view>
   <view class="process-bottom">
     <view class="flex-box" style="position: relative;" a:for="{{process}}">

pages/statistics/assaign/assaign.js

@@ -69,7 +69,6 @@ Page({
      data.target_info.forEach(user => {
         arr.push(user.id);
     })
-
     this.setData({
       [`items.task_name`]:data.name,
       [`items.range_type`]:0,
@@ -78,8 +77,7 @@ Page({
       [`items.task_cycle`]:data.task_cycle,
       [`items.file_list`]:data.file_list,
       arrIndex:data.task_cycle,
-      columnsIndex: parseInt(data.task_cycle_value),
-      [`items.task_expire_day`]: parseInt(data.task_cycle_value) + 1,
+      [`items.task_expire_day`]: parseInt(data.task_cycle_value),
       [`items.checked`]:data.point_config.item_info? true:false,
       // 执行人
       users: data.target_info.length > 0 ? data.target_info : [],
@@ -98,7 +96,9 @@ Page({
     let columnsArray = this.data[str];
     this.setData({
       columnsArray: columnsArray,
+      columnsIndex: parseInt(data.task_cycle_value)-1,
     });
+    console.log(this.data)
 
     // 规则
     let point=Number(data.point_config.base_point);

pages/statistics/offerAreward/offerAreward.js

@@ -92,8 +92,7 @@ Page({
       [`items.task_cycle`]: data.task_cycle,
       [`items.file_list`]: data.file_list,
       arrIndex: data.task_cycle,
-      columnsIndex: parseInt(data.task_cycle_value-1),
-      [`items.task_expire_day`]: parseInt(data.task_cycle_value) + 1,
+      [`items.task_expire_day`]: parseInt(data.task_cycle_value),
       [`items.checked`]: data.point_config.item_info ? true : false,
       // 执行人
       users: data.target_info.length > 0 ? data.target_info : [],
@@ -112,6 +111,7 @@ Page({
     let columnsArray = this.data[str];
     this.setData({
       columnsArray: columnsArray,
+      columnsIndex: parseInt(data.task_cycle_value)-1,
     });
 
     // 规则

pages/workbench/approve/approve.axml

@@ -48,7 +48,6 @@
                     <text class="green flex-1">扣</text>
                   </view>
                 </view>
-
               </view>
               <block a:if="{{item.selectRule}}">
                 <view class="fontColorD input_text" a:if="{{item.selectRule.range_type==1}}">固定：{{item.selectRule.min_point}} {{item.selectRule.pt_Obj.name}}</view>
@@ -90,9 +89,9 @@
             <text class="green" a:else style="position: relative;top:8rpx;">-</text>
             <view class="flex-1">
               <view class="flex-box flex-v-ce">
-                <view a:if="{{item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
+                <view a:if="{{(item.selectRule.range_type==1&&item.selectRule.min_point==item.selectRule.max_point)||item.pid>0}}" style="padding-left:10rpx; height:60rpx;line-height:60rpx;" class="flex-1">{{item.point}}</view>
                 <input a:else value="{{item.point}}"  placeholder="0" type="number" onInput="bindKeyInput"  class="flex-1"/>
-                <view class="picker-box"  catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1}}">
+                <view class="picker-box"  catchTap="bindPickerChange" a:if="{{item.selectRule.range_type!=1&&item.pid==0}}">
                   <view class="{{item.isArrindex==true ? 'picker-right':'picker-left'}} yuan"></view>
                   <view class="flex-box flex-v-ce">
                     <text class="red flex-1">奖</text>
@@ -186,6 +185,7 @@
             </view>
           </view>
         </block>
+        
         <view class="fontColorB" style="font-size:24rpx;padding-left:28rpx">奖票多用于优秀表现和重要事项的表彰</view>
         <view class="flex-box flex-v-ce li margin-bottom" style="padding:26rpx 28rpx;">
           <view class="label">发放奖票</view>