Commit Graph

Select branches

Hide Pull Requests

dev

dev-cq

dev-cq-rudy20240806

dev-cq-rudy20240806b

dev-nw

dev-nwcc

dev-nwcc-test

dev-nx

dev-nx-rudy20240805

dev-nx-rudy20240806

dev-nx-sx20240821

dev-nx-sx20240821b

flow_dev

macode20240820

main

master

test

#1

#2

Mono Color

• 8e964622fb 优化 BianLzhaoMin 2024-04-28 09:15:05 +0800
• a8d0461e37 退料申请查询在用量代码提交 liang.chao 2024-04-28 09:13:18 +0800
• f0d7d5d7ad Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-26 18:11:22 +0800
• 5751307d15 退料接收优化zzy zzyuan 2024-04-26 18:11:19 +0800
• f5f2307232 Bug修复 15856 2024-04-26 17:58:14 +0800
• 48e9941ac6 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-04-26 17:53:14 +0800
• eecb2f69f7 优化bug BianLzhaoMin 2024-04-26 17:53:09 +0800
• 86c204a632 字段别名添加 liang.chao 2024-04-26 17:52:15 +0800
• 1131c36f7e Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug BianLzhaoMin 2024-04-26 17:51:54 +0800
• 51abc81b1e 优化测试问题 BianLzhaoMin 2024-04-26 17:51:49 +0800
• c1a578302e fix: 1360 若选择物品种类与设备类型，重置按钮无法重置设备类型内容 binbin_pan 2024-04-26 17:48:25 +0800
• 1cb0d7d1a3 维修分析 binbin_pan 2024-04-26 17:34:08 +0800
• e10c810281 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-26 17:22:19 +0800
• e95c7585c0 前端问题修改（退料申请机具类型选择筛选） zzyuan 2024-04-26 17:22:16 +0800
• bf0992137d 成套机具和退料申请当前在用量代码提交 liang.chao 2024-04-26 17:00:29 +0800
• df24cb9922 优化 BianLzhaoMin 2024-04-26 15:45:36 +0800
• f1cfbef49b Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-04-26 14:45:21 +0800
• 9e2f6da1de 处置功能开发 以及页面优化 BianLzhaoMin 2024-04-26 14:45:18 +0800
• ba5282063c 退料分析 binbin_pan 2024-04-26 10:56:01 +0800
• eb1c5d8d76 领料分析 binbin_pan 2024-04-26 10:25:38 +0800
• 5ea7738ef6 fix: 1338 状态显示完成，流程步骤显示确认为灰色 binbin_pan 2024-04-26 09:45:00 +0800
• 3edb63e8b8 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-25 18:23:44 +0800
• 760a1085b1 优化 BianLzhaoMin 2024-04-25 18:23:40 +0800
• 5f80f7e09e 前端环境 zzyuan 2024-04-25 18:00:54 +0800
• 4b5d251679 Merge remote-tracking branch 'origin/dev' into dev-nx 15856 2024-04-25 17:57:37 +0800
• 330447577a 优化 BianLzhaoMin 2024-04-25 17:48:06 +0800
• 9c8d13a8a4 优化 BianLzhaoMin 2024-04-25 17:35:22 +0800
• 102c6b52a4 增加南网打包配置 BianLzhaoMin 2024-04-25 17:29:01 +0800
• ae27ee7547 优化 BianLzhaoMin 2024-04-25 17:06:18 +0800
• da35634589 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-25 17:04:12 +0800
• c829701efc Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-25 17:03:59 +0800
• 8048fc5ec9 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug zzyuan 2024-04-25 17:03:43 +0800
• dd0845a4d7 领料保存报错提示重复 zzyuan 2024-04-25 17:03:40 +0800
• 5051b6ae92 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 15856 2024-04-25 16:47:32 +0800
• 14822542ce Bug修复 15856 2024-04-25 16:43:56 +0800
• 090fc6c17d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 15856 2024-04-25 16:42:58 +0800
• 358cbda9a2 冲突合并 BianLzhaoMin 2024-04-25 16:39:24 +0800
• d293399415 成套机具代码提交 liang.chao 2024-04-25 16:30:04 +0800
• b005744181 冲突合并 BianLzhaoMin 2024-04-25 16:29:21 +0800
• 3797f88699 测试问题修改 BianLzhaoMin 2024-04-25 16:28:47 +0800
• 882d4a364f Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-25 16:28:09 +0800
• 36c171adc0 fix: 手机号校验 binbin_pan 2024-04-25 16:26:40 +0800
• 4357ae3307 手机号输入只能为数字11位 zzyuan 2024-04-25 16:21:40 +0800
• 14bfda5e94 冲突合并 BianLzhaoMin 2024-04-25 16:03:49 +0800
• b162811f47 测试问题修改 BianLzhaoMin 2024-04-25 16:00:19 +0800
• 0e681358a9 bug mashuai 2024-04-25 15:52:01 +0800
• 6fdb0b7fb1 fix: 1323 退料审核不通过原因无法输入 binbin_pan 2024-04-25 15:41:28 +0800
• 9aab9d752f fix: 1319 退料接收详情页面连点两次，页面卡死 binbin_pan 2024-04-25 14:58:34 +0800
• 41601ff933 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug zzyuan 2024-04-25 14:52:07 +0800
• 83d7b2801e 序号改为顺序1 zzyuan 2024-04-25 14:51:15 +0800
• ff893914d9 bug修改 mashuai 2024-04-25 14:51:11 +0800
• f99aa9aa31 fix: 1315 若进入子页面，使用列表进入主页，再次点击其他数据的按钮，打开仍然时第一次的子页面 binbin_pan 2024-04-25 14:36:57 +0800
• c11d023886 fix: 1313 提示为往来单位，字段为领料单位 binbin_pan 2024-04-25 14:14:30 +0800
• 6deca039fa fix: 1309 已绑定的标签可以再次进行绑定操作（APP端二维码扫描出多个设备） binbin_pan 2024-04-25 14:05:28 +0800
• 7ddb70360e fix:长期领料已完成确认，但是页面图标未变成“√”修改 jackal 2024-04-25 13:40:11 +0800
• 646456b1c6 fix: 1310 填写协议的租赁期限的数字过大时，页面会报错 binbin_pan 2024-04-25 13:19:04 +0800
• 62aeaf6cfd bug修改 mashuai 2024-04-25 13:08:53 +0800
• 9df0dae379 删除提示框文案修改现在不携带编号类数据 zzyuan 2024-04-25 11:28:22 +0800
• 10e57c23ae Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug zzyuan 2024-04-25 11:10:39 +0800
• 2c0b35d7bc treeselect查询英文结果改为中文 zzyuan 2024-04-25 11:10:36 +0800
• e5076c061b fix: 1285 删除一条数据，再新增数据时，用户编号不会连续 binbin_pan 2024-04-25 10:59:17 +0800
• fa0a4148fc Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug zzyuan 2024-04-25 10:58:32 +0800
• 0655ee501b system模块前端问题修改 zzyuan 2024-04-25 10:58:28 +0800
• f8a6621f06 fix: 1276 查询框不能查询 binbin_pan 2024-04-25 10:56:44 +0800
• 20a6b3318b fix:用户管理页面导入失败提示修改 jackal 2024-04-25 10:46:47 +0800
• d8990a97e9 fix:treeselect组件修改 jackal 2024-04-25 10:36:07 +0800
• 4cab68bba6 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug zzyuan 2024-04-25 10:32:50 +0800
• ee0aba24e6 往来单位在领退管理中改为对应字段 zzyuan 2024-04-25 10:32:47 +0800
• 7737e18910 fix:新增供应商必填校验添加 jackal 2024-04-25 10:26:47 +0800
• 82f8e5bb6c 宁夏退料在用量修改 zzyuan 2024-04-25 10:04:44 +0800
• 2313d7baca 单位工程下拉查询bug'修改 zzyuan 2024-04-25 09:33:17 +0800
• 6866107192 config binbin_pan 2024-04-25 09:27:12 +0800
• f7da293b87 领料分析-弹框 binbin_pan 2024-04-25 09:26:22 +0800
• 7a81252dc1 宁夏报废模块优化 BianLzhaoMin 2024-04-25 09:24:31 +0800
• 3ac38557af 成套机具代码提交 liang.chao 2024-04-24 17:59:17 +0800
• 237699319a Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-04-24 17:57:50 +0800
• aaedeaa557 优化 BianLzhaoMin 2024-04-24 17:57:47 +0800
• 1d5116a05e 新购验收入库分析-弹框 binbin_pan 2024-04-24 17:24:56 +0800
• 392b6d769b 总保有量-弹框 binbin_pan 2024-04-24 15:58:10 +0800
• 7247b3679d 退料分析-折线图弹框 binbin_pan 2024-04-24 15:00:07 +0800
• 4af501532f Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-24 14:10:21 +0800
• 580e3a851a 退料接收1 zzyuan 2024-04-24 14:10:08 +0800
• 37d0365868 Merge remote-tracking branch 'origin/dev' into dev liang.chao 2024-04-24 14:09:26 +0800
• 6ffe2fb057 Merge remote-tracking branch 'origin/dev-cq-bug' into dev liang.chao 2024-04-24 14:08:35 +0800
• 82e8a6db4a 退料审核代码提交 liang.chao 2024-04-24 14:05:18 +0800
• a34c11e3bf feat:抱杆明细弹窗组件开发 jackal 2024-04-24 11:27:59 +0800
• 0861d579b5 退料数据-弹框 binbin_pan 2024-04-24 11:21:16 +0800
• bc22b4397e 领料数据-弹框 binbin_pan 2024-04-24 10:14:36 +0800
• 82ce5836ee 优化 BianLzhaoMin 2024-04-24 09:22:58 +0800
• afc93e38bd 优化 BianLzhaoMin 2024-04-24 08:46:24 +0800
• 5490fd2e8f 成套抱杆机具验收 liang.chao 2024-04-23 17:36:00 +0800
• 74d7fc2e87 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug liang.chao 2024-04-23 16:16:41 +0800
• ae0b637828 fix：新购工机具入库审核状态修改 jackal 2024-04-23 16:16:08 +0800
• 182442491a Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug liang.chao 2024-04-23 14:54:40 +0800
• 2ef3d4dbe4 前端退料接收编码退料 zzyuan 2024-04-23 14:53:54 +0800
• af4498afd0 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug liang.chao 2024-04-23 14:37:18 +0800
• d2d9f5b6c4 退料接收按钮判断 zzyuan 2024-04-23 14:35:31 +0800
• 6e6420c65c 前端修改问题修改 zzyuan 2024-04-23 13:44:50 +0800
• 79ee11ff05 tomcat版本替换 liang.chao 2024-04-23 13:22:19 +0800
• 05d4e08f4a tomcat版本替换 liang.chao 2024-04-23 13:13:48 +0800