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/myJobApply/index.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
index 47c1a5e..57d399e 100644
--- a/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
+++ b/src/views/specialWorkSystem/workTicket/myJobApply/index.vue
@@ -15,6 +15,7 @@
:value="item.id"
/>
</el-select>
+
<el-button type="primary" @click="searchRecord">查询</el-button>
<el-button plain @click="clearSearch">重置</el-button>
</div>
@@ -87,13 +88,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>
@@ -132,7 +133,7 @@
</div>
</div>
</div>
- <div class="text" v-show="item.expFinishApprovalTime != null">
+ <div class="text" v-show="item.expFinishApprovalTime && item.expFinishApprovalTime != null">
期望结束时间：<span>{{ item.expFinishApprovalTime }}</span>
</div>
<div class="text" v-show="item.finishApprovalTime != null">
@@ -320,7 +321,7 @@
// 填写表单
const toApply = () => {
router.push({
- path: 'workApply'
+ path: 'apply'
});
};
@@ -694,10 +695,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