|
@@ -5,7 +5,7 @@
|
|
|
<div class="company">
|
|
|
<span>公司:</span>
|
|
|
<a-select v-model="company" style="width: 120px" @change="companyChange">
|
|
|
- <a-select-option value="">
|
|
|
+ <a-select-option value="" v-if="selectOption.company.length>1">
|
|
|
全部
|
|
|
</a-select-option>
|
|
|
<a-select-option v-for="(item) in selectOption.company" :value='item.companyId' :key="item.companyId">
|
|
@@ -434,14 +434,14 @@ const designDetailColumns = [
|
|
|
scopedSlots: { customRender: 'personCost' },
|
|
|
|
|
|
width:100,
|
|
|
- filterDropdown: true, // 自定义的列筛选功能,我们占位为信息提示Icon的位置
|
|
|
- filterIcon: () => {
|
|
|
- return (
|
|
|
- <Tooltip placement="top" onVisibleChange={() => onVisibleChange(1)}>
|
|
|
- <Icon type="question-circle" theme="outlined" />
|
|
|
- </Tooltip>
|
|
|
- );
|
|
|
- },
|
|
|
+ // filterDropdown: true, // 自定义的列筛选功能,我们占位为信息提示Icon的位置
|
|
|
+ // filterIcon: () => {
|
|
|
+ // return (
|
|
|
+ // <Tooltip placement="top" onVisibleChange={() => onVisibleChange(1)}>
|
|
|
+ // <Icon type="question-circle" theme="outlined" />
|
|
|
+ // </Tooltip>
|
|
|
+ // );
|
|
|
+ // },
|
|
|
|
|
|
},
|
|
|
{
|
|
@@ -655,12 +655,16 @@ export default {
|
|
|
//获取选择框的信息
|
|
|
getInfoHttp(){
|
|
|
getAction('/ctop/performance/show/getPerformanceInfo',{}).then((res)=>{
|
|
|
- // console.log(res);
|
|
|
-
|
|
|
+ // console.log(res);
|
|
|
this.selectOption=res.result;
|
|
|
this.yearsArr=Reflect.ownKeys(res.result.data).splice(0,Reflect.ownKeys(res.result.data).length-1)
|
|
|
// console.log(this.yearsArr)
|
|
|
- })
|
|
|
+ console.log(this.selectOption.company.length)
|
|
|
+ if(this.selectOption.company.length==1){
|
|
|
+ this.company=this.selectOption.company[0].companyId
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
},
|
|
|
//职位改变
|
|
|
positionChange(val){
|
|
@@ -782,22 +786,37 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- onVisibleChange (key) { //Tooltip 显示隐藏的回调,类似onmouseenter 进入离开事件,用来显示我们不同的信息提醒
|
|
|
- let str = '';
|
|
|
- switch (key) {
|
|
|
- case 1:
|
|
|
- str = '你的姓名';
|
|
|
- default:
|
|
|
- break;
|
|
|
- }
|
|
|
+ // onVisibleChange (key) { //Tooltip 显示隐藏的回调,类似onmouseenter 进入离开事件,用来显示我们不同的信息提醒
|
|
|
+ // let str = '';
|
|
|
+ // switch (key) {
|
|
|
+ // case 1:
|
|
|
+ // str = '你的姓名';
|
|
|
+ // default:
|
|
|
+ // break;
|
|
|
+ // }
|
|
|
|
|
|
- // this.filterTitleKey=str
|
|
|
- }
|
|
|
+ // // this.filterTitleKey=str
|
|
|
+ // }
|
|
|
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.getInfoHttp();
|
|
|
- this.tableHttp();
|
|
|
+ new Promise((resolve,reject)=>{
|
|
|
+ getAction('/ctop/performance/show/getPerformanceInfo',{}).then((res)=>{
|
|
|
+ // console.log(res);
|
|
|
+ this.selectOption=res.result;
|
|
|
+ this.yearsArr=Reflect.ownKeys(res.result.data).splice(0,Reflect.ownKeys(res.result.data).length-1)
|
|
|
+ // console.log(this.yearsArr)
|
|
|
+ console.log(this.selectOption.company.length)
|
|
|
+ if(this.selectOption.company.length==1){
|
|
|
+ this.company=this.selectOption.company[0].companyId
|
|
|
+ }
|
|
|
+ resolve('true')
|
|
|
+ });
|
|
|
+
|
|
|
+ }).then((res)=>{
|
|
|
+ this.tableHttp();
|
|
|
+ })
|
|
|
+
|
|
|
},
|
|
|
filters: {
|
|
|
pointHandle(val){
|