Commit Graph

Select branches

Hide Pull Requests

dev

dev-cq

dev-cq-rudy20240806

dev-cq-rudy20240806b

dev-nw

dev-nwcc

dev-nwcc-test

dev-nx

dev-nx-rudy20240805

dev-nx-rudy20240806

dev-nx-sx20240821

dev-nx-sx20240821b

flow_dev

macode20240820

main

master

test

#1

#2

Mono Color

• 70db7794fc Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-07 14:44:20 +0800
• 18a57c30b5 新购增加提交审核按钮 BianLzhaoMin 2024-06-07 14:44:17 +0800
• d6577e9a6e 修改 hayu 2024-06-07 14:42:33 +0800
• 69c17b101c 增加优化页面 BianLzhaoMin 2024-06-07 14:11:43 +0800
• 13fb468240 Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-06-07 13:34:02 +0800
• 300c85c369 优化新购页面按钮不显示问题 BianLzhaoMin 2024-06-07 13:34:00 +0800
• b6a404753b 重庆新购无法绑定编码问题修改 csyue 2024-06-07 13:29:51 +0800
• f4d9a8a171 优化页面提示 BianLzhaoMin 2024-06-07 11:19:26 +0800
• c57c539f51 优化仓储管理菜单展示 BianLzhaoMin 2024-06-07 11:17:34 +0800
• 803baa19f0 修改 hayu 2024-06-07 10:07:55 +0800
• 75895eaa56 新购流程修改 hayu 2024-06-07 09:58:35 +0800
• c47cfa28d6 Merge remote-tracking branch 'origin/dev-nx' into dev-nx hayu 2024-06-07 09:53:59 +0800
• d74109015c 试运行问题修改 csyue 2024-06-06 17:59:23 +0800
• f69ccc2b63 fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据 binbin_pan 2024-06-06 16:24:38 +0800
• d5eec60eff 解决测试bug BianLzhaoMin 2024-06-06 16:08:25 +0800
• e1928139b7 测试问题修改 BianLzhaoMin 2024-06-06 15:57:41 +0800
• a96647b29f 图形验证码问题 binbin_pan 2024-06-06 15:54:54 +0800
• ff0d34952d Merge remote-tracking branch 'origin/dev-nw' into dev-nw mashuai 2024-06-06 15:52:18 +0800
• 147c10476f 短信过期时效，图形验证码缓存清理 mashuai 2024-06-06 15:52:11 +0800
• 9e113d0ee0 优化首页查看跳转，领料驳回等bug问题 BianLzhaoMin 2024-06-06 14:20:07 +0800
• 1655cdc492 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-06 11:47:55 +0800
• fa74b08c76 测试领料流程 BianLzhaoMin 2024-06-06 11:47:52 +0800
• ba231b659c Merge remote-tracking branch 'origin/dev-nx' into dev-nx csyue 2024-06-05 17:49:21 +0800
• 8c3665d599 试运行问题修改 csyue 2024-06-05 17:48:30 +0800
• db82be8297 明文加解密 binbin_pan 2024-06-05 17:41:29 +0800
• 37e8761508 重置，修改加解密 mashuai 2024-06-05 17:40:33 +0800
• 791fc7ae3e Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-05 16:35:10 +0800
• 2c994c2bd4 优化插槽使用规范 BianLzhaoMin 2024-06-05 16:35:08 +0800
• 75e5a4d3f1 入库管理-审核弹框-操作按钮增加权限判断 binbin_pan 2024-06-05 16:34:57 +0800
• 2a0556f200 试运行问题修改 csyue 2024-06-05 15:44:39 +0800
• c316048317 领料出库-增加手动出库结单 binbin_pan 2024-06-05 15:41:36 +0800
• cd66690bd5 重置，修改加解密 mashuai 2024-06-05 14:56:09 +0800
• ed6da1696e 明文加解密 binbin_pan 2024-06-05 14:52:16 +0800
• a5e306a0f9 盘点入库详情 mashuai 2024-06-05 14:32:17 +0800
• a790ba40e8 优化 binbin_pan 2024-06-05 14:24:27 +0800
• f0a94ac0db 盘点入库-查看详情 binbin_pan 2024-06-05 14:20:20 +0800
• 47831720ed 盘点入库详情 mashuai 2024-06-05 14:06:45 +0800
• 3209f2279d Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-05 14:03:21 +0800
• 9f963fbdc8 领料页面优化 BianLzhaoMin 2024-06-05 14:03:17 +0800
• fd668b51ee 明文加解密 binbin_pan 2024-06-05 14:01:33 +0800
• 82d80aa1b7 重庆用户加解密 mashuai 2024-06-05 13:42:32 +0800
• a5f7806154 重庆用户加解密 mashuai 2024-06-05 13:37:52 +0800
• 84299f69af 宁夏试运行问题修改 csyue 2024-06-05 13:30:17 +0800
• 5e3626d293 Merge remote-tracking branch 'origin/dev-nx' into dev-nx csyue 2024-06-05 13:15:51 +0800
• 860987874e 宁夏试运行问题修改 csyue 2024-06-05 13:15:29 +0800
• e8d364f707 Merge remote-tracking branch 'origin/dev-nw' into dev-nw mashuai 2024-06-05 10:48:17 +0800
• b8138072d4 修改重置加解密 mashuai 2024-06-05 10:48:08 +0800
• 47cb821ccf 加解密 binbin_pan 2024-06-05 10:43:30 +0800
• 924765b242 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-05 10:08:50 +0800
• 7cdd1e1e42 完善菜单权限 BianLzhaoMin 2024-06-05 10:08:46 +0800
• facf7ffebc Merge remote-tracking branch 'origin/dev-nx' into dev-nx hayu 2024-06-05 09:13:30 +0800
• 8c120a3002 宁夏试运行问题修改 csyue 2024-06-04 18:10:42 +0800
• 24f60a356a 退料模块，权限菜单优化 BianLzhaoMin 2024-06-04 18:09:12 +0800
• 793d29c1ec Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-06-04 17:02:38 +0800
• 55a471f328 修改打包配置，调试退料接收 BianLzhaoMin 2024-06-04 17:02:36 +0800
• 9df51c3993 重庆bug修复 15856 2024-06-04 17:00:56 +0800
• 76476069d5 领料管理菜单权限增加 BianLzhaoMin 2024-06-04 16:15:12 +0800
• 24b6c7be6e bug修复 赵福海 2024-06-04 15:41:08 +0800
• e4c4a9fd33 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-04 15:02:44 +0800
• d53bbaa645 领料退料菜单优化完成 BianLzhaoMin 2024-06-04 15:02:37 +0800
• a8fc887cd1 领料管理-查看详情-任务状态修改 binbin_pan 2024-06-04 14:18:46 +0800
• d02a155852 解密初始密码 binbin_pan 2024-06-04 14:05:26 +0800
• bc2ee69dd7 解密初始密码 binbin_pan 2024-06-04 14:01:19 +0800
• 3be3330714 宁夏试运行问题修改 csyue 2024-06-04 13:04:54 +0800
• f23f39483f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-04 11:04:08 +0800
• b168d5c1ac 仓库管理菜单梳理完成 BianLzhaoMin 2024-06-04 11:04:01 +0800
• 9fa92a9b22 弹框title统一改为:设备出库 binbin_pan 2024-06-04 09:45:36 +0800
• dd9d4d5c20 Merge remote-tracking branch 'origin/dev-nx' into dev-nx hayu 2024-06-04 09:12:04 +0800
• 351bcbfb12 测试问题修改 hayu 2024-06-04 09:01:38 +0800
• 4201951630 宁夏试运行问题修改 csyue 2024-06-03 18:45:24 +0800
• 67ea808d43 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-03 18:06:31 +0800
• 41ac88dc18 菜单配置优化，新购验收菜单下新增，修改等跳页面跳转重构 BianLzhaoMin 2024-06-03 18:06:22 +0800
• 2e19924104 综合查询-领料查询-列表增加车牌号、领料单号字段 binbin_pan 2024-06-03 17:48:17 +0800
• 52e8e95c45 维修管理-维修-维修人下拉接口更换 binbin_pan 2024-06-03 16:21:05 +0800
• f148a8fd77 工机具管理-类型管理-维修员、库管员下拉问题 binbin_pan 2024-06-03 13:38:30 +0800
• b1b42b9a78 优化列表序号，分页时延续问题 BianLzhaoMin 2024-06-03 11:10:25 +0800
• e7e8c6da07 修改列表序号翻页时延续问题 BianLzhaoMin 2024-06-03 11:03:34 +0800
• e908f0e2df 退料申请退料人手机号码问题优化 BianLzhaoMin 2024-06-03 09:49:25 +0800
• 60610d8f64 解决预报废页面无法显示问题 BianLzhaoMin 2024-06-03 09:35:35 +0800
• eba8462ae0 预报废审核页面调试 BianLzhaoMin 2024-06-03 09:18:18 +0800
• 3818d7e237 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-03 09:01:04 +0800
• 403661be05 测试问题项修改 csyue 2024-05-31 23:38:35 +0800
• df24e8cb71 前端页面刷新 mashuai 2024-05-31 16:32:47 +0800
• 7690b80b6b 测试问题项修改 csyue 2024-05-31 15:26:47 +0800
• d1c8638876 测试问题项修改 csyue 2024-05-31 15:19:44 +0800
• 0000bf3752 Merge remote-tracking branch 'origin/dev' into dev-cq 赵福海 2024-05-31 15:19:38 +0800
• 16dc57e902 测试问题项修改 csyue 2024-05-31 15:04:51 +0800
• e547366f45 测试问题项修改 csyue 2024-05-31 14:48:04 +0800
• f4d2a37cfe 新购流程修改 hayu 2024-05-31 13:09:02 +0800
• c350486773 Revert "bug" mashuai 2024-05-31 11:22:35 +0800
• 4c83705ab1 bug mashuai 2024-05-31 11:19:06 +0800
• 8fa53f2dad 预报废页面bug修改 BianLzhaoMin 2024-05-31 10:35:43 +0800
• a14014831a Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw BianLzhaoMin 2024-05-30 22:56:33 +0800
• d33ca8df36 修改域名打包配置 BianLzhaoMin 2024-05-30 22:56:26 +0800
• e7067cf120 bug mashuai 2024-05-30 22:51:24 +0800
• 7cb36cbbcb Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-05-30 18:26:43 +0800
• 6f50c3a9c9 优化登录页输入框无法验证问题 BianLzhaoMin 2024-05-30 18:26:39 +0800
• 31b0546225 优化登录页样式等问题 BianLzhaoMin 2024-05-30 18:14:29 +0800
• 5354eff460 Merge branch 'dev-nw' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nw BianLzhaoMin 2024-05-30 18:04:40 +0800
• 05f15fcd5d 优化登录页面问题 BianLzhaoMin 2024-05-30 18:04:30 +0800