From 902a537974ce0374d68d9e717febab7157a69286 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 13 十月 2022 09:43:54 +0800
Subject: [PATCH] 冲突
---
src/views/specialWorkSystem/workTicket/myApproval/index.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myApproval/index.vue b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
index 5721959..13eec8e 100644
--- a/src/views/specialWorkSystem/workTicket/myApproval/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myApproval/index.vue
@@ -85,13 +85,13 @@
<div class="stepCard">
<el-card class="box-card" shadow="always">
<div class="text">
- 审批结果：<span>{{ item.approvalResultDesc }}</span>
+ 审批结果：<span class="bold-text">{{ item.approvalResultDesc }}</span>
</div>
<div class="text">
- 审批层级：<span>{{ item.typeDesc }}</span>
+ 审批层级：<span class="bold-text">{{ item.typeDesc }}</span>
</div>
<div class="text" v-if="item.auditTypeDesc">
- 审批类型：<span>{{ item.auditTypeDesc }}</span>
+ 审批类型：<span class="bold-text">{{ item.auditTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
@@ -638,10 +638,13 @@
padding-left: 10px;
span {
- font-weight: bolder;
color: #409eff;
}
+ .bold-text{
+ font-weight: bolder;
+ }
+
&:last-of-type {
margin-bottom: 0;
}
--
Gitblit v1.9.2