哥哥玩剑魂呢 3 years ago
parent
commit
f65c3900b8

+ 52 - 7
src/views/common/below/rewardTask.vue

@@ -104,11 +104,18 @@
 						></el-cascader>
 						<span style="color:#b5b7bb;padding-left:10px;">选中的部门可查看或领取任务</span>
 					</el-form-item>
-
-					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每逾期一天扣分</div>
-					<el-form-item label="逾期扣分" prop="timeout_deduction_point">
-						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数值"></el-input>
+					
+					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每 提前/逾期 一天 加分/扣分</div>
+					<el-form-item label="提前奖分" prop="ahead_award_point">
+						<el-input v-model="formData.ahead_award_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日奖分" style="width: 150px;"></el-input> 分/每天,
+						奖分上限 &nbsp;<el-input v-model="formData.ahead_award_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入奖分上限" style="width: 150px;"></el-input> 分
+					</el-form-item>
+					<el-form-item label="逾期扣分"  prop="timeout_deduction_point" >
+						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日扣分" style="width: 150px;"></el-input> 分/每天,
+						扣分上限 &nbsp;<el-input v-model="formData.timeout_deduction_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入扣分上限" style="width: 150px;"></el-input> 分
 					</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>
@@ -158,6 +165,9 @@ export default {
 				reviewer_id: '',
 				task_cycle: 0,
 				timeout_deduction_point: null,
+				timeout_deduction_point_limit: null,
+				ahead_award_point: null,
+				ahead_award_point_limit: null,
 				dept_ids: []
 			},
 			point_types: [],
@@ -299,13 +309,28 @@ export default {
 			this.reviewer_selected = { dept: [], employee: [] };
 			this.dept_selected = { dept: [], employee: [] };
 		},
