|
@@ -368,30 +368,28 @@
|
|
|
</h4>
|
|
</h4>
|
|
|
<div style="display: flex">
|
|
<div style="display: flex">
|
|
|
<div
|
|
<div
|
|
|
- @click="addProjectFee"
|
|
|
|
|
- style="display: flex; flex-direction: column"
|
|
|
|
|
- :class="`${selectRoomId == '1' || chooseLivingRoom.livingOrder && chooseLivingRoom.livingOrder.settleType !== -1 ? 'disabled' : ''}`">
|
|
|
|
|
|
|
+ @click="strikeBalance"
|
|
|
|
|
+ style="display: flex; flex-direction: column">
|
|
|
<a-icon
|
|
<a-icon
|
|
|
- type="tool"
|
|
|
|
|
- style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
|
|
|
|
|
+ type="pound"
|
|
|
|
|
+ style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
|
/><a-button
|
|
/><a-button
|
|
|
type="link"
|
|
type="link"
|
|
|
- >
|
|
|
|
|
- 增加消费
|
|
|
|
|
- </a-button>
|
|
|
|
|
|
|
+ >
|
|
|
|
|
+ 冲账
|
|
|
|
|
+ </a-button>
|
|
|
</div>
|
|
</div>
|
|
|
<div
|
|
<div
|
|
|
- :class="`${consumSelectedRowKeys.length == 0 || selectRoomId == '1' || chooseLivingRoom.livingOrder && chooseLivingRoom.livingOrder.settleType !== -1 ? 'disabled' : ''}`"
|
|
|
|
|
- @click="tuidan"
|
|
|
|
|
- style="display: flex; flex-direction: column">
|
|
|
|
|
|
|
+ @click="addProjectFee"
|
|
|
|
|
+ style="display: flex; flex-direction: column"
|
|
|
|
|
+ :class="`${selectRoomId == '1' || chooseLivingRoom.livingOrder && chooseLivingRoom.livingOrder.settleType !== -1 ? 'disabled' : ''}`">
|
|
|
<a-icon
|
|
<a-icon
|
|
|
- type="import"
|
|
|
|
|
|
|
+ type="tool"
|
|
|
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="consumSelectedRowKeys.length == 0 || selectRoomId == '1'"
|
|
|
|
|
>
|
|
>
|
|
|
- 退单
|
|
|
|
|
|
|
+ 增加消费
|
|
|
</a-button>
|
|
</a-button>
|
|
|
</div>
|
|
</div>
|
|
|
<div style="display: flex; flex-direction: column">
|
|
<div style="display: flex; flex-direction: column">
|
|
@@ -415,24 +413,13 @@
|
|
|
:pagination="false"
|
|
:pagination="false"
|
|
|
:scroll="{ y: 160 }"
|
|
:scroll="{ y: 160 }"
|
|
|
rowKey="id"
|
|
rowKey="id"
|
|
|
- :row-selection="rowSelection"
|
|
|
|
|
>
|
|
>
|
|
|
<template slot="subjectType" slot-scope="text, record, index">
|
|
<template slot="subjectType" slot-scope="text, record, index">
|
|
|
- {{ getSubjectTypeText(text) }}
|
|
|
|
|
|
|
+ {{ getSubjectTypeText(text,record) }}
|
|
|
</template>
|
|
</template>
|
|
|
<template slot="roomId" slot-scope="text, record, index">
|
|
<template slot="roomId" slot-scope="text, record, index">
|
|
|
{{ getRoomName(text) }}
|
|
{{ getRoomName(text) }}
|
|
|
</template>
|
|
</template>
|
|
|
- <a-table
|
|
|
|
|
- rowKey="id"
|
|
|
|
|
- :columns="innerColumns"
|
|
|
|
|
- :pagination="false"
|
|
|
|
|
- slot="expandedRowRender"
|
|
|
|
|
- slot-scope="record"
|
|
|
|
|
- :data-source="record.feeGoodVos"
|
|
|
|
|
- v-if="record.subjectType === 6"
|
|
|
|
|
- >
|
|
|
|
|
- </a-table>
|
|
|
|
|
</a-table>
|
|
</a-table>
|
|
|
<div
|
|
<div
|
|
|
style="
|
|
style="
|
|
@@ -461,8 +448,7 @@
|
|
|
</h4>
|
|
</h4>
|
|
|
<div style="display: flex" >
|
|
<div style="display: flex" >
|
|
|
<div
|
|
<div
|
|
|
- @click="refund(1)"
|
|
|
|
|
- :class="`${chooseLivingRoom.livingOrder && chooseLivingRoom.livingOrder.settleType !== -1 ? 'disabled' : ''}`"
|
|
|
|
|
|
|
+ @click="enterAccount"
|
|
|
style="display: flex; flex-direction: column">
|
|
style="display: flex; flex-direction: column">
|
|
|
<a-icon
|
|
<a-icon
|
|
|
type="transaction"
|
|
type="transaction"
|
|
@@ -478,12 +464,6 @@
|
|
|
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" @click="strikeBalance">
|
|
|
|
|
- <a-icon
|
|
|
|
|
- type="pound"
|
|
|
|
|
- style="color: rgba(255, 141, 26, 1); font-size: 18px"
|
|
|
|
|
- /><a-button type="link"> 冲账 </a-button>
|
|
|
|
|
- </div>
|
|
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
<a-divider />
|
|
<a-divider />
|
|
@@ -563,6 +543,7 @@
|
|
|
>
|
|
>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
|
|
+ <enter-account-model ref="enterAccountModel" @ok="modalFormOk"></enter-account-model>
|
|
|
<adjust-price-form ref="adjustPriceForm" @ok="modalFormOk"></adjust-price-form>
|
|
<adjust-price-form ref="adjustPriceForm" @ok="modalFormOk"></adjust-price-form>
|
|
|
<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>
|
|
@@ -667,6 +648,7 @@ import { match } from 'assert'
|
|
|
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 StrikeBalance from '@views/room/modules/checkIn/StrikeBalanceModel'
|
|
|
import StrikeBalanceModel from '@views/room/modules/checkIn/StrikeBalanceModel'
|
|
import StrikeBalanceModel from '@views/room/modules/checkIn/StrikeBalanceModel'
|
|
|
|
|
+import EnterAccountModel from '@views/room/modules/checkIn/EnterAccountModel'
|
|
|
const columns = [
|
|
const columns = [
|
|
|
// {
|
|
// {
|
|
|
// title: "",
|
|
// title: "",
|
|
@@ -676,19 +658,22 @@ const columns = [
|
|
|
{
|
|
{
|
|
|
title: '房间号',
|
|
title: '房间号',
|
|
|
dataIndex: 'roomId',
|
|
dataIndex: 'roomId',
|
|
|
- width: 70,
|
|
|
|
|
|
|
+ width: 80,
|
|
|
scopedSlots: { customRender: 'roomId' }
|
|
scopedSlots: { customRender: 'roomId' }
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '费项',
|
|
title: '费项',
|
|
|
dataIndex: 'subjectType',
|
|
dataIndex: 'subjectType',
|
|
|
- width: 60,
|
|
|
|
|
|
|
+ width: 160,
|
|
|
scopedSlots: { customRender: 'subjectType' }
|
|
scopedSlots: { customRender: 'subjectType' }
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '入账日期',
|
|
title: '入账日期',
|
|
|
dataIndex: 'dayTime',
|
|
dataIndex: 'dayTime',
|
|
|
- width: 110
|
|
|
|
|
|
|
+ width: 110,
|
|
|
|
|
+ customRender: function (text, record) {
|
|
|
|
|
+ return record.dayTime.substring(0, 10)
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '单价',
|
|
title: '单价',
|
|
@@ -700,13 +685,13 @@ const columns = [
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '优惠价',
|
|
title: '优惠价',
|
|
|
- dataIndex: 'money'
|
|
|
|
|
- // width: 80,
|
|
|
|
|
|
|
+ dataIndex: 'money',
|
|
|
|
|
+ // width: 60,
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
title: '数量',
|
|
title: '数量',
|
|
|
dataIndex: 'feeType',
|
|
dataIndex: 'feeType',
|
|
|
- // width: 60,
|
|
|
|
|
|
|
+ width: 60,
|
|
|
customRender: function (text) {
|
|
customRender: function (text) {
|
|
|
return 1
|
|
return 1
|
|
|
}
|
|
}
|
|
@@ -720,41 +705,6 @@ const columns = [
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
]
|
|
]
|
|
|
-const innerColumns = [
|
|
|
|
|
- {
|
|
|
|
|
- title: '名称',
|
|
|
|
|
- dataIndex: 'name'
|
|
|
|
|
- // width: 110,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '单价',
|
|
|
|
|
- dataIndex: 'originalPrice'
|
|
|
|
|
- // width: 110,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '优惠价格',
|
|
|
|
|
- dataIndex: 'price'
|
|
|
|
|
- // width: 110,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '商品数量',
|
|
|
|
|
- dataIndex: 'num'
|
|
|
|
|
- // width: 110,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- title: '小计',
|
|
|
|
|
- dataIndex: 'num*price',
|
|
|
|
|
- customRender: function (text, record) {
|
|
|
|
|
- return record.price * record.num
|
|
|
|
|
- }
|
|
|
|
|
- // width: 110,
|
|
|
|
|
- }
|
|
|
|
|
- // {
|
|
|
|
|
- // title: '入账时间',
|
|
|
|
|
- // dataIndex: 'createTime'
|
|
|
|
|
- // // width: 110,
|
|
|
|
|
- // },
|
|
|
|
|
-]
|
|
|
|
|
|
|
|
|
|
const columns2 = [
|
|
const columns2 = [
|
|
|
{
|
|
{
|
|
@@ -804,6 +754,7 @@ const endDate = new Date(date.setDate(date.getDate() + 1))
|
|
|
export default {
|
|
export default {
|
|
|
name: 'BusMeetingRoomForm',
|
|
name: 'BusMeetingRoomForm',
|
|
|
components: {
|
|
components: {
|
|
|
|
|
+ EnterAccountModel,
|
|
|
StrikeBalanceModel,
|
|
StrikeBalanceModel,
|
|
|
StrikeBalance,
|
|
StrikeBalance,
|
|
|
AdjustPriceForm,
|
|
AdjustPriceForm,
|
|
@@ -844,7 +795,6 @@ export default {
|
|
|
consumSelectedRows: [],
|
|
consumSelectedRows: [],
|
|
|
data,
|
|
data,
|
|
|
columns,
|
|
columns,
|
|
|
- innerColumns,
|
|
|
|
|
data2,
|
|
data2,
|
|
|
columns2,
|
|
columns2,
|
|
|
wakeList: [{}],
|
|
wakeList: [{}],
|
|
@@ -984,6 +934,7 @@ export default {
|
|
|
this.getbusCustomer()
|
|
this.getbusCustomer()
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ // table的expandIcon属性,修改默认展开关闭按钮 子表无数据时不显示展开图标
|
|
|
/**
|
|
/**
|
|
|
* 添加同住人姓名
|
|
* 添加同住人姓名
|
|
|
*/
|
|
*/
|
|
@@ -1329,19 +1280,19 @@ export default {
|
|
|
this.$refs.modalFeeForm.title = '增加消费项目'
|
|
this.$refs.modalFeeForm.title = '增加消费项目'
|
|
|
this.$refs.modalFeeForm.disableSubmit = false
|
|
this.$refs.modalFeeForm.disableSubmit = false
|
|
|
},
|
|
},
|
|
|
- tuidan() {
|
|
|
|
|
- postAction(
|
|
|
|
|
- '/business/busRoomBookingOrders/退你麻痹单狗东西',
|
|
|
|
|
- this.consumSelectedRowKeys
|
|
|
|
|
- ).then((res) => {
|
|
|
|
|
- if (res.success) {
|
|
|
|
|
- this.$message.success('退单成功')
|
|
|
|
|
- this.getBookingOrderInfo()
|
|
|
|
|
- } else {
|
|
|
|
|
- this.$message.warning(res.message)
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // tuidan() {
|
|
|
|
|
+ // postAction(
|
|
|
|
|
+ // '/business/busRoomBookingOrders/退你麻痹单狗东西',
|
|
|
|
|
+ // this.consumSelectedRowKeys
|
|
|
|
|
+ // ).then((res) => {
|
|
|
|
|
+ // if (res.success) {
|
|
|
|
|
+ // this.$message.success('退单成功')
|
|
|
|
|
+ // this.getBookingOrderInfo()
|
|
|
|
|
+ // } else {
|
|
|
|
|
+ // this.$message.warning(res.message)
|
|
|
|
|
+ // }
|
|
|
|
|
+ // })
|
|
|
|
|
+ // },
|
|
|
partialSettle() {
|
|
partialSettle() {
|
|
|
var list2 = this.feesList.filter((t) =>
|
|
var list2 = this.feesList.filter((t) =>
|
|
|
this.consumSelectedRowKeys.includes(t.id)
|
|
this.consumSelectedRowKeys.includes(t.id)
|
|
@@ -1398,7 +1349,7 @@ export default {
|
|
|
var find = this.model.livingRoomIds[index]
|
|
var find = this.model.livingRoomIds[index]
|
|
|
return find ? find.roomName : ''
|
|
return find ? find.roomName : ''
|
|
|
},
|
|
},
|
|
|
- getSubjectTypeText(text) {
|
|
|
|
|
|
|
+ getSubjectTypeText(text,record) {
|
|
|
var msg = ''
|
|
var msg = ''
|
|
|
if (text == 1) {
|
|
if (text == 1) {
|
|
|
msg = '押金'
|
|
msg = '押金'
|
|
@@ -1411,7 +1362,7 @@ export default {
|
|
|
} else if (text == 5) {
|
|
} else if (text == 5) {
|
|
|
msg = '结账收款'
|
|
msg = '结账收款'
|
|
|
} else if (text == 6) {
|
|
} else if (text == 6) {
|
|
|
- msg = '商品'
|
|
|
|
|
|
|
+ msg = '商品-' + record.feeGoodVo.name
|
|
|
} else if (text == 7) {
|
|
} else if (text == 7) {
|
|
|
msg = '点餐'
|
|
msg = '点餐'
|
|
|
} else if (text == 8) {
|
|
} else if (text == 8) {
|
|
@@ -1561,30 +1512,30 @@ export default {
|
|
|
this.selectedRowKeys = selectedRowKeys
|
|
this.selectedRowKeys = selectedRowKeys
|
|
|
this.selectionRows = selectionRows
|
|
this.selectionRows = selectionRows
|
|
|
},
|
|
},
|
|
|
- refund(value) {
|
|
|
|
|
- let ids = []
|
|
|
|
|
- let mess = ''
|
|
|
|
|
- if (value === 1) {
|
|
|
|
|
- ids = this.consumSelectedRowKeys
|
|
|
|
|
- mess = '消费详情中要收款'
|
|
|
|
|
- } else {
|
|
|
|
|
- ids = this.selectedRowKeys
|
|
|
|
|
- mess = '收款详情中要退款'
|
|
|
|
|
- }
|
|
|
|
|
- if (!ids || ids.length === 0) {
|
|
|
|
|
- this.$message.warning('请先勾选' + mess + '的账单')
|
|
|
|
|
- return
|
|
|
|
|
- }
|
|
|
|
|
- postAction('/business/busRoomBookingOrders/payPortionFee', ids
|
|
|
|
|
- ).then(resp => {
|
|
|
|
|
- if (resp.result === true) {
|
|
|
|
|
- this.$message.success('操作成功')
|
|
|
|
|
- this.getBookingOrderInfo()
|
|
|
|
|
- } else {
|
|
|
|
|
- this.$message.success('操作失败')
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // refund(value) {
|
|
|
|
|
+ // let ids = []
|
|
|
|
|
+ // let mess = ''
|
|
|
|
|
+ // if (value === 1) {
|
|
|
|
|
+ // ids = this.consumSelectedRowKeys
|
|
|
|
|
+ // mess = '消费详情中要收款'
|
|
|
|
|
+ // } else {
|
|
|
|
|
+ // ids = this.selectedRowKeys
|
|
|
|
|
+ // mess = '收款详情中要退款'
|
|
|
|
|
+ // }
|
|
|
|
|
+ // if (!ids || ids.length === 0) {
|
|
|
|
|
+ // this.$message.warning('请先勾选' + mess + '的账单')
|
|
|
|
|
+ // return
|
|
|
|
|
+ // }
|
|
|
|
|
+ // postAction('/business/busRoomBookingOrders/payPortionFee', ids
|
|
|
|
|
+ // ).then(resp => {
|
|
|
|
|
+ // if (resp.result === true) {
|
|
|
|
|
+ // this.$message.success('操作成功')
|
|
|
|
|
+ // this.getBookingOrderInfo()
|
|
|
|
|
+ // } else {
|
|
|
|
|
+ // this.$message.success('操作失败')
|
|
|
|
|
+ // }
|
|
|
|
|
+ // })
|
|
|
|
|
+ // },
|
|
|
strikeBalance() {
|
|
strikeBalance() {
|
|
|
debugger
|
|
debugger
|
|
|
console.log(this.consumSelectedRows)
|
|
console.log(this.consumSelectedRows)
|
|
@@ -1595,6 +1546,14 @@ export default {
|
|
|
this.$refs.modalStrikeBalanceForm.title = '冲账单'
|
|
this.$refs.modalStrikeBalanceForm.title = '冲账单'
|
|
|
this.$refs.modalStrikeBalanceForm.edit(this.consumSelectedRows)
|
|
this.$refs.modalStrikeBalanceForm.edit(this.consumSelectedRows)
|
|
|
},
|
|
},
|
|
|
|
|
+ enterAccount() {
|
|
|
|
|
+ let chooseRooms = [this.chooseLivingRoom]
|
|
|
|
|
+ if (this.selectRoomId === '1') {
|
|
|
|
|
+ chooseRooms = this.model.livingRoomIds.filter(e => e.roomId !== '1')
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$refs.enterAccountModel.title = '收款'
|
|
|
|
|
+ this.$refs.enterAccountModel.add(chooseRooms)
|
|
|
|
|
+ },
|
|
|
async handleAdd() {
|
|
async handleAdd() {
|
|
|
var that = this
|
|
var that = this
|
|
|
var index = this.model.livingRoomIds.findLastIndex(
|
|
var index = this.model.livingRoomIds.findLastIndex(
|
|
@@ -1851,6 +1810,10 @@ export default {
|
|
|
cursor: not-allowed;
|
|
cursor: not-allowed;
|
|
|
opacity: 0.5;
|
|
opacity: 0.5;
|
|
|
}
|
|
}
|
|
|
|
|
+/deep/ .noExpand .ant-table-row-expand-icon {
|
|
|
|
|
+ display: none;
|
|
|
|
|
+
|
|
|
|
|
+}
|
|
|
/deep/.ant-table-thead > tr > th {
|
|
/deep/.ant-table-thead > tr > th {
|
|
|
background: rgba(42, 130, 228, 1);
|
|
background: rgba(42, 130, 228, 1);
|
|
|
color: #ffffff;
|
|
color: #ffffff;
|