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/certDialog.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/coalMine/cPeopleManage/components/certDialog.vue b/src/views/coalMine/cPeopleManage/components/certDialog.vue
index 7a4e4fd..d5be215 100644
--- a/src/views/coalMine/cPeopleManage/components/certDialog.vue
+++ b/src/views/coalMine/cPeopleManage/components/certDialog.vue
@@ -20,7 +20,6 @@
<el-table-column label="资格类型" align="center" prop="qualificationType" />
<el-table-column label="作业类别" align="center" prop="jobCategory" />
<el-table-column label="操作项目" align="center" prop="operationItems" />
- <el-table-column label="人员" align="center" prop="staffId" />
<el-table-column label="有效期至" align="center" prop="expiredTime"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
@@ -33,6 +32,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