Просмотр исходного кода

Merge branch 'master' into gzu_1st_main_20260830(考试培训)

dedsudiyu 1 неделя назад
Родитель
Сommit
89a2b37ca8

+ 2 - 2
src/views/safetyEducationExaminationNew/workbench/UserInfoCard.vue

@@ -27,8 +27,8 @@
         <div class="left-sub-min-box" v-if="userInfo.userType == 2">
           <p class="name-p">实验室信息</p>
           <p class="text-p" v-if="userInfo.bound">{{userInfo.labName}}</p>
-          <p class="text-p" v-if="!userInfo.bound&&userInfo.educationType == 1">暂无绑定实验室</p>
-          <p class="text-p" v-if="!userInfo.bound&&userInfo.educationType == 2">{{userInfo.isFinishExam?'暂无绑定实验室':'请先完成入学考试'}}</p>
+          <p class="text-p" v-if="!userInfo.bound&&userInfo.educationType == 1">{{userInfo.approvalStatus ==2 ?'已驳回请重新绑定':'暂无绑定实验室'}}</p>
+          <p class="text-p" v-if="!userInfo.bound&&userInfo.educationType == 2">{{userInfo.approvalStatus ==2 ?'已驳回请重新绑定':(userInfo.isFinishExam?'暂无绑定实验室':'请先完成入学考试')}}</p>
           <p class="button-p" v-if="(!userInfo.bound&&userInfo.educationType == 1)||(!userInfo.bound&&userInfo.educationType == 2&&userInfo.isFinishExam)" @click="shadeButton(4)">去绑定</p>
           <p class="sub-name-p" v-if="userInfo.bound">{{userInfo.bindStatus}}</p>
         </div>