From da614b00cc2b6721a6deadeb51f278d5a17f732e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 04 三月 2025 09:56:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/personnel/personnelInfo/index.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/index.vue b/src/views/CNAS/personnel/personnelInfo/index.vue
index 5cbb11a..9867a41 100644
--- a/src/views/CNAS/personnel/personnelInfo/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/index.vue
@@ -75,17 +75,17 @@
: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"-->
-<!-- :isDepartment="isDepartment"></personnel-capacity>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="娌熼�氳褰�" name="娌熼�氳褰�">-->
-<!-- <Communicate v-if="activeName === '娌熼�氳褰�'" ref="communicateRef" :departId="departId" :isDepartment="isDepartment"></Communicate>-->
-<!-- </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"
+ :isDepartment="isDepartment"></personnel-capacity>
+ </el-tab-pane>
+ <el-tab-pane label="娌熼�氳褰�" name="娌熼�氳褰�">
+ <Communicate v-if="activeName === '娌熼�氳褰�'" ref="communicateRef" :departId="departId" :isDepartment="isDepartment"></Communicate>
+ </el-tab-pane>
</el-tabs>
</div>
<el-dialog :visible.sync="addDia" title="鏋舵瀯鏂板" width="400px">
--
Gitblit v1.9.3