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/personnelTraining.vue | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
index cb850e2..a003633 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnelTraining.vue
@@ -5,16 +5,18 @@
<div class="title">
<span style="font-weight: bold">骞村害璁″垝</span>
</div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="page" ref="page" size="small" :inline="true">
- <el-form-item label="缂栧埗浜�">
- <el-input v-model="page.compilerName" clearable></el-input>
- </el-form-item>
- <el-form-item>
- <el-button size="small" type="primary" @click="getYearPlanList(departId)">鏌� 璇�</el-button>
- </el-form-item>
- </el-form>
- <div>
+ <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: 88px;font-size: 14px;font-weight: 700;color: #606266;">缂栧埗浜�</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="page.compilerName"
+ @keyup.enter.native="getYearPlanList(departId)"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button type="primary" size="mini" @click="getYearPlanList(departId)">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button size="small" type="primary" @click="uploadDia = true, getUserList()">瀵煎叆</el-button>
</div>
</div>
@@ -26,25 +28,22 @@
<div class="title">
<span style="font-weight: bold">骞村害璁″垝鏄庣粏</span>
</div>
- <div style="display: flex;justify-content: space-between;">
- <el-form :model="inDetailForm" ref="inDetailForm" size="small" :inline="true">
- <el-form-item label="鍩硅璁插笀">
- <el-input v-model="inDetailForm.trainingLecturerName" class="search" clearable placeholder="璇疯緭鍏�"
- size="small"></el-input>
- </el-form-item>
- <el-form-item label="鍩硅鏃ユ湡">
- <el-date-picker v-model="inDetailForm.trainingDate" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
- size="small" type="date" value-format="yyyy-MM-dd"></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button size="small" type="primary" @click="searchTable">鏌� 璇�</el-button>
- </el-form-item>
- </el-form>
- <div>
+ <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: 88px;font-size: 14px;font-weight: 700;color: #606266;">鍩硅璁插笀</span>
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="inDetailForm.trainingLecturerName"
+ @keyup.enter.native="searchTable"></el-input>
+ </div>
+ <div style="line-height: 30px;">
+ <el-button size="mini" type="primary" @click="searchTable">鏌ヨ</el-button>
+ </div>
+ </div>
+ <div style="line-height: 30px;">
<el-button v-if="isDepartment && currentChangeRow && isOperation" size="small"
- @click="batchDelete">鎵归噺鍒犻櫎</el-button>
+ @click="batchDelete">鎵归噺鍒犻櫎</el-button>
<el-button v-if="isDepartment && currentChangeRow && isOperation" size="small" type="primary"
- @click="addTrainingPlan('add')">鏂板</el-button>
+ @click="addTrainingPlan('add')">鏂板</el-button>
</div>
</div>
<lims-table :tableData="inDetailPlanTableData" :column="inDetailPlanColumn"
@@ -84,13 +83,13 @@
</el-dialog>
<el-dialog :visible.sync="uploadDia" title="鏁版嵁瀵煎叆" width="500px">
<div style="display: flex;align-items: center;">
- <div style="width: 70px">骞翠唤锛�</div>
+ <div style="width: 70px"><span class="required-span">* </span>骞翠唤锛�</div>
<el-date-picker v-model="planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy"
placeholder="閫夋嫨骞�">
</el-date-picker>
</div>
<div style="display: flex;align-items: center;margin: 10px 0">
- <div style="width: 70px">瀹℃牳浜猴細</div>
+ <div style="width: 70px"><span class="required-span">* </span>瀹℃牳浜猴細</div>
<el-select v-model="reviewerId" clearable filterable size="small" style="width: 50%;">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -625,6 +624,14 @@
},
// 骞村害璁″垝-瀵煎叆
submitUpload() {
+ if (!this.planYear) {
+ this.$message.error('璇烽�夋嫨骞翠唤')
+ return
+ }
+ if (!this.reviewerId) {
+ this.$message.error('璇烽�夋嫨瀹℃牳浜�')
+ return
+ }
if (this.$refs.upload.uploadFiles.length == 0) {
this.$message.error('鏈�夋嫨鏂囦欢')
return
--
Gitblit v1.9.3