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

• ba4400a0fc 组件同步 BianLzhaoMin 2024-06-20 13:31:51 +0800
• 87698622cd 增加配置组件 BianLzhaoMin 2024-06-20 13:28:34 +0800
• e1ca6fdde4 代码同步（领退料，仓储管理） BianLzhaoMin 2024-06-20 13:24:44 +0800
• cd1117c199 测试 BianLzhaoMin 2024-06-20 13:19:57 +0800
• 9275d57f12 优化报废审核弹框数据显示 BianLzhaoMin 2024-06-20 13:09:01 +0800
• d958d0b775 新购 hayu 2024-06-20 09:07:29 +0800
• 816fbbdea3 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-19 16:47:41 +0800
• 624edef0ec 优化领料申请页面字段回显展示问题 BianLzhaoMin 2024-06-19 16:47:38 +0800
• 0b8f5fabb6 test mashuai 2024-06-19 16:11:56 +0800
• e40741b038 test mashuai 2024-06-19 16:09:17 +0800
• a874c9a4a5 优化页面样式 BianLzhaoMin 2024-06-19 15:54:10 +0800
• e6936235e2 优化页面样式 BianLzhaoMin 2024-06-19 15:30:08 +0800
• 771e755198 Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-06-19 14:43:01 +0800
• b4b8a79df0 优化首页查看跳转报错问题 BianLzhaoMin 2024-06-19 14:42:17 +0800
• 92200848f0 二维码退料问题 csyue 2024-06-19 14:42:09 +0800
• afa141b7c6 Merge remote-tracking branch 'origin/dev-cq' into dev-cq csyue 2024-06-19 14:41:34 +0800
• bd76fb2296 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-19 14:33:33 +0800
• 119b37d3eb 测试组件封装 BianLzhaoMin 2024-06-19 14:33:26 +0800
• d293205c43 退料审核bug mashuai 2024-06-19 13:59:19 +0800
• 4186260ef5 退料审核bug mashuai 2024-06-19 13:55:58 +0800
• 2030b0d41c 二维码查询退料 csyue 2024-06-19 13:51:32 +0800
• f507727924 Merge remote-tracking branch 'origin/dev-nx' into dev-nx mashuai 2024-06-19 11:34:54 +0800
• f072ab95b8 退料审核bug mashuai 2024-06-19 11:34:47 +0800
• 35922d044d Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-19 11:20:58 +0800
• eab8f94c0e 优化新购配件页面回显问题 BianLzhaoMin 2024-06-19 11:20:54 +0800
• 8ef3af8059 优化序号问题 binbin_pan 2024-06-19 11:17:48 +0800
• d6e6d0deef 优化序号问题 binbin_pan 2024-06-19 11:06:10 +0800
• c82f214e93 Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-06-19 10:40:45 +0800
• ab988ecc69 优化审核步骤 BianLzhaoMin 2024-06-19 10:40:39 +0800
• 5c3c788d71 优化老版本插槽 binbin_pan 2024-06-19 10:34:22 +0800
• 0616cc2bf0 动态配置大屏跳转地址 binbin_pan 2024-06-19 10:12:35 +0800
• ee066b0495 动态配置大屏跳转地址 binbin_pan 2024-06-19 10:02:46 +0800
• 357f0350c6 内部审批以后短信通知管理人员进行出库 15856 2024-06-19 09:52:03 +0800
• 8e18c4c351 Merge remote-tracking branch 'origin/dev-cq' into dev-cq csyue 2024-06-18 18:20:29 +0800
• 74869937fe 重庆测试问题修改 csyue 2024-06-18 18:19:10 +0800
• 84022ffe21 新购配件管理缓存问题优化 binbin_pan 2024-06-18 17:58:21 +0800
• bc45f6bf07 综合服务中心导出功能修改 hayu 2024-06-18 17:42:02 +0800
• 43ca5391e7 退料审核bug mashuai 2024-06-18 17:38:08 +0800
• e80849ec52 退料审核bug mashuai 2024-06-18 16:23:47 +0800
• 4a8042b267 退料审核bug mashuai 2024-06-18 16:14:53 +0800
• 2aed98e19c 首页展示问题优化 15856 2024-06-18 15:21:55 +0800
• 9ee26edfa7 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-18 15:12:59 +0800
• 1c54fbe9a3 优化领料审核页面缓存问题，数量退料接收时报废信息填写以及预报废列表等地方回显问题开发 BianLzhaoMin 2024-06-18 15:12:54 +0800
• 276c919ea7 新购验收管理-采购状态下拉优化 binbin_pan 2024-06-18 14:55:00 +0800
• 00b8031a96 退料接收新增报废图片和报废原因 15856 2024-06-18 14:49:37 +0800
• 7be2995a04 退料审核bug mashuai 2024-06-18 14:07:30 +0800
• 948b3a524c 维修管理-内部维修-维修数量根据是否选择配件来确认必填与禁用 binbin_pan 2024-06-18 14:04:12 +0800
• 4a0741161e 退料审核bug mashuai 2024-06-18 13:44:23 +0800
• 1667fca06c 去除重庆默认密码登录转跳重置密码页 binbin_pan 2024-06-18 11:00:10 +0800
• 292d9dc820 Merge remote-tracking branch 'origin/dev-nx' into dev-nx csyue 2024-06-18 10:58:46 +0800
• d9e69d21b6 宁夏测试问题修改 csyue 2024-06-18 10:58:07 +0800
• 01aa8c72b2 领料申请增加任务状态搜索, 优化领料审核详情页任务状态显示 binbin_pan 2024-06-18 10:47:26 +0800
• 71c75d2f2f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-18 10:37:19 +0800
• 84272fee42 优化领料审核页面缓存问题 BianLzhaoMin 2024-06-18 10:37:15 +0800
• 9803534ef5 优化创建人 15856 2024-06-18 10:11:30 +0800
• 036c1eb2a5 优化: 工机具管理-编码设备管理-下拉选择先后顺序 binbin_pan 2024-06-18 09:14:34 +0800
• fb0ec7cb81 优化搜索查询 binbin_pan 2024-06-17 18:02:16 +0800
• a538a5eb84 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-17 17:13:54 +0800
• 6a64086767 优化报废图片上传问题 BianLzhaoMin 2024-06-17 17:13:51 +0800
• 5da3ca0b18 文件上传修改 15856 2024-06-17 17:12:22 +0800
• 69bbdf63b0 Merge remote-tracking branch 'origin/dev-nx' into dev-nx csyue 2024-06-17 17:03:46 +0800
• a43c4bf040 宁夏测试问题修改 csyue 2024-06-17 17:03:40 +0800
• 9bc7fd4bc9 优化: 领料申请搜索条件缓存 binbin_pan 2024-06-17 16:42:52 +0800
• 113ed727af 宁夏测试问题修改 csyue 2024-06-17 16:30:46 +0800
• ee30623248 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-17 16:18:09 +0800
• 31a70c1178 优化报废图片展示问题 BianLzhaoMin 2024-06-17 16:18:00 +0800
• da207e3298 宁夏测试问题修改 csyue 2024-06-17 14:43:54 +0800
• 782d2c645a Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-17 14:28:16 +0800
• 8a38a64c30 优化页面样式等问题 BianLzhaoMin 2024-06-17 14:28:10 +0800
• c1c4a6c72d 文件上传修改 15856 2024-06-17 13:55:55 +0800
• 2534328388 领料bug mashuai 2024-06-17 13:37:06 +0800
• d8c426d527 重庆大屏-去除原宁夏的二级页面 binbin_pan 2024-06-17 11:22:28 +0800
• 9e1f958e40 新购工机具入库-采购状态下拉 binbin_pan 2024-06-17 11:09:52 +0800
• 86bbb36485 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-17 11:08:37 +0800
• 0d9c4e82a0 优化协议管理列表展示问题 BianLzhaoMin 2024-06-17 11:08:33 +0800
• 63327236d5 优化: 下拉框支持搜索 binbin_pan 2024-06-17 10:24:12 +0800
• 1745146eee 优化: 标签绑定管理-已绑定状态不能再次勾选绑定, 类型管理-维修员 资产属性 回显问题 binbin_pan 2024-06-17 09:58:45 +0800
• aaf91518ea Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-17 09:37:27 +0800
• 3181ae6751 领料审核页面增加组件缓存 实现查询或审核后主列表保持之前的查询状态 BianLzhaoMin 2024-06-17 09:37:23 +0800
• 561a5d4cef Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev dev zzyuan 2024-06-17 09:11:34 +0800
• 4216c34014 Merge remote-tracking branch 'origin/dev-cq' into dev-cq hayu 2024-06-14 18:04:55 +0800
• 986013197c 代码异味 hayu 2024-06-14 18:04:40 +0800
• bfb48eb5f7 fix: 2094 点击二级库中的进厂数量的数字，进入二级页面，页面标题为“退库” binbin_pan 2024-06-14 18:04:11 +0800
• fa1aed07f8 fix: 2043 下拉框显示有问题 binbin_pan 2024-06-14 17:41:56 +0800
• 21b5304490 领料催办任务 15856 2024-06-14 17:33:27 +0800
• 245c841248 重庆测试问题修改 csyue 2024-06-14 17:28:18 +0800
• c03ce8ee88 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-06-14 17:24:20 +0800
• 2e0814935e 首页领料任务催办功能完善，页面优化等问题 BianLzhaoMin 2024-06-14 17:24:17 +0800
• 6b8ba4129b Merge remote-tracking branch 'origin/dev-cq' into dev-cq csyue 2024-06-14 16:31:50 +0800
• a6497fcc2c 重庆测试问题修改 csyue 2024-06-14 16:31:45 +0800
• 8c78471e2f 验证码时效 mashuai 2024-06-14 16:17:07 +0800
• cc8e909a1f fix: 2085 不填写任何东西就可以提交 binbin_pan 2024-06-14 15:56:27 +0800
• 1fd3565c51 新购时间筛选修改 hayu 2024-06-14 15:14:34 +0800
• 9cd15963dd bug mashuai 2024-06-14 14:58:11 +0800
• 073227f5ac 优化-标签绑定管理多选框 类型管理-维修员,资产属性回显 binbin_pan 2024-06-14 14:21:19 +0800
• f7bb700762 Merge remote-tracking branch 'origin/dev-cq' into dev-cq csyue 2024-06-14 13:51:10 +0800
• 5f5b7bccae 重庆测试问题修改 csyue 2024-06-14 13:50:59 +0800
• dd94f1ee56 新购新增类型下拉框去重 hayu 2024-06-14 13:50:59 +0800
• fe70c92210 在任务表中对领料和退料创建人进行统一存userId，对以前的逻辑进行修改 15856 2024-06-14 13:48:18 +0800
• d693d19f5d bug mashuai 2024-06-14 13:46:13 +0800