From dd43c95c5a020c1a828263cc5944ed6fb644b65d Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 五月 2023 08:53:18 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/~mayuhao/HazardInvestigationSystem
---
src/views/specialWorkManage/workTicket/myApproval/index.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/views/specialWorkManage/workTicket/myApproval/index.vue b/src/views/specialWorkManage/workTicket/myApproval/index.vue
index 2c3510c..475088d 100644
--- a/src/views/specialWorkManage/workTicket/myApproval/index.vue
+++ b/src/views/specialWorkManage/workTicket/myApproval/index.vue
@@ -88,7 +88,10 @@
审批结果：<span>{{ item.approvalResultDesc }}</span>
</div>
<div class="text">
- 审批类型：<span>{{ item.typeDesc }}</span>
+ 审批层级：<span>{{ item.typeDesc }}</span>
+ </div>
+ <div class="text" v-if="item.auditTypeDesc">
+ 审批类型：<span>{{ item.auditTypeDesc }}</span>
</div>
<div class="text" v-show="item.startApprovalTime != null">
开始时间：<span>{{ item.startApprovalTime }}</span>
@@ -419,9 +422,9 @@
width: 100%;
height: 100%;
- &::v-deep(.el-tabs__content) {
- height: calc(100% - 60px);
- }
+ //&::v-deep(.el-tabs__content) {
+ // height: calc(100% - 60px);
+ //}
.el-tab-pane {
height: 100%;
--
Gitblit v1.9.2