From 308d3989cfdc8609e8efcce7c01d2461214ef208 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Thu, 27 Mar 2025 17:31:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=B8=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/svg/cardOrder.svg | 1 + src/views/system/cardOrder/index.vue | 150 ++++++++++++++++---------- src/views/system/getRecords/index.vue | 59 +++++++++- 3 files changed, 148 insertions(+), 62 deletions(-) create mode 100644 src/assets/icons/svg/cardOrder.svg diff --git a/src/assets/icons/svg/cardOrder.svg b/src/assets/icons/svg/cardOrder.svg new file mode 100644 index 0000000..2842a6d --- /dev/null +++ b/src/assets/icons/svg/cardOrder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/system/cardOrder/index.vue b/src/views/system/cardOrder/index.vue index 01ce326..28ea8fa 100644 --- a/src/views/system/cardOrder/index.vue +++ b/src/views/system/cardOrder/index.vue @@ -25,14 +25,6 @@ @keyup.enter.native="handleQuery" /> - - - - - - 搜索 重置 @@ -103,30 +87,55 @@ + + + + + + + + + + - - - - - - - - - - - - - - - - - - { + console.error('路由跳转错误:', err); // 添加错误日志 + this.$modal.msgError("页面跳转失败"); + }); + }, /** 当排序按钮被点击时触发 **/ onSortChange(column) { if (column.order == null) { @@ -515,3 +539,15 @@ export default { } }; + + diff --git a/src/views/system/getRecords/index.vue b/src/views/system/getRecords/index.vue index 6f33122..ab054d3 100644 --- a/src/views/system/getRecords/index.vue +++ b/src/views/system/getRecords/index.vue @@ -78,9 +78,37 @@ + + + + + + + @@ -172,19 +200,26 @@ const defaultSort = { export default { name: "GetRecords", mixins: [$showColumns], - dicts: ['ss_card_get_method', 'ss_card_status'], + dicts: ['ss_card_get_method', 'ss_card_status','ss_card_type','ss_platform_type'], data() { return { // 字段列表 columns: [ {key: 'recordId', visible: true, label: '记录ID', 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: 'userName', visible: true, label: '领取人', minWidth: "120", sortable: true, overflow: false, align: 'center', width: null}, {key: 'cardName', visible: true, label: '卡券', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, - {key: 'receiveTime', visible: true, label: '领取时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + {key: 'receiveTime', visible: true, label: '领取时间', minWidth: "150", sortable: false, overflow: false, align: 'center', width: null}, {key: 'getMethod', 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: 'startTime', visible: true, label: '开始使用时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, - {key: 'endTime', visible: true, label: '结束使用时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null}, + {key: 'startTime', visible: true, label: '使用时间', minWidth: "260", sortable: false, overflow: false, align: 'center', width: null}, + // {key: 'endTime', visible: true, label: '结束使用时间', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + {key: 'storedAmount', visible: true, label: '剩余/已用金额', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + {key: 'remainingTimes', visible: true, label: '剩余/已用次数', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + {key: 'remainingHours', visible: true, label: '剩余/已用小时', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + // {key: 'usedAmount', visible: true, label: '已使用金额', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + // {key: 'usedTimes', visible: true, label: '已使用次数', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, + // {key: 'usedHours', visible: true, label: '已使用小时', minWidth: "120", sortable: false, overflow: false, align: 'center', width: null}, ], // 排序方式 orderSorts: ['ascending', 'descending', null], @@ -244,6 +279,20 @@ export default { this.getList(); }, methods: { + /** 查看商户详情 */ + merchantDetail(row) { + if (!row.userId) { + this.$modal.msgError("商户ID不能为空"); + return; + } + console.log('跳转到商户详情，ID:', row.userId); // 添加日志 + this.$router.push({ + path: `/user/detail/${row.userId}` + }).catch(err => { + console.error('路由跳转错误:', err); // 添加错误日志 + this.$modal.msgError("页面跳转失败"); + }); + }, /** 当排序按钮被点击时触发 **/ onSortChange(column) { if (column.order == null) {