|
@@ -381,15 +381,15 @@
|
|
|
</a-button>
|
|
</a-button>
|
|
|
</div>
|
|
</div>
|
|
|
<div
|
|
<div
|
|
|
- :class="`${selectedRowKeys1.length == 0 || selectRoomId == '1' || chooseLivingRoom.livingOrder && chooseLivingRoom.livingOrder.settleType !== -1 ? 'disabled' : ''}`"
|
|
|
|
|
- @click="tuidan"
|
|
|
|
|
- style="display: flex; flex-direction: column">
|
|
|
|
|
|
|
+ :class="`${consumSelectedRowKeys.length == 0 || selectRoomId == '1' || chooseLivingRoom.livingOrder && chooseLivingRoom.livingOrder.settleType !== -1 ? 'disabled' : ''}`"
|
|
|
|
|
+ @click="tuidan"
|
|
|
|
|
+ style="display: flex; flex-direction: column">
|
|
|
<a-icon
|
|
<a-icon
|
|
|
type="import"
|
|
type="import"
|
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
|
/><a-button
|
|
/><a-button
|
|
|
type="link"
|
|
type="link"
|
|
|
- :disabled="selectedRowKeys1.length == 0 || selectRoomId == '1'"
|
|
|
|
|
|
|
+ :disabled="consumSelectedRowKeys.length == 0 || selectRoomId == '1'"
|
|
|
>
|
|
>
|
|
|
退单
|
|
退单
|
|
|
</a-button>
|
|
</a-button>
|
|
@@ -400,7 +400,7 @@
|
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
|
/><a-button
|
|
/><a-button
|
|
|
type="link"
|
|
type="link"
|
|
|
- :disabled="selectedRowKeys1.length == 0 || selectRoomId == '1'"
|
|
|
|
|
|
|
+ :disabled="consumSelectedRowKeys.length == 0 || selectRoomId == '1'"
|
|
|
@click="partialSettle"
|
|
@click="partialSettle"
|
|
|
>
|
|
>
|
|
|
部分结账
|
|
部分结账
|
|
@@ -478,7 +478,7 @@
|
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
|
/><a-button type="link"> 退款 </a-button>
|
|
/><a-button type="link"> 退款 </a-button>
|
|
|
</div>
|
|
</div>
|
|
|
- <div style="display: flex; flex-direction: column">
|
|
|
|
|
|
|
+ <div style="display: flex; flex-direction: column" @click="strikeBalance">
|
|
|
<a-icon
|
|
<a-icon
|
|
|
type="pound"
|
|
type="pound"
|
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
@@ -567,8 +567,9 @@
|
|
|
<customer-modal ref="modalCustomerForm" @ok="modalFormOk"></customer-modal>
|
|
<customer-modal ref="modalCustomerForm" @ok="modalFormOk"></customer-modal>
|
|
|
<refund-modal ref="modalRefundForm" @ok="modalFormOk"></refund-modal>
|
|
<refund-modal ref="modalRefundForm" @ok="modalFormOk"></refund-modal>
|
|
|
<payment-modal ref="modalPaymentForm" @ok="modalFormOk"></payment-modal>
|
|
<payment-modal ref="modalPaymentForm" @ok="modalFormOk"></payment-modal>
|
|
|
- <pay-or-refund-modal ref="modalPayOrRefundForm" @ok="modalFormOk"></pay-or-refund-modal>
|
|
|
|
|
|
|
+<!-- <pay-or-refund-modal ref="modalPayOrRefundForm" @ok="modalFormOk"></pay-or-refund-modal>-->
|
|
|
<fee-modal ref="modalFeeForm" @ok="modalFormOk"></fee-modal>
|
|
<fee-modal ref="modalFeeForm" @ok="modalFormOk"></fee-modal>
|
|
|
|
|
+ <strike-balance-model ref="modalStrikeBalanceForm" @ok="modalFormOk"></strike-balance-model>
|
|
|
<member-message-modal ref="modalMemberMessage"></member-message-modal>
|
|
<member-message-modal ref="modalMemberMessage"></member-message-modal>
|
|
|
<lease-goods-modal ref="modalLeaseGoods"></lease-goods-modal>
|
|
<lease-goods-modal ref="modalLeaseGoods"></lease-goods-modal>
|
|
|
<select-check-in-room-order-modal
|
|
<select-check-in-room-order-modal
|
|
@@ -662,8 +663,10 @@ import EditRemarkModal from './EditRemarkModal.vue'
|
|
|
import EditBreakfastNumModal from './EditBreakfastNumModal.vue'
|
|
import EditBreakfastNumModal from './EditBreakfastNumModal.vue'
|
|
|
import EditBookingTypeModal from './EditBookingTypeModal.vue'
|
|
import EditBookingTypeModal from './EditBookingTypeModal.vue'
|
|
|
import { match } from 'assert'
|
|
import { match } from 'assert'
|
|
|
-import PayOrRefundModal from '@views/room/modules/checkIn/PayOrRefundModel'
|
|
|
|
|
|
|
+// import PayOrRefundModal from '@views/room/modules/checkIn/PayOrRefundModel'
|
|
|
import AdjustPriceForm from '@views/room/modules/checkIn/AdjustPriceForm'
|
|
import AdjustPriceForm from '@views/room/modules/checkIn/AdjustPriceForm'
|
|
|
|
|
+import StrikeBalance from '@views/room/modules/checkIn/StrikeBalanceModel'
|
|
|
|
|
+import StrikeBalanceModel from '@views/room/modules/checkIn/StrikeBalanceModel'
|
|
|
const columns = [
|
|
const columns = [
|
|
|
// {
|
|
// {
|
|
|
// title: "",
|
|
// title: "",
|
|
@@ -801,6 +804,8 @@ const endDate = new Date(date.setDate(date.getDate() + 1))
|
|
|
export default {
|
|
export default {
|
|
|
name: 'BusMeetingRoomForm',
|
|
name: 'BusMeetingRoomForm',
|
|
|
components: {
|
|
components: {
|
|
|
|
|
+ StrikeBalanceModel,
|
|
|
|
|
+ StrikeBalance,
|
|
|
AdjustPriceForm,
|
|
AdjustPriceForm,
|
|
|
PayOrRefundModal,
|
|
PayOrRefundModal,
|
|
|
CustomerModal,
|
|
CustomerModal,
|
|
@@ -835,6 +840,8 @@ export default {
|
|
|
time: ''
|
|
time: ''
|
|
|
},
|
|
},
|
|
|
selectedRowKeys: [],
|
|
selectedRowKeys: [],
|
|
|
|
|
+ consumSelectedRowKeys: [],
|
|
|
|
|
+ consumSelectedRows: [],
|
|
|
data,
|
|
data,
|
|
|
columns,
|
|
columns,
|
|
|
innerColumns,
|
|
innerColumns,
|
|
@@ -882,7 +889,6 @@ export default {
|
|
|
payTypeList: [],
|
|
payTypeList: [],
|
|
|
vipCustomer: {},
|
|
vipCustomer: {},
|
|
|
selectRoomId: '1',
|
|
selectRoomId: '1',
|
|
|
- selectedRowKeys1: [],
|
|
|
|
|
/**
|
|
/**
|
|
|
* 选中房间信息
|
|
* 选中房间信息
|
|
|
*/
|
|
*/
|
|
@@ -939,12 +945,8 @@ export default {
|
|
|
rowSelection() {
|
|
rowSelection() {
|
|
|
return {
|
|
return {
|
|
|
onChange: (selectedRowKeys, selectedRows) => {
|
|
onChange: (selectedRowKeys, selectedRows) => {
|
|
|
- // console.log(
|
|
|
|
|
- // `selectedRowKeys: ${selectedRowKeys}`,
|
|
|
|
|
- // "selectedRows: ",
|
|
|
|
|
- // selectedRows
|
|
|
|
|
- // );
|
|
|
|
|
- this.selectedRowKeys1 = selectedRowKeys
|
|
|
|
|
|
|
+ this.consumSelectedRowKeys = selectedRowKeys
|
|
|
|
|
+ this.consumSelectedRows = selectedRows
|
|
|
},
|
|
},
|
|
|
getCheckboxProps: (record) => ({
|
|
getCheckboxProps: (record) => ({
|
|
|
props: {
|
|
props: {
|
|
@@ -1330,7 +1332,7 @@ export default {
|
|
|
tuidan() {
|
|
tuidan() {
|
|
|
postAction(
|
|
postAction(
|
|
|
'/business/busRoomBookingOrders/退你麻痹单狗东西',
|
|
'/business/busRoomBookingOrders/退你麻痹单狗东西',
|
|
|
- this.selectedRowKeys1
|
|
|
|
|
|
|
+ this.consumSelectedRowKeys
|
|
|
).then((res) => {
|
|
).then((res) => {
|
|
|
if (res.success) {
|
|
if (res.success) {
|
|
|
this.$message.success('退单成功')
|
|
this.$message.success('退单成功')
|
|
@@ -1342,7 +1344,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
partialSettle() {
|
|
partialSettle() {
|
|
|
var list2 = this.feesList.filter((t) =>
|
|
var list2 = this.feesList.filter((t) =>
|
|
|
- this.selectedRowKeys1.includes(t.id)
|
|
|
|
|
|
|
+ this.consumSelectedRowKeys.includes(t.id)
|
|
|
)
|
|
)
|
|
|
console.log(list2)
|
|
console.log(list2)
|
|
|
var amount = list2.reduce(function (total, item) {
|
|
var amount = list2.reduce(function (total, item) {
|
|
@@ -1365,7 +1367,7 @@ export default {
|
|
|
couponFirstAmount: 0,
|
|
couponFirstAmount: 0,
|
|
|
discount: 9,
|
|
discount: 9,
|
|
|
vipCustomerId: this.model.orderInfo.vipCustomerId,
|
|
vipCustomerId: this.model.orderInfo.vipCustomerId,
|
|
|
- selectedFeeIds: this.selectedRowKeys1
|
|
|
|
|
|
|
+ selectedFeeIds: this.consumSelectedRowKeys
|
|
|
})
|
|
})
|
|
|
this.$refs.modalPaymentForm.title = '部分结账收款'
|
|
this.$refs.modalPaymentForm.title = '部分结账收款'
|
|
|
this.$refs.modalPaymentForm.disableSubmit = false
|
|
this.$refs.modalPaymentForm.disableSubmit = false
|
|
@@ -1563,7 +1565,7 @@ export default {
|
|
|
let ids = []
|
|
let ids = []
|
|
|
let mess = ''
|
|
let mess = ''
|
|
|
if (value === 1) {
|
|
if (value === 1) {
|
|
|
- ids = this.selectedRowKeys1
|
|
|
|
|
|
|
+ ids = this.consumSelectedRowKeys
|
|
|
mess = '消费详情中要收款'
|
|
mess = '消费详情中要收款'
|
|
|
} else {
|
|
} else {
|
|
|
ids = this.selectedRowKeys
|
|
ids = this.selectedRowKeys
|
|
@@ -1583,6 +1585,16 @@ export default {
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
},
|
|
},
|
|
|
|
|
+ strikeBalance() {
|
|
|
|
|
+ debugger
|
|
|
|
|
+ console.log(this.consumSelectedRows)
|
|
|
|
|
+ if (this.consumSelectedRows.length === 0) {
|
|
|
|
|
+ this.$message.warning('请先选择消费详情中需要冲账的账单')
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$refs.modalStrikeBalanceForm.title = '冲账单'
|
|
|
|
|
+ this.$refs.modalStrikeBalanceForm.edit(this.consumSelectedRows)
|
|
|
|
|
+ },
|
|
|
async handleAdd() {
|
|
async handleAdd() {
|
|
|
var that = this
|
|
var that = this
|
|
|
var index = this.model.livingRoomIds.findLastIndex(
|
|
var index = this.model.livingRoomIds.findLastIndex(
|