Merge branch 'master' into xbnl_20260904(应知应会区分学生/教职工)

src/views/safetyEducationExaminationNew/dataStatistics/userListPage.vue

@@ -17,8 +17,17 @@
         <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">
+          <div class="table-top-button-box">
+            <div>
+              <p @click="queryParams.bindStatus = 'BOUND'" :class="queryParams.bindStatus == 'BOUND'?'check-table-button':''">已绑定</p>
+              <p @click="queryParams.bindStatus = 'UNBOUND'" :class="queryParams.bindStatus == 'UNBOUND'?'check-table-button':''">未匹配</p>
+              <p @click="queryParams.bindStatus = 'NO_LAB_NEED'" :class="queryParams.bindStatus == 'NO_LAB_NEED'?'check-table-button':''">无需进入实验室</p>
             </div>
           </div>
         </el-form-item>
@@ -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:'',
         });