From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突
---
src/views/home/data-table/index.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/views/home/data-table/index.vue b/src/views/home/data-table/index.vue
index d73e80e..96dfd61 100644
--- a/src/views/home/data-table/index.vue
+++ b/src/views/home/data-table/index.vue
@@ -18,6 +18,12 @@
</el-table-column>
<el-table-column prop="date" label="杩愮淮鎴鏃堕棿" align="center">
</el-table-column>
+ <el-table-column prop="date" label="鐘舵��" align="center">
+ <template slot-scope="scope">
+ <el-tag type="warning"
+ disable-transitions>涓存湡</el-tag>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
<el-button size="mini">缂栬緫</el-button>
--
Gitblit v1.8.0