'1.5.5.02'

src/views/common/below/repeatTaskDetailsPopup.vue

@@ -21,6 +21,10 @@
             <div class="label">逾期扣分</div>
             <div class="content_text">{{workDetailData.point_config.timeout_deduction_point}}/天</div>
           </li>
+          <li class="flex-box" v-if="workDetailData.point_config.ahead_award_point">
+						<div class="label">提前奖分</div>
+						<div class="content_text">{{ workDetailData.point_config.ahead_award_point }}/天</div>
+					</li>
           <li class="flex-box" v-if="workDetailData.point_config">
             <div class="label">任务积分</div>
             <div class="content_text">{{workDetailData.point_config.base_point}}</div>

src/views/common/below/rewardTask.vue

@@ -358,6 +358,17 @@ export default {
 			}
 			if(this.ahead_timeout(data.ahead_award_point,data.ahead_award_point_limit,'提前奖分','奖分')) return
 			if(this.ahead_timeout(data.timeout_deduction_point,data.timeout_deduction_point_limit,'逾期扣分','扣分')) return
+			let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+			if(!this.$getIsCreator('creator') && entry_limit > 0){
+				if(data.ahead_award_point > entry_limit || data.timeout_deduction_point > entry_limit ){
+					this.$message.warning('每日奖扣分 不能超过您的奖扣分权限（您的奖扣分权限：' + entry_limit + '分）')
+					return
+				}
+				if(data.ahead_award_point_limit > entry_limit*10 || data.timeout_deduction_point_limit > entry_limit*10 ){
+					this.$message.warning('奖扣分上限不能超过' + entry_limit*10 + '分（您的奖扣分权限' + entry_limit + '分*10）')
+					return
+				}
+			}
 			let add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
 			add.forEach(item =>{
 				this.deletedata(data,item)

src/views/common/below/rewardTaskAmend.vue

@@ -414,6 +414,17 @@ export default {
 			}
 			if(this.ahead_timeout(data.ahead_award_point,data.ahead_award_point_limit,'提前奖分','奖分')) return
 			if(this.ahead_timeout(data.timeout_deduction_point,data.timeout_deduction_point_limit,'逾期扣分','扣分')) return
+			let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+			if(!this.$getIsCreator('creator') && entry_limit > 0){
+				if(data.ahead_award_point > entry_limit || data.timeout_deduction_point > entry_limit ){
+					this.$message.warning('每日奖扣分 不能超过您的奖扣分权限（您的奖扣分权限：' + entry_limit + '分）')
+					return
+				}
+				if(data.ahead_award_point_limit > entry_limit*10 || data.timeout_deduction_point_limit > entry_limit*10 ){
+					this.$message.warning('奖扣分上限不能超过' + entry_limit*10 + '分（您的奖扣分权限' + entry_limit + '分*10）')
+					return
+				}
+			}
 			let add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
 			add.forEach(item =>{
 				this.deletedata(data,item)

src/views/common/below/rewardTaskDetailsPopup.vue

@@ -48,6 +48,10 @@
             <div class="label">逾期扣分</div>
             <div class="content_text">{{workDetailData.point_config.timeout_deduction_point}}/天</div>
           </li>
+          <li class="flex-box" v-if="workDetailData.point_config.ahead_award_point">
+						<div class="label">提前奖分</div>
+						<div class="content_text">{{ workDetailData.point_config.ahead_award_point }}/天</div>
+					</li>
           <li class="flex-box" v-if="workDetailData.department_info">
             <div class="label">可见范围</div>
             <div class="content_text" v-if="workDetailData.department_info.length>0">

src/views/common/below/taskDetailsPopup.vue

@@ -41,6 +41,10 @@
 						<div class="label">逾期扣分</div>
 						<div class="content_text">{{ workDetailData.point_config.timeout_deduction_point }}</div>
 					</li>
+					<li class="flex-box" v-if="workDetailData.point_config.ahead_award_point > 0">
+						<div class="label">提前奖分</div>
+						<div class="content_text">{{ workDetailData.point_config.ahead_award_point }}</div>
+					</li>
 					<li class="flex-box">
 						<div class="label">审批人</div>
 						<div class="content_text">{{ workDetailData.reviewer_name }}</div>

src/views/common/below/temporaryTask.vue

@@ -327,6 +327,7 @@ export default {
 				delete data.expire_time;
 				data.task_remark ? '' : delete data.task_remark;
 			}
+
 			if(!data.ahead_award_point && data.ahead_award_point_limit){
 				this.$message.warning('奖分上限不为0时每日奖分不能为空')
 				return
@@ -343,6 +344,19 @@ export default {
 			}
 			if(this.ahead_timeout(data.ahead_award_point,data.ahead_award_point_limit,'提前奖分','奖分')) return
 			if(this.ahead_timeout(data.timeout_deduction_point,data.timeout_deduction_point_limit,'逾期扣分','扣分')) return
+
+			let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+			if(!this.$getIsCreator('creator') && entry_limit > 0){
+				if(data.ahead_award_point > entry_limit || data.timeout_deduction_point > entry_limit ){
+					this.$message.warning('每日奖扣分 不能超过您的奖扣分权限（您的奖扣分权限：' + entry_limit + '分）')
+					return
+				}
+				if(data.ahead_award_point_limit > entry_limit*10 || data.timeout_deduction_point_limit > entry_limit*10 ){
+					this.$message.warning('奖扣分上限不能超过' + entry_limit*10 + '分（您的奖扣分权限' + entry_limit + '分*10）')
+					return
+				}
+			}
+
 			let add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
 			add.forEach(item =>{
 				this.deletedata(data,item)

src/views/common/below/temporaryTaskAmend.vue

@@ -374,6 +374,17 @@ export default {
 			}
 			if(this.ahead_timeout(data.ahead_award_point,data.ahead_award_point_limit,'提前奖分','奖分')) return
 			if(this.ahead_timeout(data.timeout_deduction_point,data.timeout_deduction_point_limit,'逾期扣分','扣分')) return
+			let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+			if(!this.$getIsCreator('creator') && entry_limit > 0){
+				if(data.ahead_award_point > entry_limit || data.timeout_deduction_point > entry_limit ){
+					this.$message.warning('每日奖扣分 不能超过您的奖扣分权限（您的奖扣分权限：' + entry_limit + '分）')
+					return
+				}
+				if(data.ahead_award_point_limit > entry_limit*10 || data.timeout_deduction_point_limit > entry_limit*10 ){
+					this.$message.warning('奖扣分上限不能超过' + entry_limit*10 + '分（您的奖扣分权限' + entry_limit + '分*10）')
+					return
+				}
+			}
 			let add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
 			add.forEach(item =>{
 				this.deletedata(data,item)

src/views/task/my_issue.vue

@@ -324,6 +324,7 @@
       },
     },
     mounted() {
+      this.getUserDetail()
       if(this.$route.query.type == 1){
         this.dialogVisible = true
       }else if(this.$route.query.type == 2){
@@ -333,6 +334,11 @@
       this.point_types = this.getPointTypes()
     },
     methods: {
+      getUserDetail(){
+        this.$axios('get', '/api/employee/detail').then(res => {
+          this.$setUserData(res.data.data.user);
+        });
+      },
       //悬赏修改
       offerARewardAmend2(item){
         this.rewardTaskAmendShow = true