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/experienceDialog.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/coalMine/cPeopleManage/components/experienceDialog.vue b/src/views/coalMine/cPeopleManage/components/experienceDialog.vue
index 5de9f1c..f3fd2d9 100644
--- a/src/views/coalMine/cPeopleManage/components/experienceDialog.vue
+++ b/src/views/coalMine/cPeopleManage/components/experienceDialog.vue
@@ -16,7 +16,7 @@
</el-row>
<el-table v-loading="loading" :data="dataList">
<el-table-column type="index" label="序号" width="55" align="center" />
- <el-table-column label="时间" align="center" prop="startTime">
+ <el-table-column label="时间" align="center">
<template #default="scope">
{{scope.row.startTime.substring(0,7) + '~' + scope.row.endTime.substring(0,7)}}
</template>
@@ -33,6 +33,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