From 0d3e86a6bacb3712e90a7dfd653e49317912e240 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:27 +0800
Subject: [PATCH] 最新版本
---
admin/src/components/business/OperaCarUseBookWindow.vue | 92 ++++++++++++++++++++++++---------------------
1 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index 0ff49fc..894234c 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -65,59 +65,46 @@
<div class="side_title">瀹℃壒娴佺▼</div>
<div class="list" v-if="model.approveDateVO !=null && model.approveDateVO.approveList !=null">
<div class="item" v-for="(item,index) in model.approveDateVO.approveList" :key="item.id">
- <div class="separate" v-if="(model.approveDateVO.copyList !=null && model.approveDateVO.copyList.length>0) || (index < model.approveDateVO.approveList.length-1)"></div>
+ <div class="separate" v-if=" (index < model.approveDateVO.approveList.length-1)"></div>
<div class="info">
- <i class="el-icon-success icon1" v-if="(item.status ==2)"></i>
- <i class="el-icon-question icon" v-if="(item.status==1)"></i>
- <i class="el-icon-error icon2" v-if="(item.status==3)"></i>
- <i class="el-icon-question icon3" v-if="(item.status==null || item.status==0 )"></i>
- <div style="display: inline" v-if="item.approveType ===0">
+ <img src="@/assets/icons/ic_tongguo.png" class="iconnew" v-if="(item.type !=1 &&item.status ==2)"/>
+ <img src="@/assets/icons/ic_dangqian.png" class="iconnew" v-if="(item.type !=1 &&item.status==1)"/>
+ <img src="@/assets/icons/ic_jujue.png" class="iconnew" v-if="(item.type !=1 &&item.status==3)"/>
+ <img src="@/assets/icons/ic_grey.png" class="iconnew" v-if="item.type ==1 || (item.status==null || item.status==0 )"/>
+ <div style="display: inline" v-if="item.approveType !=1">
<img v-if="item.faceImg!=null && item.faceImg !=''" :src="item.faceImg" class="avatar" alt="" />
<img v-if="item.faceImg ==null ||item.faceImg ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
</div>
- <div style="display: inline" v-if="item.approveType ===1">
- <img src="@/assets/avatar/man.png" class="avatar" alt="" />
+ <div style="display: inline" v-if="item.approveType ==1">
+ <img v-if="item.status == 1" src="@/assets/icons/ic_chaosong.png" class="avatar" alt="" />
+ <img v-if="item.status != 1" src="@/assets/icons/ic_duoren.png" class="avatar" alt="" />
</div>
<div class="content">
<div class="line">
<div class="name">{{ item.title}}</div>
- <div class="time">{{ item.createDate }}</div>
+ <div class="time">{{ item.checkDate }}</div>
</div>
<div class="line">
<div class="company">
- {{ item.createUserName }} {{ item.companyName }}
+ {{ 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>
</div>
</div>
- <div class="remark">
- {{ item.checkInfo ||'姘寸數璐瑰弽鍙嶅澶嶅弽鍙嶅澶嶆柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曞彂鍙戝彂' }}
+ <div v-if="item.approveType != 1 && item.checkInfo !=null && item.checkInfo !=''" class="remark">
+ {{ item.checkInfo || '' }}
+ </div>
+ <div v-if="item.approveType == 1 " class="childList">
+ <div class="m_content" 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 > {{item1.memberName}}</span>
+ </div>
</div>
</div>
-<!-- <div class="item" v-if="model.approveDateVO.copyList !=null && model.approveDateVO.copyList.length">
- <div class="info">
- <i class="el-icon-question icon3"></i>
- <img v-if="1===2" :src="faceImg" class="avatar" alt="" />
- <img v-if="1===1" src="@/assets/avatar/man.png" class="avatar" alt="" />
- <div class="content">
- <div class="line">
- <div class="name">鎶勯��</div>
- <div class="time"></div>
- </div>
- <div class="line">
- <div class="company">
- {{ 'aaa' }} {{ 'aaaad' }}
- <div style="display: inline">
- 锛�<span class="status-green">{{'sdf'}}</span>锛�
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>-->
</div>
</div>
</div>
@@ -130,6 +117,7 @@
<el-dialog
append-to-body
title="鍚屾剰鐢宠"
+ style="text-align: center"
class="dialogCl"
:visible.sync="isShowProblem"
width="480px"
@@ -162,6 +150,7 @@
<el-dialog
append-to-body
title="鎷掔粷鐢宠"
+ style="text-align: center"
class="dialogCl"
:visible.sync="isBackProblem"
width="600px"
@@ -451,8 +440,27 @@
position: absolute;
border-left: 2px dashed #cccccc;
left: 31px;
- height: calc(100% - 24px);
- top: 46px;
+ 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;
+ }
+ .m_content{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 4px;
}
.info {
display: flex;
@@ -476,18 +484,15 @@
color: #dc362e;
font-size: 24px;
}
+ .iconnew{
+ width: 24px;
+ height: 24px;
+ }
.icon3 {
position: relative;
z-index: 11;
color:gray;
font-size: 24px;
- }
- .avatar {
- width: 40px;
- height: 40px;
- border-radius: 50%;
- margin: 0 12px 0 16px;
- border: 1px solid;
}
.content {
flex: 1;
@@ -521,6 +526,7 @@
color: #666666;
margin-left: 120px;
}
+
}
}
}
--
Gitblit v1.9.3