From 7b3b1cb76452258c3b554b6364ef5d50ed34542c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 11:40:14 +0800
Subject: [PATCH] 最新版本

---
 admin/src/components/business/OperaCarUseBookWindow.vue |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/business/OperaCarUseBookWindow.vue b/admin/src/components/business/OperaCarUseBookWindow.vue
index d4290bb..146c5de 100644
--- a/admin/src/components/business/OperaCarUseBookWindow.vue
+++ b/admin/src/components/business/OperaCarUseBookWindow.vue
@@ -67,35 +67,35 @@
           <div class="item" v-for="(item,index) in model.approveDateVO.approveList" :key="item.id">
             <div class="separate" v-if=" (index < model.approveDateVO.approveList.length-1)"></div>
             <div class="info">
-              <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 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 v-if="item.status === 1"  src="@/assets/icons/ic_chaosong.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 v-if="item.approveType != 1 " 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 style="display: inline" v-for="item1 in item.approveList" :key="item1.id">
@@ -117,6 +117,7 @@
     <el-dialog
         append-to-body
         title="鍚屾剰鐢宠"
+        style="text-align: center"
         class="dialogCl"
         :visible.sync="isShowProblem"
         width="480px"
@@ -149,6 +150,7 @@
     <el-dialog
         append-to-body
         title="鎷掔粷鐢宠"
+        style="text-align: center"
         class="dialogCl"
         :visible.sync="isBackProblem"
         width="600px"
@@ -478,7 +480,7 @@
             height: 40px;
             border-radius: 50%;
             margin: 0 12px 0 16px;
-            border: 1px solid;
+            //border: 1px solid;
           }
           .content {
             flex: 1;

--
Gitblit v1.9.3