diff --git a/src/api/system/refund.js b/src/api/system/refund.js index 5672ec9..271c762 100644 --- a/src/api/system/refund.js +++ b/src/api/system/refund.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询退款订单列表 +// 查询退款列表 export function listRefund(query) { return request({ url: '/system/refund/list', @@ -9,7 +9,7 @@ export function listRefund(query) { }) } -// 查询退款订单详细 +// 查询退款详细 export function getRefund(id) { return request({ url: '/system/refund/' + id, @@ -17,7 +17,7 @@ export function getRefund(id) { }) } -// 新增退款订单 +// 新增退款 export function addRefund(data) { return request({ url: '/system/refund', @@ -26,7 +26,7 @@ export function addRefund(data) { }) } -// 修改退款订单 +// 修改退款 export function updateRefund(data) { return request({ url: '/system/refund', @@ -35,7 +35,7 @@ export function updateRefund(data) { }) } -// 删除退款订单 +// 删除退款 export function delRefund(id) { return request({ url: '/system/refund/' + id, diff --git a/src/api/system/refund2.js b/src/api/system/refund2.js new file mode 100644 index 0000000..5672ec9 --- /dev/null +++ b/src/api/system/refund2.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询退款订单列表 +export function listRefund(query) { + return request({ + url: '/system/refund/list', + method: 'get', + params: query + }) +} + +// 查询退款订单详细 +export function getRefund(id) { + return request({ + url: '/system/refund/' + id, + method: 'get' + }) +} + +// 新增退款订单 +export function addRefund(data) { + return request({ + url: '/system/refund', + method: 'post', + data: data + }) +} + +// 修改退款订单 +export function updateRefund(data) { + return request({ + url: '/system/refund', + method: 'put', + data: data + }) +} + +// 删除退款订单 +export function delRefund(id) { + return request({ + url: '/system/refund/' + id, + method: 'delete' + }) +} diff --git a/src/main.js b/src/main.js index 12e5fb4..6b86711 100644 --- a/src/main.js +++ b/src/main.js @@ -39,6 +39,9 @@ import VueMeta from 'vue-meta' import DictData from '@/components/DictData' // 行内表单组件 import FormCol from '@/components/FormCol/index.vue' +// 过滤器 +import filter from "@/utils/filter"; +filter(Vue); // 全局方法挂载 Vue.prototype.getDicts = getDicts diff --git a/src/utils/filter.js b/src/utils/filter.js new file mode 100644 index 0000000..09eac52 --- /dev/null +++ b/src/utils/filter.js @@ -0,0 +1,30 @@ +const filters = { + // 金钱显示，保留两位小数 + money(num) { + return filters.fix2(num); + }, + // 缺省值 + defaultValue(data) { + return data == null ? '--' : data; + }, + fix2(num) { + if (num == null) { + return num; + } + return num.toFixed(2); + }, + fix10(num) { + if (num == null) { + return num; + } + return num.toFixed(10); + }, + dv(data) { + return filters.defaultValue(data); + } +} +export default (vm) => { + Object.keys(filters).forEach(key => { + vm.filter(key, filters[key]) + }) +} diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 67c022f..42e2e2d 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -73,48 +73,94 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + import { listOrder, getOrder, delOrder, addOrder, updateOrder } from "@/api/system/order"; +import { $showColumns } from '@/utils/mixins'; +import {parseTime} from "../../../utils/ruoyi"; +// 默认排序字段 +const defaultSort = { + prop: "createTime", + order: "descending" +} export default { name: "Order", + mixins: [$showColumns], dicts: ['ss_order_status', 'ss_pay_type', 'rl_distribution_mode', 'rl_rental_unit','ss_order_type','et_order_pay_status'], data() { return { + // 字段列表 + 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: '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: 'paid', 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: 'duration', 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}, + ], + // 排序方式 + orderSorts: ['ascending', 'descending', null], // 遮罩层 loading: true, // 选中数组 @@ -232,10 +305,13 @@ export default { title: "", // 是否显示弹出层 open: false, + defaultSort, // 查询参数 queryParams: { pageNum: 1, pageSize: 10, + orderByColumn: defaultSort.prop, + isAsc: defaultSort.order, orderNo: null, outTradeNo: null, userId: null, @@ -293,6 +369,18 @@ export default { this.getList(); }, methods: { + parseTime, + /** 当排序按钮被点击时触发 **/ + onSortChange(column) { + if (column.order == null) { + this.queryParams.orderByColumn = defaultSort.prop; + this.queryParams.isAsc = defaultSort.order; + } else { + this.queryParams.orderByColumn = column.prop; + this.queryParams.isAsc = column.order; + } + this.getList(); + }, /** 查询订单列表 */ getList() { this.loading = true; diff --git a/src/views/system/refund/index.vue b/src/views/system/refund/index.vue index 8f7b517..08b4a37 100644 --- a/src/views/system/refund/index.vue +++ b/src/views/system/refund/index.vue @@ -1,31 +1,6 @@