|
|
@@ -21,7 +21,7 @@
|
|
|
</el-form-item>
|
|
|
<!-- 关键字 -->
|
|
|
<el-form-item class="persons_names">
|
|
|
- <el-input v-model="formData.keyword" :clearable="true" placeholder="输入同事姓名" max="200" class="persons_name" @clear="keywordSearch" >
|
|
|
+ <el-input v-model="formData.keyword" :clearable="true" placeholder="搜索姓名" max="200" class="persons_name" @clear="keywordSearch" >
|
|
|
<el-button slot="append" icon="el-icon-search" @click="keywordSearch"></el-button>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
@@ -54,7 +54,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<!-- 达标选项 -->
|
|
|
- <el-form-item v-if="currentTag === 'target'" label="查看达标员工" >
|
|
|
+ <el-form-item v-if="currentTag === 'target'" label="只看全部达标的" >
|
|
|
<el-checkbox v-model="formData.complete" size="medium" />
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -144,7 +144,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="奖分" prop="reward_point" />
|
|
|
<el-table-column label="扣分" prop="deduction_point"/>
|
|
|
- <el-table-column label="奖扣比例" prop="ratio"/>
|
|
|
+ <el-table-column label="奖扣比例" prop="ratio" :formatter="ratioFormatter"/>
|
|
|
<el-table-column label="奖扣人次" prop="exec" />
|
|
|
</el-table>
|
|
|
<center style="padding: 20px 0;">
|
|
|
@@ -236,6 +236,10 @@ export default {
|
|
|
downloadData:[]
|
|
|
}
|
|
|
},
|
|
|
+ created() {
|
|
|
+ this.currentTag = this.$route.query.tag || 'target';
|
|
|
+ if (['target','search'].indexOf(this.currentTag) < 0) this.currentTag = 'target';
|
|
|
+ },
|
|
|
computed:{
|
|
|
downloadFields: function (){
|
|
|
return this.currentTag === 'target' ? this.downloadTargetFields : this.downloadSearchFields;
|
|
|
@@ -297,6 +301,7 @@ export default {
|
|
|
currentTag(val,oVal){
|
|
|
if (val === oVal) return;
|
|
|
this.getList();
|
|
|
+ // this.$router.push({path: '/manager_statistics',query:{tag:val}})
|
|
|
},
|
|
|
timeScope(val,oVal){
|
|
|
this.formData.startDate = val[0];
|
|
|
@@ -423,7 +428,7 @@ export default {
|
|
|
if (msg.page === 0){
|
|
|
self.downloadData = self.search.list.map((item) => {
|
|
|
let i = self.parseDownloadDataSearch(item);
|
|
|
- i.timeScope = msg.start_date + "-" + msg.end_date;
|
|
|
+ i.timeScope = msg.start_date + "至" + msg.end_date;
|
|
|
return i;
|
|
|
});
|
|
|
self.loading = false;
|
|
|
@@ -433,7 +438,7 @@ export default {
|
|
|
if (res.type !== msg.type || res.code !== 1) return;
|
|
|
self.downloadData = res.result.list.map((item) => {
|
|
|
let i = self.parseDownloadDataSearch(item);
|
|
|
- i.timeScope = msg.start_date + "-" + msg.end_date;
|
|
|
+ i.timeScope = msg.start_date + "至" + msg.end_date;
|
|
|
return i;
|
|
|
});
|
|
|
self.loading = false;
|
|
|
@@ -465,7 +470,8 @@ export default {
|
|
|
this.openDetail({
|
|
|
date:this.formData.month,
|
|
|
id:e.id,
|
|
|
- name:e.name
|
|
|
+ name:e.name,
|
|
|
+ source:'target',
|
|
|
});
|
|
|
},
|
|
|
openDetailSearch(e){
|
|
|
@@ -473,12 +479,17 @@ export default {
|
|
|
startDate:this.formData.startDate,
|
|
|
endDate:this.formData.endDate,
|
|
|
id:e.id,
|
|
|
- name:e.name
|
|
|
+ name:e.name,
|
|
|
+ source:'search',
|
|
|
});
|
|
|
},
|
|
|
openDetail(data){
|
|
|
- this.$router.push({path:'/integral_event_two',query:{data:JSON.stringify(data)}})
|
|
|
- }
|
|
|
+ // this.$router.push({path:'/integral_event_two',query:{data:JSON.stringify(data)}})
|
|
|
+ this.$router.replace({path:'/integral_event_two',query:{data:JSON.stringify(data)}});
|
|
|
+ },
|
|
|
+ ratioFormatter(row, column, cellValue, index){
|
|
|
+ return cellValue ? cellValue : '--';
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
|
