Commit Graph

57 Commits

Author SHA1 Message Date
haozq 463dfdc5ce 修改结算逻辑 2026-01-22 17:45:16 +08:00
haozq 88218faa48 提交 2026-01-22 17:37:26 +08:00
马三炮 693bbe6610 领料明细导出合并同一天同一型号机具数据 2026-01-22 15:54:28 +08:00
马三炮 eb6d66c279 领料明细导出合并同一天同一型号机具数据 2026-01-22 15:24:01 +08:00
马三炮 4065a867a4 结算导出领退料明细 2026-01-22 10:36:44 +08:00
haozq 2307a79659 修改日期 2026-01-20 11:32:41 +08:00
syruan 38a49ad0a8 首页导航条修改 2026-01-04 17:02:46 +08:00
syruan 5d90547613 Merge remote-tracking branch 'origin/main' 2026-01-04 16:35:34 +08:00
syruan ad018c85e5 机具库存收藏修改 2026-01-04 16:31:41 +08:00
syruan e529b47b36 机具库存收藏修改 2026-01-04 16:30:10 +08:00
syruan 6bd057512e 机具库存收藏修改 2026-01-04 16:29:38 +08:00
syruan b88e206f1a 机具库存收藏修改 2026-01-04 16:28:21 +08:00
syruan de9cb9ea53 机具库存收藏修改 2026-01-04 16:26:36 +08:00
syruan fb1cbfcc37 分页组件重构、新类型管理模块上线、BootStarp表格斑马线去除 2026-01-04 16:01:38 +08:00
hayu f80d4148b9 机具领料导入 2026-01-04 15:30:01 +08:00
hayu 8fa6e994f0 机具领料模版下载与导入 2025-12-30 13:48:42 +08:00
hayu 5a513f49d1 修改 2025-12-16 11:27:15 +08:00
hayu 9c92ac8f79 机具库存收藏修改 2025-12-04 16:29:26 +08:00
hayu 1c784481c0 代办任务状态选择后自动查询 2025-12-04 10:40:54 +08:00
hayu 4f9471db51 领料单样式 2025-12-04 10:02:50 +08:00
hayu 9934b4b340 新购流程查看 2025-12-04 08:55:46 +08:00
jiang eecbff5ae2 机具库存收藏修改 2025-12-03 20:33:27 +08:00
jiang 79c3b3124d 机具库存收藏修改 2025-12-03 20:26:41 +08:00
jiang 5d6389bf3f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	resources/mybatis/bm/ProjectManageMapper.xml
#	resources/mybatis/scrap/ScrapTaskRecordMapper.xml
#	src/com/bonus/bm/controller/ProjectManageController.java
#	src/com/bonus/bm/dao/ProjectManageDao.java
#	src/com/bonus/bm/service/ProjectManageService.java
2025-12-03 20:12:21 +08:00
jiang e767b6182c 机具库存收藏修改 2025-12-03 20:11:16 +08:00
hayu 448f0e9e96 修改 2025-12-03 20:05:26 +08:00
syruan c8f7e94c8e 优化Excel导出功能,增加费用汇总区域及金额转换为中文大写 2025-12-03 19:53:45 +08:00
jiang 037c8e3e69 机具库存收藏修改 2025-12-03 19:52:59 +08:00
syruan 3bdf7bdc12 结算单打印签字区域对其调整 2025-12-03 13:08:53 +08:00
hayu c97b87be10 修改 2025-12-02 16:14:14 +08:00
syruan bc847087d8 修改 2025-12-02 14:36:00 +08:00
syruan 72944b90ce 结算修改 2025-12-02 14:32:24 +08:00
jiang 7621de57f3 机具库存收藏修改 2025-09-15 10:22:01 +08:00
syruan 1e3b66e9e6 增加APP维修关键字搜索 2025-07-18 09:43:57 +08:00
syruan 0e8708343c 待办移动端适配-增加全选批量 2025-07-16 21:59:25 +08:00
syruan fe7722020d 增加待办移动端适配-优化sql判断 2025-07-16 21:20:59 +08:00
syruan 271569ba6e 增加待办移动端适配 2025-07-16 18:26:36 +08:00
jiang 8922b69069 机具库存收藏修改 2025-07-16 18:17:38 +08:00
hayu 7ccc77c2f7 修改 2025-07-16 14:45:35 +08:00
jiang c9f34ad08f 机具库存收藏修改 2025-07-16 14:31:33 +08:00
jiang 418a217700 Merge remote-tracking branch 'origin/main' 2025-07-16 14:19:47 +08:00
syruan 41086c1353 修复登陆弹窗多次触发问题 2025-07-15 18:16:08 +08:00
jiang d0f891bb6b 机具库存收藏修改 2025-07-15 14:06:37 +08:00
hayu 8d6a68ee8e 功能修改 2025-07-14 18:42:16 +08:00
hayu f4bd00b4fb 问题优化 2025-07-10 18:54:12 +08:00
syruan 06eeeb01c7 Merge remote-tracking branch 'coding/main' into 0620 2025-07-10 18:01:17 +08:00
syruan a79edd5765 feat(login): 重构登录页面并添加新功能
- 重新设计了登录页面的布局和样式,增加了更多视觉元素
- 添加了记住密码功能,支持本地存储用户名和密码
- 实现了表单实时验证和错误提示
- 增加了用户协议弹窗和登录中动画效果
- 优化了键盘导航,支持Tab键在表单元素间切换- 调整了首页导航
2025-07-10 18:01:14 +08:00
jiang 61c2a74d6f 机具库存收藏修改 2025-07-10 18:00:11 +08:00
jiang 2153fab6b4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	WebContent/WEB-INF/views/rm/UnFinishContentList.jsp
2025-07-10 17:59:30 +08:00
jiang 773248c9a3 机具库存收藏修改 2025-07-10 17:58:32 +08:00