Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/home.vue

@@ -372,7 +372,7 @@
 									</span>
 								</p>
 								<p
-									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:3;"
 								>
 									{{ prize.remark ? prize.remark.customize : '' }}
 								</p>
@@ -400,7 +400,7 @@
 									<span style="color:#FF9600;font-size:16px;">{{ buckle.point }} B分</span>
 								</p>
 								<p
-									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+									style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:3;"
 								>
 									{{ buckle.remark ? buckle.remark.customize : '' }}
 								</p>

src/views/common/below/taskDetailsPopup.vue

@@ -39,11 +39,11 @@
 					</li>
 					<li class="flex-box" v-if="workDetailData.point_config.timeout_deduction_point > 0">
 						<div class="label">逾期扣分</div>
-						<div class="content_text">{{ workDetailData.point_config.timeout_deduction_point }}</div>
+						<div class="content_text">{{ workDetailData.point_config.timeout_deduction_point }} B分/天</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>
+						<div class="content_text">{{ workDetailData.point_config.ahead_award_point }} B分/天</div>
 					</li>
 					<li class="flex-box">
 						<div class="label">审批人</div>

src/views/ranking/department_statistics.vue

@@ -237,7 +237,7 @@
 										</span>
 									</p>
 									<p
-										style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+										style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:3;"
 									>
 										{{ prize.remark ? prize.remark.customize : '' }}
 									</p>
@@ -265,7 +265,7 @@
 										<span style="color:#FF9600;font-size:16px;">{{ buckle.point }} B分</span>
 									</p>
 									<p
-										style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:2;padding-bottom:10px; "
+										style="margin:8px 0 0 5px;font-size:13px;line-height:20px;color:#303133;overflow:hidden; text-overflow:ellipsis;display:-webkit-box; -webkit-box-orient:vertical;-webkit-line-clamp:3;"
 									>
 										{{ buckle.remark ? buckle.remark.customize : '' }}
 									</p>

src/views/ranking/integral_event.vue

@@ -95,7 +95,7 @@
 					</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.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>
@@ -107,7 +107,7 @@
 							<span v-show="scope.row.source_type > 10">其他</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="create_time" label="录入时间" align="left" width="120px">
+					<el-table-column prop="create_time" label="录入时间" align="left" width="140px">
 						<template slot-scope="scope">
 							<!-- {{ cuttString(scope.row.create_time) }} -->
 							{{ scope.row.create_time }}
@@ -161,7 +161,7 @@
 
 				<el-row v-show="detail_info.source_type_mark">
 					<el-col :span="6">来源类型</el-col>
-					<el-col :span="18">{{ detail_info.event_type_mark }}</el-col>
+					<el-col :span="18">{{ detail_info.source_type_mark }}</el-col>
 				</el-row>
 
 				<el-row v-show="!detail_info.rule_id">
@@ -388,7 +388,7 @@ export default {
 			
 			source_type: [
 				{id: 0,name: '全部'},
-				{id: 1,name: '积分录入'},
+				{id: 1,name: '积分奖扣'},
 				{id: 2,name: '任务'},
 				{id: 3,name: '积分系统分配'},
 				{id: 4,name: '考勤系统分配'},
@@ -590,6 +590,7 @@ export default {
 					(this.formData.rule_id ? '&rule_id=' + this.formData.rule_id : '') +
 					(this.formData.pt_id ? '&pt_id=' + this.formData.pt_id : '') +
 					(this.formData.dept_ids ? '&dept_ids=' + this.formData.dept_ids : '') +
+					(this.formData.source_type ? '&source_type=' + this.formData.source_type : '') +
 					(this.formData.start_day ? '&start_day=' + this.formData.start_day : '') +
 					(this.formData.end_day ? '&end_day=' + this.formData.end_day : '') +
 					(this.formData.keyword ? '&keyword=' + this.formData.keyword : ''),