|
@@ -36,8 +36,8 @@
|
|
|
<text class="p1">车辆状态:</text>
|
|
|
<text class="p2">
|
|
|
<text v-if="businessItem.realInTime==null">未入场</text>
|
|
|
- <text v-if="businessItem.realInTime!=null">已入场</text>
|
|
|
- <text v-if="businessItem.outDayTime!=null">已离场</text>
|
|
|
+ <text v-if="businessItem.realInTime!=null&&businessItem.adminConfirmOut==0">已入场</text>
|
|
|
+ <text v-if="businessItem.outDayTime!=null&&businessItem.adminConfirmOut==1">已离场</text>
|
|
|
</text>
|
|
|
</view>
|
|
|
<view class="item">
|
|
@@ -75,7 +75,12 @@
|
|
|
确认支付</view>
|
|
|
<view class="btn b1" v-if="customemrId=='1'&&businessItem.realInTime==null"
|
|
|
@click="rcFn(businessItem)">确认入场</view>
|
|
|
- <view class="btn b1" v-if="customemrId=='1'&&businessItem.complete==1&&businessItem.payStatus>1"
|
|
|
+ <view class="btn b1"
|
|
|
+ v-if="customemrId=='1'
|
|
|
+ &&businessItem.complete==1
|
|
|
+ &&businessItem.payStatus>1
|
|
|
+ &&businessItem.adminConfirmPay==1
|
|
|
+ &&businessItem.adminConfirmOut==0"
|
|
|
@click="cc(businessItem)">确认离场</view>
|
|
|
<view class="btn b1" v-if="businessItem.confirmInput==0" @click="editFn(businessItem)">修改</view>
|
|
|
<view class="btn b3" @click="toDetail(businessItem)">详情</view>
|