|
@@ -68,7 +68,7 @@
|
|
|
</sa-td>
|
|
|
<el-table-column label="操作" width="240px" fixed="right">
|
|
|
<template slot-scope="s">
|
|
|
- <el-button class="c-btn" type="primary" v-if="s.row.realInTime!=null
|
|
|
+ <el-button class="c-btn" type="primary" v-if="s.row.realInTime!=null&&s.row.chinaCarInTime!=null
|
|
|
&&s.row.complete==0&¤tCustomerId=='1'" @click="completeFn(s.row)">生成账单</el-button>
|
|
|
<el-button class="c-btn" type="primary" v-if="(s.row.confirmInput==0)
|
|
|
&&s.row.payStatus==1
|
|
@@ -81,7 +81,7 @@
|
|
|
@click="payFn(s.row)">
|
|
|
马上支付</el-button>
|
|
|
<el-button class="c-btn" type="primary"
|
|
|
- v-if="currentCustomerId=='1'&&(s.row.realInTime==null&&s.row.chinaCarInTime==null)"
|
|
|
+ v-if="currentCustomerId=='1'&&(s.row.realInTime==null||s.row.chinaCarInTime==null)"
|
|
|
@click="inFn(s.row)">确认入场
|
|
|
</el-button>
|
|
|
<el-button class="c-btn" type="primary"
|