0.0

pages/statistics/assaign/assaign.js

@@ -109,29 +109,34 @@ Page({
     var name = e.target.dataset.name;
     let value=e.detail.value;
     var point = `items.${name}`;
-    var pointIimit= that.data.point_limit[1].point;
-    if(pointIimit!=0&&pointIimit!=-1){
-      if(name=='timeout_deduction_point'||name=='ahead_award_point'){
-          pointIimit=pointIimit*1;
-          if(value>pointIimit){
-              this.showToast('分值不能超过您的奖扣分权限');
-                this.setData({
-                  [point]: '',
-                });
-              return false
-          }
-      }else{
-          pointIimit=pointIimit*10;
-          if(value>pointIimit){
-              this.showToast('上限不能超过'+pointIimit+'分');
-                this.setData({
-                  [point]: '',
-                });
-              return false
-          }
-      }
-    }
-    this.setData({
+	
+	if(that.data.point_limit.length>0){
+		var pointIimit= that.data.point_limit[1].point;
+		if(pointIimit!=0&&pointIimit!=-1){
+		  if(name=='timeout_deduction_point'||name=='ahead_award_point'){
+		      pointIimit=pointIimit*1;
+		      if(value>pointIimit){
+		          this.showToast('分值不能超过您的奖扣分权限');
+		            this.setData({
+		              [point]: '',
+		            });
+		          return false
+		      }
+		  }else{
+		      pointIimit=pointIimit*10;
+		      if(value>pointIimit){
+		          this.showToast('上限不能超过'+pointIimit+'分');
+		            this.setData({
+		              [point]: '',
+		            });
+		          return false
+		      }
+		  }
+		}
+	}
+
+    
+	this.setData({
       [point]: value,
     });
   },

pages/statistics/assaign_set/assaign_set.js

@@ -115,29 +115,31 @@ Page({
     var name = e.target.dataset.name;
     let value=e.detail.value;
     var point = `items.${name}`;
-    var pointIimit= that.data.point_limit[1].point;
-    if(pointIimit!=0&&pointIimit!=-1){
-      if(name=='timeout_deduction_point'||name=='ahead_award_point'){
-          pointIimit=pointIimit*1;
-          if(value>pointIimit){
-              this.showToast('分值不能超过您的奖扣分权限');
-                this.setData({
-                  [point]: '',
-                });
-              return false
-          }
-      }else{
-          pointIimit=pointIimit*10;
-          if(value>pointIimit){
-              this.showToast('上限不能超过'+pointIimit+'分');
-                this.setData({
-                  [point]: '',
-                });
-              return false
-          }
-      }
-    }
-    this.setData({
+	if(that.data.point_limit.length>0){
+		var pointIimit= that.data.point_limit[1].point;
+		if(pointIimit!=0&&pointIimit!=-1){
+		  if(name=='timeout_deduction_point'||name=='ahead_award_point'){
+		      pointIimit=pointIimit*1;
+		      if(value>pointIimit){
+		          this.showToast('分值不能超过您的奖扣分权限');
+		            this.setData({
+		              [point]: '',
+		            });
+		          return false
+		      }
+		  }else{
+		      pointIimit=pointIimit*10;
+		      if(value>pointIimit){
+		          this.showToast('上限不能超过'+pointIimit+'分');
+		            this.setData({
+		              [point]: '',
+		            });
+		          return false
+		      }
+		  }
+		}
+	}
+	this.setData({
       [point]: value,
     });
   },

pages/statistics/offerAreward/offerAreward.js

@@ -14,14 +14,14 @@ Page({
       reviewer_id: '',//审批者id
       revieweName: '',
       timeout_deduction_point: '',//逾期扣分/天
-      timeout_deduction_point_limit:'',//逾期扣分上限
+      timeout_deduction_point_limit: '',//逾期扣分上限
       ahead_award_point: '',//提前奖分/天
-      ahead_award_point_limit:'',//提前奖分上限
+      ahead_award_point_limit: '',//提前奖分上限
 
       task_cycle: 0,//任务发布周期 1-天 2-周 3-月
       task_expire_day: 1,//任务截至天数
 
-      task_type:1,
+      task_type: 1,
       popupCx: '',
     },
     reviewerObj: [],//默认审批人
@@ -45,40 +45,40 @@ Page({
     ],
     arrIndex: 0,
     defaultSection: [],//选择的部门
-    point_limit:0,
+    point_limit: 0,
     columnsIndex: 0,//条件选择
-    columnsArray: [{name:'01:00', value: 1}, {name:'02:00', value: 2}, {name:'03:00', value: 3}, {name:'04:00', value: 4}, {name:'05:00', value: 5}, {name:'06:00', value: 6}, {name:'07:00', value: 7}, {name:'08:00', value: 8}, {name:'09:00', value: 9}, {name:'10:00', value: 10}, {name:'11:00', value: 11}, {name:'12:00', value: 12}, {name:'13:00', value: 13}, {name:'14:00', value: 14}, {name:'15:00', value: 15}, {name:'16:00', value: 16}, {name:'17:00', value: 17}, {name:'18:00', value: 18}, {name:'19:00', value: 19}, {name:'20:00', value: 20}, {name:'21:00', value: 21}, {name:'22:00', value: 22}, {name:'23:00', value: 23}, {name:'24:00', value: 24}],
-    columns1: [{name:'01:00', value: 1}, {name:'02:00', value: 2}, {name:'03:00', value: 3}, {name:'04:00', value: 4}, {name:'05:00', value: 5}, {name:'06:00', value: 6}, {name:'07:00', value: 7}, {name:'08:00', value: 8}, {name:'09:00', value: 9}, {name:'10:00', value: 10}, {name:'11:00', value: 11}, {name:'12:00', value: 12}, {name:'13:00', value: 13}, {name:'14:00', value: 14}, {name:'15:00', value: 15}, {name:'16:00', value: 16}, {name:'17:00', value: 17}, {name:'18:00', value: 18}, {name:'19:00', value: 19}, {name:'20:00', value: 20}, {name:'21:00', value: 21}, {name:'22:00', value: 22}, {name:'23:00', value: 23}, {name:'24:00', value: 24}],
-    columns2: [{name: '周一', value: 1}, {name: '周二', value: 2}, {name: '周三', value: 3}, {name: '周四', value: 4}, {name: '周五', value: 5}, {name: '周六', value: 6}, {name: '周日', value: 7}],
-    columns3: [{name:'1号', value: 1},{name:'2号', value: 2},{name:'3号', value: 3},{name:'4号', value: 4},{name:'5号', value: 5},{name:'6号', value: 6},{name:'7号', value: 7},{name:'8号', value: 8},{name:'9号', value: 9},{name:'10号', value: 10},{name:'11号', value: 11},{name:'12号', value: 12},{name:'13号', value: 13},{name:'14号', value: 14},{name:'15号', value: 15},{name:'16号', value: 16},{name:'17号', value: 17},{name:'18号', value: 18},{name:'19号', value: 19},{name:'20号', value: 20},{name:'21号', value: 21},{name:'22号', value: 22},{name:'23号', value: 23},{name:'24号', value: 24},{name:'25号', value: 25},{name:'26号', value: 26},{name:'27号', value: 27},{name:'28号', value: 28},{name:'29号', value: 29},{name:'30号', value: 30},{name:'31号', value: 31}],
+    columnsArray: [{ name: '01:00', value: 1 }, { name: '02:00', value: 2 }, { name: '03:00', value: 3 }, { name: '04:00', value: 4 }, { name: '05:00', value: 5 }, { name: '06:00', value: 6 }, { name: '07:00', value: 7 }, { name: '08:00', value: 8 }, { name: '09:00', value: 9 }, { name: '10:00', value: 10 }, { name: '11:00', value: 11 }, { name: '12:00', value: 12 }, { name: '13:00', value: 13 }, { name: '14:00', value: 14 }, { name: '15:00', value: 15 }, { name: '16:00', value: 16 }, { name: '17:00', value: 17 }, { name: '18:00', value: 18 }, { name: '19:00', value: 19 }, { name: '20:00', value: 20 }, { name: '21:00', value: 21 }, { name: '22:00', value: 22 }, { name: '23:00', value: 23 }, { name: '24:00', value: 24 }],
+    columns1: [{ name: '01:00', value: 1 }, { name: '02:00', value: 2 }, { name: '03:00', value: 3 }, { name: '04:00', value: 4 }, { name: '05:00', value: 5 }, { name: '06:00', value: 6 }, { name: '07:00', value: 7 }, { name: '08:00', value: 8 }, { name: '09:00', value: 9 }, { name: '10:00', value: 10 }, { name: '11:00', value: 11 }, { name: '12:00', value: 12 }, { name: '13:00', value: 13 }, { name: '14:00', value: 14 }, { name: '15:00', value: 15 }, { name: '16:00', value: 16 }, { name: '17:00', value: 17 }, { name: '18:00', value: 18 }, { name: '19:00', value: 19 }, { name: '20:00', value: 20 }, { name: '21:00', value: 21 }, { name: '22:00', value: 22 }, { name: '23:00', value: 23 }, { name: '24:00', value: 24 }],
+    columns2: [{ name: '周一', value: 1 }, { name: '周二', value: 2 }, { name: '周三', value: 3 }, { name: '周四', value: 4 }, { name: '周五', value: 5 }, { name: '周六', value: 6 }, { name: '周日', value: 7 }],
+    columns3: [{ name: '1号', value: 1 }, { name: '2号', value: 2 }, { name: '3号', value: 3 }, { name: '4号', value: 4 }, { name: '5号', value: 5 }, { name: '6号', value: 6 }, { name: '7号', value: 7 }, { name: '8号', value: 8 }, { name: '9号', value: 9 }, { name: '10号', value: 10 }, { name: '11号', value: 11 }, { name: '12号', value: 12 }, { name: '13号', value: 13 }, { name: '14号', value: 14 }, { name: '15号', value: 15 }, { name: '16号', value: 16 }, { name: '17号', value: 17 }, { name: '18号', value: 18 }, { name: '19号', value: 19 }, { name: '20号', value: 20 }, { name: '21号', value: 21 }, { name: '22号', value: 22 }, { name: '23号', value: 23 }, { name: '24号', value: 24 }, { name: '25号', value: 25 }, { name: '26号', value: 26 }, { name: '27号', value: 27 }, { name: '28号', value: 28 }, { name: '29号', value: 29 }, { name: '30号', value: 30 }, { name: '31号', value: 31 }],
   },
   onLoad() {
     that = this;
     dd.setNavigationBar({ title: "发布悬赏任务" });
     that.setData({
       types: app.globalData.types,
-      [`items.expire_time`]: app.globalData.day+' 18:00',
-      point_limit:app.globalData.userData.point_config.point_limit
+      [`items.expire_time`]: app.globalData.day + ' 18:00',
+      point_limit: app.globalData.userData.point_config.point_limit
     })
   },
-  activeDate(e){
+  activeDate(e) {
     this.setData({
       columnsIndex: e.detail.value,
-      [`items.task_expire_day`]:parseInt(e.detail.value)+1
+      [`items.task_expire_day`]: parseInt(e.detail.value) + 1
     });
   },
   bindObjPickerChange(e) {
     this.setData({
-      columnsIndex:0,
-      [`items.task_expire_day`]:1,
+      columnsIndex: 0,
+      [`items.task_expire_day`]: 1,
       arrIndex: e.detail.value,
       [`items.task_cycle`]: e.detail.value
     });
     // 跟不同重复周期，切换数据源
-    let str='columns'+e.detail.value;
-    let columnsArray=this.data[str];
+    let str = 'columns' + e.detail.value;
+    let columnsArray = this.data[str];
     this.setData({
-      columnsArray:columnsArray,
+      columnsArray: columnsArray,
     });
   },
   openType(e) {
@@ -103,28 +103,30 @@ Page({
   //积分输入
   bindKeyInput2(e) {
     var name = e.target.dataset.name;
-    let value=e.detail.value;
+    let value = e.detail.value;
     var point = `items.${name}`;
-    var pointIimit= that.data.point_limit[1].point;
-    if(pointIimit!=0&&pointIimit!=-1){
-      if(name=='timeout_deduction_point'||name=='ahead_award_point'){
-          pointIimit=pointIimit*1;
-          if(value>pointIimit){
-              this.showToast('分值不能超过您的奖扣分权限');
-                this.setData({
-                  [point]: '',
-                });
-              return false
+    if (that.data.point_limit.length > 0) {
+      var pointIimit = that.data.point_limit[1].point;
+      if (pointIimit != 0 && pointIimit != -1) {
+        if (name == 'timeout_deduction_point' || name == 'ahead_award_point') {
+          pointIimit = pointIimit * 1;
+          if (value > pointIimit) {
+            this.showToast('分值不能超过您的奖扣分权限');
+            this.setData({
+              [point]: '',
+            });
+            return false
           }
-      }else{
-          pointIimit=pointIimit*10;
-          if(value>pointIimit){
-              this.showToast('上限不能超过'+pointIimit+'分');
-                this.setData({
-                  [point]: '',
-                });
-              return false
+        } else {
+          pointIimit = pointIimit * 10;
+          if (value > pointIimit) {
+            this.showToast('上限不能超过' + pointIimit + '分');
+            this.setData({
+              [point]: '',
+            });
+            return false
           }
+        }
       }
     }
     this.setData({
@@ -286,7 +288,7 @@ Page({
     app.globalData.showToast(text);
   },
   formSubmit() {
-    var items =JSON.parse(JSON.stringify(this.data.items));
+    var items = JSON.parse(JSON.stringify(this.data.items));
     if (!items.task_name) {
       this.showToast('请输入任务内容')
       return;
@@ -305,34 +307,34 @@ Page({
         return;
       }
     }
-    if(!items.task_remark){
+    if (!items.task_remark) {
       delete items.task_remark
     }
-    if(!items.timeout_deduction_point){
+    if (!items.timeout_deduction_point) {
       delete items.timeout_deduction_point
     }
-    if(items.dept_ids.length==0){
+    if (items.dept_ids.length == 0) {
       delete items.dept_ids
-    }else{
-      items.dept_ids=items.dept_ids.toString();
+    } else {
+      items.dept_ids = items.dept_ids.toString();
     }
-    items.file_list=items.file_list.toString();
+    items.file_list = items.file_list.toString();
     this.setData({ disabled: true });
     var url;
     if (items.task_cycle == 0) {
-        delete items.task_cycle
-        delete items.task_expire_day
-        url = '/api/integral/task/publish'
-      } else {
-        delete items.expire_time
-        url = '/api/integral/schedule/publish/task'
+      delete items.task_cycle
+      delete items.task_expire_day
+      url = '/api/integral/task/publish'
+    } else {
+      delete items.expire_time
+      url = '/api/integral/schedule/publish/task'
     }
-    app.$post(url,items).then((res) => {
-        this.showToast(res.data.msg);
-        setTimeout(() => {
-          this.setData({ disabled: false });
-          dd.navigateBack({ delta: 1 })
-        }, 1000);
+    app.$post(url, items).then((res) => {
+      this.showToast(res.data.msg);
+      setTimeout(() => {
+        this.setData({ disabled: false });
+        dd.navigateBack({ delta: 1 })
+      }, 1000);
     }).finally(err => {
       this.setData({ disabled: false });
     })

pages/statistics/offerAreward_set/offerAreward_set.js

@@ -113,29 +113,31 @@ Page({
     var name = e.target.dataset.name;
     let value=e.detail.value;
     var point = `items.${name}`;
-    var pointIimit= that.data.point_limit[1].point;
-    if(pointIimit!=0&&pointIimit!=-1){
-      if(name=='timeout_deduction_point'||name=='ahead_award_point'){
-          pointIimit=pointIimit*1;
-          if(value>pointIimit){
-              this.showToast('分值不能超过您的奖扣分权限');
-                this.setData({
-                  [point]: '',
-                });
-              return false
-          }
-      }else{
-          pointIimit=pointIimit*10;
-          if(value>pointIimit){
-              this.showToast('上限不能超过'+pointIimit+'分');
-                this.setData({
-                  [point]: '',
-                });
-              return false
-          }
-      }
-    }
-    this.setData({
+	if(that.data.point_limit.length>0){
+		var pointIimit= that.data.point_limit[1].point;
+		if(pointIimit!=0&&pointIimit!=-1){
+		  if(name=='timeout_deduction_point'||name=='ahead_award_point'){
+		      pointIimit=pointIimit*1;
+		      if(value>pointIimit){
+		          this.showToast('分值不能超过您的奖扣分权限');
+		            this.setData({
+		              [point]: '',
+		            });
+		          return false
+		      }
+		  }else{
+		      pointIimit=pointIimit*10;
+		      if(value>pointIimit){
+		          this.showToast('上限不能超过'+pointIimit+'分');
+		            this.setData({
+		              [point]: '',
+		            });
+		          return false
+		      }
+		  }
+		}
+	}
+	this.setData({
       [point]: value,
     });
   },

pages/workbench/apply/apply.js

@@ -28,7 +28,8 @@ Page({
     getReviewerObj: {},//默认当前的缓存对象
     defaultRuleId: '',
     qrcodeId: '',//扫码进入
-    popupCx: ''
+    popupCx: '',
+    boxTop:0,
   },
   onLoad(e) {
     that = this;
@@ -57,6 +58,13 @@ Page({
       })
     }
   },
+  onPageScroll(e){
+      if(e.scrollTop!=0){
+        this.setData({
+          boxTop:e.scrollTop
+        })
+      }
+  },
   //获取缓存的审批人
   getReviewerObj(id, fuc) {
     dd.getStorage({
@@ -136,6 +144,11 @@ Page({
       isShowType: '',
       popupCx: ''
     });
+    setTimeout(()=>{
+      dd.pageScrollTo({
+        scrollTop: that.data.boxTop
+      })
+    },100)
   },
   showToast(text) {
     app.globalData.showToast(text);

pages/workbench/jk_B/jk_B.js

@@ -18,6 +18,7 @@ Page({
     defaultRuleId: '',
     isCreator:false,//是否创始人
     popupCx: '',
+    boxTop:0,
   },
   onLoad(data) {
     that = this;
@@ -53,6 +54,13 @@ Page({
       dd.setNavigationBar({ title: "奖扣A分" });
     }
   },
+  onPageScroll(e){
+      if(e.scrollTop!=0){
+        this.setData({
+          boxTop:e.scrollTop
+        })
+      }
+  },
   onShow() {
     animation = dd.createAnimation({
       duration: 200,
@@ -92,8 +100,13 @@ Page({
     that.setData({
       isShowType: '',
       animationInfo: animation.export(),
-      popupCx: ''
+      popupCx: '',
     });
+    setTimeout(()=>{
+      dd.pageScrollTo({
+        scrollTop: that.data.boxTop
+      })
+    },100)
   },
   //选择弹窗
   openSelect(e) {
@@ -126,7 +139,7 @@ Page({
       isShowType: num,
       activeIndex: e.target.dataset.index,
       animationInfo: animation.export(),
-      popupCx: 'container__mask'
+      popupCx: 'container__mask',
     });
   },
   //删除图片