Commit Graph

309 Commits

Author SHA1 Message Date
hongchao 482d0052a3 减免费用 2025-02-15 17:00:43 +08:00
bb_pan 3b3d7f7c49 机械化设备标准配置管理 2025-02-15 16:52:13 +08:00
hongchao 83825b59a1 报废审核台账 2025-02-14 15:17:53 +08:00
hongchao 0d70716f45 减免费用 2025-02-14 13:16:52 +08:00
hongchao 54c4bad8cb bug修复 2025-02-10 09:19:20 +08:00
hongchao 517ddbf1b4 费用推送审核管理 2025-01-24 17:50:01 +08:00
hongchao f576b86c25 费用推送管理 2025-01-24 16:39:38 +08:00
zzyuan 0013ca35a7 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-23 16:42:33 +08:00
zzyuan ab4e64d9a0 报表修饰后入库接口对接 2025-01-23 16:42:23 +08:00
hongchao 0aecab77e8 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-23 16:20:10 +08:00
hongchao 3994f5c566 费用推送,bug修复 2025-01-23 16:20:02 +08:00
zzyuan 0d4cb9f3e4 报表-维修报表接口对接 2025-01-23 15:23:19 +08:00
hongchao c3fb3c7d87 领料单,出库检验单打印样式调整 2025-01-23 13:54:30 +08:00
zzyuan ef712b8db5 测试问题修改 2025-01-22 18:12:10 +08:00
zzyuan 9343c33b54 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-22 17:38:51 +08:00
zzyuan 3cd1005b5e 前端问题修改,报表模块代码 2025-01-22 17:38:39 +08:00
hongchao 1c5eda8555 费用推送管理 2025-01-22 16:13:23 +08:00
hongchao 1f76e51498 配件管理功能优化 2025-01-21 16:18:59 +08:00
zzyuan 5633a14764 Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui 2025-01-20 18:16:56 +08:00
zzyuan cd46ab166c 配件领用接口对接 2025-01-20 18:16:48 +08:00
hongchao 9dffb46b18 结算审批 2025-01-20 17:10:15 +08:00
hongchao 253d7094cf 会签流程配置管理 2025-01-17 15:20:51 +08:00
zzyuan e9324c42ce 退料维修模块审核流程梳理 2025-01-16 18:34:21 +08:00
hongchao 53f9a3ef90 会签配置管理 2025-01-16 15:34:56 +08:00
hongchao ebcf19bd0f 结算申请(单个结算),以及提交 2025-01-16 09:23:35 +08:00
hongchao 02485efff3 相关配套文件 2025-01-10 15:40:24 +08:00
hongchao 6a3da83a4c 配件管理 2025-01-10 08:55:27 +08:00
zzyuan fcd4d29585 电子档案下载 2025-01-09 17:50:38 +08:00
zzyuan 1ac9bd125f 文件档案下载 2025-01-08 18:13:09 +08:00
hongchao 12eee67965 报废原因管理 2025-01-07 18:39:31 +08:00
zzyuan f289beb34b 二维码管理 2024-12-31 14:54:41 +08:00
zzyuan c6ec188406 电子档案管理 2024-12-27 17:55:03 +08:00
zzyuan 7096fa1ea2 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-25 18:03:08 +08:00
zzyuan d58d6ff3ca 综合查询接口对接 2024-12-25 18:02:54 +08:00
hongchao 7e6c2f093a 出库单检验 2024-12-25 16:43:28 +08:00
zzyuan 8bbe2ed185 新购绑定驳回逻辑 2024-12-24 19:31:05 +08:00
zzyuan ca722cad9e 驳回提交2 2024-12-24 16:38:12 +08:00
zzyuan c498e59cda 新购模块问题修改 2024-12-24 10:22:01 +08:00
zzyuan 59e3711a8b 综合查询一级列表查询 2024-12-20 18:33:52 +08:00
zzyuan 1fa605c876 综合查询前端页面绘制 2024-12-16 17:59:18 +08:00
zzyuan 602eec34a6 修试入库和报废管理接口对接 2024-12-13 15:15:56 +08:00
zzyuan 51a095555d 报废管理一级列表 2024-12-13 13:30:22 +08:00
zzyuan 3dd85bd679 修试入库接口对接 2024-12-13 10:51:39 +08:00
zzyuan e34ac6f1b0 维修模块流程接口对接 2024-12-12 18:21:08 +08:00
zzyuan cab519687c 标准箱列表库存日期 2024-12-12 11:09:43 +08:00
zzyuan 8d4ffa0368 报废管理页面草稿 2024-12-11 13:57:24 +08:00
syruan 3c9bf5de20 API 2024-12-10 17:23:07 +08:00
syruan a112a45fd4 API 2024-12-10 17:22:22 +08:00
syruan ca4de9560c BUG修复 2024-12-06 18:23:17 +08:00
zzyuan de0edb532a 结算管理对接 2024-12-05 17:52:22 +08:00
zzyuan e429e80e14 物资管理问题修改,结算管理页面绘制 2024-12-04 18:05:59 +08:00
zzyuan 84dae5a3fc Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-12-03 18:41:43 +08:00
zzyuan b65aa5b75b 测试问题修改zzy 2024-12-03 18:41:30 +08:00
bonus e56dedc5ba Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-12-03 17:49:04 +08:00
bonus f5da08f165 修改退料单打印状态 2024-12-03 17:48:15 +08:00
zzyuan 720e979d7e 测试问题修改,物资类型 2024-12-03 17:41:58 +08:00
zzyuan 8ba6fb2a13 测试问题修改zzy' 2024-12-02 11:08:27 +08:00
jjLv 47860e17be Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-29 16:56:37 +08:00
jjLv 61394340fe 修试后入库以及维修数量管理有效性 2024-11-29 16:56:30 +08:00
bonus 40eedf86ef 1基础管理人员配置权限功能修改 2024-11-29 14:11:03 +08:00
jjLv 9263107c7c Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-29 13:55:19 +08:00
jjLv 15c7ffd52d 新购绑定二维码,维修数量检验 2024-11-29 13:55:10 +08:00
bonus 288ac73cbb 1基础管理2物资管理权限功能修改 2024-11-29 13:39:19 +08:00
bonus 2f8c6a6060 冲突合并 2024-11-27 18:31:42 +08:00
bonus d8c440ae0a delete请求修改post请求 2024-11-27 18:28:00 +08:00
BianLzhaoMin 0563089229 冲突合并 2024-11-26 10:22:33 +08:00
jjLv fdb9cd241b 外层修试通过接口 2024-11-25 16:50:32 +08:00
jjLv 7f885d25c4 维修合格 2024-11-25 10:48:52 +08:00
jjLv d43507f7f0 维修管理 2024-11-25 10:46:48 +08:00
jjLv 4dbfef45b7 维修合格 2024-11-25 09:47:08 +08:00
jjLv e8d1aa05e0 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-22 10:18:45 +08:00
jjLv 6c95b8e2c3 修试后入库 2024-11-22 10:18:37 +08:00
zzyuan b5242d634c 退料相关修改 2024-11-22 09:04:26 +08:00
jjLv 2a59185686 维修管理 2024-11-19 18:27:04 +08:00
jjLv 8c5cf9aac4 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-19 10:42:55 +08:00
jjLv b3c1870869 维修 2024-11-19 10:42:45 +08:00
zzyuan 2598daaa9a 编码入库 2024-11-18 13:47:20 +08:00
zzyuan 2e009ddc19 新购入库 2024-11-16 15:25:23 +08:00
lSun 6d368377d8 lsun 领料出库-数量出库 2024-11-15 18:53:30 +08:00
zzyuan b9603f1ccc Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-15 18:33:42 +08:00
zzyuan 879f1f4661 退料接口对接,维修接口对接 2024-11-15 18:33:30 +08:00
jjLv 64fa253bcf 绑定 2024-11-15 16:02:29 +08:00
jjLv ad1108ae23 修饰审核二级页面 2024-11-15 13:53:51 +08:00
jjLv edf3233332 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-15 09:03:29 +08:00
jjLv 3ef6e9ae58 修试审核 2024-11-15 09:03:22 +08:00
zzyuan f58951364a Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-14 18:06:21 +08:00
zzyuan 3e54607772 退料联调代码提交 2024-11-14 18:06:10 +08:00
jjLv aa73d0d6a0 领料出库 2024-11-14 17:31:45 +08:00
jjLv 14bb2ffb55 领料出库 2024-11-14 15:30:10 +08:00
lSun 0e95fcebbf lsun 维修管理 2024-11-14 15:26:24 +08:00
jjLv 18628e8288 领料申请 2024-11-14 12:57:47 +08:00
lSun 0b500b85af lsun 维修管理 2024-11-14 11:06:10 +08:00
lSun 67f2029cd8 lsun 维修管理 2024-11-14 10:38:52 +08:00
zzyuan 0e8ebc3559 退料接受接口对接 2024-11-14 10:31:33 +08:00
jjLv 882b72ad1b 领料出库 2024-11-14 08:49:14 +08:00
lSun e8b2118da1 lsun 协议管理 2024-11-13 18:12:12 +08:00
jjLv 6d2104dff3 领料申请 2024-11-13 16:05:29 +08:00
jjLv 94b92c7f84 领料 2024-11-13 14:40:58 +08:00
lSun 4ddaf1aee1 lsun 协议管理 2024-11-12 18:27:02 +08:00
jjLv 2710040308 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-12 15:05:28 +08:00
jjLv 12acf2d76b 领料出库 2024-11-12 15:05:17 +08:00
weiweiw 5691d366f9 手机号脱敏显示 2024-11-12 14:56:22 +08:00
lSun 7d1736d9fa lsun 协议管理 2024-11-12 14:27:45 +08:00
jjLv a170b129cc 领料申请 2024-11-12 10:28:11 +08:00
jjLv 56dc6791fc 领料申请 2024-11-11 16:16:55 +08:00
jjLv 9f7c29a2d9 领料管理 2024-11-11 12:12:48 +08:00
jjLv c7561b83e7 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-11 09:52:21 +08:00
jjLv b4ea9dbf98 配件类型左侧树 2024-11-11 09:52:14 +08:00
BianLzhaoMin 543f3ce2d1 Merge branch 'dev-sy-11-8' into material-ui 2024-11-08 17:45:49 +08:00
zzyuan f12ac8ad1f Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 17:41:26 +08:00
BianLzhaoMin 8864dd40af 编码绑定页面完善 2024-11-08 17:41:07 +08:00
zzyuan 4d5b66281e 新购验收 2024-11-08 17:40:41 +08:00
jjLv 5d2a0e272b 站点配置 2024-11-08 17:27:11 +08:00
weiweiw cf48732c87 Merge remote-tracking branch 'origin/main' 2024-11-08 10:28:22 +08:00
jiang 1d31b2fe3c 用户登录问题修改 2024-11-07 16:50:42 +08:00
jjLv b5dfa73ab8 物资配置 2024-11-07 16:37:23 +08:00
jjLv f897b22203 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-07 16:12:48 +08:00
jjLv 8acae94a24 左侧树角色id动态获取 2024-11-07 16:12:36 +08:00
zzyuan 24f30cce3f 新购新增联调4 2024-11-07 15:56:37 +08:00
jiang d14ab8e5f6 Merge remote-tracking branch 'origin/main' 2024-11-07 15:02:58 +08:00
jiang 828794effa 用户登录问题修改 2024-11-07 15:02:38 +08:00
weiweiw 1d84c5db55 增加日志备份功能和完善日志 操作 2024-11-07 15:01:48 +08:00
zzyuan c16548d169 新购-新增 2024-11-07 14:33:17 +08:00
zzyuan 6613e9fe16 新购-新增-文件管理 2024-11-07 10:50:20 +08:00
weiweiw 58c745980c Merge branch 'refs/heads/dev' 2024-11-07 09:24:49 +08:00
jiang 5ac47fa006 用户登录问题修改 2024-11-06 20:53:49 +08:00
zzyuan 534a14bc0f 新购文件管理 2024-11-06 19:06:30 +08:00
zzyuan c28fcbab24 新购到货新增2 2024-11-06 17:13:40 +08:00
zzyuan 1a16d8d016 新购到货-通知人员 2024-11-06 15:13:34 +08:00
weiweiw 865423d802 修改所有PUT 方法为post 2024-11-06 13:46:29 +08:00
jjLv add756b320 维修员页面 2024-11-06 13:20:47 +08:00
weiweiw 1ba873093c 修改所有delete 方法为post 2024-11-06 12:01:58 +08:00
jjLv 3f57f7b93f 新购管理 2024-11-05 13:57:31 +08:00
jjLv 43bf81c75f 库管员页面 2024-11-04 13:00:40 +08:00
jjLv aafbf5d30d 解绑 2024-10-31 19:08:20 +08:00
jjLv 9d7c389ca1 库管员配置 2024-10-31 18:48:31 +08:00
jjLv 6ad52f4107 库管员配置 2024-10-31 15:43:43 +08:00
jjLv dcbad6826e 库管员,维修员配置 2024-10-31 12:53:24 +08:00
jjLv ecedc86725 文件上传 2024-10-30 16:49:20 +08:00
jjLv 4f078ed5a7 物资厂家管理 2024-10-30 14:31:10 +08:00
jjLv 0596f2a887 物资文件上传 2024-10-30 11:27:42 +08:00
jjLv d9bd4cfe29 新购绑定相关配置添加 2024-10-29 18:03:15 +08:00
sxu 644652324f Merge branch 'main' into material-ui 2024-10-29 17:46:50 +08:00
jiang 7ffda168f5 用户登录问题修改 2024-10-29 14:19:41 +08:00
jjLv 150ca02fdb 物资厂家管理新增营业执照 2024-10-29 14:08:31 +08:00
jjLv f0d04656a3 基础管理bug修改 2024-10-29 10:46:04 +08:00
jjLv 3dd8720bb6 物资管理 2024-10-25 18:13:13 +08:00
jjLv 7f53d4a40d 物资管理整体框架 2024-10-25 12:54:20 +08:00
jjLv ff383c5754 基础管理 2024-10-25 12:42:45 +08:00
jjLv 753b02ed90 基础管理 2024-10-24 17:59:57 +08:00
weiweiw 444a3bf9b9 给菜单增加系统类型,并根据后台系统调用menu/getRouters/0接口 2024-10-16 08:10:36 +08:00
jiang eb9e9db8b1 用户登录问题修改 2024-09-08 20:13:32 +08:00
jiang 41579ccd28 bug修改 2024-07-31 15:06:58 +08:00
jiang 5889169554 web登录 2024-07-24 10:51:57 +08:00
jiang da9ffd1b80 web登录 2024-07-22 15:32:27 +08:00
lizhenhua dbd1ac89a4 审计日志功能上传 2024-07-18 20:42:38 +08:00
tjxt 468126a928 新增日志管理页面 2024-07-17 14:35:04 +08:00
weiweiw 69bc37df4b merge code for encryption 2024-07-04 10:35:24 +08:00
paulch 74257bf36c move from Bonus-Cloud 2024-06-26 15:11:05 +08:00