Commit Graph

1583 Commits

Author SHA1 Message Date
hayu d6577e9a6e 修改 2024-06-07 14:42:33 +08:00
BianLzhaoMin f4d9a8a171 优化页面提示 2024-06-07 11:19:26 +08:00
hayu 803baa19f0 修改 2024-06-07 10:07:55 +08:00
hayu 75895eaa56 新购流程修改 2024-06-07 09:58:35 +08:00
hayu c47cfa28d6 Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
#	sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
2024-06-07 09:53:59 +08:00
csyue d74109015c 试运行问题修改 2024-06-06 17:59:23 +08:00
BianLzhaoMin e1928139b7 测试问题修改 2024-06-06 15:57:41 +08:00
BianLzhaoMin 9e113d0ee0 优化首页查看跳转,领料驳回等bug问题 2024-06-06 14:20:07 +08:00
BianLzhaoMin 1655cdc492 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-06 11:47:55 +08:00
BianLzhaoMin fa74b08c76 测试领料流程 2024-06-06 11:47:52 +08:00
csyue ba231b659c Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-06-05 17:49:21 +08:00
csyue 8c3665d599 试运行问题修改 2024-06-05 17:48:30 +08:00
BianLzhaoMin 791fc7ae3e Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-05 16:35:10 +08:00
BianLzhaoMin 2c994c2bd4 优化插槽使用规范 2024-06-05 16:35:08 +08:00
binbin_pan 75e5a4d3f1 入库管理-审核弹框-操作按钮增加权限判断 2024-06-05 16:34:57 +08:00
csyue 2a0556f200 试运行问题修改 2024-06-05 15:44:39 +08:00
binbin_pan c316048317 领料出库-增加手动出库结单 2024-06-05 15:41:36 +08:00
mashuai cd66690bd5 重置,修改加解密 2024-06-05 14:56:09 +08:00
binbin_pan ed6da1696e 明文加解密 2024-06-05 14:52:16 +08:00
BianLzhaoMin 3209f2279d Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-05 14:03:21 +08:00
BianLzhaoMin 9f963fbdc8 领料页面优化 2024-06-05 14:03:17 +08:00
csyue 5e3626d293 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 2024-06-05 13:15:51 +08:00
csyue 860987874e 宁夏试运行问题修改 2024-06-05 13:15:29 +08:00
BianLzhaoMin 924765b242 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-05 10:08:50 +08:00
BianLzhaoMin 7cdd1e1e42 完善菜单权限 2024-06-05 10:08:46 +08:00
hayu facf7ffebc Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
2024-06-05 09:13:30 +08:00
csyue 8c120a3002 宁夏试运行问题修改 2024-06-04 18:10:42 +08:00
BianLzhaoMin 24f60a356a 退料模块,权限菜单优化 2024-06-04 18:09:12 +08:00
BianLzhaoMin 76476069d5 领料管理菜单权限增加 2024-06-04 16:15:12 +08:00
BianLzhaoMin e4c4a9fd33 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-04 15:02:44 +08:00
BianLzhaoMin d53bbaa645 领料退料菜单优化完成 2024-06-04 15:02:37 +08:00
binbin_pan a8fc887cd1 领料管理-查看详情-任务状态修改 2024-06-04 14:18:46 +08:00
binbin_pan d02a155852 解密初始密码 2024-06-04 14:05:26 +08:00
csyue 3be3330714 宁夏试运行问题修改 2024-06-04 13:04:54 +08:00
BianLzhaoMin f23f39483f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-04 11:04:08 +08:00
BianLzhaoMin b168d5c1ac 仓库管理菜单梳理完成 2024-06-04 11:04:01 +08:00
binbin_pan 9fa92a9b22 弹框title统一改为:设备出库 2024-06-04 09:45:36 +08:00
hayu dd9d4d5c20 Merge remote-tracking branch 'origin/dev-nx' into dev-nx
# Conflicts:
#	sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
2024-06-04 09:12:04 +08:00
csyue 4201951630 宁夏试运行问题修改 2024-06-03 18:45:24 +08:00
BianLzhaoMin 67ea808d43 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-03 18:06:31 +08:00
BianLzhaoMin 41ac88dc18 菜单配置优化,新购验收菜单下新增,修改等跳页面跳转重构 2024-06-03 18:06:22 +08:00
binbin_pan 2e19924104 综合查询-领料查询-列表增加车牌号、领料单号字段 2024-06-03 17:48:17 +08:00
binbin_pan 52e8e95c45 维修管理-维修-维修人下拉接口更换 2024-06-03 16:21:05 +08:00
binbin_pan f148a8fd77 工机具管理-类型管理-维修员、库管员下拉问题 2024-06-03 13:38:30 +08:00
BianLzhaoMin 60610d8f64 解决预报废页面无法显示问题 2024-06-03 09:35:35 +08:00
BianLzhaoMin eba8462ae0 预报废审核页面调试 2024-06-03 09:18:18 +08:00
BianLzhaoMin 3818d7e237 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-03 09:01:04 +08:00
csyue 403661be05 测试问题项修改 2024-05-31 23:38:35 +08:00
mashuai df24e8cb71 前端页面刷新 2024-05-31 16:32:47 +08:00
csyue d1c8638876 测试问题项修改 2024-05-31 15:19:44 +08:00