From ff28e6db2f3535812a753a7213cc106ece8f297c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 28 二月 2025 14:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/personnel/personnelInfo/index.vue | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/index.vue b/src/views/CNAS/personnel/personnelInfo/index.vue
index a55381e..5cbb11a 100644
--- a/src/views/CNAS/personnel/personnelInfo/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/index.vue
@@ -57,24 +57,24 @@
@updatePerson="updatePerson"></PersonnelList>
<personnelInformation v-if="activeName === '浜哄憳鍩烘湰淇℃伅' && !isShowAll" :clickNodeVal="clickNodeVal"></personnelInformation>
</el-tab-pane>
-<!-- <el-tab-pane label="鍩硅璁″垝" name="鍩硅璁″垝">-->
-<!-- <PersonnelTraining v-if="activeName === '鍩硅璁″垝'" ref="personnelTraining"-->
-<!-- :departId="departId" :isDepartment="isDepartment"></PersonnelTraining>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="宀椾綅鑱岃矗" name="宀椾綅鑱岃矗">-->
-<!-- <job-responsibilities v-if="activeName === '宀椾綅鑱岃矗'" ref="jobResponsibilities"-->
-<!-- :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="鍩硅璁″垝">
+ <PersonnelTraining v-if="activeName === '鍩硅璁″垝'" ref="personnelTraining"
+ :departId="departId" :isDepartment="isDepartment"></PersonnelTraining>
+ </el-tab-pane>
+ <el-tab-pane label="宀椾綅鑱岃矗" name="宀椾綅鑱岃矗">
+ <job-responsibilities v-if="activeName === '宀椾綅鑱岃矗'" ref="jobResponsibilities"
+ :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>-->
@@ -274,6 +274,10 @@
height: 14px;
/* 璁剧疆婊氬姩鏉″搴� */
}
+.node_i {
+ color: orange;
+ font-size: 18px;
+}
.custom-tree-node {
width: 80%;
line-height: 32px;
--
Gitblit v1.9.3