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

604 Commits

Author SHA1 Message Date
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
mashuai df24e8cb71 前端页面刷新 2024-05-31 16:32:47 +08:00
hayu f4d2a37cfe 新购流程修改 2024-05-31 13:09:02 +08:00
BianLzhaoMin 8fa53f2dad 预报废页面bug修改 2024-05-31 10:35:43 +08:00
BianLzhaoMin 6f50c3a9c9 优化登录页输入框无法验证问题 2024-05-30 18:26:39 +08:00
BianLzhaoMin 72919c2ffa 解决页面插槽使用不规范问题 2024-05-30 10:39:59 +08:00
BianLzhaoMin 2a453c8f14 清除南网相关配置 2024-05-29 17:13:05 +08:00
BianLzhaoMin ac1d192df7 领料申请页面字段微调 2024-05-29 14:21:42 +08:00
BianLzhaoMin 3be3fd24eb 优化页面展示，增加分公司审核按钮判断 2024-05-29 10:47:32 +08:00
BianLzhaoMin 7de764f72c 盘点入库页面优化 2024-05-28 18:42:17 +08:00
BianLzhaoMin 85997e5401 增加盘点入库详情查询功能 2024-05-28 16:54:30 +08:00
BianLzhaoMin bf1ad92297 解决列表序号延续问题 2024-05-28 14:55:56 +08:00
BianLzhaoMin 7174769903 解除重置密码跳转逻辑 2024-05-28 11:27:39 +08:00
BianLzhaoMin 5d53a58d78 解除密码加密 2024-05-28 10:37:43 +08:00
BianLzhaoMin c0ac8806c8 优化登录页面图形验证码校验问题 2024-05-27 16:33:12 +08:00
binbin_pan 2d37e70125 去除采购员下拉 多余的请选择选项 2024-05-25 12:24:59 +08:00
binbin_pan aa395fed2b 密码明文加密 2024-05-24 19:30:37 +08:00
binbin_pan 65859bd0cb 密码明文加密 2024-05-24 19:11:11 +08:00
binbin_pan 8697321719 打开弹窗调用树接口 2024-05-24 18:27:34 +08:00
binbin_pan c6d4e9f551 nx暂不使用加密 2024-05-24 13:28:51 +08:00
binbin_pan 5f64adb61d 明文加密 2024-05-23 19:12:48 +08:00
binbin_pan 1c94382ae0 增加初始密码登录后重置初始密码页 2024-05-23 17:32:12 +08:00
BianLzhaoMin d13d7b2374 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-23 17:17:22 +08:00
BianLzhaoMin d07edc2818 优化领料管理页面列表备注字段报错问题 2024-05-23 17:17:16 +08:00
binbin_pan f272f0638f 限制头像上传图片格式 2024-05-23 14:22:41 +08:00
binbin_pan 53d757ce59 密码框增加小眼睛查看密码 2024-05-23 09:36:49 +08:00
binbin_pan a74db9ac70 fix: 用户密码明文传输漏洞 2024-05-22 15:15:35 +08:00
BianLzhaoMin 7c741e09b1 优化环境变量配置问题 区分测试环境与生产环境 2024-05-17 14:40:37 +08:00
BianLzhaoMin e33e2c8094 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-17 14:27:48 +08:00
BianLzhaoMin a71a21d070 优化用户权限以及页面等样式问题 2024-05-17 14:27:43 +08:00
binbin_pan 25089dac0a 修改密码增加校验 2024-05-17 14:25:27 +08:00
BianLzhaoMin d48d3e82c3 增加报废列表等导出功能，封装重复组件，优化页面 2024-05-16 17:44:30 +08:00
BianLzhaoMin 7e1dd910f2 测试问题修改 并新增维修报废 退料报废两个静态页面 2024-05-16 14:16:49 +08:00
binbin_pan 412cd85ae7 退料接收详情-查看接口 2024-05-15 15:13:17 +08:00
binbin_pan d163158826 去除多余字段 2024-05-15 13:45:52 +08:00
binbin_pan 4964d48407 fix: 1592 预报废审核无法进行导出 2024-05-15 12:09:37 +08:00
BianLzhaoMin 04553ab094 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-15 11:29:25 +08:00
BianLzhaoMin 74664cd0b4 优化预报废列表字段展示问题 2024-05-15 11:29:17 +08:00
binbin_pan a377d31610 fix: bug 修复 2024-05-15 09:50:45 +08:00
BianLzhaoMin 244c850889 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-05-15 08:46:47 +08:00
BianLzhaoMin 42a8e5c561 优化测试问题 2024-05-15 08:46:38 +08:00
binbin_pan e95995911c fix: 1594 报废列表中部分搜索条件无法进行搜索 2024-05-14 17:59:05 +08:00
BianLzhaoMin 2a284b8d52 合并冲突 2024-05-14 15:54:22 +08:00
BianLzhaoMin 5316d97e2b 优化权限数据流程 2024-05-14 15:53:42 +08:00
binbin_pan 0ce4cc37be 宁夏大屏跳转链接 2024-05-13 14:13:07 +08:00
binbin_pan ada8e96ccd 宁夏大屏不显示问题 2024-05-13 10:11:43 +08:00
BianLzhaoMin 12a1c479ee 优化审核问题 2024-05-11 18:05:49 +08:00
BianLzhaoMin f31c01c045 优化流程 2024-05-08 17:43:00 +08:00
BianLzhaoMin 360f2fc5cc 优化权限流程问题 2024-05-08 17:26:31 +08:00
BianLzhaoMin 3db5bbb1f0 优化权限流程 2024-05-08 16:50:01 +08:00
BianLzhaoMin 1272ccda12 优化流程 2024-05-08 15:59:37 +08:00
BianLzhaoMin 8731cdc995 优化 2024-05-07 21:17:16 +08:00
BianLzhaoMin d0d700208f 优化 2024-05-07 17:37:03 +08:00
BianLzhaoMin f6c1bdb1c7 冲突合并 2024-05-07 16:38:53 +08:00
BianLzhaoMin 2463392124 测试问题优化 2024-05-07 16:31:07 +08:00
BianLzhaoMin b340c8ec01 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-07 11:14:15 +08:00
BianLzhaoMin 5a7856a150 测试问题优化 2024-05-07 11:14:11 +08:00
binbin_pan b5e0736479 fix: 1478 待报废中，先输写必填项内容，再将内容删除，点击保存按钮，页面提示操作成功 2024-05-07 09:15:23 +08:00
BianLzhaoMin 4686425fbb 冲突合并 2024-05-06 19:37:14 +08:00
BianLzhaoMin bbd4cd5409 优化测试问题 2024-05-06 19:32:16 +08:00
hhui b86f8fd839 fix:报废明细图片添加无数据展示 2024-05-06 17:56:22 +08:00
binbin_pan 2051c7c8d2 fix: 1474 待报废上传图片时，若选择超过3张图片，弹出2次提示 2024-05-06 17:52:21 +08:00
hhui e3c493cfaf fix:修饰入库查询清空 2024-05-06 17:49:02 +08:00
hhui 40ec1a1fc7 fix:维修数量校验 2024-05-06 17:34:41 +08:00
binbin_pan f502ec3294 fix: 1454 内部维修只能添加配件不能删除多余页 2024-05-06 17:30:53 +08:00
liang.chao d3ecfdeaa0 Merge branch 'dev' into dev-cq-bug 2024-05-06 17:09:37 +08:00
zzyuan 94deba2140 退料接收数量反显 2024-05-06 17:07:08 +08:00
binbin_pan f70f0462d6 fix: 1458 内部维修字段必填项，没有f必填项标识 2024-05-06 17:06:10 +08:00
hhui d1d7c93872 fix:bug修改 2024-05-06 17:03:01 +08:00