From bc44c8e3c9d85691ce3fa73ef1300a6fae46e365 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:07:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/index.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/index.vue b/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/index.vue
index 9467953..728e737 100644
--- a/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/index.vue
+++ b/src/views/CNAS/personnel/personnelInfo/Department/components/PersonnelTraining/index.vue
@@ -14,7 +14,7 @@
</div>
</template>
<template v-slot:table>
- <limsTable :column="yearPlanColumn" :currentChange="currentChange" :height="'130'"
+ <limsTable :column="yearPlanColumn" :currentChange="currentChange" :height="'28vh'"
:table-data="yearPlanTableData" :table-loading="yearLoading" highlightCurrentRow style="padding: 0 15px"
:page="pagination" @pagination="paginationMetod">
</limsTable>
@@ -45,17 +45,15 @@
<template v-slot:table>
<el-tabs v-model="activeName" style="margin-left: 15px">
<el-tab-pane label="鏈煿璁�" name="first">
- <limsTable :column="inDetailPlanColumn" :handleSelectionChange="handleSelectionChange"
- :height="tableHeight + ''" :isSelection="true" :table-data="inDetailPlanTableData"
- :table-loading="yearLoading" style="padding: 0 15px" :page="inDetailPagination"
- @pagination="paginationmethod0">
+ <limsTable :column="inDetailPlanColumn" :handleSelectionChange="handleSelectionChange" :height="'28vh'"
+ :isSelection="true" :table-data="inDetailPlanTableData" :table-loading="yearLoading"
+ style="padding: 0 15px" :page="inDetailPagination" @pagination="paginationmethod0">
</limsTable>
</el-tab-pane>
<el-tab-pane label="宸茬粨鏉�" name="second">
- <limsTable :column="inDetailPlanColumn" :handleSelectionChange="handleSelectionChange"
- :height="tableHeight + ''" :isSelection="true" :table-data="inDetailPlanTableData"
- :table-loading="yearLoading" style="padding: 0 15px" :page="inDetailPagination"
- @pagination="paginationmethod0">
+ <limsTable :column="inDetailPlanColumn" :handleSelectionChange="handleSelectionChange" :height="'28vh'"
+ :isSelection="true" :table-data="inDetailPlanTableData" :table-loading="yearLoading"
+ style="padding: 0 15px" :page="inDetailPagination" @pagination="paginationmethod0">
</limsTable>
</el-tab-pane>
</el-tabs>
@@ -851,7 +849,7 @@
handleClaimFun(claimAndClaim, rowId) {
claimOfTrainingAndAssessmentRecords({
claimAndClaim,
- rowId
+ courseId: rowId
}).then((res) => {
this.getInDetailPlan(this.currentChangeRow.id);
});
--
Gitblit v1.9.3