diff --git a/src/api/order.js b/src/api/order.js index 8c16833..ebcb61f 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -15,6 +15,18 @@ import request from './request' export function orderListApi(data) { return request.get('order/lst', data) } +/** + * @description 转账订单 -- 列表 + */ +export function orderOtherListApi(data) { + return request.get('order_other/lst', data) +} +/** + * @description 转账订单 -- 上传凭证 + */ +export function orderOtherPayOrder(data) { + return request.post('order_other/pay_order', data) +} /** * @description 订单 -- 表头 @@ -43,18 +55,31 @@ export function orderDeliveryApi(id) { return request.get(`store/order/delivery/${id}/form`) } + /** * @description 订单 -- 详情 */ export function orderDetailApi(id) { return request.get(`order/detail/${id}`) } +/** + * @description 订单 -- 详情 + */ +export function orderOtherDetailApi(id) { + return request.get(`order_other/detail/${id}`) +} /** * @description 订单 -- 记录 */ export function orderLogApi(id, data) { return request.get(`order/status/${id}`, data) } +/** + * @description 订单 -- 记录 + */ +export function orderOtherLogApi(id, data) { + return request.get(`order_other/status/${id}`, data) +} /** * @description 退款订单 -- 列表 */ @@ -67,6 +92,12 @@ export function refundorderListApi(data) { export function getChildrenOrderApi(id) { return request.get(`order/children/${id}`) } +/** + * @description 订单 -- 子订单 + */ +export function getChildrenOrderOtherApi(id) { + return request.get(`order_other/children/${id}`) +} /** * @description 获取物流信息 */ @@ -79,6 +110,12 @@ export function getExpress(id) { export function exportOrderApi(data) { return request.get(`order/excel`, data ) } +/** + * @description 导出订单 + */ +export function exportOrderOtherApi(data) { + return request.get(`order_other/excel`, data ) +} /** * @description 导出退款单 */ @@ -156,4 +193,4 @@ export function takeOrderListApi(data) { */ export function rechargeBalancei() { return request.get(`delivery/belence`) -} \ No newline at end of file +} diff --git a/src/api/public.js b/src/api/public.js new file mode 100644 index 0000000..ddb9d3f --- /dev/null +++ b/src/api/public.js @@ -0,0 +1,17 @@ +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- +import request from './request' +/** + * @description 上传图片 + */ +export function uploadImage(data) { + return request.post('upload/image/0/file', data) +} + diff --git a/src/router/modules/order.js b/src/router/modules/order.js index 741cadd..a73eb07 100644 --- a/src/router/modules/order.js +++ b/src/router/modules/order.js @@ -44,7 +44,15 @@ const orderRouter = title: '核销订单' }, component: () => import('@/views/order/orderCancellate/index') - } + }, + { + path: 'listTransfer', + name: 'listTransfer', + meta: { + title: '转账订单' + }, + component: () => import('@/views/order/listTransfer/index') + }, ] } diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue index 4e76abf..a7aedc0 100644 --- a/src/views/order/list/index.vue +++ b/src/views/order/list/index.vue @@ -494,7 +494,7 @@ export default { if (lebData.export.length) { data = data.concat(lebData.export) excelData.page++ - } + } } createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); return diff --git a/src/views/order/listTransfer/index.vue b/src/views/order/listTransfer/index.vue new file mode 100644 index 0000000..5e6a940 --- /dev/null +++ b/src/views/order/listTransfer/index.vue @@ -0,0 +1,732 @@ + + + + + diff --git a/src/views/order/listTransfer/orderDetails.vue b/src/views/order/listTransfer/orderDetails.vue new file mode 100644 index 0000000..28c22d9 --- /dev/null +++ b/src/views/order/listTransfer/orderDetails.vue @@ -0,0 +1,726 @@ + + +