diff --git a/bms-back/sql/monitor/order_source_menu.sql b/bms-back/sql/monitor/order_source_menu.sql index 86b3d795..9f2208e6 100644 --- a/bms-back/sql/monitor/order_source_menu.sql +++ b/bms-back/sql/monitor/order_source_menu.sql @@ -1,8 +1,28 @@ --- 订单数据源 under system monitor (parent_id = 2) +-- 订单数据源: under billing center (same parent as 计费试算), above quote SET NAMES utf8mb4; INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query, route_name, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark) -SELECT 2325, N'订单数据源', 2, 9, 'orderSource', 'monitor/orderSource/index', '', 'OrderSource', 1, 0, 'C', '0', '0', 'monitor:orderSource:list', 'list', 'admin', sysdate(), N'查询上游 Oracle TAB_ORDER,需客户+提货时间筛选' +SELECT 2325, N'订单数据源', q.parent_id, + CASE WHEN q.order_num > 1 THEN q.order_num - 1 ELSE 1 END, + 'orderSource', 'monitor/orderSource/index', '', 'OrderSource', 1, 0, 'C', '0', '0', + 'monitor:orderSource:list', 'list', 'admin', sysdate(), N'查询上游 Oracle TAB_ORDER,需客户+提货时间筛选;菜单在计费试算上方' + FROM ( + SELECT parent_id, order_num + FROM sys_menu + WHERE menu_type = 'C' + AND ( + component = 'price/billing/quote' + OR menu_name = N'计费试算' + OR perms = 'price:billing:quote' + ) + ORDER BY menu_id + LIMIT 1 + ) q + WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2325 OR perms = 'monitor:orderSource:list'); + +-- fallback: keep under system monitor if quote menu missing +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, query, route_name, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark) +SELECT 2325, N'订单数据源', 2, 9, 'orderSource', 'monitor/orderSource/index', '', 'OrderSource', 1, 0, 'C', '0', '0', 'monitor:orderSource:list', 'list', 'admin', sysdate(), N'查询上游 Oracle TAB_ORDER,需客户+提货时间筛选;菜单在计费试算上方' FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2325 OR perms = 'monitor:orderSource:list'); INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time) diff --git a/bms-back/sql/monitor/order_source_menu_move_to_billing.sql b/bms-back/sql/monitor/order_source_menu_move_to_billing.sql new file mode 100644 index 00000000..a1df0c7c --- /dev/null +++ b/bms-back/sql/monitor/order_source_menu_move_to_billing.sql @@ -0,0 +1,32 @@ +-- Move 订单数据源 under billing center, above 计费试算 +SET NAMES utf8mb4; + +SELECT @quote_parent := parent_id, @quote_order := order_num + FROM sys_menu + WHERE menu_type = 'C' + AND ( + component = 'price/billing/quote' + OR menu_name = N'计费试算' + OR perms = 'price:billing:quote' + ) + ORDER BY menu_id + LIMIT 1; + +-- If quote menu exists: shift siblings then move order-source menu +UPDATE sys_menu + SET order_num = order_num + 1 + WHERE @quote_parent IS NOT NULL + AND parent_id = @quote_parent + AND order_num >= @quote_order + AND menu_id <> 2325 + AND NOT (perms = 'monitor:orderSource:list' AND menu_type = 'C'); + +UPDATE sys_menu + SET parent_id = @quote_parent, + order_num = @quote_order, + path = 'orderSource', + component = 'monitor/orderSource/index', + route_name = 'OrderSource', + update_time = sysdate() + WHERE @quote_parent IS NOT NULL + AND (menu_id = 2325 OR (perms = 'monitor:orderSource:list' AND menu_type = 'C')); diff --git a/bms-front/src/views/price/billing/bill.vue b/bms-front/src/views/price/billing/bill.vue index 575f54ae..83aaa164 100644 --- a/bms-front/src/views/price/billing/bill.vue +++ b/bms-front/src/views/price/billing/bill.vue @@ -166,7 +166,7 @@ const columns = [ { label: '计价来源', prop: 'matchSource', align: 'center', width: 130, slot: 'matchSource' }, { label: '客户状态', prop: 'customerActiveStatus', align: 'center', width: 100, slot: 'customerActiveStatus' }, { label: '额度欠费', prop: 'creditArrearsStatus', align: 'center', width: 100, slot: 'creditArrearsStatus' }, - { label: '退费状态', prop: 'refundStatus', align: 'center', width: 100, slot: 'refundStatus' }, + // { label: '退费状态', prop: 'refundStatus', align: 'center', width: 100, slot: 'refundStatus' }, { label: '计费时间', prop: 'bizDate', align: 'center', width: 170, parseTime: true }, { label: '下单时间', prop: 'orderTime', align: 'center', width: 170, parseTime: true }, { label: '销售员', prop: 'belongSaler', minWidth: 100, showOverflowTooltip: true }, @@ -198,14 +198,6 @@ const searchColumns = [ placeholder: '请选择', props: { clearable: true } }, - { - label: '退费状态', - prop: 'refundStatus', - component: 'select', - options: refundStatusOptions, - placeholder: '请选择', - props: { clearable: true } - }, { label: '计费时间', prop: 'bizDateRange',