|
@ -227,7 +227,7 @@ |
|
|
|
|
|
|
|
|
<!-- 20220728 取消退押金操作 --> |
|
|
<!-- 20220728 取消退押金操作 --> |
|
|
<!-- <view class="cr-btn" @click="depositRefundBtn" v-if="orderInfo.order_type == 'deposit'&&orderInfo.pay_status == 2">退押金</view> --> |
|
|
<!-- <view class="cr-btn" @click="depositRefundBtn" v-if="orderInfo.order_type == 'deposit'&&orderInfo.pay_status == 2">退押金</view> --> |
|
|
<view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type == 'rent'&&orderInfo.status_type == 5">结束计费</view> |
|
|
|
|
|
|
|
|
<view class="cr-btn" @click="overBillingBtn" v-if="orderInfo.order_type == 'rent'&&orderInfo.status_type == 5 || true">结束计费</view> |
|
|
<!-- <view class="cr-btn" @click="overBillingBtn">结束计费</view> --> |
|
|
<!-- <view class="cr-btn" @click="overBillingBtn">结束计费</view> --> |
|
|
|
|
|
|
|
|
<end-billing |
|
|
<end-billing |
|
@ -235,6 +235,7 @@ |
|
|
@close = 'isShowEndBilling = false' |
|
|
@close = 'isShowEndBilling = false' |
|
|
@confirm = 'endBillingBtn' |
|
|
@confirm = 'endBillingBtn' |
|
|
:orderInfo = 'orderInfo' |
|
|
:orderInfo = 'orderInfo' |
|
|
|
|
|
ref="endBilling" |
|
|
></end-billing> |
|
|
></end-billing> |
|
|
|
|
|
|
|
|
</view> |
|
|
</view> |
|
@ -368,6 +369,13 @@ export default { |
|
|
let _order = res.order || { extension: {} }; |
|
|
let _order = res.order || { extension: {} }; |
|
|
this.orderInfo = _order; |
|
|
this.orderInfo = _order; |
|
|
this.isShowEndBilling = isEndBilling; |
|
|
this.isShowEndBilling = isEndBilling; |
|
|
|
|
|
|
|
|
|
|
|
// 自动填充金额 |
|
|
|
|
|
this.$nextTick(_=>{ |
|
|
|
|
|
if(this.$refs&&this.$refs.endBilling&&this.$refs.endBilling.setAmount){ |
|
|
|
|
|
this.$refs.endBilling.setAmount(_order.amount || 0); |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
// 20220728 取消退押金操作 |
|
|
// 20220728 取消退押金操作 |
|
|