|
|
@@ -59,7 +59,7 @@
|
|
|
<div class="cert-img">
|
|
|
<ImageThumbnail
|
|
|
:image-list="user.imgFile"
|
|
|
- height="70px"
|
|
|
+ height="60px"
|
|
|
width="80px"
|
|
|
radius="8px"
|
|
|
/>
|
|
|
@@ -70,14 +70,15 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="records" v-if="item.recentOutInRequestRecords.length > 0">
|
|
|
- <div>
|
|
|
- <van-icon name="label-o" class="rec-icon"/>
|
|
|
+ <div style="display: flex;align-items: center;">
|
|
|
+ <!-- <van-icon name="underway-o" class="rec-icon"/> -->
|
|
|
+ <img src="../../../../assets/svg/history.svg" width="15px" height="15px" class="rec-icon"/>
|
|
|
<span class="rec-text">最新申请记录</span>
|
|
|
</div>
|
|
|
<!-- <van-icon name="more" /> -->
|
|
|
<div>
|
|
|
<!-- <van-icon size="25px" name="ellipsis" /> -->
|
|
|
- <span class="entry-title" @click.stop="goOutInList()" >更多</span>
|
|
|
+ <span class="rec-title" @click.stop="goOutInList()" >更多</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
@@ -86,17 +87,20 @@
|
|
|
<div class="entry-left">
|
|
|
<div class="entry-title">出入名单:{{ e.userNames }}</div>
|
|
|
<div class="entry-sub">核对人:{{ e.createBy }}</div>
|
|
|
- <div class="entry-time" >申请提交时间:{{ dayjs(e.createTime).format("YYYY-MM-DD HH:mm") }}</div>
|
|
|
- <div class="entry-time" v-if="e.approveTime">审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</div>
|
|
|
+ <div class="entry-time" >
|
|
|
+ <span>申请时间:{{ dayjs(e.createTime).format("YYYY-MM-DD HH:mm") }}</span>
|
|
|
+ <span v-if="e.approveTime"> | 审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</span>
|
|
|
+ </div>
|
|
|
+ <!-- <div class="entry-time" v-if="e.approveTime">审核时间:{{ dayjs(e.approveTime).format("YYYY-MM-DD HH:mm") }}</div> -->
|
|
|
|
|
|
</div>
|
|
|
<div class="entry-right" @click.stop="handleOutInRequestRecordClick(e)">
|
|
|
<van-tag size="large" v-if="e.status===0" type="warning" plain>待审批</van-tag>
|
|
|
- <van-tag size="large" v-else-if="e.status===1" type="warning" plain>待登记</van-tag>
|
|
|
+ <van-tag size="large" v-else-if="e.status===1" type="primary" plain>待登记</van-tag>
|
|
|
<van-tag size="large" v-else-if="e.status===2" type="success" plain>已完成</van-tag>
|
|
|
<van-tag size="large" v-else-if="e.status===3" type="danger" plain>已拒绝</van-tag>
|
|
|
- <van-tag size="large" v-else-if="e.status===4" type="primary" plain>已逾期</van-tag>
|
|
|
- <van-tag size="large" v-else-if="e.status===5" type="default" plain>已补登</van-tag>
|
|
|
+ <van-tag size="large" v-else-if="e.status===4" type="danger" plain>已逾期</van-tag>
|
|
|
+ <van-tag size="large" v-else-if="e.status===5" type="success" plain>已补登</van-tag>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -310,7 +314,7 @@ export default {
|
|
|
margin: 0px !important;
|
|
|
}
|
|
|
.van-divider{
|
|
|
- margin: 2.266667vw 0 !important;
|
|
|
+ margin: 1.266667vw 0 !important;
|
|
|
}
|
|
|
.van-tabs__nav--card {
|
|
|
border-radius: 25px !important;
|
|
|
@@ -348,7 +352,7 @@ export default {
|
|
|
height: 8vw;
|
|
|
}
|
|
|
.van-tag {
|
|
|
- font-size:18px;
|
|
|
+ font-size:26px;
|
|
|
}
|
|
|
.van-tabs__nav--line.van-tabs__nav--complete
|
|
|
{
|
|
|
@@ -401,11 +405,12 @@ export default {
|
|
|
font-weight: 550;
|
|
|
font-size: 30px;
|
|
|
margin-bottom: 8px;
|
|
|
+ margin-left: 15px;
|
|
|
}
|
|
|
.period {
|
|
|
- font-size: 28px;
|
|
|
+ font-size: 24px;
|
|
|
color: #969799;
|
|
|
- margin-bottom: 15px;
|
|
|
+ margin-bottom: 5px;
|
|
|
}
|
|
|
.certs {
|
|
|
display: flex;
|
|
|
@@ -433,8 +438,8 @@ export default {
|
|
|
/* border-radius: 10px; */
|
|
|
}
|
|
|
.cert-img-name{
|
|
|
- font-size:28px;
|
|
|
- height: 35px;
|
|
|
+ font-size:20px;
|
|
|
+ height: 25px;
|
|
|
/* width: 150px;
|
|
|
height: 120px; */
|
|
|
/* background: #e6ebf5; */
|
|
|
@@ -449,14 +454,15 @@ export default {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
color: #888;
|
|
|
- font-size: 28px;
|
|
|
+ font-size: 24px;
|
|
|
padding-bottom: 10px;
|
|
|
border-bottom: 1px solid #f2f3f5;
|
|
|
justify-content:space-between;
|
|
|
}
|
|
|
.rec-icon { margin-right: 4px; }
|
|
|
-.rec-text { font-size: 28px; }
|
|
|
-.entries { margin-top: 8px;margin-left: 15px; }
|
|
|
+.rec-text { font-size: 24px; }
|
|
|
+.rec-title { font-size: 24px; color: #333; }
|
|
|
+.entries { margin-top: 0px;margin-left: 15px; }
|
|
|
.entry {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
@@ -464,13 +470,17 @@ export default {
|
|
|
padding: 10px 0;
|
|
|
border-bottom: 1px solid #f2f3f5;
|
|
|
}
|
|
|
+.entry-right{
|
|
|
+ margin-bottom: 50px;
|
|
|
+}
|
|
|
.entry:last-child { border-bottom: none; }
|
|
|
.entry-title { font-size: 28px; color: #333; }
|
|
|
-.entry-sub { font-size: 28px; color: #999; margin-top: 8px; }
|
|
|
-.entry-time { font-size: 28px; color: #999; margin-top: 8px; }
|
|
|
+.entry-sub { font-size: 24px; color: #999; margin-top: 8px; }
|
|
|
+.entry-time { font-size: 20px; color: #999; margin-top: 8px; }
|
|
|
|
|
|
.card-footer {
|
|
|
- margin-top: 10px; }
|
|
|
+ margin-top: 8px;
|
|
|
+ }
|
|
|
|
|
|
.fab {
|
|
|
position: fixed;
|