From 27a169ee0d6f0c81be81454b039415adf7bce250 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Wed, 19 Jun 2024 10:47:42 +0800
Subject: [PATCH] =?UTF-8?q?task#14072=EF=BC=8C=E7=BB=B4=E4=BF=9D=E7=BB=88?=
 =?UTF-8?q?=E6=AD=A2=E5=8A=A0=E5=8E=9F=E5=9B=A0=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/approval.scss                      |  6 ++---
 src/views/caseList/caseAuditList.vue          |  3 +++
 src/views/index/toDoList.vue                  |  4 ++--
 .../maintenance-application.vue               | 24 +++++++++----------
 .../vehicle-maintenance-list.vue              | 10 ++++++--
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/styles/approval.scss b/src/styles/approval.scss
index edd9863e..818115e2 100644
--- a/src/styles/approval.scss
+++ b/src/styles/approval.scss
@@ -1,14 +1,12 @@
 @import "@/styles/mixin.scss";
 .refresh{
   min-height: 100%;
-  background-color: #F4F5F7;
+  //background-color: #F4F5F7;
 }
 .wrap{
   @include wh(100%,100%);
   box-sizing: border-box;
-}
-.navBar{
-  margin-bottom: 46px;
+  background-color: #F4F5F7;
 }
 .tab_wrap {
   @include fontWeightSize(500, 14px);
diff --git a/src/views/caseList/caseAuditList.vue b/src/views/caseList/caseAuditList.vue
index 276ede42..d80e0419 100644
--- a/src/views/caseList/caseAuditList.vue
+++ b/src/views/caseList/caseAuditList.vue
@@ -199,6 +199,9 @@ export default {
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
 @import "@/styles/approval.scss";
+.navBar{
+  margin-bottom: 46px;
+}
 .listItem{
   padding: 14px 25px 13px 29px;
   div{
diff --git a/src/views/index/toDoList.vue b/src/views/index/toDoList.vue
index 1cf27be9..9e4778d4 100644
--- a/src/views/index/toDoList.vue
+++ b/src/views/index/toDoList.vue
@@ -100,7 +100,8 @@ export default {
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
 .wrapCotainer{
-
+  @include wh(100%,100%);
+  background-color: #F4F5F7;
 }
 .navBar{
   height: 46px;
@@ -116,7 +117,6 @@ export default {
 .wrap {
   @include wh(100%, 100%);
   @include sizing4Padding(13px,13px,0,13px);
-  background-color: #F4F5F7;
   .itemWrap{
     @include wh(349px, 68px);
     background: #FFFFFF;
diff --git a/src/views/vehicle-maintenance/maintenance-application.vue b/src/views/vehicle-maintenance/maintenance-application.vue
index aa2c4123..c1e9cc23 100644
--- a/src/views/vehicle-maintenance/maintenance-application.vue
+++ b/src/views/vehicle-maintenance/maintenance-application.vue
@@ -23,10 +23,10 @@
       <div class="line"></div>
       <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="detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3"><span class="opa" style="width: 60px;">门店信息:</span><span>{{detailInfo.address || ''}}</span></div>
-      <div class="shopImgList" v-if="detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3">
-        <template v-if="detailInfo.storePhotoUrls.indexOf(',') !== -1">
+<!--      审批中，通过，终止detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3-->
+      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" style="width: 60px !important;">门店信息:</span><span>{{detailInfo.repairPoint || ''}}</span></div>
+      <div class="shopImgList" v-if="[1,2,3].includes(detailInfo.states)">
+        <template v-if="detailInfo.storePhotoUrls && detailInfo.storePhotoUrls.indexOf(',') !== -1">
           <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
             <img  :src="item" @click="previewPhoto(item)">
           </div>
@@ -47,7 +47,7 @@
         <div class="leftTitle commonTitle">维保项目照片:</div>
       </div>
       <div class="shopImgList">
-        <template v-if="detailInfo.maintenancePhotoUrls.indexOf(',') !== -1">
+        <template v-if="detailInfo.maintenancePhotoUrls && detailInfo.maintenancePhotoUrls.indexOf(',') !== -1">
           <div v-for="(item,index) in (detailInfo.maintenancePhotoUrls?.split(','))" :key="index">
             <img  :src="item" @click="previewPhoto(item)">
           </div>
@@ -62,7 +62,7 @@
         <div class="leftTitle commonTitle">维保清单/凭证照片:</div>
       </div>
       <div class="shopImgList">
-        <template v-if="detailInfo.voucherPhotoUrls.indexOf(',') !== -1">
+        <template v-if="detailInfo.voucherPhotoUrls && detailInfo.voucherPhotoUrls.indexOf(',') !== -1">
           <div v-for="(item,index) in (detailInfo.voucherPhotoUrls?.split(','))" :key="index">
             <img  :src="item" @click="previewPhoto(item)">
           </div>
@@ -72,10 +72,10 @@
         </template>
       </div>
     </div>
-    <!--  维保申请审批中，维保完成审批中  -->
-    <div class="approvalContent" v-if="detailInfo.states == 1 || detailInfo.states == 4">
-      <div class="title commonTitle">审批意见：</div>
-      <textarea class="multiple" placeholder="输入意见" v-model="auditRemark"></textarea>
+    <!--  维保申请审批中，维保完成审批中,  -->
+    <div class="approvalContent" v-if="[1,4,3].includes(detailInfo.states)">
+      <div class="title commonTitle">{{detailInfo.states == 3 ? '终止原因' : '审批意见：' }}</div>
+      <textarea class="multiple" :placeholder="detailInfo.states == 3 ? '输入原因' : '输入意见'" v-model="auditRemark"></textarea>
     </div>
 <!--审批意见显示：   只要不是审批中状态-->
     <div class="resultWrap" v-if="!(detailInfo.states == 1 || detailInfo.states == 4)">
@@ -154,7 +154,7 @@ export default {
 
     },
     async handleConfirm(){
-      let res=await vehicleMaintenanceStop({id:this.rowInfo.id, vehicleId:this.rowInfo.vehicleId})
+      let res=await vehicleMaintenanceStop({id:this.rowInfo.id, vehicleId:this.rowInfo.vehicleId, auditRemark:this.auditRemark,})
       if (res.code==200){
         this.show=false
         await this.getDetail();
@@ -222,7 +222,7 @@ export default {
 <style scoped lang="scss">
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
-@import "@/styles/approval.scss";
+//@import "@/styles/approval.scss";
 .wrap{
   background-color: #F4F5F7;
 }
diff --git a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
index e395df18..6fe5c8aa 100644
--- a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
+++ b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
@@ -18,7 +18,7 @@
       <span class="numTip" style="opacity: 1 !important;" v-if="index===0 && item.num">{{item.num}}</span>
     </div>
   </div>
-  <van-pull-refresh class="refresh" v-model="isLoading"  @refresh="onRefresh"  v-show="!show">
+  <van-pull-refresh  v-model="isLoading"  @refresh="onRefresh"  v-show="!show">
     <div class="listWrap">
       <div class="listItem"  @click="noMultipleClicks(goPageDetail,item)" v-for="(item,index) in pageList" :key="index">
         <div class="line1">
@@ -30,7 +30,6 @@
         </div>
         <div class="driverInfo">{{ item.vehicleName }} /  {{ item.plateNumber }}</div>
         <div class="time">{{ item.createTime }}</div>
-<!--        <div v-show="activeIndex == 2"><span>审核备注:</span><span style="color: #FF5D2E">{{ item.auditRemark }}</span></div>-->
       </div>
     </div>
   </van-pull-refresh>
@@ -157,6 +156,13 @@ export default {
 @import "@/styles/mixin.scss";
 @import "@/styles/common.scss";
 @import "@/styles/approval.scss";
+.navBar{
+  height: 46px;
+}
+.listWrap{
+  height: calc(100% - 100px);
+  overflow-y: auto;
+}
 .listItem{
   padding: 11px 28px 11px 23px;
   div{