From 2edfe17a39cb5aa653318cad9474d18fbdaa204e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 30 五月 2024 18:23:47 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/business/OperaCarUseBookWindow.vue | 67 ++++++++++++++++-----------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index e50d4ef..d4290bb 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -65,53 +65,43 @@
<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 < logList.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 ==0)"></i>
- <i class="el-icon-question icon" v-if="(item.status==2 || item.status==5)"></i>
- <i class="el-icon-error icon2" v-if="(item.status==3 ||item.status==4 || item.status==6 ) "></i>
- <i class="el-icon-question icon3" v-if="(item.status==3 ||item.status==4 || item.status==6 ) "></i>
- <img v-if="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
- <img v-if="item.avatar ==null ||item.avatar ==''" src="@/assets/avatar/man.png" class="avatar" alt="" />
+ <img src="@/assets/icons/ic_tongguo.png" class="iconnew" v-if="(item.status ==2)"/>
+ <img src="@/assets/icons/ic_dangqian.png" class="iconnew" v-if="(item.status==1)"/>
+ <img src="@/assets/icons/ic_jujue.png" class="iconnew" v-if="(item.status==3)"></i>
+ <img src="@/assets/icons/ic_grep.png" class="iconnew" v-if="(item.status==null || item.status==0 )"></i>
+ <div style="display: inline" v-if="item.approveType ===0">
+ <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 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>3
+ <div class="time">{{ item.createDate }}</div>
</div>
<div class="line">
<div class="company">
{{ item.createUserName }} {{ item.companyName }}
- <div style="display: inline">
- 锛�<span class="status-green">{{stausInfo}}</span>
+ <div style="display: inline" v-if="item.statusInfo!=null && item.statusInfo!=''">
+ <span class="status-green">{{item.statusInfo||''}}</span>锛�
</div>
- </div>
- </div>
- <div class="line">
- <div class="remark">
- {{ item.checkInfo ||'' }}
</div>
</div>
</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="item.avatar!=null && item.avatar !=''" :src="item.avatar" class="avatar" alt="" />
- <img v-if="item.avatar ==null ||item.avatar ==''" 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">
- {{ item.createUserName }} {{ item.companyName }}
- <div style="display: inline">
- 锛�<span class="status-green">{{stausInfo}}</span>
- </div>
- </div>
- </div>
+ <div v-if="item.approveType != 1 " class="remark">
+ {{ item.checkInfo ||'姘寸數璐瑰弽鍙嶅澶嶅弽鍙嶅澶嶆柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曟柟娉曞彂鍙戝彂' }}
+ </div>
+ <div v-if="item.approveType == 1 " class="childList">
+ <div style="display: inline" 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>
</div>
</div>
</div>
@@ -449,7 +439,7 @@
border-left: 2px dashed #cccccc;
left: 31px;
height: calc(100% - 24px);
- top: 46px;
+ top: 34px;
}
.info {
display: flex;
@@ -472,6 +462,10 @@
z-index: 11;
color: #dc362e;
font-size: 24px;
+ }
+ .iconnew{
+ width: 24px;
+ height: 24px;
}
.icon3 {
position: relative;
@@ -518,6 +512,9 @@
color: #666666;
margin-left: 120px;
}
+ .childList {
+ margin-left: 120px;
+ }
}
}
}
--
Gitblit v1.9.3