From 05708d1ee2a2dc9d8748c635b867db035a0c4324 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Tue, 18 Jun 2024 11:04:22 +0800
Subject: [PATCH] =?UTF-8?q?task#13992,=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC=E8=88=AA=EF=BC=8C=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=AF=A6=E6=83=85=E7=9A=84=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index/toDoList.vue                  | 42 ++++++++++++++-----
 .../maintenance-application.vue               |  8 ++--
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/views/index/toDoList.vue b/src/views/index/toDoList.vue
index 0f0baaea..1cf27be9 100644
--- a/src/views/index/toDoList.vue
+++ b/src/views/index/toDoList.vue
@@ -1,17 +1,30 @@
 <template>
-
-  <div class="empty" v-if="show">
-    <img src="@/assets/empty.png" >
-  </div>
-  <div class="wrap"  v-else>
-    <div class="itemWrap" @click="goApprovalList" v-for="(item,index) in todolist" :key="index">
-      <div class="left">
-        <div class="title">{{ item.toDoName }}<span class="num">{{item.toDoCount}}</span></div>
-        <img class="ritBtn" src="@/assets/todoRight.png">
+  <div class="wrapCotainer">
+    <div class="navBar">
+      <van-nav-bar
+          title="待办列表"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goBack"
+      />
+    </div>
+    <div class="empty" v-if="show">
+      <img src="@/assets/empty.png" >
+    </div>
+    <div class="wrap"  v-else>
+      <div class="itemWrap" @click="goApprovalList" v-for="(item,index) in todolist" :key="index">
+        <div class="left">
+          <div class="title">{{ item.toDoName }}<span class="num" v-if="item.toDoCount">{{item.toDoCount}}</span></div>
+          <img class="ritBtn" src="@/assets/todoRight.png">
+        </div>
+        <div class="time">{{ item.toDoTime }}</div>
       </div>
-      <div class="time">{{ item.toDoTime }}</div>
     </div>
   </div>
+
 <!--  <div class="wrap" v-else>
     <ul id="dataList" class="dataList">
       <li class="item" v-for="(item,i) in todolist" :key="i">
@@ -35,8 +48,11 @@
 //getToDoList,toDoAudit
 import {toDoListNew} from "@/api/order"
 import {userOperationPermissions} from "@/api/mine"
+import {myMixins} from  "@/utils/myMixins"
+
 export default {
   name: "toDoList",
+  mixins:[myMixins],
   data() {
     return {
       todolist: [],
@@ -83,6 +99,12 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
+.wrapCotainer{
+
+}
+.navBar{
+  height: 46px;
+}
 .empty{
   @include wh(100%,100%);
   background-color: #FAFAFA;
diff --git a/src/views/vehicle-maintenance/maintenance-application.vue b/src/views/vehicle-maintenance/maintenance-application.vue
index 10397a93..6cf79f1d 100644
--- a/src/views/vehicle-maintenance/maintenance-application.vue
+++ b/src/views/vehicle-maintenance/maintenance-application.vue
@@ -24,7 +24,7 @@
       <div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div>
       <div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
 <!--      审批中，通过，终止-->
-      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa">门店信息:</span><span>{{detailInfo.address || ''}}</span></div>
+      <div class="shopName" v-if="detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3"><span class="opa">门店信息:</span><span>{{detailInfo.address || ''}}</span></div>
       <div class="shopImgList">
         <template v-if="detailInfo.storePhotoUrls.indexOf(',') !== -1">
           <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
@@ -91,8 +91,8 @@
       </div>
       <div :class="getStatusColor(detailInfo.states)" class="time">{{ detailInfo.createTime }}  {{detailInfo.statesStr}}</div>
 <!--      完成不通过-->
-      <div class="line" v-if="detailInfo.states==2 || detailInfo.states==5"></div>
-      <div class="reason" v-if="detailInfo.states==2 || detailInfo.states==5">{{detailInfo.auditRemark}}</div>
+      <div class="line" v-if="detailInfo.auditRemark"></div>
+      <div class="reason" v-if="detailInfo.auditRemark">{{detailInfo.auditRemark}}</div>
     </div>
   </div>
 <!--  维保申请审批中，维保完成审批中-->
@@ -132,7 +132,7 @@ export default {
   computed: {
      // 维保申请不通过，维保完成不通过
      noPassStatus(){
-       return  this.detailInfo.states===5
+       return  this.detailInfo.states===5 || this.detailInfo.states===4 || this.detailInfo.states===6;
      },
   },
   methods: {