DeXun/erp-next
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 完成履约管理模块全量功能迭代

Browse Source 
本次迭代包含以下核心功能：
1. 新增履约时效总览可视化页面，支持多维度数据统计
2. 实现物料/客户/供应商的Excel批量导入导出功能
3. 新增订单批量结单功能，优化结单流程校验
4. 完善日志配置，新增文件日志落地
5. 修复分类查询逻辑，优化多租户数据隔离
6. 新增甲方履约结单管理页面与权限控制
7. 重构部分Mapper与Service接口，增强代码健壮性
This commit is contained in:
王文昊
2026-06-18 11:10:36 +08:00
parent 7a8e4297e0
commit 7b71822a32
37 changed files with 1759 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/fix_menu_client_close_date.sql Normal file
View File

@@ -0,0 +1,17 @@
-- ═══════════════════════════════════════════════════════════
-- 甲方履约 - 结单时间管理 菜单与权限
-- ═══════════════════════════════════════════════════════════
SET NAMES utf8mb4;
-- 1. 创建菜单
INSERT IGNORE 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)
VALUES(2044, '甲方结单管理', 2040, 4, 'closeDate', 'bid/clientDelivery/closeDate', 1, 0, 'C', '0', '0', 'bid:clientdelivery:closeDate', 'date', 'admin', NOW());
-- 2. 给 admin 角色授权
INSERT IGNORE INTO sys_role_menu(role_id, menu_id) VALUES(1, 2044);
-- 3. 按钮权限
INSERT IGNORE INTO sys_menu(menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time)
SELECT '结单确认', menu_id, 1, '#', NULL, 1, 0, 'F', '0', '0', 'bid:clientdelivery:closeDate:edit', '#', 'admin', NOW()
FROM sys_menu WHERE perms = 'bid:clientdelivery:closeDate' AND menu_id = 2044;

42
sql/fix_menu_import.sql Normal file
View File

@@ -0,0 +1,42 @@
-- ═══════════════════════════════════════════════════════════
-- Excel 批量导入功能 - 权限菜单初始化
-- 物料/客户/供应商 三模块的导入导出按钮权限
-- ═══════════════════════════════════════════════════════════
SET NAMES utf8mb4;
-- 清理可能存在的旧数据
DELETE FROM sys_role_menu WHERE menu_id IN (2140, 2141, 2142, 2143, 2144, 2145);
DELETE FROM sys_menu WHERE menu_id IN (2140, 2141, 2142, 2143, 2144, 2145);
-- 1. 物料导入按钮 (parent=2001 物料管理)
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)
VALUES(2140, UNHEX('E789A9E69699E5AFBCE585A5'), 2001, 7, '', NULL, 1, 0, 'F', '0', '0', 'bid:material:import', '#', 'admin', NOW());
-- 2. 物料导出按钮
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)
VALUES(2141, UNHEX('E789A9E69699E5AFBCE587BA'), 2001, 8, '', NULL, 1, 0, 'F', '0', '0', 'bid:material:export', '#', 'admin', NOW());
-- 3. 客户导入按钮 (parent=2028 甲方客户管理)
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)
VALUES(2142, UNHEX('E5AEA2E688B7E5AFBCE585A5'), 2028, 10, '', NULL, 1, 0, 'F', '0', '0', 'bid:client:import', '#', 'admin', NOW());
-- 4. 客户导出按钮
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)
VALUES(2143, UNHEX('E5AEA2E688B7E5AFBCE587BA'), 2028, 11, '', NULL, 1, 0, 'F', '0', '0', 'bid:client:export', '#', 'admin', NOW());
-- 5. 供应商导入按钮 (parent=2002 供应商管理)
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)
VALUES(2144, UNHEX('E4BE9BE5BA94E59586E5AFBCE585A5'), 2002, 7, '', NULL, 1, 0, 'F', '0', '0', 'bid:supplier:import', '#', 'admin', NOW());
-- 6. 供应商导出按钮
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)
VALUES(2145, UNHEX('E4BE9BE5BA94E59586E5AFBCE587BA'), 2002, 8, '', NULL, 1, 0, 'F', '0', '0', 'bid:supplier:export', '#', 'admin', NOW());
-- 7. 给 admin 角色授权
INSERT INTO sys_role_menu(role_id, menu_id) VALUES(1, 2140);
INSERT INTO sys_role_menu(role_id, menu_id) VALUES(1, 2141);
INSERT INTO sys_role_menu(role_id, menu_id) VALUES(1, 2142);
INSERT INTO sys_role_menu(role_id, menu_id) VALUES(1, 2143);
INSERT INTO sys_role_menu(role_id, menu_id) VALUES(1, 2144);
INSERT INTO sys_role_menu(role_id, menu_id) VALUES(1, 2145);

17
sql/fix_menu_timeline.sql Normal file
View File

@@ -0,0 +1,17 @@
-- ═══════════════════════════════════════════════════════════
-- 履约时效总览 菜单（同时覆盖供应商履约和甲方履约的甘特图）
-- 挂在订单履约(2120)下，与供应商履约、甲方履约同级
-- ═══════════════════════════════════════════════════════════
SET NAMES utf8mb4;
-- 1. 删除旧的子菜单（2122挂在2121下，2123挂在2040下）
DELETE FROM sys_role_menu WHERE menu_id IN (2122, 2123);
DELETE FROM sys_menu WHERE menu_id IN (2122, 2123);
-- 2. 新增统一菜单，挂在订单履约(2120)下，排序3
INSERT IGNORE 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)
VALUES(2124, '履约时效总览', 2120, 3, 'timeline', 'bid/order/timeline', 1, 0, 'C', '0', '0', 'bid:order:timeline', 'chart', 'admin', NOW());
-- 3. 给 admin 角色授权
INSERT IGNORE INTO sys_role_menu(role_id, menu_id) VALUES(1, 2124);