|
|
@@ -17,11 +17,20 @@
|
|
|
<el-form-item label="" prop="personType">
|
|
|
<div class="table-top-button-box">
|
|
|
<div>
|
|
|
- <p @click="queryParams.personType = 2" :class="queryParams.personType == 2?'check-table-button':''">研究生</p>
|
|
|
- <p @click="queryParams.personType = 3" :class="queryParams.personType == 3?'check-table-button':''">本科生</p>
|
|
|
+ <p @click="checkPersonType(2)" :class="queryParams.personType == 2?'check-table-button':''">研究生</p>
|
|
|
+ <p @click="checkPersonType(3)" :class="queryParams.personType == 3?'check-table-button':''">本科生</p>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="" prop="bindStatus">
|
|
|
+ <el-select v-model="queryParams.bindStatus"
|
|
|
+ placeholder="绑定状态"
|
|
|
+ style="width: 180px">
|
|
|
+ <el-option key="BOUND" label="已绑定" value="BOUND"/>
|
|
|
+ <el-option key="UNBOUND" label="未匹配" value="UNBOUND"/>
|
|
|
+ <el-option key="NO_LAB_NEED" v-if="queryParams.personType == 2" label="无需进入实验室" value="NO_LAB_NEED"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="" prop="deptId">
|
|
|
<el-select v-if="adminType == 1"
|
|
|
v-model="queryParams.deptId"
|
|
|
@@ -131,6 +140,7 @@
|
|
|
pageSize:20,
|
|
|
valueYear:'',
|
|
|
personType:'2',
|
|
|
+ bindStatus:'',
|
|
|
deptId:'',
|
|
|
levelIdClassifyTypeId:[],
|
|
|
account:'',
|
|
|
@@ -159,6 +169,13 @@
|
|
|
this.laboratoryLevelConfigGetLevelTitleList();
|
|
|
this.getList();
|
|
|
},
|
|
|
+ //切换本科生/研究生
|
|
|
+ checkPersonType(type){
|
|
|
+ if(this.queryParams.personType != type){
|
|
|
+ this.$set(this.queryParams,'personType',type);
|
|
|
+ this.$set(this.queryParams,'bindStatus','');
|
|
|
+ }
|
|
|
+ },
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
this.$set(this.exportConfig,'userIds',selection.map(item => item.userId));
|
|
|
@@ -179,6 +196,7 @@
|
|
|
valueYear:this.drawerPropsData.valueYear,
|
|
|
personType:this.drawerPropsData.personType,
|
|
|
deptId:this.drawerPropsData.deptId,
|
|
|
+ bindStatus:'',
|
|
|
levelIdClassifyTypeId:[],
|
|
|
account:'',
|
|
|
});
|
|
|
@@ -191,12 +209,13 @@
|
|
|
academicYear:this.queryParams.valueYear,
|
|
|
personType:this.queryParams.personType,
|
|
|
account:this.queryParams.account,
|
|
|
+ bindStatus:this.queryParams.bindStatus,
|
|
|
}
|
|
|
if(this.queryParams.levelIdClassifyTypeId[0]){
|
|
|
obj.levelId = this.queryParams.levelIdClassifyTypeId[0];
|
|
|
}
|
|
|
if(this.queryParams.levelIdClassifyTypeId[1]){
|
|
|
- obj.classifyTypeId = this.queryParams.levelIdClassifyTypeId[1];
|
|
|
+ obj.typeId = this.queryParams.levelIdClassifyTypeId[1];
|
|
|
}
|
|
|
if(this.adminType == 1){
|
|
|
obj.deptId = this.queryParams.deptId;
|
|
|
@@ -220,12 +239,13 @@
|
|
|
academicYear:this.queryParams.valueYear,
|
|
|
personType:this.queryParams.personType,
|
|
|
account:this.queryParams.account,
|
|
|
+ bindStatus:this.queryParams.bindStatus,
|
|
|
};
|
|
|
if(this.queryParams.levelIdClassifyTypeId[0]){
|
|
|
this.exportConfig.screenData.levelId = this.queryParams.levelIdClassifyTypeId[0];
|
|
|
}
|
|
|
if(this.queryParams.levelIdClassifyTypeId[1]){
|
|
|
- this.exportConfig.screenData.classifyTypeId = this.queryParams.levelIdClassifyTypeId[1];
|
|
|
+ this.exportConfig.screenData.typeId = this.queryParams.levelIdClassifyTypeId[1];
|
|
|
}
|
|
|
if(this.adminType == 1){
|
|
|
this.exportConfig.screenData.deptId = this.queryParams.deptId;
|