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

• 00773c6bd0 领料出库详情查看接口修改 liang.chao 2024-05-07 17:54:30 +0800
• d0d700208f 优化 BianLzhaoMin 2024-05-07 17:37:03 +0800
• f6c1bdb1c7 冲突合并 BianLzhaoMin 2024-05-07 16:38:53 +0800
• 8ab553727b Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug BianLzhaoMin 2024-05-07 16:31:11 +0800
• 2463392124 测试问题优化 BianLzhaoMin 2024-05-07 16:31:07 +0800
• 8b5519223f 测试问题bug修改 liang.chao 2024-05-07 16:29:36 +0800
• b340c8ec01 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug BianLzhaoMin 2024-05-07 11:14:15 +0800
• 5a7856a150 测试问题优化 BianLzhaoMin 2024-05-07 11:14:11 +0800
• d92af0df79 导出预报废审核列表 15856 2024-05-07 11:02:36 +0800
• 0f3675df58 bug mashuai 2024-05-07 10:21:12 +0800
• b5e0736479 fix: 1478 待报废中，先输写必填项内容，再将内容删除，点击保存按钮，页面提示操作成功 binbin_pan 2024-05-07 09:15:23 +0800
• 4686425fbb 冲突合并 BianLzhaoMin 2024-05-06 19:37:14 +0800
• bbd4cd5409 优化测试问题 BianLzhaoMin 2024-05-06 19:32:16 +0800
• 75d2b02422 bug mashuai 2024-05-06 18:20:45 +0800
• c0394d1f59 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug liang.chao 2024-05-06 17:59:58 +0800
• 25ad01ce71 bug修改提交 liang.chao 2024-05-06 17:59:30 +0800
• b86f8fd839 fix:报废明细图片添加无数据展示 hhui 2024-05-06 17:56:22 +0800
• 2051c7c8d2 fix: 1474 待报废上传图片时，若选择超过3张图片，弹出2次提示 binbin_pan 2024-05-06 17:52:21 +0800
• e3c493cfaf fix:修饰入库查询清空 hhui 2024-05-06 17:49:02 +0800
• 40ec1a1fc7 fix:维修数量校验 hhui 2024-05-06 17:34:41 +0800
• f502ec3294 fix: 1454 内部维修只能添加配件不能删除多余页 binbin_pan 2024-05-06 17:30:53 +0800
• d3ecfdeaa0 Merge branch 'dev' into dev-cq-bug liang.chao 2024-05-06 17:09:37 +0800
• faab921dae Merge remote-tracking branch 'origin/dev' into dev liang.chao 2024-05-06 17:07:50 +0800
• 94deba2140 退料接收数量反显 zzyuan 2024-05-06 17:07:08 +0800
• 0cce5cc793 退料审核代码提交 liang.chao 2024-05-06 17:07:03 +0800
• f70f0462d6 fix: 1458 内部维修字段必填项，没有f必填项标识 binbin_pan 2024-05-06 17:06:10 +0800
• d1d7c93872 fix:bug修改 hhui 2024-05-06 17:03:01 +0800
• 6015dd0ae5 fix:bug修改 hhui 2024-05-06 16:49:45 +0800
• 8a67438b15 fix: 1453 退料审核时被驳回，驳回后修改数据再次提交，审核时查看的数据依然是驳回前的数据 binbin_pan 2024-05-06 16:42:25 +0800
• 3e75f58a59 fix: 1468 无法进行勾选数据准确导出 binbin_pan 2024-05-06 16:32:20 +0800
• 369c0c95c1 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug BianLzhaoMin 2024-05-06 16:18:08 +0800
• ad4cda739b 测试bug优化 BianLzhaoMin 2024-05-06 16:18:05 +0800
• f07c7663c9 fix: 1451 维修详情里的序号显示NaN binbin_pan 2024-05-06 15:50:11 +0800
• 54c2460965 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-05-06 15:21:41 +0800
• 83f78e85c8 页面优化 BianLzhaoMin 2024-05-06 15:21:37 +0800
• 40736e1c85 催办，退料报废，维修报废，预报废审核，报废审核 15856 2024-05-06 10:35:08 +0800
• 382a4fb6a1 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 15856 2024-05-06 10:33:55 +0800
• 4c8a65cd54 大屏 mashuai 2024-05-06 10:04:58 +0800
• 33cce0d866 退料审核代码提交 liang.chao 2024-05-06 09:57:28 +0800
• 3501c258f7 代码合并 宁夏 BianLzhaoMin 2024-05-06 09:51:10 +0800
• 2ee57ad53f Merge remote-tracking branch 'origin/dev-nx' into dev-nx 15856 2024-05-06 09:51:01 +0800
• 86935fa01f 代码合并 宁夏 BianLzhaoMin 2024-05-06 09:49:54 +0800
• 688599a5b0 宁夏 冲突合并 BianLzhaoMin 2024-05-06 09:48:15 +0800
• 52745e9a4e 退料审核代码提交 liang.chao 2024-05-06 09:42:49 +0800
• ef45941890 Merge remote-tracking branch 'origin/dev-nx' into dev-nx 15856 2024-05-06 09:28:40 +0800
• 834faeee43 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 15856 2024-04-30 17:51:44 +0800
• 571771bcac Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug BianLzhaoMin 2024-04-30 17:50:39 +0800
• f511ad6292 优化测试问题 BianLzhaoMin 2024-04-30 17:50:34 +0800
• bc8420e094 bug修改提交 liang.chao 2024-04-30 16:43:40 +0800
• 18168f0c46 删除重复接口 binbin_pan 2024-04-30 15:59:35 +0800
• e1d74486b7 fix: 1443 出库的状态与出库状态下拉框中数据不对应 binbin_pan 2024-04-30 15:50:36 +0800
• 1ed94a6706 bug mashuai 2024-04-30 15:14:27 +0800
• 43b159ca72 Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug BianLzhaoMin 2024-04-30 15:10:43 +0800
• 0634f707d1 优化二级库表单重置bug BianLzhaoMin 2024-04-30 15:10:40 +0800
• c3f97d83d4 fix: 1441 单位类型中第二页的数据，在往来单位新增页面下拉框不展示 binbin_pan 2024-04-30 15:06:04 +0800
• 62a7113b70 Merge remote-tracking branch 'origin/dev-cq-bug' into dev hhui 2024-04-30 15:03:10 +0800
• 8514069663 feat:抱杆台账查询页面接口联调 hhui 2024-04-30 14:58:02 +0800
• 9bc4bc2f6e Merge remote-tracking branch 'origin/dev' into dev 15856 2024-04-30 14:32:33 +0800
• 25f84100e6 bug修复 15856 2024-04-30 14:32:17 +0800
• 1030c78305 app领料申请详情bug提交 liang.chao 2024-04-30 14:09:40 +0800
• 8b433a699e Merge remote-tracking branch 'origin/dev-cq' into dev 15856 2024-04-30 13:12:50 +0800
• 1419b8c32d Merge remote-tracking branch 'origin/dev-cq-bug' into dev 15856 2024-04-30 13:11:10 +0800
• f23b73106a bug mashuai 2024-04-30 11:29:00 +0800
• 6b002958d6 Merge remote-tracking branch 'origin/dev' into dev liang.chao 2024-04-30 11:23:54 +0800
• ffe7c67c6f 重庆领料审核修改后无数据bug liang.chao 2024-04-30 11:23:49 +0800
• bbf5d988f3 Merge remote-tracking branch 'origin/dev-cq-bug' into dev 15856 2024-04-30 10:26:55 +0800
• 763c003c34 新购验收查询接口添加 liang.chao 2024-04-30 09:09:34 +0800
• 88ac035ed7 bug mashuai 2024-04-29 18:43:22 +0800
• dfd01cfd5f Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-29 18:05:15 +0800
• ec8993ab37 综合查询时间重置 zzyuan 2024-04-29 18:05:10 +0800
• 958771084c Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-29 18:03:43 +0800
• bb5cfa3d0d 库存日志页面参数查询调试 BianLzhaoMin 2024-04-29 18:03:37 +0800
• e3820da708 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-29 17:57:15 +0800
• 6d79f0f5e9 岗位编号改为序号 zzyuan 2024-04-29 17:57:04 +0800
• d1ed28a088 bug mashuai 2024-04-29 17:42:02 +0800
• fc4e97d591 fix: 1417 设备绑定编码时，绑定几台设备重复展示几次数据 binbin_pan 2024-04-29 17:38:07 +0800
• 101e0d7ef6 页面优化 BianLzhaoMin 2024-04-29 17:14:44 +0800
• 0cce767acd 优化 BianLzhaoMin 2024-04-29 17:06:02 +0800
• 0f4f63b29c Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-04-29 16:53:22 +0800
• a687f53fb0 优化页面 BianLzhaoMin 2024-04-29 16:53:18 +0800
• d58c1b788d bug mashuai 2024-04-29 16:52:51 +0800
• 7cef74aa24 物资LOG日志修订 syruan 2024-04-29 16:50:07 +0800
• c64e32b423 fix: 1421 输入框出现unknown binbin_pan 2024-04-29 15:58:21 +0800
• 4f9cb5e37e 宁夏大屏二级页面 mashuai 2024-04-29 14:38:15 +0800
• 38ebf1ded7 库存日志页面接口调试 字段回显确认 BianLzhaoMin 2024-04-29 13:27:26 +0800
• 860b95d5dd 1399 基础管理新增页面存在错乱字符 binbin_pan 2024-04-29 13:21:34 +0800
• f775acb88f 前端useNum修改 zzyuan 2024-04-29 10:38:57 +0800
• b6ac7ef9f2 代码提交 liang.chao 2024-04-29 10:35:34 +0800
• 459fc25d55 优化 BianLzhaoMin 2024-04-28 17:49:42 +0800
• 0ba80b20e7 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-04-28 16:55:23 +0800
• 83863f7e22 由阿胡 BianLzhaoMin 2024-04-28 16:55:12 +0800
• bad5c11bdc Merge remote-tracking branch 'origin/dev' into dev-cq-bug 15856 2024-04-28 16:41:10 +0800
• 0c77aa4e46 Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug 15856 2024-04-28 16:23:50 +0800
• 660d90550a Bug修复 15856 2024-04-28 16:23:43 +0800
• c2aaa44f1b app联调代码提交 liang.chao 2024-04-28 16:16:29 +0800
• a202afc189 优化 binbin_pan 2024-04-28 16:15:15 +0800
• 8ac830e90a 优化 binbin_pan 2024-04-28 15:43:19 +0800
• c6e9d286dc 弹框样式调整 binbin_pan 2024-04-28 14:51:18 +0800
• b1dab92965 弹框样式调整 binbin_pan 2024-04-28 14:08:42 +0800
• f697659bd7 优化测试问题 BianLzhaoMin 2024-04-28 10:28:22 +0800