Merge branch 'master' into prod-24-06-20

This commit is contained in:
2024-06-29 16:35:51 +08:00

View File

@ -24,7 +24,7 @@
<div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div> <div ><span class="opa">车辆名称:</span><span>{{ detailInfo.vehicleName }}</span></div>
<div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div> <div><span class="opa">车牌号:</span><span>{{ detailInfo.plateNumber }}</span></div>
<!-- 审批中通过终止detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3--> <!-- 审批中通过终止detailInfo.states ==1 || detailInfo.states ==2 ||detailInfo.states ==3-->
<div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span>{{detailInfo.repairPoint || ''}}</span></div> <div class="shopName" v-if="[1,2,3].includes(detailInfo.states)"><span class="opa" >门店信息:</span><span class="textarea">{{detailInfo.repairPoint || ''}}</span></div>
<div class="shopImgList" v-if="[1,2,3].includes(detailInfo.states)"> <div class="shopImgList" v-if="[1,2,3].includes(detailInfo.states)">
<template v-if="detailInfo.storePhotoUrls && detailInfo.storePhotoUrls.indexOf(',') !== -1"> <template v-if="detailInfo.storePhotoUrls && detailInfo.storePhotoUrls.indexOf(',') !== -1">
<div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index"> <div v-for="(item,index) in (detailInfo.storePhotoUrls?.split(','))" :key="index">
@ -40,7 +40,7 @@
<div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ parseInt(detailInfo.mileage) || '' }}km</span></div> <div v-if="noPassStatus"><span class="opa">车辆里程:</span><span>{{ parseInt(detailInfo.mileage) || '' }}km</span></div>
<div v-if="noPassStatus"><span class="opa">结算类型:</span><span>{{ detailInfo.paymentType?.label || '' }}</span></div> <div v-if="noPassStatus"><span class="opa">结算类型:</span><span>{{ detailInfo.paymentType?.label || '' }}</span></div>
<div v-if="noPassStatus && detailInfo.paymentType?.code !=2"><span class="opa">维修金额:</span><span>{{ detailInfo.amount || ''}}</span></div> <div v-if="noPassStatus && detailInfo.paymentType?.code !=2"><span class="opa">维修金额:</span><span>{{ detailInfo.amount || ''}}</span></div>
<div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project">{{ detailInfo.information ||'' }}</span></div> <div v-if="noPassStatus && detailInfo.paymentType?.code !=2" class="shopName"><span class="opa">维保项目:</span><span class="project textarea">{{ detailInfo.information ||'' }}</span></div>
</div> </div>
<!-- 不通过--> <!-- 不通过-->
<div class="detailInfo" v-if="noPassStatus && detailInfo.paymentType?.code !=2"> <div class="detailInfo" v-if="noPassStatus && detailInfo.paymentType?.code !=2">
@ -335,13 +335,16 @@ export default {
line-height: 27px; line-height: 27px;
} }
.shopName{ .shopName{
//width: 100%; width: 100%;
display: flex; display: flex;
align-items: baseline; align-items: baseline;
.textarea{
width: calc(100% - 60px);
}
} }
.project{ .project{
color: #E8A524; color: #E8A524;
width: calc(100% - 60px); //width: calc(100% - 60px);
} }
.shopImgList{ .shopImgList{
margin-top: 6px; margin-top: 6px;