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}}" a:if="{{item.pt_id == if_ab || if_ab == 0}}">
+          <label class="flex-box flex-v-ce items" a:for="{{item_list}}">
             <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}}" a:if="{{item.pt_id == if_ab || if_ab == 0}}">
+        <label class="flex-box flex-v-ce items" a:for="{{selectItem}}">
           <view class="radio">
             <radio value="{{item}}" checked="{{item.checked}}"/>{{item.value}}</view>
           <view class="radio-right flex-1">

Component/selectRule/selectRule.js

@@ -20,7 +20,6 @@ Component({
     onConfirm:(data) => console.log(data),
     isGzType:'',
     defaultId:'',//默认选中
-    if_ab: 0,
   },
   didMount() {
     that = this;

pages/statistics/assaign/assaign.axml

@@ -136,7 +136,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" 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

@@ -64,7 +64,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
-    if_ab: 3,
+    isGzType: 3,
   },
   onLoad() {
     that = this;
@@ -130,7 +130,7 @@ Page({
     var id = e.target.dataset.id;
     that.setData({
       [`items.pt_id`]: id,
-      if_ab: id,
+      isGzType: id,
     })
     this.clearTree()
   },

pages/statistics/assaign_set/assaign_set.axml

@@ -4,7 +4,7 @@
     
 
       <view class="li">
-        <textarea class="textarea" maxlength="100" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容" data-index="{{index}}"></textarea>
+        <textarea class="textarea" maxlength="20" 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">
@@ -102,7 +102,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" 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,8 +56,8 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
-    if_ab: 3,
-          popupCx: '',
+    isGzType: 3,
+    popupCx: '',
   },
   onLoad(e) {
     that = this;
@@ -106,7 +106,7 @@ Page({
           item_id: item.item_id,//积分细则id 不选可以为0
           checked: item.item_id? true:false,//是否选择规则
         },
-        if_ab: item.pt_id,
+        isGzType: item.pt_id,
       })
     }
     that.setData({
@@ -414,6 +414,7 @@ Page({
     app.$post('api/integral/work/update', items).then((res) => {
       page1.getDetail(items.id, function () {
         app.globalData.showToast(res.data.msg);
+        this.setData({ disabled: false });
         setTimeout(() => {
           dd.navigateBack({ delta: 1 })
         }, 1000);

pages/statistics/my_issue/my_issue.axml

@@ -75,28 +75,9 @@
         <view style="margin-bottom:10rpx;">{{item.name}}</view>
         <view class="flex-box flex-v-ce fontColorX" style="font-size:28rpx;">
           <image mode="scaleToFill" src="../../../image/sj2.png"/>
-          <text a:if="{{item.task_cycle == 1}}">每天自动发布</text>
-          <text a:if="{{item.task_cycle == 2}}">
-            <text a:if="{{item.task_cycle_value == 1}}">每周一自动发布</text>
-            <text a:if="{{item.task_cycle_value == 2}}">每周二自动发布</text>
-            <text a:if="{{item.task_cycle_value == 3}}">每周三自动发布</text>
-            <text a:if="{{item.task_cycle_value == 4}}">每周四自动发布</text>
-            <text a:if="{{item.task_cycle_value == 5}}">每周五自动发布</text>
-            <text a:if="{{item.task_cycle_value == 6}}">每周六自动发布</text>
-            <text a:if="{{item.task_cycle_value == 7}}">每周日自动发布</text>
-          </text>
-          <text a:if="{{item.task_cycle == 3}}">每月自动发布</text>
-          <text a:if="{{item.task_cycle == 1}}"> 完成截止为{{item.task_cycle_value}}点</text>
-          <text a:if="{{item.task_cycle == 2}}"> 完成截止为
-            <text a:if="{{item.task_cycle_value == 1}}">周一</text>
-            <text a:if="{{item.task_cycle_value == 2}}">周二</text>
-            <text a:if="{{item.task_cycle_value == 3}}">周三</text>
-            <text a:if="{{item.task_cycle_value == 4}}">周四</text>
-            <text a:if="{{item.task_cycle_value == 5}}">周五</text>
-            <text a:if="{{item.task_cycle_value == 6}}">周六</text>
-            <text a:if="{{item.task_cycle_value == 7}}">周日</text>
-          </text>
-          <text a:if="{{item.task_cycle == 3}}"> 完成截止为次月{{item.task_cycle_value}}号</text>
+          <text a:if="{{item.task_cycle == 1}}">每天0点自动发布，{{item.task_cycle_value > 9 ? item.task_cycle_value + ': 00' : '0' + item.task_cycle_value + ': 00'}}截止</text>
+          <text a:if="{{item.task_cycle == 2}}">每天自动发布，周{{weekList[item.task_cycle_value - 1]}}截止</text>
+          <text a:if="{{item.task_cycle == 3}}">每月1号自动发布，{{item.task_cycle_value - 1}}号截止</text>
         </view>
       </view>
       <view class="noDatas" a:if="{{isData}}">没有更多咯</view>

pages/statistics/my_issue/my_issue.js

@@ -18,6 +18,7 @@ Page({
     },
     list: [],
     searchName: '',
+    weekList: ['一', '二', '三', '四', '五', '六', '日'],
   },
   onLoad(e) {
     if (e.index) {

pages/statistics/offerAreward/offerAreward.axml

@@ -2,7 +2,7 @@
   <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>
+        <textarea class="textarea" maxlength="20" 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">
@@ -122,7 +122,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" 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,7 +59,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
-    if_ab: 3,
+    isGzType: 3,
 
   },
   onLoad() {
@@ -125,7 +125,7 @@ Page({
     var id = e.target.dataset.id;
     that.setData({
       [`items.pt_id`]: id,
-      if_ab: id,
+      isGzType: id,
     })
     this.clearTree()
   },

pages/statistics/offerAreward_set/offerAreward_set.axml

@@ -3,7 +3,7 @@
     <view class="inputs">
 
       <view class="li">
-        <textarea class="textarea" maxlength="100" value="{{items.task_name}}" onInput="bindTextAreaBlur" placeholder="请输入任务内容" data-index="{{index}}"></textarea>
+        <textarea class="textarea" maxlength="20" 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">
@@ -111,7 +111,7 @@
     </view>
   </view>
   <view class="box" animation="{{animationInfo}}">
-    <select-rule defaultId="{{defaultRuleId}}" if_ab="{{if_ab}}" onConfirm="onSelectItem" onClose="onClose" a:if="{{isShowType=='3'}}"/>
+    <select-rule defaultId="{{defaultRuleId}}" isGzType="{{isGzType}}" 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,7 +53,7 @@ Page({
     defaultRuleId: '',
     selectRule: '',//选择的规则
     isArrindex: true,
-    if_ab: 3,
+    isGzType: 3,
     popupCx: '',
   },
   onLoad(e) {
@@ -106,7 +106,7 @@ Page({
         },
         types: app.globalData.types,
         point_limit:app.globalData.userData.point_config.point_limit,
-        if_ab: item.pt_id,
+        isGzType: item.pt_id,
       })
     }
   },
@@ -146,7 +146,7 @@ Page({
     var id = e.target.dataset.id;
     that.setData({
       [`items.pt_id`]: id,
-      if_ab: id,
+      isGzType: id,
     })
     this.clearTree()
   },

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.source_type_mark}}</view>
+        <view class="flex-1">{{dataDetail.type_mark}}</view>
       </view>
       <view class="flex-box flex-v-ce">
         <view class="laber">任务积分</view>
@@ -71,7 +71,7 @@
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.department_info.length>0}}">
         <view class="laber">可见范围</view>
         <view class="flex-1">
-            <text a:for="{{dataDetail.department_info}}">{{item.name}},</text>
+            <text a:for="{{dataDetail.department_info}}">{{item.name}}<text a:if="{{(dataDetail.department_info.length-1)>index}}"> ,</text></text>
         </view>
       </view>
       <view class="flex-box flex-v-ce" a:if="{{dataDetail.complete_task&&dataDetail.complete_task.remark}}">

pages/workbench/my_approve/my_approve.axml

@@ -3,7 +3,7 @@
     <form onReset="onReset">
       <view class="search flex-box flex-v-ce">
         <image mode="scaleToFill" src="../../../image/ss.png"/>
-        <input placeholder="请输入姓名或内容" onInput="bindKeyInput" onConfirm="bindKeyInput" class="flex-1"/>
+        <input placeholder="请输入姓名" onInput="bindKeyInput" onConfirm="bindKeyInput" class="flex-1"/>
         <button a:if="{{isVal}}" class="delVal" formType="reset">×</button>
       </view>
     </form>