From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue b/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
index a2642b7..52d1c4b 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/training-record.vue
@@ -6,15 +6,18 @@
<div class="title">
<span style="font-weight: bold">骞村害璁″垝</span>
</div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="trainingPagination" ref="trainingPagination" size="small" :inline="true">
- <el-form-item label="濮撳悕">
- <el-input v-model="trainingPagination.userName" class="search" clearable placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
- <el-form-item>
+ <div style="display: flex;justify-content: space-between">
+ <div style="display: flex;">
+ <div style="margin-bottom: 18px;margin-right: 10px;display: flex;align-items: center;line-height: 32px;">
+ <span style="width: 48px;font-size: 14px;font-weight: 700;color: #606266;">濮撳悕</span>
+ <el-input v-model="trainingPagination.userName" class="search"
+ @keyup.enter.native="getPersonnelTraining(departId)"
+ clearable placeholder="璇疯緭鍏�" size="small"></el-input>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="getPersonnelTraining(departId)">鏌ヨ</el-button>
- </el-form-item>
- </el-form>
+ </div>
+ </div>
</div>
<lims-table :tableData="trainingTableData" :column="trainingColumn"
ref="trainingTableData"
@@ -34,6 +37,7 @@
clearable
format="yyyy"
placeholder="閫夋嫨骞�"
+ @change="queryPersonnelDetailsPage(currentChangeRow.userId)"
size="small"
type="year"
value-format="yyyy">
@@ -141,9 +145,6 @@
label: '鍩硅鍐呭',
prop: 'trainingContent'
}, {
- label: '鍩硅璇炬椂',
- prop: 'educationBackground'
- }, {
label: '璇炬椂',
prop: 'classHour'
}, {
@@ -168,22 +169,6 @@
this.getPersonnelTraining(this.departId);
},
methods: {
- // exportExcel() {
- // this.outLoading = true;
- // const name = this.isDepartment ? 'departmentId' : 'userId';
- // this.$axios.get(this.$api.personal.personTrackRecordExport + `&${name}=` + this.departId, { responseType: 'blob' }).then(res => {
- // this.outLoading = false;
- // this.$message.success('瀵煎嚭鎴愬姛');
- // const blob = new Blob([res], { type: 'application/octet-stream' });
- // const url = URL.createObjectURL(blob);
- // const link = document.createElement('a');
- // link.href = url;
- // link.download = '鍩硅璁板綍.xlsx';
- // link.click();
- // }).catch(err => {
- // this.outLoading = false;
- // })
- // },
// 鏌ヨ
refreshTable() {
this.getPersonnelTraining(this.departId);
--
Gitblit v1.9.3