|
@@ -135,11 +135,10 @@
|
|
|
</span>
|
|
</span>
|
|
|
</a-table>
|
|
</a-table>
|
|
|
</div>
|
|
</div>
|
|
|
-
|
|
|
|
|
- <!-- <ces-order-message-modal
|
|
|
|
|
- ref="modalForm"
|
|
|
|
|
- @ok="modalFormOk"
|
|
|
|
|
- ></ces-order-message-modal> -->
|
|
|
|
|
|
|
+ <bill-room-info-modal
|
|
|
|
|
+ ref="ModalBillRoomInfo"
|
|
|
|
|
+ @ok="modalLockRoomFormOk"
|
|
|
|
|
+ ></bill-room-info-modal>
|
|
|
</a-card>
|
|
</a-card>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
@@ -147,13 +146,13 @@
|
|
|
import "@/assets/less/TableExpand.less";
|
|
import "@/assets/less/TableExpand.less";
|
|
|
import { mixinDevice } from "@/utils/mixin";
|
|
import { mixinDevice } from "@/utils/mixin";
|
|
|
import { JeecgListMixin } from "@/mixins/JeecgListMixin";
|
|
import { JeecgListMixin } from "@/mixins/JeecgListMixin";
|
|
|
-// import CesOrderMessageModal from "./modules/CesOrderMessageModal";
|
|
|
|
|
|
|
+import BillRoomInfoModal from "./modules/checkIn/BillRoomInfoModal.vue";
|
|
|
import { httpAction, postAction, getAction } from "@/api/manage";
|
|
import { httpAction, postAction, getAction } from "@/api/manage";
|
|
|
export default {
|
|
export default {
|
|
|
name: "CesOrderMessageList",
|
|
name: "CesOrderMessageList",
|
|
|
mixins: [JeecgListMixin, mixinDevice],
|
|
mixins: [JeecgListMixin, mixinDevice],
|
|
|
components: {
|
|
components: {
|
|
|
- // CesOrderMessageModal,
|
|
|
|
|
|
|
+ BillRoomInfoModal,
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -226,7 +225,7 @@ export default {
|
|
|
dataIndex: "createDate",
|
|
dataIndex: "createDate",
|
|
|
customRender: function (text, record) {
|
|
customRender: function (text, record) {
|
|
|
if (record.livingDayPrices && record.livingDayPrices.length > 0) {
|
|
if (record.livingDayPrices && record.livingDayPrices.length > 0) {
|
|
|
- return record.livingDayPrices[0].price
|
|
|
|
|
|
|
+ return record.livingDayPrices[0].price;
|
|
|
}
|
|
}
|
|
|
if (record.bookingDayPrices && record.bookingDayPrices.length > 0) {
|
|
if (record.bookingDayPrices && record.bookingDayPrices.length > 0) {
|
|
|
return record.bookingDayPrices[0].price;
|
|
return record.bookingDayPrices[0].price;
|
|
@@ -315,6 +314,10 @@ export default {
|
|
|
id: record.orderNo,
|
|
id: record.orderNo,
|
|
|
},
|
|
},
|
|
|
});
|
|
});
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.$refs.ModalBillRoomInfo.add(record.id, 1);
|
|
|
|
|
+ this.$refs.ModalBillRoomInfo.title = "账单";
|
|
|
|
|
+ this.$refs.ModalBillRoomInfo.disableSubmit = true;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|