From bc2cda03481cd62a1b04959d2653678053e60b18 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 31 五月 2024 18:23:35 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/business/OperaCarUseBookWindow.vue | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 146c5de..1a817a3 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -12,7 +12,7 @@
<div class="time">鎻愪氦鏃堕棿锛歿{model.createDate}}</div>
</div>
<span class="right" v-if="model.status === 0">鐢宠涓�</span>
- <span class="right" v-if="model.status === 1">寰呭鎵�</span>
+ <span class="right" v-if="model.status === 1">瀹℃壒涓�</span>
<span class="right" style="background:#53b76f " v-if="model.status === 2">瀹℃壒閫氳繃</span>
<span class="right" style="background:#dc362e " v-if="model.status === 3">瀹℃壒涓嶉�氳繃</span>
<span class="right" style="background:#dc362e " v-if="model.status === 4">宸插彇娑�</span>
@@ -88,7 +88,7 @@
<div class="company">
{{ item.memberName }}
<div style="display: inline" v-if="item.statusInfo!=null && item.statusInfo!=''">
- <span class="status-green">{{item.statusInfo ||''}}</span>锛�
+ 锛�<span class="status-green">{{item.statusInfo ||''}}</span>锛�
</div>
</div>
</div>
@@ -98,10 +98,10 @@
{{ item.checkInfo || '' }}
</div>
<div v-if="item.approveType == 1 " class="childList">
- <div style="display: inline" v-for="item1 in item.approveList" :key="item1.id">
+ <div class="m_content company" v-for="item1 in item.approveList" :key="item1.id">
<img v-if="item1.faceImg!=null && item1.faceImg !=''" :src="item1.faceImg" class="avatar" alt="" />
<img v-if="item1.faceImg ==null ||item1.faceImg ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
- <span style="display: inline-block"> {{item1.memberName}}</span>
+ <span > {{item1.memberName}}</span>
</div>
</div>
</div>
@@ -440,8 +440,34 @@
position: absolute;
border-left: 2px dashed #cccccc;
left: 31px;
- height: calc(100% - 24px);
- top: 34px;
+ height: calc(100% - 36px);
+ top: 49px;
+ }
+ .avatar {
+ width: 40px;
+ height: 40px;
+ border-radius: 50%;
+ margin: 0 12px 0 16px;
+ //border: 1px solid;
+ }
+ .childList{
+ display: flex;
+ flex-wrap: wrap;
+ margin-left: 100px;
+ }
+ .company {
+ font-size: 13px;
+ color: #888888;
+ .status {
+ color: #00ba67;
+ }
+ }
+ .m_content{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 4px;
}
.info {
display: flex;
@@ -475,13 +501,6 @@
color:gray;
font-size: 24px;
}
- .avatar {
- width: 40px;
- height: 40px;
- border-radius: 50%;
- margin: 0 12px 0 16px;
- //border: 1px solid;
- }
.content {
flex: 1;
.line {
@@ -497,13 +516,6 @@
.time {
color: #888888;
}
- .company {
- font-size: 13px;
- color: #888888;
- .status {
- color: #00ba67;
- }
- }
}
}
}
@@ -512,11 +524,9 @@
border-radius: 4px;
padding: 13px 15px;
color: #666666;
- margin-left: 120px;
+ margin-left: 100px;
}
- .childList {
- margin-left: 120px;
- }
+
}
}
}
--
Gitblit v1.9.3