Commit Graph

721 Commits

Author SHA1 Message Date
zzyuan 3938b14243 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-16 18:16:37 +08:00
zzyuan acc549943f 领料申请出库数量判断 2024-11-16 18:14:00 +08:00
jjLv bfcdd158b1 编码出库状态传1 2024-11-16 16:11:28 +08:00
zzyuan b998cf5b55 领料出库添加leaseType 2024-11-16 16:07:37 +08:00
zzyuan 145d6feaf6 新购参数修改 2024-11-16 15:48:33 +08:00
zzyuan 2e009ddc19 新购入库 2024-11-16 15:25:23 +08:00
jjLv 5832a7f9ca 领料出库 2024-11-16 14:01:15 +08:00
zzyuan 21eb93dc29 Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui 2024-11-15 19:29:00 +08:00
zzyuan 4328eb32c9 退料单 2024-11-15 19:28:43 +08:00
jjLv cba02963da Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-15 19:07:17 +08:00
jjLv d1fd246499 领料申请 2024-11-15 19:07:10 +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 f9425a1188 验收 2024-11-15 17:50:37 +08:00
jjLv 00460397fb 验收 2024-11-15 17:45:08 +08:00
jjLv f32baffd4e 验收 2024-11-15 17:41:14 +08:00
jjLv 499dd3fe78 验收管理模式 2024-11-15 17:37:34 +08:00
jjLv f6bad9b43d 联调 2024-11-15 17:03:07 +08:00
jjLv 31c8917d86 绑定bug修复 2024-11-15 16:43:33 +08:00
jjLv 64fa253bcf 绑定 2024-11-15 16:02:29 +08:00
jjLv 576f6d11b9 绑定 2024-11-15 15:22:57 +08:00
jjLv 8e2381ce29 领料出库细节优化 2024-11-15 14:30:49 +08:00
jjLv ad1108ae23 修饰审核二级页面 2024-11-15 13:53:51 +08:00
weiweiw e2e439ba30 用户和角色list 对id 为1 或内置的 不能删除或修改 2024-11-15 11:24:37 +08:00
jjLv 4229d9a236 领料出库 2024-11-15 09:25:43 +08:00
jjLv 73354af9bc 领料出库 2024-11-15 09:22:11 +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 d481bb6f40 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-14 17:31:53 +08:00
jjLv aa73d0d6a0 领料出库 2024-11-14 17:31:45 +08:00
zzyuan 3511ca822c 维修任务管理一级二级页面绘制 2024-11-14 17:22:44 +08:00
jjLv cca3b4a1e9 出库 2024-11-14 16:11:28 +08:00
jjLv 14bb2ffb55 领料出库 2024-11-14 15:30:10 +08:00
lSun 0e95fcebbf lsun 维修管理 2024-11-14 15:26:24 +08:00
jjLv 7affaf9a39 租赁工程下拉框 2024-11-14 13:20:52 +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 e193a6cfe4 lsun 协议管理 2024-11-13 18:19:51 +08:00
lSun e8b2118da1 lsun 协议管理 2024-11-13 18:12:12 +08:00
lSun 86f2803c26 lsun 协议管理 2024-11-13 16:34:16 +08:00
jjLv 6d2104dff3 领料申请 2024-11-13 16:05:29 +08:00
jjLv 94b92c7f84 领料 2024-11-13 14:40:58 +08:00
lSun 7a66eb028e lsun 协议管理 2024-11-13 14:20:15 +08:00
jjLv 82bf1bfa51 领料权限 2024-11-13 14:04:19 +08:00
jjLv ef9733ef31 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-13 14:00:41 +08:00
jjLv 5ee4f3a9ca 领料 2024-11-13 14:00:32 +08:00
lSun 3bce0ae649 lsun 协议管理 2024-11-13 13:56:53 +08:00
lSun 9d5bcd5b4f lsun 协议管理 2024-11-12 18:43:01 +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
weiweiw 2ee58cefb0 tokentime的输入大小进行限制 2024-11-12 10:53:58 +08:00
jjLv ac7f2bf296 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-12 10:28:19 +08:00
jjLv a170b129cc 领料申请 2024-11-12 10:28:11 +08:00
zzyuan 9f5ccc7a06 新购接口参数 2024-11-12 09:58:20 +08:00
zzyuan 65aff8c6d7 新购管理接口参数修改 2024-11-11 18:32:47 +08:00
zzyuan 619ef2ad17 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-11 18:12:53 +08:00
zzyuan 92badead39 退料管理,退料列表新增页面 2024-11-11 18:12:38 +08:00
jjLv 56dc6791fc 领料申请 2024-11-11 16:16:55 +08:00
jiang ae4a120987 用户登录问题修改 2024-11-11 13:42:53 +08:00
jjLv 9f7c29a2d9 领料管理 2024-11-11 12:12:48 +08:00
weiweiw 56d8178d32 角色和用户对内置属性进行开发 2024-11-11 11:55:02 +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
weiweiw 2d898be6c4 告警功能增加 2024-11-11 09:49:34 +08:00
weiweiw daff010eb7 告警功能增加 2024-11-10 08:55:36 +08:00
zzyuan 3cb799255e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 17:59:44 +08:00
zzyuan dc61d5d7a3 二级明细状态展示 2024-11-08 17:59:08 +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
jjLv ce21f53e0e 站点配置 2024-11-08 16:13:43 +08:00
jjLv dec4a044b8 站点配置 2024-11-08 15:52:42 +08:00
zzyuan e710cbdac0 站点配置 2024-11-08 15:02:59 +08:00
jiang 68f09fcb7d 提交代码 2024-11-08 15:01:17 +08:00
jjLv 13714ee18e Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 14:29:31 +08:00
jjLv 31d17904de 站点配置 2024-11-08 14:29:22 +08:00
jiang 328e28d7ee Merge remote-tracking branch 'origin/main' 2024-11-08 10:51:35 +08:00
jiang b6fd43084e 用户登录问题修改 2024-11-08 10:51:14 +08:00
weiweiw 295174579e 修复页面报错 2024-11-08 10:35:39 +08:00
zzyuan e7459cb829 新购内部导出 2024-11-08 10:28:49 +08:00
weiweiw cf48732c87 Merge remote-tracking branch 'origin/main' 2024-11-08 10:28:22 +08:00
weiweiw 0fce987c48 修复页面报错 2024-11-08 10:27:51 +08:00
BianLzhaoMin ffefbb5611 Merge branch 'material-ui' into dev-sy-11-8 2024-11-08 09:31:36 +08:00
zzyuan b93c30cca7 新购验收、入库二级页面 2024-11-08 09:30:26 +08:00
BianLzhaoMin cfa7b138b9 Merge branch 'material-ui' into dev-sy-11-8 2024-11-08 09:16:18 +08:00
BianLzhaoMin 8dd9cd22cb 解决启动时控制台warning警告 2024-11-08 09:15:25 +08:00
zzyuan 1814dbaba1 新购验收1 2024-11-08 09:10:01 +08:00
jjLv 7965252432 物资配置 2024-11-08 08:59:05 +08:00
jjLv e0c276dfa8 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-08 08:47:15 +08:00
jjLv cbd0762bff 站点配置 2024-11-08 08:47:05 +08:00
zzyuan 72505a72f0 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-07 17:22:41 +08:00
zzyuan 20ffd00bcf 新购新增5 2024-11-07 17:22:30 +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 83a3627af9 编辑查看文件管理上传 2024-11-07 11:21:22 +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 b971631106 新购新增3 2024-11-06 18:27:24 +08:00
zzyuan fe4daa62ac Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-06 17:26:29 +08:00
zzyuan c28fcbab24 新购到货新增2 2024-11-06 17:13:40 +08:00
jjLv 6555f21d5d 物资类型右侧表格,配件类型左侧树 2024-11-06 17:03:18 +08:00
zzyuan 39a97186b0 新购到货-新增1 2024-11-06 16:46:12 +08:00
zzyuan 1a16d8d016 新购到货-通知人员 2024-11-06 15:13:34 +08:00
jjLv ad4572febd 物资厂家 2024-11-06 14:05:46 +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
jiang 22d2c5dba1 用户登录问题修改 2024-11-06 10:05:50 +08:00
jjLv 30b727a6b5 新增显示关系属性 2024-11-05 14:48:11 +08:00
jiang 33cab82ec6 用户登录问题修改 2024-11-05 14:43:17 +08:00
jjLv 42646b4f32 多选解绑和绑定 2024-11-05 14:42:12 +08:00
jjLv 3f57f7b93f 新购管理 2024-11-05 13:57:31 +08:00
jjLv 4ddcabaef0 Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui 2024-11-04 13:00:48 +08:00
jjLv 43bf81c75f 库管员页面 2024-11-04 13:00:40 +08:00
sxu 4a232bf511 Merge branch 'main' into material-ui 2024-11-01 10:42:36 +08:00
jiang 580626e5fd 用户登录问题修改 2024-11-01 10:19:37 +08:00
jjLv cf304ce8ee 解绑 2024-10-31 19:31:59 +08:00
jjLv 127320e8db 解绑 2024-10-31 19:24:03 +08:00
jjLv d16a200a72 解绑 2024-10-31 19:15:56 +08:00
jjLv aafbf5d30d 解绑 2024-10-31 19:08:20 +08:00
jjLv 18e0272b6b bug 2024-10-31 18:50:05 +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 acc96ac903 文件加密,维修员页面增加 2024-10-31 10:27:56 +08:00
jjLv dbac0b4493 物资文件上传,删除服务器文件 2024-10-30 17:58:47 +08:00
jjLv ecedc86725 文件上传 2024-10-30 16:49:20 +08:00
jjLv a1eb8e0f0d 物资厂家 2024-10-30 15:06:31 +08:00
jjLv 4f078ed5a7 物资厂家管理 2024-10-30 14:31:10 +08:00
jjLv 0596f2a887 物资文件上传 2024-10-30 11:27:42 +08:00
jjLv de858331a0 物资厂家文件上传 2024-10-30 11:00:50 +08:00
jjLv 7a080291fc 文件上传下载 2024-10-30 10:30:06 +08:00
jjLv c2e5ba2dec 物资厂家文件上传回显 2024-10-30 09:50:16 +08:00
jjLv acf7f69d8e 绑定相关配置 2024-10-29 18:06:41 +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 df9a8e0253 用户登录问题修改 2024-10-29 15:48:18 +08:00
jiang 7e6ecd0dba 用户登录问题修改 2024-10-29 15:20:59 +08:00
jjLv 38b9e2c32e 物资厂家文件出现重复新增bug 2024-10-29 14:53:33 +08:00
jjLv 56a6ad55fc 物资厂家Bug修复 2024-10-29 14:31:13 +08:00
jjLv f9e373cf1f 配件类型管理 2024-10-29 14:22:58 +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 9d83fb64b8 基础管理分页处理 2024-10-29 09:11:04 +08:00
jjLv c99da5778a 导出 2024-10-28 17:54:52 +08:00
jjLv 9e90d6d352 物资类型导出修改 2024-10-28 17:53:00 +08:00
jjLv da7888a9d8 往来单位导出 2024-10-28 17:07:37 +08:00
jjLv 09ed54aba5 物资类型管理 2024-10-28 16:25:31 +08:00
jjLv 79e72d2b0b 物资类型管理修改功能bug修复 2024-10-28 13:29:42 +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 77b4ec475b 基础管理 2024-10-24 18:11:40 +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 116cd0bad8 用户登录问题修改 2024-09-19 09:39:23 +08:00
jiang 4a84ccb7db 用户登录问题修改 2024-09-18 15:51:58 +08:00
jiang 305a665da2 用户登录问题修改 2024-09-14 17:34:19 +08:00
jiang 3370b734a2 用户登录问题修改 2024-09-13 16:36:46 +08:00
jiang e94ea40959 Merge remote-tracking branch 'origin/main' 2024-09-13 16:07:06 +08:00
jiang d0b5d6c704 用户登录问题修改 2024-09-13 16:06:50 +08:00
weiweiw 86c164db35 增加支持顶级部门功能 2024-09-12 18:02:17 +08:00
jiang be94bc276f 用户登录问题修改 2024-09-10 18:01:39 +08:00
jiang 8bb10191ea 用户登录问题修改 2024-09-10 10:04:32 +08:00
jiang eb9e9db8b1 用户登录问题修改 2024-09-08 20:13:32 +08:00
weiweiw 312c9ebaec update naming style 2024-08-26 13:05:39 +08:00
jiang 20797914db 数据加密和完整性校验 2024-08-16 15:50:37 +08:00
jiang dd0e2f4721 数据加密和完整性校验 2024-08-09 13:25:47 +08:00
weiweiw 410a89c695 update naming style 2024-08-08 17:00:40 +08:00
jiang b130e05078 数据加密和完整性校验 2024-08-08 15:31:39 +08:00
jiang 02e82010ef 数据加密和完整性校验 2024-08-08 15:11:05 +08:00
jiang 700a9c6ac7 数据加密和完整性校验 2024-08-07 11:27:37 +08:00
jiang 877ae77cb3 数据加密和完整性校验 2024-08-06 15:47:19 +08:00
weiweiw 6f26e09f66 rollback request.js 2024-07-31 18:28:32 +08:00
jiang 5cfdb4870c bug修改 2024-07-31 16:19:37 +08:00
jiang 41579ccd28 bug修改 2024-07-31 15:06:58 +08:00
jiang bc13169c25 bug修改 2024-07-29 19:48:02 +08:00
jiang fab7226afb bug修改 2024-07-29 19:23:39 +08:00
lizhenhua bc2c980153 审计日志功能上传 2024-07-28 13:19:11 +08:00
weiweiw f89d4023ca update naming style 2024-07-26 14:59:03 +08:00
lizhenhua 7a2e6cb04b 审计日志功能上传 2024-07-25 14:33:05 +08:00
lizhenhua 5f43e35b90 Merge remote-tracking branch 'origin/main' into main 2024-07-24 19:27:08 +08:00
lizhenhua 2494e804cc 审计日志功能上传 2024-07-24 19:27:02 +08:00
jiang ae2c7d5302 web登录 2024-07-24 18:07:42 +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 783af74cd1 Merge remote-tracking branch 'origin/main' into main 2024-07-22 14:08:04 +08:00
lizhenhua d37b8dc13b 审计日志功能上传 2024-07-22 14:07:50 +08:00
weiweiw 2fd185f1f7 remove unused configuration 2024-07-21 08:53:09 +08:00
lizhenhua 149dc3cbeb Merge remote-tracking branch 'origin/main' into main 2024-07-18 20:44:14 +08:00
lizhenhua dbd1ac89a4 审计日志功能上传 2024-07-18 20:42:38 +08:00
paulch cd2eebd69e update version 2024-07-18 17:34:49 +08:00
paulch 4812ef2516 remove pay image 2024-07-18 17:04:48 +08:00
paulch b93da82f30 Merge remote-tracking branch 'origin/main' 2024-07-18 17:03:16 +08:00
paulch 6cd9fa76cd update the default profile image 2024-07-18 17:03:01 +08:00
tjxt 468126a928 新增日志管理页面 2024-07-17 14:35:04 +08:00
weiweiw aa9691b85b update naming style 2024-07-08 09:55:01 +08:00
weiweiw 69bc37df4b merge code for encryption 2024-07-04 10:35:24 +08:00
paulch 2cf17addf2 add missing files 2024-06-26 16:02:38 +08:00
paulch 74257bf36c move from Bonus-Cloud 2024-06-26 15:11:05 +08:00