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/components/Edit.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
index ada7585..af8e822 100644
--- a/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
+++ b/src/views/CNAS/personnel/personnelInfo/components/Edit.vue
@@ -28,7 +28,7 @@
<el-row style="margin: 15px 0">
<el-form>
<el-row>
- <el-col :span="5">
+ <el-col :span="6">
<el-form-item label="鍩硅鏃ユ湡:">
<el-date-picker v-model="trainingForm.openingTime" format="yyyy-MM-dd" :disabled="currentRow.state !== 3"
placeholder="閫夋嫨鏃ユ湡" size="small" value-format="yyyy-MM-dd"
@@ -119,7 +119,7 @@
<div v-if="selectUserDia" class="body" style="height: 60vh;">
<lims-table :tableData="tableData1" :column="column1"
:isSelection="true" :handleSelectionChange="selectMethod"
- :height="'calc(100vh - 290px)'" :tableLoading="tableLoading1"></lims-table>
+ height="500" :tableLoading="tableLoading1"></lims-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="selectUserDia = false">鍙� 娑�</el-button>
@@ -137,7 +137,7 @@
import {
newPersonnelAddedToTrainingRecords,
outOfFocusPreservation, trainingAndAssessmentRecordsAdded, trainingAndAssessmentRecordsEvaluate,
- trainingAndAssessmentRecordsPage
+ trainingAndAssessmentRecordsPage, deleteTrainingAndAssessmentRecords
} from "@/api/cnas/personal/personalTraining";
export default {
@@ -221,6 +221,7 @@
},
addUserTableInfo: {
name: null,
+ type: 2
},
multipleSelection: [],
userList: [],
@@ -300,15 +301,13 @@
},
batchDelete() {
if (this.multipleSelection.length > 0) {
- let ids = this.multipleSelection.map(item => item.trainingRecordId)
+ let ids = this.multipleSelection.map(item => item.trainingRecordId).join(',')
this.$confirm('鏄惁纭鍒犻櫎鎵�閫夋嫨鐨勬暟鎹�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- let formData = new FormData()
- formData.append('ids', ids)
- deleteTrainingAndAssessmentRecords(formData).then(res => {
+ deleteTrainingAndAssessmentRecords({ids: ids}).then(res => {
if (res.code == 200) {
this.$message.success('鍒犻櫎鎴愬姛');
this.getInfo()
--
Gitblit v1.9.3