From eb62b71480dfe6876072b3980d3bb2d3f83ebc04 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Mon, 17 Jun 2024 17:42:43 +0800
Subject: [PATCH] =?UTF-8?q?task#13992,=E5=AE=A1=E6=89=B9=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E7=8A=B6=E6=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintenance-application.vue               | 55 ++++++++++++++++---
 .../vehicle-maintenance-list.vue              |  2 +-
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/src/views/vehicle-maintenance/maintenance-application.vue b/src/views/vehicle-maintenance/maintenance-application.vue
index 4d29089c..10397a93 100644
--- a/src/views/vehicle-maintenance/maintenance-application.vue
+++ b/src/views/vehicle-maintenance/maintenance-application.vue
@@ -24,15 +24,23 @@
       <div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div>
       <div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
 <!--      审批中，通过，终止-->
-      <div class="shopName"><span class="opa">门店信息:</span><span>{{detailInfo.address || ''}}</span></div>
+      <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa">门店信息:</span><span>{{detailInfo.address || ''}}</span></div>
       <div class="shopImgList">
-        <img :src="detailInfo.storePhotoUrls">
+        <template v-if="detailInfo.storePhotoUrls.indexOf(',') !== -1">
+          <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
+            <img  :src="item" @click="previewPhoto(item)">
+          </div>
+        </template>
+        <template v-else>
+          <img  :src="detailInfo.storePhotoUrls" @click="previewPhoto(detailInfo.storePhotoUrls)">
+        </template>
+<!--        <img :src="detailInfo.storePhotoUrls" @click="previewPhoto(detailInfo.storePhotoUrls)">-->
       </div>
 <!--      不通过-->
-      <div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ detailInfo.mileage ||'' }}km</span></div>
+      <div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ detailInfo.mileage?.toFixed(2) ||'' }}km</span></div>
       <div v-if="noPassStatus"><span class="opa">结算类型:</span><span>月结</span></div>
       <div v-if="noPassStatus"><span class="opa">维修金额:</span><span>{{ detailInfo.amount || ''}}元</span></div>
-      <div v-if="noPassStatus" class="shopName"><span class="opa">维保项目:</span><span class="project">{{ detailInfo.information ||'' }}陕西省西安市新城区长乐西路街道西京医院陕西省西安市新城区长乐西路街道西京医院陕西省西安市新城区长乐西路街道西京医院</span></div>
+      <div v-if="noPassStatus" class="shopName"><span class="opa">维保项目:</span><span class="project">{{ detailInfo.information ||'' }}</span></div>
     </div>
 <!--   不通过-->
     <div class="detailInfo"  v-if="noPassStatus">
@@ -40,7 +48,15 @@
         <div class="leftTitle commonTitle">维保项目照片:</div>
       </div>
       <div class="shopImgList">
-        <img :src="detailInfo.maintenancePhotoUrls">
+        <template v-if="detailInfo.maintenancePhotoUrls.indexOf(',') !== -1">
+          <div v-for="(item,index) in (detailInfo.maintenancePhotoUrls?.split(','))" :key="index">
+            <img  :src="item" @click="previewPhoto(item)">
+          </div>
+        </template>
+        <template v-else>
+          <img  :src="detailInfo.maintenancePhotoUrls" @click="previewPhoto(detailInfo.maintenancePhotoUrls)">
+        </template>
+<!--        <img :src="detailInfo.maintenancePhotoUrls">-->
       </div>
     </div>
     <div class="detailInfo"  v-if="noPassStatus">
@@ -48,7 +64,15 @@
         <div class="leftTitle commonTitle">维保清单/凭证照片:</div>
       </div>
       <div class="shopImgList">
-        <img :src="detailInfo.voucherPhotoUrls">
+        <template v-if="detailInfo.voucherPhotoUrls.indexOf(',') !== -1">
+          <div v-for="(item,index) in (detailInfo.voucherPhotoUrls?.split(','))" :key="index">
+            <img  :src="item" @click="previewPhoto(item)">
+          </div>
+        </template>
+        <template v-else>
+          <img  :src="detailInfo.voucherPhotoUrls" @click="previewPhoto(detailInfo.voucherPhotoUrls)">
+        </template>
+<!--        <img :src="detailInfo.voucherPhotoUrls">-->
       </div>
     </div>
     <!--  维保申请审批中，维保完成审批中  -->
@@ -67,8 +91,8 @@
       </div>
       <div :class="getStatusColor(detailInfo.states)" class="time">{{ detailInfo.createTime }}  {{detailInfo.statesStr}}</div>
 <!--      完成不通过-->
-      <div class="line" v-if="noPassStatus"></div>
-      <div class="reason" v-if="noPassStatus">{{detailInfo.auditRemark}}</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>
   </div>
 <!--  维保申请审批中，维保完成审批中-->
@@ -87,6 +111,7 @@
 <script>
 import {getVehicleMaintenanceDetail,vehicleMaintenanceStop,vehicleMaintenanceApproval} from "@/api/maintenance"
 import {myMixins} from  "@/utils/myMixins"
+import { ImagePreview } from "vant";
 export default {
   name: "maintenance-application",
   mixins:[myMixins],
@@ -107,7 +132,7 @@ export default {
   computed: {
      // 维保申请不通过，维保完成不通过
      noPassStatus(){
-       return this.detailInfo.states===2 || this.detailInfo.states===5
+       return  this.detailInfo.states===5
      },
   },
   methods: {
@@ -119,6 +144,18 @@ export default {
         }
       });
     },
+    previewPhoto(url) {
+      let urls=[]
+      // this.auditPhotoList.forEach((item)=>{
+        urls.push(url)
+      // })
+      ImagePreview({
+        images: url,
+        startPosition: 0,
+        closeable: true,
+      });
+
+    },
     async handleConfirm(){
       let res=await vehicleMaintenanceStop({id:this.rowInfo.id, vehicleId:this.rowInfo.vehicleId})
       if (res.code==200){
diff --git a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
index 9b4fbe2a..e395df18 100644
--- a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
+++ b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
@@ -15,7 +15,7 @@
     <div v-for="(item, index) in tabArr" :key="index"
          @click="changeTab(index)">
       <span :class="{'active' : activeIndex == index , 'alpha' :true}"> {{ item.name }}</span>
-      <span class="numTip" style="opacity: 1 !important;" v-if="index===0">{{item.num}}</span>
+      <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">