+		ahead_timeout(item,arr,codes,code){
+			if(item){
+				if(arr){
+					if(Number(item) > Number(arr)){
+						this.$message.warning(code +'上限不能小于每日'+ code)
+						return true
+					}
+				}else{
+					this.$message.warning( codes + '不为0时,'+ code +'上限不能为空')
+					return true
+				}
+			}
+		},
+		deletedata(data,arr){
+			data[arr] && data[arr] != 0 ?  '' : delete data[arr]
+		},
 		// 提交
 		saveFun(formName) {
 			// 没有选择重复任务的时候
 			// /api/integral/task/publish
 			// 选择重复任务之后
 			// /api/integral/schedule/publish/task
-			this.forTheTaskLoading = true;
 			let self = this;
 			let data = JSON.parse(JSON.stringify(self.formData));
 			if (data.task_cycle == 0) {
@@ -313,12 +338,32 @@ export default {
 				delete data.task_expire_day;
 				delete data.targets;
 				data.task_remark ? '' : delete data.task_remark;
-				data.timeout_deduction_point ? '' : delete data.timeout_deduction_point;
 			} else {
 				delete data.expire_time;
 				data.task_remark ? '' : delete data.task_remark;
-				data.timeout_deduction_point ? '' : delete data.timeout_deduction_point;
 			}
+			if(!data.ahead_award_point && data.ahead_award_point_limit){
+				this.$message.warning('奖分上限不为0时每日奖分不能为空')
+				return
+			}else if(data.ahead_award_point && !data.ahead_award_point_limit){
+				this.$message.warning('每日奖分不为0时奖分上限不能为空')
+				return
+			}
+			if(!data.timeout_deduction_point && data.timeout_deduction_point_limit){
+				this.$message.warning('扣分上限不为0时每日扣分不能为空')
+				return
+			}else if(data.timeout_deduction_point && !data.timeout_deduction_point_limit){
+				this.$message.warning('每日扣分不为0时扣分上限不能为空')
+				return
+			}
+			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 add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
+			add.forEach(item =>{
+				this.deletedata(data,item)
+			})
+
+			this.forTheTaskLoading = true;
 			self.$axios('post', self.formData.task_cycle == 0 ? '/api/integral/task/publish' : '/api/integral/schedule/publish/task', data)
 				.then(res => {
 					if (res.data.code == 1) {

+ 65 - 14
src/views/common/below/rewardTaskAmend.vue

@@ -93,10 +93,17 @@
 						<span style="color:#b5b7bb;padding-left:10px;">选中的部门可查看或领取任务</span>
 					</el-form-item>
 
-					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每逾期一天扣分</div>
-					<el-form-item label="逾期扣分" prop="timeout_deduction_point">
-						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数值"></el-input>
+					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每 提前/逾期 一天 加分/扣分</div>
+					<el-form-item label="提前奖分" prop="ahead_award_point">
+						<el-input v-model="formData.ahead_award_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日奖分" style="width: 150px;"></el-input> 分/每天,
+						奖分上限 &nbsp;<el-input v-model="formData.ahead_award_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入奖分上限" style="width: 150px;"></el-input> 分
 					</el-form-item>
+					<el-form-item label="逾期扣分"  prop="timeout_deduction_point" >
+						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日扣分" style="width: 150px;"></el-input> 分/每天,
+						扣分上限 &nbsp;<el-input v-model="formData.timeout_deduction_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入扣分上限" style="width: 150px;"></el-input> 分
+					</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>
@@ -150,6 +157,9 @@ export default {
 				reviewer_id: '',
 				task_cycle: 0,
 				timeout_deduction_point: null,
+				timeout_deduction_point_limit: null,
+				ahead_award_point: null,
+				ahead_award_point_limit: null,
 				dept_ids: null
 			},
 			point_types: [],
@@ -273,12 +283,12 @@ export default {
 				{ id: this.rewardTaskAmendData.reviewer_id, img_url: this.rewardTaskAmendData.img_url, name: this.rewardTaskAmendData.reviewer_name }
 			];
 
-			if (this.rewardTaskAmendData.point_config.timeout_deduction_point != '0') {
-				//逾期扣分/月
-				this.formData.timeout_deduction_point = this.rewardTaskAmendData.point_config.timeout_deduction_point;
-			} else {
-				this.formData.timeout_deduction_point = '';
-			}
+
+			let add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
+			add.forEach(item =>{
+				this.deductionPoint(item)
+			})
+
 			let department_infoName = '';
 			// avatar: "static/images/e66f.jpg"
 			// dept_id: 462
@@ -310,6 +320,13 @@ export default {
 		this.getDepartment();
 	},
 	methods: {
+		deductionPoint(item){
+			if (this.rewardTaskAmendData.point_config[item] != '0') {
+				this.formData[item] = this.rewardTaskAmendData.point_config[item];
+			} else {
+				this.formData[item] = '';
+			}
+		},
 		handleChange(val) {
 			let data = [];
 			for (let i in val) {
@@ -341,13 +358,24 @@ export default {
 			this.dept_name = [];
 			this.dept_selected = { dept: [], employee: [] };
 		},
+		ahead_timeout(item,arr,codes,code){
+			if(item){
+				if(arr){
+					if(Number(item) > Number(arr)){
+						this.$message.warning(code +'上限不能小于每日'+ code)
+						return true
+					}
+				}else{
+					this.$message.warning( codes + '不为0时,'+ code +'上限不能为空')
+					return true
+				}
+			}
+		},
+		deletedata(data,arr){
+			data[arr] && data[arr] != 0 ?  '' : delete data[arr]
+		},
 		// 提交
 		saveFun(formName) {
-			// 没有选择重复任务的时候
-			// /api/integral/task/publish
-			// 选择重复任务之后
-			// /api/integral/schedule/publish/task
-			this.forTheTaskLoading = true;
 			let self = this;
 			let data = JSON.parse(JSON.stringify(self.formData));
 			data.task_remark ? '' : delete data.task_remark;
@@ -369,6 +397,29 @@ export default {
 			//   data.task_remark?'':delete data.task_remark
 			//   data.timeout_deduction_point?'':delete data.timeout_deduction_point
 			// }
+			
+			if(!data.ahead_award_point && data.ahead_award_point_limit){
+				this.$message.warning('奖分上限不为0时每日奖分不能为空')
+				return
+			}else if(data.ahead_award_point && !data.ahead_award_point_limit){
+				this.$message.warning('每日奖分不为0时奖分上限不能为空')
+				return
+			}
+			if(!data.timeout_deduction_point && data.timeout_deduction_point_limit){
+				this.$message.warning('扣分上限不为0时每日扣分不能为空')
+				return
+			}else if(data.timeout_deduction_point && !data.timeout_deduction_point_limit){
+				this.$message.warning('每日扣分不为0时扣分上限不能为空')
+				return
+			}
+			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 add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
+			add.forEach(item =>{
+				this.deletedata(data,item)
+			})
+
+			this.forTheTaskLoading = true;
 			self.$axios('post', '/api/integral/task/update', data)
 				.then(res => {
 					if (res.data.code == 1) {

+ 53 - 7
src/views/common/below/temporaryTask.vue

@@ -108,10 +108,17 @@
 						</el-select>
 					</el-form-item>
 
-					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每逾期一天扣分</div>
-					<el-form-item label="逾期扣分" prop="timeout_deduction_point">
-						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数值"></el-input>
+					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每 提前/逾期 一天 加分/扣分</div>
+					<el-form-item label="提前奖分" prop="ahead_award_point">
+						<el-input v-model="formData.ahead_award_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日奖分" style="width: 150px;"></el-input> 分/每天,
+						奖分上限 &nbsp;<el-input v-model="formData.ahead_award_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入奖分上限" style="width: 150px;"></el-input> 分
 					</el-form-item>
+					<el-form-item label="逾期扣分"  prop="timeout_deduction_point" >
+						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日扣分" style="width: 150px;"></el-input> 分/每天,
+						扣分上限 &nbsp;<el-input v-model="formData.timeout_deduction_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入扣分上限" style="width: 150px;"></el-input> 分
+					</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>
@@ -159,7 +166,10 @@ export default {
 				targets: [],
 				reviewer_id: '',
 				task_cycle: 0,
-				timeout_deduction_point: null
+				timeout_deduction_point: null,
+				timeout_deduction_point_limit: null,
+				ahead_award_point: null,
+				ahead_award_point_limit: null,
 			},
 			point_types: [],
 			// 执行者
@@ -283,9 +293,24 @@ export default {
 			this.approval_selected = { dept: [], employee: [] };
 			this.reviewer_selected = { dept: [], employee: [] };
 		},
+		ahead_timeout(item,arr,codes,code){
+			if(item){
+				if(arr){
+					if(Number(item) > Number(arr)){
+						this.$message.warning(code +'上限不能小于每日'+ code)
+						return true
+					}
+				}else{
+					this.$message.warning( codes + '不为0时,'+ code +'上限不能为空')
+					return true
+				}
+			}
+		},
+		deletedata(data,arr){
+			data[arr] && data[arr] != 0 ?  '' : delete data[arr]
+		},
 		// 提交
 		saveFun(formName) {
-			this.taskload = true;
 			// 没有选择重复任务的时候
 			// /api/integral/work/publish
 			// 选择重复任务之后
@@ -296,14 +321,35 @@ export default {
 				delete data.task_cycle;
 				delete data.task_expire_day;
 				data.task_remark ? '' : delete data.task_remark;
-				data.timeout_deduction_point ? '' : delete data.timeout_deduction_point;
 			} else {
 				delete data.package_id;
 				delete data.weight;
 				delete data.expire_time;
 				data.task_remark ? '' : delete data.task_remark;
-				data.timeout_deduction_point ? '' : delete data.timeout_deduction_point;
 			}
+			if(!data.ahead_award_point && data.ahead_award_point_limit){
+				this.$message.warning('奖分上限不为0时每日奖分不能为空')
+				return
+			}else if(data.ahead_award_point && !data.ahead_award_point_limit){
+				this.$message.warning('每日奖分不为0时奖分上限不能为空')
+				return
+			}
+			if(!data.timeout_deduction_point && data.timeout_deduction_point_limit){
+				this.$message.warning('扣分上限不为0时每日扣分不能为空')
+				return
+			}else if(data.timeout_deduction_point && !data.timeout_deduction_point_limit){
+				this.$message.warning('每日扣分不为0时扣分上限不能为空')
+				return
+			}
+			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 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 => {
 					if (res.data.code == 1) {

+ 69 - 14
src/views/common/below/temporaryTaskAmend.vue

@@ -99,11 +99,18 @@
 					<el-form-item label="任务描述" prop="task_remark" :rules="[{ max: 300, message: '长度不能超过 300 个字', trigger: 'blur' }]">
 						<el-input type="textarea" :rows="5" maxlength="300" show-word-limit v-model="formData.task_remark" placeholder="请输入任务内容(限300字)"></el-input>
 					</el-form-item>
-
-					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每逾期一天扣分</div>
-					<el-form-item label="逾期扣分" prop="timeout_deduction_point">
-						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入数值"></el-input>
+					
+					<div style="margin-left: 80px; margin-bottom: 8px;">以天为单位,每 提前/逾期 一天 加分/扣分</div>
+					<el-form-item label="提前奖分" prop="ahead_award_point">
+						<el-input v-model="formData.ahead_award_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日奖分" style="width: 150px;"></el-input> 分/每天,
+						奖分上限 &nbsp;<el-input v-model="formData.ahead_award_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入奖分上限" style="width: 150px;"></el-input> 分
+					</el-form-item>
+					<el-form-item label="逾期扣分"  prop="timeout_deduction_point" >
+						<el-input v-model="formData.timeout_deduction_point" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入每日扣分" style="width: 150px;"></el-input> 分/每天,
+						扣分上限 &nbsp;<el-input v-model="formData.timeout_deduction_point_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入扣分上限" style="width: 150px;"></el-input> 分
 					</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>
@@ -155,7 +162,10 @@ export default {
 				targets: [],
 				reviewer_id: '',
 				task_cycle: 0,
-				timeout_deduction_point: null
+				timeout_deduction_point: null,
+				timeout_deduction_point_limit: null,
+				ahead_award_point: null,
+				ahead_award_point_limit: null,
 			},
 			point_types: [],
 			// 执行者
@@ -292,10 +302,23 @@ export default {
 
 			this.formData.reviewer_id = this.modifyData.reviewer_id;
 			this.reviewer_selected.employee = [{ id: this.modifyData.reviewer_id, img_url: this.modifyData.img_url, name: this.modifyData.reviewer_name }];
-			if (this.modifyData.point_config.timeout_deduction_point != '0') {
-				this.formData.timeout_deduction_point = this.modifyData.point_config.timeout_deduction_point;
+			// if (this.modifyData.point_config.timeout_deduction_point != '0') {
+			// 	this.formData.timeout_deduction_point = this.modifyData.point_config.timeout_deduction_point;
+			// } else {
+			// 	this.formData.timeout_deduction_point = '';
+			// }
+			
+			let add = ['ahead_award_point', 'ahead_award_point_limit', 'timeout_deduction_point', 'timeout_deduction_point_limit']
+			add.forEach(item =>{
+				this.deductionPoint(item)
+			})
+
+		},
+		deductionPoint(item){
+			if (this.modifyData.point_config[item] != '0') {
+				this.formData[item] = this.modifyData.point_config[item];
 			} else {
-				this.formData.timeout_deduction_point = '';
+				this.formData[item] = '';
 			}
 		},
 		sub(formName) {
@@ -311,19 +334,51 @@ export default {
 			this.executorName = '';
 			this.reviewerName = '';
 		},
+		ahead_timeout(item,arr,codes,code){
+			if(item){
+				if(arr){
+					if(Number(item) > Number(arr)){
+						this.$message.warning(code +'上限不能小于每日'+ code)
+						return true
+					}
+				}else{
+					this.$message.warning( codes + '不为0时,'+ code +'上限不能为空')
+					return true
+				}
+			}
+		},
+		deletedata(data,arr){
+			data[arr] && data[arr] != 0 ?  '' : delete data[arr]
+		},
 		// 提交
 		saveFun(formName) {
-			this.taskload = true;
-			// 没有选择重复任务的时候
-			// /api/integral/work/publish
-			// 选择重复任务之后
-			// /api/integral/schedule/publish/work
-
 			let self = this;
 			let data = JSON.parse(JSON.stringify(self.formData));
 			if (data.timeout_deduction_point == '') {
 				data.timeout_deduction_point = 0;
 			}
+			
+			if(!data.ahead_award_point && data.ahead_award_point_limit){
+				this.$message.warning('奖分上限不为0时每日奖分不能为空')
+				return
+			}else if(data.ahead_award_point && !data.ahead_award_point_limit){
+				this.$message.warning('每日奖分不为0时奖分上限不能为空')
+				return
+			}
+			if(!data.timeout_deduction_point && data.timeout_deduction_point_limit){
+				this.$message.warning('扣分上限不为0时每日扣分不能为空')
+				return
+			}else if(data.timeout_deduction_point && !data.timeout_deduction_point_limit){
+				this.$message.warning('每日扣分不为0时扣分上限不能为空')
+				return
+			}
+			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 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', '/api/integral/work/update', data)
 				.then(res => {
 					if (res.data.code == 1) {

+ 38 - 7
src/views/ranking/integral_event.vue

@@ -15,8 +15,8 @@
 						placeholder="全部规则分类"
 					></el-cascader>
 				</el-form-item>
-				<el-form-item label="积分类">
-					<el-select class="date-picker-width" size="medium" v-model="formData.pt_id" clearable placeholder="请选择积分类">
+				<el-form-item label="积分类">
+					<el-select class="date-picker-width" size="medium" v-model="formData.pt_id" clearable placeholder="请选择积分类">
 						<el-option v-for="item in getTypes()" :key="item.name" :label="item.name" :value="item.id"></el-option>
 					</el-select>
 				</el-form-item>
@@ -33,6 +33,11 @@
 						placeholder="全公司"
 					></el-cascader>
 				</el-form-item>
+				<el-form-item label="事件来源">
+					<el-select class="date-picker-width" size="medium" v-model="formData.source_type" clearable placeholder="全部">
+						<el-option v-for="item in source_type" :key="item.id" :label="item.name" :value="item.id"></el-option>
+					</el-select>
+				</el-form-item>
 				<el-form-item label="时间" style="margin-top: 1px;">
 					<el-date-picker
 						v-model="time_slot"
@@ -82,15 +87,23 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="remark" show-overflow-tooltip label="事件" align="left"></el-table-column>
-					<el-table-column prop="source_type" label="来源" align="left" width="120px">
+					<el-table-column prop="create_time" label="事件时间" align="left" width="140px">
+						<template slot-scope="scope">
+							{{ scope.row.event_time }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="source_type" label="来源" align="left" width="160px">
 						<template slot-scope="scope">
-							<span v-show="scope.row.source_type == 1">积分录入</span>
+							<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 == 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>
+							<span v-show="scope.row.source_type == 5">积分申请 <span v-if="scope.row.employee_name">({{scope.row.employee_name}})</span></span>
 							<span v-show="scope.row.source_type == 6">绩效任务包</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>
+							<span v-show="scope.row.source_type == 10">钉钉汇报(日志)奖扣分</span>
+							<span v-show="scope.row.source_type > 10">其他</span>
 						</template>
 					</el-table-column>
 					<el-table-column prop="create_time" label="录入时间" align="left" width="110px">
@@ -146,7 +159,7 @@
 
 				<el-row v-show="detail_info.source_type_mark">
 					<el-col :span="6">来源类型</el-col>
-					<el-col :span="18">{{ detail_info.source_type_mark }}</el-col>
+					<el-col :span="18">{{ detail_info.event_type_mark }}</el-col>
 				</el-row>
 
 				<el-row v-show="!detail_info.rule_id">
@@ -370,6 +383,19 @@ export default {
 			nowIndex: 1,
 			toleadResult: {},
 			deriveNum: 0,
+			
+			source_type: [
+				{id: 0,name: '全部'},
+				{id: 1,name: '积分录入'},
+				{id: 2,name: '任务'},
+				{id: 3,name: '积分系统分配'},
+				// {id: 4,name: '考勤系统分配'},
+				{id: 5,name: '积分申请'},
+				// {id: 6,name: '绩效任务包'},
+				{id: 8,name: '积分导入'},
+				{id: 9,name: 'A分转B分'},
+				{id: 10,name: '钉钉汇报(日志)奖扣分'},
+			]
 		};
 	},
 	components: { noData, Steps, toLead },
@@ -396,6 +422,11 @@ export default {
 			!val ? delete this.formData.pt_id : '';
 			this.get_integral_list(this.formData);
 		},
+		'formData.source_type'(val) {
+			this.formData.page = 1;
+			val == 0 ? delete this.formData.source_type : '';
+			this.get_integral_list(this.formData);
+		},
 		'formData.page'(val, old_val) {
 			this.get_integral_list(this.formData);
 		},