Commit Graph

123 Commits

Author SHA1 Message Date
FrancisHu 2b82d31bf1 2.28新增查询 2024-02-28 13:31:56 +08:00
FrancisHu abd8c517a5 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-28 09:52:02 +08:00
zhouzy062 15c8119f94 租赁平台登录 2024-02-27 18:02:33 +08:00
FrancisHu 6374843a63 2.27新增查询 2024-02-27 17:01:49 +08:00
zhouzy062 73e07c5bf8 退料 2024-02-27 14:13:21 +08:00
zhouzy062 df24c7e4bf 退料优化 2024-02-27 14:07:01 +08:00
zhouzy062 f77902ad2c 领料申请接口修改 2024-02-27 10:33:50 +08:00
zhouzy062 f42b926b71 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-26 20:16:24 +08:00
zhouzy062 76ce215d1f 领料管理 2024-02-26 20:16:16 +08:00
bns_han cb2d8a551a 综合查询 2024-02-26 19:28:18 +08:00
zhouzy062 d4c9beff5e 领料审批权限 2024-02-26 18:43:14 +08:00
bonus 1856249b0e 综合查询-领料查询 2024-02-26 14:14:19 +08:00
bonus 2861b288be 综合查询 2024-02-26 14:06:58 +08:00
zhouzy062 ad775627c5 费用结算 2024-02-26 10:17:48 +08:00
liang.chao baa645f36b 退料申请表数据问题修改 2024-02-23 17:26:16 +08:00
zhouzy062 7942e4a93d 领料内部审核前端代码 2024-02-22 13:56:32 +08:00
zhouzy062 51d2ae84ca Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-21 18:28:49 +08:00
zhouzy062 ec04b2770e 新购验收机具配件验收入库驳回 2024-02-21 18:27:47 +08:00
zhouzy062 79ce2d3ce2 前台提交 2024-01-31 13:51:10 +08:00
liang.chao 713bc6ece2 Merge branch 'dev' into test-sso
# Conflicts:
#	sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
#	sgzb-ui/vue.config.js
2024-01-30 15:09:59 +08:00
zhouzy062 101dd0e27d 前端配置 2024-01-30 10:50:26 +08:00
zhouzy062 2ff85222c6 登录接口对接 2024-01-30 10:35:06 +08:00
zhouzy062 c8511a8e9d 前端问题修改 2024-01-30 09:16:55 +08:00
liang.chao 9a47a636ab Merge branch 'dev' into test-sso
# Conflicts:
#	sgzb-ui/vue.config.js
2024-01-29 17:15:36 +08:00
zhouzy062 9352a18f75 前端问题修改1.29 2024-01-29 17:08:39 +08:00
zhouzy062 ffa76924f2 接口变更 2024-01-29 14:34:31 +08:00
zhouzy062 14407d7f7e 南网登录 2024-01-29 10:21:25 +08:00
zhouzy062 e1197aedc1 南网打包地址 2024-01-26 19:44:33 +08:00
zhouzy062 567732d51e 登陆前端代码 2024-01-26 19:11:15 +08:00
liang.chao ddae3a4261 Merge branch 'dev' into test-sso 2024-01-26 16:09:48 +08:00
liang.chao b0105ff73f 领料审核通过 2024-01-26 15:59:51 +08:00
zhouzy062 70fe005e8d Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-01-26 13:08:02 +08:00
zhouzy062 1fd7600a81 修改问题提交 2024-01-26 13:07:02 +08:00
zhouzy062 2d6b540764 Merge branch 'test' of http://192.168.0.56:3000/bonus/devicesmgt into test 2024-01-23 20:34:36 +08:00
zhouzy062 49e80e1f1c 图片上传及头像 2024-01-23 20:33:02 +08:00
zhouzy062 3ccf84651d 上传地址优化 2024-01-23 13:40:20 +08:00
zhouzy062 629f937be7 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-01-23 10:25:20 +08:00
zhouzy062 7b2d465d72 前端问题修改 2024-01-23 10:15:48 +08:00
liang.chao c1f3d612e6 代码还原 2024-01-22 17:42:47 +08:00
zhouzy062 6b07845e13 测试问题修改,导航切换 2024-01-22 09:18:46 +08:00
zhouzy062 03819147ae 领料列表问题修改 2024-01-19 10:36:52 +08:00
zhouzy062 eb1ca9b5d9 打印单修改,新购配件验收入库,测试问题修改 2024-01-19 10:22:39 +08:00
zhouzy062 dbe3c870af 前端流程问题修改 2024-01-14 14:51:21 +08:00
zhouzy062 db86f585c0 领料,退料,维修1 2024-01-12 10:07:35 +08:00
zhouzy062 49320db995 导出功能,短信登录,领料模块优化审批 2024-01-10 16:29:46 +08:00
zhouxain01 152226b4e9 提交树形搜索 2023-12-25 13:37:00 +08:00
zhouxain01 8672cf565d 提交修试管理bug 2023-12-25 11:29:19 +08:00
zhouxain01 dd7a91b9a7 提交树形结构只能选择叶子节点 2023-12-25 10:59:28 +08:00
zhouxain01 aabcf222b1 提交退库修改字段值新增计量单位unitNames 2023-12-25 10:38:00 +08:00
zhouxain01 0e12123327 提交退库修改字段值新增计量单位 2023-12-25 10:32:21 +08:00