bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,472 Commits 17 Branches 0 Tags 43 MiB
Commit Graph

572 Commits

Author SHA1 Message Date
BianLzhaoMin 8fffbb4c67 增加领料时设备类型选择 并过滤出指定类型机具 2024-06-13 14:57:57 +08:00
BianLzhaoMin bd89662085 优化报废等页面数据回显，操作事件等 2024-06-13 14:08:59 +08:00
BianLzhaoMin 8bc40d2f07 优化新购配件保存后无法跳转问题，解决报废图片在预报废列表不回显等问题 2024-06-13 13:07:11 +08:00
binbin_pan 48dbc1cbab fix: 2049-2050-2051-2057 2024-06-12 18:44:06 +08:00
BianLzhaoMin 00c0e75abf 优化领料申请页面问题 2024-06-12 17:20:34 +08:00
BianLzhaoMin a9a42f4421 增加领料审核页面状态查询 2024-06-12 16:53:33 +08:00
binbin_pan b5c59ac97a 领料管理-领料审核-查看详情任务状态 2024-06-12 16:22:40 +08:00
BianLzhaoMin eaaa9cdafa 冲突合并 2024-06-12 16:17:19 +08:00
BianLzhaoMin c4c2e6953d 优化页面样式，首页跳转bug等问题 2024-06-12 16:16:08 +08:00
binbin_pan 8edeace992 优化检验时间选择 2024-06-12 14:49:59 +08:00
binbin_pan 079b106148 fix: 协议管理，工程查询目前只能下拉选择，不能支持搜索选择 2024-06-12 13:49:22 +08:00
binbin_pan 6a21d5e7a3 优化 2024-06-12 13:25:33 +08:00
binbin_pan 940378a692 fix: 2036 检验时间可以晚于下次检验时间 2024-06-12 11:16:47 +08:00
binbin_pan 91c0464a0e 盘点入库-编码入库-设备编码必填 2024-06-12 10:35:55 +08:00
binbin_pan b360d07dc4 fix: 2023 建议提示在输入框左侧显示 2024-06-12 09:44:34 +08:00
hayu 6e6694eb27 新购流程及综合查询修改 2024-06-07 17:12:11 +08:00
BianLzhaoMin 1fcb130c64 优化页面样式 2024-06-07 15:03:35 +08:00
BianLzhaoMin 18a57c30b5 新购增加提交审核按钮 2024-06-07 14:44:17 +08:00
BianLzhaoMin f4d9a8a171 优化页面提示 2024-06-07 11:19:26 +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
BianLzhaoMin e1928139b7 测试问题修改 2024-06-06 15:57:41 +08:00
BianLzhaoMin 9e113d0ee0 优化首页查看跳转，领料驳回等bug问题 2024-06-06 14:20:07 +08:00
BianLzhaoMin fa74b08c76 测试领料流程 2024-06-06 11:47:52 +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
binbin_pan c316048317 领料出库-增加手动出库结单 2024-06-05 15:41:36 +08:00
binbin_pan ed6da1696e 明文加解密 2024-06-05 14:52:16 +08:00
BianLzhaoMin 9f963fbdc8 领料页面优化 2024-06-05 14:03:17 +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
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
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
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