diff --git a/src/api/order.js b/src/api/order.js index 5c322de..c83955d 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -372,3 +372,23 @@ export function rechargeInfoApi (data) { export function storeOrderApi (data) { return request.get(`delivery/station/code`, data) } + +/** + * @description 代发订单 -- 列表 + */ +export function behalfAdminOrderList (data) { + return request.get(`store/behalf_admin/order_list`, data) +} +/** + * @description 代发订单 -- 表头 + */ +export function behalfAdminChartApi () { + return request.get('store/behalf_admin/chart') +} + +/** + * @description 代发订单 -- 状态 + */ +export function behalfAdminStatus (data) { + return request.post(`store/behalf_admin/status`, data) +} \ No newline at end of file diff --git a/src/router/modules/order.js b/src/router/modules/order.js index 20a7565..3fabfe9 100644 --- a/src/router/modules/order.js +++ b/src/router/modules/order.js @@ -60,6 +60,21 @@ const orderRouter = title: '赊账订单' }, component: () => import('@/views/order/index_credit') + },{ + path: 'behalfList', + name: 'OrderBehalfList', + meta: { + title: '代发订单' + }, + component: () => import('@/views/order/order_list') + } + ,{ + path: 'streetbehalfList', + name: 'StreetOrderBehalfList', + meta: { + title: '代发订单' + }, + component: () => import('@/views/order/street_order_list') } ] } diff --git a/src/views/order/orderDetails.vue b/src/views/order/orderDetails.vue index 6835239..16d1275 100644 --- a/src/views/order/orderDetails.vue +++ b/src/views/order/orderDetails.vue @@ -32,13 +32,13 @@ @click="send" >发送货 - 小票打印 + > --> @@ -145,31 +145,31 @@
实际支付:
{{ orderDetailList.finalOrder ? (parseFloat(orderDetailList.finalOrder.pay_price) + parseFloat(orderDetailList.pay_price)) : orderDetailList.pay_price }}
-
  • +
  • 订单总价:
    {{ orderDetailList.total_price ? orderDetailList.total_price : '-' }}
  • -
  • +
  • 支付运费:
    {{ orderDetailList.pay_postage }}
  • -
  • + +
    diff --git a/src/views/order/orderDetailsBehalf.vue b/src/views/order/orderDetailsBehalf.vue new file mode 100644 index 0000000..6d1c13e --- /dev/null +++ b/src/views/order/orderDetailsBehalf.vue @@ -0,0 +1,744 @@ + + + diff --git a/src/views/order/order_list.vue b/src/views/order/order_list.vue new file mode 100644 index 0000000..633bb26 --- /dev/null +++ b/src/views/order/order_list.vue @@ -0,0 +1,2045 @@ + + + + + diff --git a/src/views/order/street_order_list.vue b/src/views/order/street_order_list.vue new file mode 100644 index 0000000..bb49a8c --- /dev/null +++ b/src/views/order/street_order_list.vue @@ -0,0 +1,1187 @@ + + + + +