From c7d6b1a520b00759c2023634b68027717212d0db Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 二月 2025 15:40:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/personnel/personnelInfo/index.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/index.vue b/src/views/CNAS/personnel/personnelInfo/index.vue
index 216f325..0fa410d 100644
--- a/src/views/CNAS/personnel/personnelInfo/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/index.vue
@@ -66,18 +66,18 @@
:departId="departId"
:isDepartment="isDepartment"></job-responsibilities>
</el-tab-pane>
-<!-- <el-tab-pane label="濂栨儵璁板綍" name="濂栨儵璁板綍">-->
-<!-- <rewardPunishmentRecord v-if="activeName === '濂栨儵璁板綍'"-->
-<!-- :departId="departId" :isDepartment="isDepartment"></rewardPunishmentRecord>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="鍩硅璁板綍" name="鍩硅璁板綍">-->
-<!-- <training-record v-if="activeName === '鍩硅璁板綍'" ref="trainingRecord"-->
-<!-- :departId="departId"-->
-<!-- :isDepartment="isDepartment"></training-record>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="浠昏亴鎺堟潈璁板綍" name="浠昏亴鎺堟潈璁板綍">-->
-<!-- <Mandate v-if="activeName === '浠昏亴鎺堟潈璁板綍'" ref="manDateRef" :departId="departId" :isDepartment="isDepartment"></Mandate>-->
-<!-- </el-tab-pane>-->
+ <el-tab-pane label="濂栨儵璁板綍" name="濂栨儵璁板綍">
+ <rewardPunishmentRecord v-if="activeName === '濂栨儵璁板綍'"
+ :departId="departId" :isDepartment="isDepartment"></rewardPunishmentRecord>
+ </el-tab-pane>
+ <el-tab-pane label="鍩硅璁板綍" name="鍩硅璁板綍">
+ <training-record v-if="activeName === '鍩硅璁板綍'" ref="trainingRecord"
+ :departId="departId"
+ :isDepartment="isDepartment"></training-record>
+ </el-tab-pane>
+ <el-tab-pane label="浠昏亴鎺堟潈璁板綍" name="浠昏亴鎺堟潈璁板綍">
+ <Mandate v-if="activeName === '浠昏亴鎺堟潈璁板綍'" ref="manDateRef" :departId="departId" :isDepartment="isDepartment"></Mandate>
+ </el-tab-pane>
<!-- <el-tab-pane label="浜哄憳鑳藉姏" name="浜哄憳鑳藉姏">-->
<!-- <personnel-capacity v-if="activeName === '浜哄憳鑳藉姏'" ref="personnelCapacity"-->
<!-- :departId="departId"-->
--
Gitblit v1.9.3