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

776 Commits

Author SHA1 Message Date
BianLzhaoMin c12a274588 成套设备编辑按钮隐藏 2024-06-25 17:43:09 +08:00
BianLzhaoMin 158416a4f2 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-25 17:36:14 +08:00
BianLzhaoMin 6183ae3eae 增加机具成套设备新增 删除 编辑功能 2024-06-25 17:36:11 +08:00
binbin_pan 968d953387 优化日期选择 2024-06-25 16:49:18 +08:00
binbin_pan 4d96be2a55 优化日期选择 2024-06-25 16:12:57 +08:00
binbin_pan 3616e79133 优化出厂日期可以晚于采购日期与到货日期 2024-06-25 16:08:50 +08:00
binbin_pan 57417fc8be fix: 出厂日期可以晚于采购日期与到货日期 2024-06-25 16:00:40 +08:00
binbin_pan 67d7bea4ce fix: 出厂日期可以晚于采购日期与到货日期 2024-06-25 15:52:53 +08:00
binbin_pan 1311fea613 工机具管理-类型管理优化 2024-06-25 09:44:07 +08:00
binbin_pan 8159501cfc 优化类型管理-库管员 2024-06-24 18:04:09 +08:00
BianLzhaoMin 53361c7f01 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-24 18:03:21 +08:00
BianLzhaoMin 37bed594d4 增加退料报废，维修报废静态页面 2024-06-24 18:03:18 +08:00
binbin_pan c27986aadc 优化 2024-06-24 15:15:38 +08:00
BianLzhaoMin f590286a09 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-24 14:29:27 +08:00
BianLzhaoMin 3b6cb450d1 优化领料申请编辑回显bug，完善退料接收编码设备报废图片上传，原因填写等问题 2024-06-24 14:29:24 +08:00
binbin_pan 56ee954dab 机具公司和调试公司的编码设备分开进行管理 2024-06-24 11:18:51 +08:00
binbin_pan 309dceac67 综合查询机具库存与调试库存分开展示 2024-06-24 10:26:49 +08:00
BianLzhaoMin 432a972005 优化测试问题 2024-06-21 17:21:01 +08:00
BianLzhaoMin 9cc286e4b7 测试问题修改 2024-06-21 10:37:08 +08:00
BianLzhaoMin 5911781f8b 测试问题优化 2024-06-20 18:03:57 +08:00
hayu 78f99ec50d 新购测试问题修改 2024-06-20 14:04:13 +08:00
BianLzhaoMin 9275d57f12 优化报废审核弹框数据显示 2024-06-20 13:09:01 +08:00
BianLzhaoMin 624edef0ec 优化领料申请页面字段回显展示问题 2024-06-19 16:47:38 +08:00
BianLzhaoMin a874c9a4a5 优化页面样式 2024-06-19 15:54:10 +08:00
BianLzhaoMin e6936235e2 优化页面样式 2024-06-19 15:30:08 +08:00
BianLzhaoMin 119b37d3eb 测试组件封装 2024-06-19 14:33:26 +08:00
BianLzhaoMin 35922d044d Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-19 11:20:58 +08:00
BianLzhaoMin eab8f94c0e 优化新购配件页面回显问题 2024-06-19 11:20:54 +08:00
binbin_pan 8ef3af8059 优化序号问题 2024-06-19 11:17:48 +08:00
binbin_pan 5c3c788d71 优化老版本插槽 2024-06-19 10:34:22 +08:00
binbin_pan 0616cc2bf0 动态配置大屏跳转地址 2024-06-19 10:12:35 +08:00
BianLzhaoMin 9ee26edfa7 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-18 15:12:59 +08:00
BianLzhaoMin 1c54fbe9a3 优化领料审核页面缓存问题，数量退料接收时报废信息填写以及预报废列表等地方回显问题开发 2024-06-18 15:12:54 +08:00
binbin_pan 276c919ea7 新购验收管理-采购状态下拉优化 2024-06-18 14:55:00 +08:00
binbin_pan 01aa8c72b2 领料申请增加任务状态搜索, 优化领料审核详情页任务状态显示 2024-06-18 10:47:26 +08:00
BianLzhaoMin 71c75d2f2f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-18 10:37:19 +08:00
BianLzhaoMin 84272fee42 优化领料审核页面缓存问题 2024-06-18 10:37:15 +08:00
binbin_pan 036c1eb2a5 优化: 工机具管理-编码设备管理-下拉选择先后顺序 2024-06-18 09:14:34 +08:00
binbin_pan fb0ec7cb81 优化搜索查询 2024-06-17 18:02:16 +08:00
BianLzhaoMin a538a5eb84 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-17 17:13:54 +08:00
BianLzhaoMin 6a64086767 优化报废图片上传问题 2024-06-17 17:13:51 +08:00
binbin_pan 9bc7fd4bc9 优化: 领料申请搜索条件缓存 2024-06-17 16:42:52 +08:00
BianLzhaoMin 31a70c1178 优化报废图片展示问题 2024-06-17 16:18:00 +08:00
BianLzhaoMin 782d2c645a Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-17 14:28:16 +08:00
BianLzhaoMin 8a38a64c30 优化页面样式等问题 2024-06-17 14:28:10 +08:00
binbin_pan 9e1f958e40 新购工机具入库-采购状态下拉 2024-06-17 11:09:52 +08:00
BianLzhaoMin 86bbb36485 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-17 11:08:37 +08:00
BianLzhaoMin 0d9c4e82a0 优化协议管理列表展示问题 2024-06-17 11:08:33 +08:00
binbin_pan 63327236d5 优化: 下拉框支持搜索 2024-06-17 10:24:12 +08:00
binbin_pan 1745146eee 优化: 标签绑定管理-已绑定状态不能再次勾选绑定, 类型管理-维修员 资产属性 回显问题 2024-06-17 09:58:45 +08:00
BianLzhaoMin 3181ae6751 领料审核页面增加组件缓存 实现查询或审核后主列表保持之前的查询状态 2024-06-17 09:37:23 +08:00
BianLzhaoMin c03ce8ee88 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx 2024-06-14 17:24:20 +08:00
BianLzhaoMin 2e0814935e 首页领料任务催办功能完善，页面优化等问题 2024-06-14 17:24:17 +08:00
hayu 960aa87399 新购状态 2024-06-14 11:30:10 +08:00
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
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
hhui 6015dd0ae5 fix:bug修改 2024-05-06 16:49:45 +08:00
binbin_pan 8a67438b15 fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据 2024-05-06 16:42:25 +08:00
binbin_pan 3e75f58a59 fix: 1468 无法进行勾选数据准确导出 2024-05-06 16:32:20 +08:00
BianLzhaoMin 369c0c95c1 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-05-06 16:18:08 +08:00
BianLzhaoMin ad4cda739b 测试bug优化 2024-05-06 16:18:05 +08:00
binbin_pan f07c7663c9 fix: 1451 维修详情里的序号显示NaN 2024-05-06 15:50:11 +08:00
BianLzhaoMin 83f78e85c8 页面优化 2024-05-06 15:21:37 +08:00
BianLzhaoMin 3501c258f7 代码合并 宁夏 2024-05-06 09:51:10 +08:00
BianLzhaoMin 86935fa01f 代码合并 宁夏 2024-05-06 09:49:54 +08:00
BianLzhaoMin 688599a5b0 宁夏 冲突合并 2024-05-06 09:48:15 +08:00
15856 834faeee43 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 17:51:44 +08:00
BianLzhaoMin 571771bcac Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-30 17:50:39 +08:00
BianLzhaoMin f511ad6292 优化测试问题 2024-04-30 17:50:34 +08:00
binbin_pan e1d74486b7 fix: 1443 出库的状态与出库状态下拉框中数据不对应 2024-04-30 15:50:36 +08:00
BianLzhaoMin 43b159ca72 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-30 15:10:43 +08:00
BianLzhaoMin 0634f707d1 优化二级库表单重置bug 2024-04-30 15:10:40 +08:00
binbin_pan c3f97d83d4 fix: 1441 单位类型中第二页的数据，在往来单位新增页面下拉框不展示 2024-04-30 15:06:04 +08:00
hhui 62a7113b70 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 15:03:10 +08:00
hhui 8514069663 feat:抱杆台账查询页面接口联调 2024-04-30 14:58:02 +08:00
15856 bbf5d988f3 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-30 10:26:55 +08:00
zzyuan dfd01cfd5f Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-29 18:05:15 +08:00
zzyuan ec8993ab37 综合查询时间重置 2024-04-29 18:05:10 +08:00
BianLzhaoMin 958771084c Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-29 18:03:43 +08:00
BianLzhaoMin bb5cfa3d0d 库存日志页面参数查询调试 2024-04-29 18:03:37 +08:00
zzyuan e3820da708 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-29 17:57:15 +08:00
zzyuan 6d79f0f5e9 岗位编号改为序号 2024-04-29 17:57:04 +08:00
binbin_pan fc4e97d591 fix: 1417 设备绑定编码时，绑定几台设备重复展示几次数据 2024-04-29 17:38:07 +08:00
BianLzhaoMin 101e0d7ef6 页面优化 2024-04-29 17:14:44 +08:00