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 @@ + + + + + + + + + 代发订单 + + 订单编号:{{ orderDetailList.order_sn }} + + + + 订单核销 + 发送货 + + + + + 订单备注 + 修改发货信息 + + + + + + + 订单状态 + + 待付款 + + {{ orderDetailList.status | orderStatusFilter }} + + + {{ orderDetailList.status | cancelOrderStatusFilter }} + + + + + 实际支付 + ¥ {{ orderDetailList.procure_price }} + + + 创建时间 + {{ orderDetailList.create_time }} + + + + + + + 用户信息 + + + 用户昵称: + + {{ + orderDetailList.user.real_name ? orderDetailList.user.real_name : orderDetailList.user.nickname + }} + + + + 用户ID: + {{ orderDetailList.user.uid ? orderDetailList.user.uid : '-' }} + + + 绑定电话: + {{ orderDetailList.user.phone ? orderDetailList.user.phone : '-' }} + + + + + 收货信息 + + + 收货人: + {{ orderDetailList.real_name ? orderDetailList.real_name : '-' }} + + + 收货电话: + {{ orderDetailList.user_phone ? orderDetailList.user_phone : '-' }} + + + 收货地址: + {{ orderDetailList.user_address ? orderDetailList.user_address : '-' }} + + + + + + 订单信息 + + + 创建时间: + {{ orderDetailList.create_time ? orderDetailList.create_time : '-' }} + + + 商品总数: + {{ orderDetailList.total_num ? orderDetailList.total_num : '-' }} + + + 实际支付: + + + + + + 积分抵扣: + 使用了{{ orderDetailList.integral }}个积分,抵扣了{{ orderDetailList.integral_price }}元 + + + 订单总价: + {{ orderDetailList.procure_price ? orderDetailList.procure_price : '-' }} + + + + 支付运费: + {{ orderDetailList.pay_postage }} + + + + + + 商家备注 + + + {{ orderDetailList.remark ? orderDetailList.remark : '-' }} + + + + + 物流信息 + + + 快递公司: + {{ orderDetailList.delivery_name ? orderDetailList.delivery_name : '-' }} + + + 快递单号: + {{ orderDetailList.delivery_id ? orderDetailList.delivery_id : '-' }} + 物流查询 + + + + + + + + + + + + + + + {{ scope.row.cart_info.product.store_name }} + + 规格:{{ + scope.row.cart_info.productAttr.sku ? scope.row.cart_info.productAttr.sku : '默认' + }} + + + + + + + + + + + {{ scope.row.cart_info.productAttr.procure_price ? scope.row.cart_info.productAttr.procure_price : '-' }} + + + + + + + + + {{ scope.row.product_num }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.order_sn }} + + + + + {{ scope.row.change_message }} + + + + + + {{ operationType(scope.row.user_type) }} + + + + + + + {{ scope.row.nickname }} + + + + + + + {{ scope.row.change_time }} + + + + + + + + + + + + + {{ scope.row.order_sn }} + + + + + + + + + {{ val.cart_info.product.store_name + ' | ' }}{{ val.cart_info.productAttr.sku }} + + {{ '¥'+ val.cart_info.productAttr.price + ' x '+ val.product_num }} + (-{{ val.product_num - val.refund_num }}) + + + + + + + {{ scope.row.pay_price }} + + + + + + 详情 + + + + + + + + + + + + 物流公司:{{ orderDetailList.delivery_name }} + 物流单号:{{ orderDetailList.delivery_id }} + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + 全部 + 待发货 + 待收货 + 交易完成 + + + + + + {{ item.text }} + + + + + + + + + + + + + + + + + + + + + + 列表导出 + + + 导出订单 + 导出发货单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ props.row.total_price | filterEmpty }} + + + {{ props.row.create_time }} + + + {{ + props.row.mark | filterEmpty + }} + + + {{ props.row.remark | filterEmpty }} + + + + + + + + + 选中本页 + 选中全部 + + + + + + changeOne(v, scope.row)" + /> + + + + + + 用户已删除 + + + + + + + + + + {{ val.cart_info.product.store_name + " | " + }}{{ val.cart_info.productAttr.sku }} + + + + + + + + + + + + {{ scope.row.order_extend.commission_rate }} + + - + + + + + + + {{ (scope.row.pay_price - scope.row.order_extend.commission_rate).toFixed(2) }} + + {{scope.row.pay_price}} + + + + + + + + + + + 待付款 + + {{ scope.row.status | orderStatusFilter }} + {{ + scope.row.status | takeOrderStatusFilter + }} + + + 已删除 + + + + + + + 查看退款单 + 编辑 + 发送货 + 订单详情 + 删除 + 去核销 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ formValidate.coupon_price }} + + + {{ formValidate.pay_price }} + + + + 确定 + + + + + + + {{ original.delivery_name }} + + + {{ original.delivery_id }} + + + + + + + 自己配送 + + + + + + + + + + + + + + + + + + + + + + + + + + + 预览 + + + + + + + + + + + + + + + + + + + + 可选择表格中的商品单独发货,发货后会生成新的订单且不能撤回,请谨慎操作! + + + + + + + + + + + + {{ + scope.row.cart_info.product.store_name + }} + + + + + + {{ + scope.row.cart_info.productAttr.sku + }} + + + + + {{ + scope.row.cart_info.productAttr.price + }} + + + + + {{ scope.row.stock_num }} + + + + + + + + + + + + + + + + + + + + + + + + 取 消 + 提交 + + + + + + + + + + + + + + + + + + + + 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 @@ + + + + + + + + + + 全部 + 待发货 + 待收货 + 交易完成 + + + + + + {{ item.text }} + + + + + + + + + + + + + + + + + + + + + + 列表导出 + + + 导出订单 + 导出发货单 + + + + + + + + + + + + + + + + + + + + + + + + + {{ props.row.total_price | filterEmpty }} + + + {{ props.row.create_time }} + + + {{ + props.row.mark | filterEmpty + }} + + + {{ props.row.remark | filterEmpty }} + + + + + + + + + 选中本页 + 选中全部 + + + + + + changeOne(v, scope.row)" + /> + + + + + + 用户已删除 + + + + + + + + + + {{ val.cart_info.product.store_name + " | " + }}{{ val.cart_info.productAttr.sku }} + + + + + + + + + + + + 待付款 + + {{ scope.row.status | orderStatusFilter }} + {{ + scope.row.status | takeOrderStatusFilter + }} + + + 已删除 + + + + + + + 确认收货 + + + + + + + + + + + + + + +
+ 可选择表格中的商品单独发货,发货后会生成新的订单且不能撤回,请谨慎操作! +