diff --git a/src/pages/eashier/roomCash/components/bing/components/baseMsg.vue b/src/pages/eashier/roomCash/components/bing/components/baseMsg.vue new file mode 100644 index 0000000..77ce521 --- /dev/null +++ b/src/pages/eashier/roomCash/components/bing/components/baseMsg.vue @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + {{form.memberName}} + + + + + + + + + + + + + + diff --git a/src/pages/eashier/roomCash/components/bing/components/cashPay.vue b/src/pages/eashier/roomCash/components/bing/components/cashPay.vue new file mode 100644 index 0000000..c4f5b4d --- /dev/null +++ b/src/pages/eashier/roomCash/components/bing/components/cashPay.vue @@ -0,0 +1,81 @@ + + + + 待付金额:{{form.debtMoney}} + 现付:{{form.collectionCashAmount}} + + + + + + + {{row.payMoney}} + + + + + + + + + + diff --git a/src/pages/eashier/roomCash/components/bing/components/cashTotalMoney.vue b/src/pages/eashier/roomCash/components/bing/components/cashTotalMoney.vue new file mode 100644 index 0000000..5866684 --- /dev/null +++ b/src/pages/eashier/roomCash/components/bing/components/cashTotalMoney.vue @@ -0,0 +1,34 @@ + + + 现付: + + {{form.payMoney||money}} + 去结算 + + + + + diff --git a/src/pages/eashier/roomCash/components/bing/components/payItems.vue b/src/pages/eashier/roomCash/components/bing/components/payItems.vue new file mode 100644 index 0000000..17b153b --- /dev/null +++ b/src/pages/eashier/roomCash/components/bing/components/payItems.vue @@ -0,0 +1,227 @@ + + + + + + + + {{row.transactionPrice}} + + + + + + {{row.amount}} + + + + + {{row.noDiscount === 0 ? "是" : row.noDiscount === 1?'否':"未设"}} + + + + + + + + + + + + + + + + {{row.servicingTime}} + + + + + + + + + + + + + {{row.courseProjectName?row.courseProjectName:'点击选择'}} + + + + + + + + {{row.rechargeTypeName?`${row.rechargeTypeName}/折扣${row.discount}%`:'点击选择'}} + + + + + + + {{row.spendMoney}} + + + + + + + + + + + 应付: + {{form.amount}} + + + + + + + + diff --git a/src/pages/eashier/roomCash/components/bing/index.vue b/src/pages/eashier/roomCash/components/bing/index.vue index 5870112..22fff12 100644 --- a/src/pages/eashier/roomCash/components/bing/index.vue +++ b/src/pages/eashier/roomCash/components/bing/index.vue @@ -113,7 +113,7 @@ - + {{scope.row.rechargeTypeName ?(scope.row.rechargeTypeName + ' / 折扣'+scope.row.discount+'%'):'点击选择'}} @@ -717,6 +717,7 @@ export default { row.index = rowIndex; }, sumMoney() { + console.log(this.form.cashNumber); let amount = 0; let payMoney = 0; this.list.forEach((item) => { diff --git a/src/pages/eashier/roomCash/components/bing/index2.vue b/src/pages/eashier/roomCash/components/bing/index2.vue new file mode 100644 index 0000000..e6b6411 --- /dev/null +++ b/src/pages/eashier/roomCash/components/bing/index2.vue @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + diff --git a/src/pages/eashier/roomCash/components/room/index.vue b/src/pages/eashier/roomCash/components/room/index.vue index 926d245..7c6d4c3 100644 --- a/src/pages/eashier/roomCash/components/room/index.vue +++ b/src/pages/eashier/roomCash/components/room/index.vue @@ -298,6 +298,7 @@ export default { .catch(() => { }); }, openAll(item) { + console.log("showList", JSON.parse(JSON.stringify(item.showList))) this.$emit("roomData", item.showList); }, editRoom(item, number) { diff --git a/src/pages/eashier/roomCash/index.vue b/src/pages/eashier/roomCash/index.vue index d28200f..7733815 100644 --- a/src/pages/eashier/roomCash/index.vue +++ b/src/pages/eashier/roomCash/index.vue @@ -17,7 +17,7 @@