Commit Graph

1202 Commits

Author SHA1 Message Date
15856 f5f2307232 Bug修复 2024-04-26 17:58:14 +08:00
liang.chao 86c204a632 字段别名添加 2024-04-26 17:52:15 +08:00
BianLzhaoMin 1131c36f7e Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-26 17:51:54 +08:00
BianLzhaoMin 51abc81b1e 优化测试问题 2024-04-26 17:51:49 +08:00
binbin_pan c1a578302e fix: 1360 若选择物品种类与设备类型,重置按钮无法重置设备类型内容 2024-04-26 17:48:25 +08:00
zzyuan e10c810281 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-26 17:22:19 +08:00
zzyuan e95c7585c0 前端问题修改(退料申请机具类型选择筛选) 2024-04-26 17:22:16 +08:00
liang.chao bf0992137d 成套机具和退料申请当前在用量代码提交 2024-04-26 17:00:29 +08:00
binbin_pan 5ea7738ef6 fix: 1338 状态显示完成,流程步骤显示确认为灰色 2024-04-26 09:45:00 +08:00
BianLzhaoMin 3edb63e8b8 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-25 18:23:44 +08:00
BianLzhaoMin 760a1085b1 优化 2024-04-25 18:23:40 +08:00
zzyuan 5f80f7e09e 前端环境 2024-04-25 18:00:54 +08:00
BianLzhaoMin 102c6b52a4 增加南网打包配置 2024-04-25 17:29:01 +08:00
zzyuan da35634589 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-25 17:04:12 +08:00
zzyuan c829701efc Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-25 17:03:59 +08:00
zzyuan 8048fc5ec9 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-25 17:03:43 +08:00
zzyuan dd0845a4d7 领料保存报错提示重复 2024-04-25 17:03:40 +08:00
15856 5051b6ae92 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:47:32 +08:00
15856 14822542ce Bug修复 2024-04-25 16:43:56 +08:00
15856 090fc6c17d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 2024-04-25 16:42:58 +08:00
liang.chao d293399415 成套机具代码提交 2024-04-25 16:30:04 +08:00
BianLzhaoMin b005744181 冲突合并 2024-04-25 16:29:21 +08:00
BianLzhaoMin 3797f88699 测试问题修改 2024-04-25 16:28:47 +08:00
zzyuan 882d4a364f Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev 2024-04-25 16:28:09 +08:00
binbin_pan 36c171adc0 fix: 手机号校验 2024-04-25 16:26:40 +08:00
zzyuan 4357ae3307 手机号输入只能为数字11位 2024-04-25 16:21:40 +08:00
BianLzhaoMin 14bfda5e94 冲突合并 2024-04-25 16:03:49 +08:00
BianLzhaoMin b162811f47 测试问题修改 2024-04-25 16:00:19 +08:00
mashuai 0e681358a9 bug 2024-04-25 15:52:01 +08:00
binbin_pan 6fdb0b7fb1 fix: 1323 退料审核不通过原因无法输入 2024-04-25 15:41:28 +08:00
binbin_pan 9aab9d752f fix: 1319 退料接收详情页面连点两次,页面卡死 2024-04-25 14:58:34 +08:00
zzyuan 41601ff933 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-25 14:52:07 +08:00
zzyuan 83d7b2801e 序号改为顺序1 2024-04-25 14:51:15 +08:00
mashuai ff893914d9 bug修改 2024-04-25 14:51:11 +08:00
binbin_pan f99aa9aa31 fix: 1315 若进入子页面,使用列表进入主页,再次点击其他数据的按钮,打开仍然时第一次的子页面 2024-04-25 14:36:57 +08:00
binbin_pan c11d023886 fix: 1313 提示为往来单位,字段为领料单位 2024-04-25 14:14:30 +08:00
binbin_pan 6deca039fa fix: 1309 已绑定的标签可以再次进行绑定操作(APP端二维码扫描出多个设备) 2024-04-25 14:05:28 +08:00
jackal 7ddb70360e fix:长期领料已完成确认,但是页面图标未变成“√”修改 2024-04-25 13:40:11 +08:00
binbin_pan 646456b1c6 fix: 1310 填写协议的租赁期限的数字过大时,页面会报错 2024-04-25 13:19:04 +08:00
mashuai 62aeaf6cfd bug修改 2024-04-25 13:08:53 +08:00
zzyuan 9df0dae379 删除提示框文案修改现在不携带编号类数据 2024-04-25 11:28:22 +08:00
zzyuan 10e57c23ae Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-25 11:10:39 +08:00
zzyuan 2c0b35d7bc treeselect查询英文结果改为中文 2024-04-25 11:10:36 +08:00
binbin_pan e5076c061b fix: 1285 删除一条数据,再新增数据时,用户编号不会连续 2024-04-25 10:59:17 +08:00
zzyuan fa0a4148fc Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-25 10:58:32 +08:00
zzyuan 0655ee501b system模块前端问题修改 2024-04-25 10:58:28 +08:00
binbin_pan f8a6621f06 fix: 1276 查询框不能查询 2024-04-25 10:56:44 +08:00
jackal 20a6b3318b fix:用户管理页面导入失败提示修改 2024-04-25 10:46:47 +08:00
jackal d8990a97e9 fix:treeselect组件修改 2024-04-25 10:36:07 +08:00
zzyuan 4cab68bba6 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug 2024-04-25 10:32:50 +08:00