Commit Graph

241 Commits

Author SHA1 Message Date
zhouzy062 baebb94716 前端问题修改 2024-03-27 09:06:10 +08:00
hayu 85cb92670f 二级库功能修复 2024-03-26 18:06:37 +08:00
FrancisHu 6dd04121b7 3.26新增盘点入库 2024-03-26 16:24:39 +08:00
zhouzy062 caa1d0881f 代码提交审查 2024-03-26 13:19:03 +08:00
zhouzy062 f30cde0cec 代码审查问题修改 2024-03-26 13:15:36 +08:00
zhouzy062 1baf4d5e50 前端问题修改 2024-03-26 11:32:17 +08:00
zhouzy062 df2f7805e4 前端bug修改3.26 2024-03-26 11:29:39 +08:00
zhouzy062 a78e50c8b3 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-26 11:29:14 +08:00
hayu f64ebf1aea 功能修复 2024-03-25 18:20:42 +08:00
zhouzy062 54c25d1997 前端问题修改 2024-03-25 16:04:51 +08:00
hayu c96e26c635 功能修复 2024-03-22 18:00:57 +08:00
zhouzy062 369b8f08b0 前端修改新购入库驳回 2024-03-22 16:53:05 +08:00
zhouzy062 abb791c1a0 前台问题修改,重庆领料新增 2024-03-22 16:31:46 +08:00
zhouzy062 2dba2b1314 基础管理导出接口,重庆退料审批领料修改 2024-03-22 15:25:38 +08:00
zhouzy062 18b0804b2c 前端问题修改2 2024-03-22 10:48:22 +08:00
zhouzy062 c3ce3db52b 前端bug单修改 2024-03-22 09:07:07 +08:00
zhouzy062 4d6e721fce 验收通知人员 2024-03-21 13:56:02 +08:00
zhouzy062 a83d4c0170 前端问题修改 2024-03-21 11:28:17 +08:00
zhouzy062 bd3fad2270 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-20 19:12:00 +08:00
zhouzy062 4ac3ba6fd0 前端问题修改 2024-03-20 19:11:56 +08:00
bns_han b980c97b58 功能完善 2024-03-20 13:58:09 +08:00
bns_han a6830079e1 综合服务中心审核 2024-03-20 11:17:46 +08:00
zhouzy062 623e84d3e0 前端修改接口名 2024-03-20 10:27:52 +08:00
zhouzy062 a4faf1a1ed 前端问题修改 2024-03-19 16:54:31 +08:00
zhouzy062 cfc7cded3a 前端试运行问题修改 2024-03-19 11:12:02 +08:00
zhouzy062 34d55b59e0 工地直转直转单接口对接 2024-03-19 09:07:55 +08:00
zhouzy062 92447485dc 重庆审批流程2 2024-03-18 10:22:37 +08:00
zhouzy062 85a1fe9cfb 重庆审批流修改 2024-03-16 13:35:57 +08:00
zhouzy062 a9de36b025 重庆领料审批更改2 2024-03-16 13:04:28 +08:00
zhouzy062 f0654697b7 添加重庆审批流1 2024-03-16 11:19:19 +08:00
zhouzy062 5844b8845a 报废图片上传 2024-03-15 18:33:30 +08:00
zhouzy062 f0842a417f 试运行问题修改 2024-03-15 16:30:03 +08:00
zhouzy062 ea01e0cd8d 前端提交 2024-03-13 19:57:14 +08:00
zhouzy062 e81a81c460 前端问题修改 2024-03-13 17:50:41 +08:00
zhouzy062 b01f424e4d 输入框限制 2024-03-11 14:57:03 +08:00
zhouzy062 5706069158 工地直转 2024-03-08 18:17:05 +08:00
zhouzy062 1f36650c1c 退料驳回,工地直转接口对接 2024-03-08 17:13:59 +08:00
zhouzy062 f55234d3ad 前端bug修改 2024-03-08 14:21:03 +08:00
zhouzy062 7f03a31a87 二级库相关导出 2024-03-07 16:46:16 +08:00
zhouzy062 01106d4c5b Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-07 13:31:29 +08:00
zhouzy062 6dcf7aae60 费用结算导出接口对接 2024-03-07 13:31:26 +08:00
bns_han 197964ee1b 功能优化 2024-03-07 11:38:10 +08:00
zhouzy062 7f33b1a081 前端问题修改 2024-03-07 10:44:18 +08:00
zhouzy062 51e0dd0681 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-07 09:19:52 +08:00
zhouzy062 f8bf0ba857 问题修改:验收图片上传,接入大屏 2024-03-07 09:19:47 +08:00
bns_han 14dedcf440 功能完善 2024-03-06 17:59:51 +08:00
bns_han a3e922936f 问题修复及综合查询 2024-03-05 18:41:35 +08:00
zhouzy062 2da530bc41 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-05 09:10:29 +08:00
zhouzy062 d5ca3c7b95 二维码扫码2 2024-03-05 09:10:14 +08:00
FrancisHu e066ccce92 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-04 17:23:35 +08:00
FrancisHu c296fc3bbd Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-03-04 17:22:58 +08:00
FrancisHu acc80d900b 3.4修改 2024-03-04 16:46:53 +08:00
zhouzy062 5d02291e72 测试问题修改3/4 2024-03-04 16:39:06 +08:00
zhouzy062 7f59083e7b 二维码跳转页面查看设备信息 2024-03-04 16:38:39 +08:00
zhouzy062 b02eb4a588 二级库模块 2024-03-01 18:17:50 +08:00
zhouzy062 3c778be029 二级库模块接口对接 2024-03-01 14:46:21 +08:00
zhouzy062 1f5869efe5 二级库1 2024-02-29 18:24:06 +08:00
zhouzy062 0467efb452 退料 2024-02-29 17:35:46 +08:00
zhouzy062 6d5c5238d3 退料5 2024-02-29 16:17:56 +08:00
zhouzy062 188cc9672d 退料5 2024-02-29 16:14:58 +08:00
zhouzy062 c29db53cc7 退料4 2024-02-29 16:11:48 +08:00
zhouzy062 bc79ea26ab 退料3 2024-02-29 16:05:42 +08:00
zhouzy062 20568326b4 退料3 2024-02-29 16:03:02 +08:00
zhouzy062 4ea4c1f81b 退料2 2024-02-29 15:51:29 +08:00
zhouzy062 dd91266e73 退料修改 2024-02-29 15:41:18 +08:00
zhouzy062 78d5489af9 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-02-29 13:30:23 +08:00
zhouzy062 e9d8939263 前端ip配置 2024-02-29 13:30:01 +08:00
zhouzy062 9d056e4498 退料审批,结算审核 2024-02-29 13:29:34 +08:00
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