0.0

src/hint.vue

@@ -1,8 +1,10 @@
 <template>
 	<div>
 		<div @click="init()">
-			<img src="./assets/image/testPc.jpg" style="width:100%;height:auto" v-if="type == 'PC'" />
-			<div class="app" v-else :style="{ width: width }"><img src="./assets/image/test.jpg" :style="{ width: width, height: 'auto' }" /></div>
+			<img src="./assets/image/pc.png" style="width:100%;height:auto" v-if="type == 'PC'" />
+			<div class="app" v-else :style="{ width: width }">
+				<img src="./assets/image/app.png" :style="{ width: width, height: 'auto' }" />
+			</div>
 		</div>
 	</div>
 </template>
@@ -30,6 +32,7 @@ export default {
 		this.corpId = data.corpId;
 		this.token = data.purchaseToken;
 		this.type = data.appEntityType;
+		// this.type = "APP";
 		if (this.corpId) {
 			this.$nextTick(()=>{
 				this.init();

src/noAccess.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="noData flex-box flex-center-center">
-		<img  src="./assets/image/APP.png" class="appImg"/>
+		<img  src="./assets/image/APP2.png" class="appImg"/>
 		<div>
 			<div>当前用户未授权进入系统，请联系管理员为您【启用积分管理】，<br/>如需咨询客服，请到您企业专属的功道云服务群咨询</div>
 		</div>

src/views/common/below/rewardTask.vue → src/views/common/rewardTask.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<!-- 悬赏任务弹窗 -->
-		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="5%">
+		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="3%">
 			<div v-loading="forTheTaskLoading">
 				<el-form :model="formData" ref="formData" label-width="80px">
 					<el-form-item
@@ -116,10 +116,11 @@
 					</el-form-item>
 					<el-form-item v-show="false" prop="ahead_award_point_limit" ></el-form-item>
 					<el-form-item v-show="false" prop="timeout_deduction_point_limit" ></el-form-item>
-
 					<el-form-item>
-						<el-button type="primary" @click="sub('formData')">提交</el-button>
-						<el-button @click="resetForm('formData')">取消</el-button>
+						<div class="flex-box-end">
+							<el-button @click="resetForm('formData')">取消</el-button>
+							<el-button type="primary" @click="sub('formData')">提交</el-button>
+						</div>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -358,15 +359,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
+			if(!this.$getIsCreator('creator')||this.$getUserData().point_config.point_limit.length!=0){
+				let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+				if(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']

src/views/common/below/rewardTaskAmend.vue → src/views/common/rewardTaskAmend.vue

@@ -106,8 +106,10 @@
 					<el-form-item v-show="false" prop="timeout_deduction_point_limit" ></el-form-item>
 
 					<el-form-item>
-						<el-button type="primary" @click="sub('formData')">确认修改</el-button>
-						<el-button @click="resetForm('formData')">取消</el-button>
+						<div class="flex-box-end">
+							<el-button @click="resetForm('formData')">取消</el-button>
+							<el-button type="primary" @click="sub('formData')">确认修改</el-button>
+						</div>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -414,17 +416,21 @@ 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
+			
+			if(!this.$getIsCreator('creator')||this.$getUserData().point_config.point_limit.length!=0){
+				let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+				if(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/temporaryTask.vue → src/views/common/temporaryTask.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<!-- 临时任务弹窗 -->
-		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="5%">
+		<el-dialog :title="showTitle" :visible.sync="dialogVisible" :close-on-click-modal="false" :before-close="closeDialog" width="600px" top="3%">
 			<div>
 				<el-form :model="formData" ref="formData" label-width="80px" v-loading="taskload">
 					<el-form-item
@@ -121,8 +121,10 @@
 					<el-form-item v-show="false" prop="timeout_deduction_point_limit" ></el-form-item>
 
 					<el-form-item>
-						<el-button type="primary" @click="sub('formData')">提交</el-button>
-						<el-button @click="resetForm('formData')">取消</el-button>
+						<div class="flex-box-end">
+							<el-button @click="resetForm('formData')">取消</el-button>
+							<el-button type="primary" @click="sub('formData')">提交</el-button>
+						</div>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -344,25 +346,24 @@ 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
+			if(!this.$getIsCreator('creator')||this.$getUserData().point_config.point_limit.length!=0){
+				let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+				if(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)
 			})
 
-
 			this.taskload = true;
 			self.$axios('post', self.formData.task_cycle == 0 ? '/api/integral/work/publish' : '/api/integral/schedule/publish/work', data)
 				.then(res => {

src/views/common/below/temporaryTaskAmend.vue → src/views/common/temporaryTaskAmend.vue

@@ -113,8 +113,10 @@
 					<el-form-item v-show="false" prop="timeout_deduction_point_limit" ></el-form-item>
 
 					<el-form-item>
-						<el-button type="primary" @click="sub('formData')">确认修改</el-button>
-						<el-button @click="resetForm('formData')">取消</el-button>
+						<div class="flex-box-end">
+							<el-button @click="resetForm('formData')">取消</el-button>
+							<el-button type="primary" @click="sub('formData')">确认修改</el-button>
+						</div>
 					</el-form-item>
 				</el-form>
 			</div>
@@ -374,15 +376,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
+			if(!this.$getIsCreator('creator')||this.$getUserData().point_config.point_limit.length!=0){
+				let entry_limit =  Number(this.$getUserData().point_config.point_limit[1].point)
+				if(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']

src/views/ranking/integral_event.vue

@@ -95,11 +95,11 @@
 					</el-table-column>
 					<el-table-column prop="source_type" label="来源" align="left" min-width="140px">
 						<template slot-scope="scope">
-							<span v-show="scope.row.source_type == 1">积分奖扣 <span v-if="scope.row.employee_name">({{scope.row.recorder_name}})</span></span>
+							<span v-show="scope.row.source_type == 1">积分奖扣 <span v-if="scope.row.recorder_name">({{scope.row.recorder_name}})</span></span>
 							<span v-show="scope.row.source_type == 2">任务</span>
 							<span v-show="scope.row.source_type == 3">积分系统分配</span>
 							<span v-show="scope.row.source_type == 4">考勤系统分配</span>
-							<span v-show="scope.row.source_type == 5">积分申请 <span v-if="scope.row.employee_name">({{scope.row.applyor_name}})</span></span>
+							<span v-show="scope.row.source_type == 5">积分申请 <span v-if="scope.row.applyor_name">({{scope.row.applyor_name}})</span></span>
 							<span v-show="scope.row.source_type == 6">绩效任务包</span>
 							<span v-show="scope.row.source_type == 8">积分导入</span>
 							<span v-show="scope.row.source_type == 9">A分转B分</span>

src/views/task/allTask.vue

@@ -123,7 +123,7 @@
 <script>
 import noData from '@/components/noData';
 import examinePopup from '@/components/examinePopup.vue';
-import taskDetailsPopup from '@/views/common/below/taskDetailsPopup'
+import taskDetailsPopup from '@/views/common/taskDetailsPopup'
 import {_debounce} from '@/api/auth';
 
 export default {

src/views/task/myExamine.vue

@@ -97,7 +97,7 @@
 <script>
 import noData from '@/components/noData';
 import examinePopup from '@/components/examinePopup.vue';
-import taskDetailsPopup from '@/views/common/below/taskDetailsPopup'
+import taskDetailsPopup from '@/views/common/taskDetailsPopup'
 
 export default {
 	name: 'my_task',

src/views/task/my_issue.vue

@@ -233,13 +233,13 @@
 
 <script>
   import noData from '@/components/noData';
-  import temporaryTask from '@/views/common/below/temporaryTask'
-  import temporaryTaskAmend from '@/views/common/below/temporaryTaskAmend'
-  import rewardTask from '@/views/common/below/rewardTask'
-  import rewardTaskAmend from '@/views/common/below/rewardTaskAmend'
-  import taskDetailsPopup from '@/views/common/below/taskDetailsPopup'
-  import repeatTaskDetailsPopup from '@/views/common/below/repeatTaskDetailsPopup'
-  import rewardTaskDetailsPopup from '@/views/common/below/rewardTaskDetailsPopup'
+  import temporaryTask from '@/views/common/temporaryTask'
+  import temporaryTaskAmend from '@/views/common/temporaryTaskAmend'
+  import rewardTask from '@/views/common/rewardTask'
+  import rewardTaskAmend from '@/views/common/rewardTaskAmend'
+  import taskDetailsPopup from '@/views/common/taskDetailsPopup'
+  import repeatTaskDetailsPopup from '@/views/common/repeatTaskDetailsPopup'
+  import rewardTaskDetailsPopup from '@/views/common/rewardTaskDetailsPopup'
   
   export default {
     name: 'my_issue',

src/views/task/my_task.vue

@@ -120,7 +120,7 @@
 
 <script>
 import noData from '@/components/noData';
-import taskDetailsPopup from '@/views/common/below/taskDetailsPopup'
+import taskDetailsPopup from '@/views/common/taskDetailsPopup'
 
 export default {
 	name: 'my_task',