From 28cba33af0194dbe3ef4fb5ee3a7c10167b54ffe Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Tue, 7 Jan 2025 21:27:57 +0800 Subject: [PATCH] 111 --- src/api/system/equipment.js | 8 +- src/api/system/refund.js | 4 +- .../system/order/components/RefundDialog.vue | 87 ++++++++++++++ src/views/system/order/index.vue | 106 ++++++++++------- src/views/system/room/index.vue | 107 ++++++++++++++++-- 5 files changed, 251 insertions(+), 61 deletions(-) create mode 100644 src/views/system/order/components/RefundDialog.vue diff --git a/src/api/system/equipment.js b/src/api/system/equipment.js index 16caed8..2f86d7a 100644 --- a/src/api/system/equipment.js +++ b/src/api/system/equipment.js @@ -12,7 +12,7 @@ export function listEquipment(query) { // 查询设施详细 export function getEquipment(equipmentId) { return request({ - url: '/system/hallEqu/' + equipmentId, + url: '/system/room/' + equipmentId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getEquipment(equipmentId) { // 新增设施 export function addEquipment(data) { return request({ - url: '/system/hallEqu', + url: '/system/room', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addEquipment(data) { // 修改设施 export function updateEquipment(data) { return request({ - url: '/system/hallEqu', + url: '/system/room', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateEquipment(data) { // 删除设施 export function delEquipment(equipmentId) { return request({ - url: '/system/hallEqu/' + equipmentId, + url: '/system/room/' + equipmentId, method: 'delete' }) } diff --git a/src/api/system/refund.js b/src/api/system/refund.js index 271c762..c58e64e 100644 --- a/src/api/system/refund.js +++ b/src/api/system/refund.js @@ -17,8 +17,8 @@ export function getRefund(id) { }) } -// 新增退款 -export function addRefund(data) { +// 退款 +export function refund(data) { return request({ url: '/system/refund', method: 'post', diff --git a/src/views/system/order/components/RefundDialog.vue b/src/views/system/order/components/RefundDialog.vue new file mode 100644 index 0000000..6196f2a --- /dev/null +++ b/src/views/system/order/components/RefundDialog.vue @@ -0,0 +1,87 @@ + + + diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 42e2e2d..cc5d38c 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -118,49 +118,32 @@ + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 取 消 + + + @@ -256,6 +242,7 @@ import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order"; import { $showColumns } from '@/utils/mixins'; import {parseTime} from "../../../utils/ruoyi"; +import RefundDialog from "@/views/system/order/components/RefundDialog.vue"; // 默认排序字段 const defaultSort = { @@ -265,6 +252,7 @@ const defaultSort = { export default { name: "Order", mixins: [$showColumns], + components: { RefundDialog}, dicts: ['ss_order_status', 'ss_pay_type', 'rl_distribution_mode', 'rl_rental_unit','ss_order_type','et_order_pay_status'], data() { return { @@ -272,19 +260,28 @@ export default { columns: [ {key: 'orderNo', visible: true, label: '订单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'userName', visible: true, label: '用户', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'storeName', visible: true, label: '店铺', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'room', visible: true, label: '房间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'equ', visible: true, label: '设施', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'outTradeNo', visible: true, label: '支付单号', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'payTime', visible: true, label: '支付时间', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'payType', visible: true, label: '支付方式', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'payId', visible: true, label: '支付id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'paid', visible: true, label: '支付状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'channelName', visible: true, label: '支付渠道', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'totalFee', visible: true, label: '订单总金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'payFee', visible: true, label: '实际支付金额', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'refund', visible: true, label: '退款', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'duration', visible: true, label: '订单时长', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'time', visible: true, label: '预约时间()', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'rule', visible: true, label: '套餐', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'handlingCharge', visible: true, label: '手续费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'platformServiceFee', visible: true, label: '服务费', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'channelName', visible: true, label: '支付渠道', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, ], + row: {}, + showRefund: false, // 排序方式 orderSorts: ['ascending', 'descending', null], // 遮罩层 @@ -369,6 +366,29 @@ export default { this.getList(); }, methods: { + handleClose(row) { + this.$confirm(`确定结束订单【${row.billNo}】吗？`, { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + // closeBill({billId: row.billId, totalEle: null}).then(res => { + // if (res.code === 200) { + // this.$message.success("操作成功"); + // this.getList(); + // } + // }) + }) + }, + // 查看详情 + handleView(row) { + this.$router.push(`/system/order/${row.orderId}`) + }, + // 处理退款 + handleRefund(row) { + this.row = row; + this.showRefund = true; + }, parseTime, /** 当排序按钮被点击时触发 **/ onSortChange(column) { diff --git a/src/views/system/room/index.vue b/src/views/system/room/index.vue index f81b3f3..387f91d 100644 --- a/src/views/system/room/index.vue +++ b/src/views/system/room/index.vue @@ -20,7 +20,7 @@ - + + @@ -121,6 +124,11 @@ + @@ -185,7 +193,12 @@ - + - - - +
确 定 @@ -220,16 +231,17 @@ const defaultSort = { export default { name: "Room", mixins: [$showColumns], - dicts: ['ss_room_type', 'ss_room_status','ss_room_tags'], + dicts: ['ss_room_type', 'ss_room_type2', 'ss_room_status','ss_room_tags'], data() { return { // 字段列表 columns: [ + {key: 'storeName', visible: true, label: '店铺', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'roomId', visible: true, label: '房间id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'roomName', visible: true, label: '房间名', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'storeName', visible: true, label: '店铺', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'feeRules', visible: true, label: '套餐', minWidth: null, sortable: false, overflow: true, align: 'center', width: null}, {key: 'tags', visible: true, label: '标签', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, {key: 'status', visible: true, label: '状态', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, ], @@ -264,9 +276,10 @@ export default { roomName: null, storeName: null, storeId: null, - type: null, + type: undefined, + type2: "1", picture: null, - tags: null, + tags: [], specification: null, status: null, }, @@ -283,6 +296,9 @@ export default { type: [ { required: true, message: "类型不能为空", trigger: "blur" } ], + // type2: [ + // { required: true, message: "类型2不能为空", trigger: "blur" } + // ], tags: [ { required: true, message: "标签不能为空", trigger: "change" } ], @@ -331,8 +347,9 @@ export default { roomName: undefined, storeId: undefined, type: undefined, + type2: undefined, picture: undefined, - tags: undefined, + tags: [], specification: undefined }; this.resetForm("form"); @@ -340,11 +357,16 @@ export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; + if (Array.isArray(this.queryParams.tags) && this.queryParams.tags.length > 0) { + this.queryParams.tags = this.queryParams.tags.join(','); + } this.getList(); }, /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.queryParams.type = undefined; + this.queryParams.tags = []; this.handleQuery(); }, // 多选框选中数据 @@ -404,7 +426,68 @@ export default { this.download('system/room/export', { ...this.queryParams }, `room_${new Date().getTime()}.xlsx`) - } + }, + /** 获取套餐说明文字 */ + getFeeRulesExplain(feeRules) { + if (!feeRules || !Array.isArray(feeRules)) { + return '-'; + } + return feeRules.map(rule => rule.explain).filter(Boolean).join('，'); + }, } }; + +