From a2aa94ae99095ec3fb5c463eefca33f89fd25bca Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 05 Mar 2024 08:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/coalMine/cPeopleManage/components/trainDialog.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/coalMine/cPeopleManage/components/trainDialog.vue b/src/views/coalMine/cPeopleManage/components/trainDialog.vue
index f94aee3..22d5fd0 100644
--- a/src/views/coalMine/cPeopleManage/components/trainDialog.vue
+++ b/src/views/coalMine/cPeopleManage/components/trainDialog.vue
@@ -21,9 +21,9 @@
{{scope.row.startTime.substring(0,7) + '~' + scope.row.endTime.substring(0,7)}}
</template>
</el-table-column>
- <el-table-column label="培训单位" align="center" prop="unit" />
- <el-table-column label="所属批次" align="center" prop="batch" />
- <el-table-column label="科目" align="center" prop="subject" />
+ <el-table-column label="培训单位" align="center" prop="unit"/>
+ <el-table-column label="所属批次" align="center" prop="batch"/>
+ <el-table-column label="科目" align="center" prop="subject"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button
@@ -35,6 +35,7 @@
<el-button
size="mini"
type="text"
+ style="color: #f56c6c"
icon="el-icon-delete"
@click="handleDelete(scope.row,scope.index)"
v-hasPermi="['system:experts:remove']"
--
Gitblit v1.9.2