From 0a26d58a3906b9e13946c7cb46fae51a0de98920 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 17 三月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/personnel/personnelInfo/index.vue | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/index.vue b/src/views/CNAS/personnel/personnelInfo/index.vue
index f931306..3435533 100644
--- a/src/views/CNAS/personnel/personnelInfo/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/index.vue
@@ -70,22 +70,22 @@
<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"-->
-<!-- :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="鍩硅璁板綍">
+ <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"
+ :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">
@@ -119,6 +119,7 @@
import Communicate from './tabs/communicate.vue'
import {addDepartmentLims, delDepartmentLims, selectCNSAPersonTree} from "@/api/cnas/personal/personalList";
export default {
+ name: 'PersonnelInfo',
components: {
PersonnelList, personnelInformation, PersonnelTraining, JobResponsibilities, rewardPunishmentRecord, TrainingRecord, Mandate, PersonnelCapacity, Communicate
},
@@ -152,6 +153,7 @@
};
},
mounted() {
+ this.activeName = this.$route.query.activeName || '浜哄憳鍩烘湰淇℃伅'
this.geList();
},
methods: {
--
Gitblit v1.9.3