diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizDeliveryOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizDeliveryOrderController.java index 6779c232..807a0c87 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizDeliveryOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BizDeliveryOrderController.java @@ -109,4 +109,10 @@ public class BizDeliveryOrderController extends BaseController { public AjaxResult transitStats() { return success(service.selectTransitStats()); } + + @PreAuthorize("@ss.hasPermi('bid:order:history')") + @GetMapping("/history/stats") + public AjaxResult historyStats() { + return success(service.selectHistoryStats()); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/bid/BizDeliveryOrderMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/bid/BizDeliveryOrderMapper.java index 9161a225..aae1a1d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/bid/BizDeliveryOrderMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/bid/BizDeliveryOrderMapper.java @@ -26,4 +26,6 @@ public interface BizDeliveryOrderMapper { // 在途统计 Map selectTransitStats(); + // 历史统计 + Map selectHistoryStats(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/IBizDeliveryOrderService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/IBizDeliveryOrderService.java index 1b3d89b2..b16cd732 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/IBizDeliveryOrderService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/IBizDeliveryOrderService.java @@ -23,4 +23,6 @@ public interface IBizDeliveryOrderService { // 在途统计 Map selectTransitStats(); + // 历史统计 + Map selectHistoryStats(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java index 2659f2d3..39cfa070 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/bid/impl/BizDeliveryOrderServiceImpl.java @@ -145,4 +145,9 @@ public class BizDeliveryOrderServiceImpl implements IBizDeliveryOrderService { public Map selectTransitStats() { return mapper.selectTransitStats(); } + + @Override + public Map selectHistoryStats() { + return mapper.selectHistoryStats(); + } } diff --git a/ruoyi-system/src/main/resources/mapper/bid/BizDeliveryOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BizDeliveryOrderMapper.xml index 74c216c3..d0085537 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BizDeliveryOrderMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BizDeliveryOrderMapper.xml @@ -78,6 +78,16 @@ WHERE delivery_status = 'transit' + + DELETE FROM biz_delivery_order WHERE do_id=#{id} diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index c2944d80..8e24596e 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -212,6 +212,17 @@ export const dynamicRoutes = [ meta: { title: '在途订单', activeMenu: '/bid/order' } }] }, + { + path: '/bid/order/history', + component: Layout, + permissions: ['bid:order:history'], + children: [{ + path: '', + component: () => import('@/views/bid/order/history'), + name: 'OrderHistory', + meta: { title: '历史订单', activeMenu: '/bid/order' } + }] + }, { path: '/bid/comparison/detail', diff --git a/ruoyi-ui/src/views/bid/order/history.vue b/ruoyi-ui/src/views/bid/order/history.vue new file mode 100644 index 00000000..54e4d463 --- /dev/null +++ b/ruoyi-ui/src/views/bid/order/history.vue @@ -0,0 +1,282 @@ + + + + +