|
@@ -286,6 +286,7 @@
|
|
<span v-if="scope.row.status != 0">¥{{ scope.row.realPrice }}</span>
|
|
<span v-if="scope.row.status != 0">¥{{ scope.row.realPrice }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
|
+ <el-table-column label="优惠券额度" align="center" prop="preferentialPrice" width="120" />
|
|
<el-table-column label="支付方式" align="center" prop="payWay">
|
|
<el-table-column label="支付方式" align="center" prop="payWay">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
|
|
<dict-tag :options="dict.type.pay_way_type" :value="scope.row.payWay"/>
|
|
@@ -324,7 +325,7 @@
|
|
<span>{{ scope.row.refundPriceTotal && scope.row.refundPriceTotal !=0 ? ('-' + scope.row.refundPriceTotal) : '' }}</span>
|
|
<span>{{ scope.row.refundPriceTotal && scope.row.refundPriceTotal !=0 ? ('-' + scope.row.refundPriceTotal) : '' }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="是否成功开票" align="center">
|
|
|
|
|
|
+ <el-table-column label="是否成功开票" align="center" width="130">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-tag type="danger" v-if="scope.row.ifSuccessInvoice == '0'">否</el-tag>
|
|
<el-tag type="danger" v-if="scope.row.ifSuccessInvoice == '0'">否</el-tag>
|
|
<el-tag type="success" v-else-if="scope.row.ifSuccessInvoice == '1'">是</el-tag>
|
|
<el-tag type="success" v-else-if="scope.row.ifSuccessInvoice == '1'">是</el-tag>
|
|
@@ -340,7 +341,7 @@
|
|
<span>{{ scope.row.remark }}</span>
|
|
<span>{{ scope.row.remark }}</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column label="OTA订单号" align="center" prop="otaOrderId">
|
|
|
|
|
|
+ <el-table-column label="OTA订单号" align="center" prop="otaOrderId" width="170">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<span>{{ scope.row.otaOrderId||'-' }}</span>
|
|
<span>{{ scope.row.otaOrderId||'-' }}</span>
|
|
</template>
|
|
</template>
|
|
@@ -850,9 +851,6 @@ export default {
|
|
.app-container {
|
|
.app-container {
|
|
height: calc( 100vh - 110px );
|
|
height: calc( 100vh - 110px );
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
-}
|
|
|
|
-.app-container-query {
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
.app-container-table-box {
|
|
.app-container-table-box {
|
|
height: calc( 100% - var(--q-height) );
|
|
height: calc( 100% - var(--q-height) );
|