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

• 032ca9a182 盘点入库问题修复 15856 2024-07-16 14:27:45 +0800
• 407551ad2a Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc sxu 2024-07-16 13:36:30 +0800
• a86ea3910b 代码生成问题 sxu 2024-07-16 13:36:04 +0800
• d35f8799ae 优化页面字段 BianLzhaoMin 2024-07-16 10:46:02 +0800
• 54077911c4 优化新购图片上传问题 BianLzhaoMin 2024-07-16 09:50:09 +0800
• 795c7d28f7 费用承担方字段增加 liang.chao 2024-07-15 18:02:55 +0800
• 0e17dcb25e 增加字段 BianLzhaoMin 2024-07-15 18:00:26 +0800
• ca3a671f2a 合并优化 15856 2024-07-15 17:45:27 +0800
• d29e28bca5 Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq BianLzhaoMin 2024-07-15 17:45:01 +0800
• 762d23c732 领料申请增加费用承担方选择功能 BianLzhaoMin 2024-07-15 17:44:58 +0800
• 7acb95c487 合并优化 15856 2024-07-15 17:15:20 +0800
• fdd93dceab 短信功能及字段回显问题提交 liang.chao 2024-07-15 16:07:10 +0800
• e38925a0cc Merge branch 'dev-nwcc' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nwcc BianLzhaoMin 2024-07-15 16:03:55 +0800
• e0487ad332 优化字典页面新增 删除问题 BianLzhaoMin 2024-07-15 16:03:51 +0800
• 57d55bbab2 合并优化 15856 2024-07-15 15:46:41 +0800
• 390419ede2 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-07-15 15:38:56 +0800
• d754f091b5 短信功能及字段回显问题提交 liang.chao 2024-07-15 15:38:47 +0800
• 1afea4da70 优化字典页面新增功能 BianLzhaoMin 2024-07-15 15:18:21 +0800
• cbaec067a0 优化页面 BianLzhaoMin 2024-07-15 14:59:05 +0800
• 3bac5f119a 解决打包报错问题 BianLzhaoMin 2024-07-15 11:26:34 +0800
• 081608c4b0 解决冲突 BianLzhaoMin 2024-07-15 11:22:34 +0800
• cd71e1cb7a 优化页面样式 BianLzhaoMin 2024-07-15 11:15:36 +0800
• c45b2bae11 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-15 10:36:08 +0800
• 12905d8afd 优化字段 BianLzhaoMin 2024-07-15 10:36:04 +0800
• a8097987df Merge remote-tracking branch 'origin/dev-nw' into dev-nwcc 15856 2024-07-15 10:21:48 +0800
• ef414d1c8c 驳回退料功能完善 liang.chao 2024-07-12 20:08:19 +0800
• d7f1e5bbcd 优化页面 BianLzhaoMin 2024-07-12 17:34:36 +0800
• 88a9b4fa46 修改领料查询，退料查询在领退料菜单下 BianLzhaoMin 2024-07-12 13:08:55 +0800
• 89f3c6f39c IOT设备管理联调 binbin_pan 2024-07-11 18:33:09 +0800
• 24e06003d9 预报废列表按钮优化 BianLzhaoMin 2024-07-11 17:24:34 +0800
• b9e8f34fe9 优化处置文件上传，报废驳回等问题 BianLzhaoMin 2024-07-11 15:17:01 +0800
• 947dc56d6c 优化上传题型 BianLzhaoMin 2024-07-11 09:41:49 +0800
• 6baa14cc5f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-10 17:55:50 +0800
• de977c0100 优化上传问题 BianLzhaoMin 2024-07-10 17:55:48 +0800
• 40eb75962a 数据推送 binbin_pan 2024-07-10 17:23:54 +0800
• a0a0ce7f28 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-07-10 16:59:59 +0800
• 1440b673d6 新购验收增加图片展示功能 liang.chao 2024-07-10 16:59:41 +0800
• ecbf580e80 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-10 16:59:28 +0800
• 445e250d2b 新购验收页面增加附件信息查看功能 BianLzhaoMin 2024-07-10 16:59:24 +0800
• 4337996e01 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-07-10 14:40:18 +0800
• 48826ae819 禅道bug修改 liang.chao 2024-07-10 14:40:08 +0800
• 2e3f6ef8af Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-10 14:12:40 +0800
• 47481e8fb4 优化页面，增加领料催办短信问题 BianLzhaoMin 2024-07-10 14:12:37 +0800
• 4e9dfa60cd 通知公告弹窗降序 mashuai 2024-07-10 11:11:32 +0800
• ff43266b93 通知公告弹窗微调 mashuai 2024-07-10 10:59:10 +0800
• 1db5f7cd6f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-10 08:50:31 +0800
• fb8599e607 优化页面 BianLzhaoMin 2024-07-10 08:50:28 +0800
• 6ed34efbb8 禅道bug修改 liang.chao 2024-07-09 19:00:53 +0800
• 5f17f97f0e Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-09 17:51:50 +0800
• 1f83edc71d 优化页面字段 BianLzhaoMin 2024-07-09 17:51:47 +0800
• e70ec91271 Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-07-09 17:40:41 +0800
• 6a2023bd4b 领料审核短信修改 liang.chao 2024-07-09 17:40:27 +0800
• 8e07744e10 优化表单搜素项 BianLzhaoMin 2024-07-09 17:07:03 +0800
• aa9aac7459 数据推送 binbin_pan 2024-07-09 17:06:32 +0800
• 99346e816d Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-09 16:54:28 +0800
• 5ddc832224 数量退料时bug修改，调试领料申请时首催短信问题 BianLzhaoMin 2024-07-09 16:54:25 +0800
• 55bb72d1a1 通知公告弹窗 mashuai 2024-07-09 13:09:27 +0800
• 1240d87af3 新增通知公告弹框 BianLzhaoMin 2024-07-09 11:22:10 +0800
• ee67ff5f5d Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-09 08:26:10 +0800
• 431d087010 优化接口取值 BianLzhaoMin 2024-07-09 08:26:07 +0800
• 8eea5b7ad4 数据推送 binbin_pan 2024-07-08 18:08:41 +0800
• feab351a4f bug调试 mashuai 2024-07-08 16:34:57 +0800
• 80df6d082d 优化页面样式 BianLzhaoMin 2024-07-08 16:26:03 +0800
• 33f6069fea 测试打包 BianLzhaoMin 2024-07-08 11:01:05 +0800
• 962e1bbad8 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-08 10:27:49 +0800
• baed28c7c3 优化字段展示 BianLzhaoMin 2024-07-08 10:27:46 +0800
• ed6530ee52 盘点入库-加大可入库的限制数量 binbin_pan 2024-07-08 09:22:41 +0800
• ff11afe15f 当一个订单多个机具归属一个库管员时，只要通知一次 15856 2024-07-06 15:17:36 +0800
• ca683c727d 禅道bug修改提交 liang.chao 2024-07-05 18:12:13 +0800
• 3fc43574dc Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-05 17:44:01 +0800
• 637594ba36 优化退料接收参数 BianLzhaoMin 2024-07-05 17:43:58 +0800
• 5b7f0128d4 禅道bug修改提交 liang.chao 2024-07-05 17:08:06 +0800
• a4e52b0902 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-05 17:02:53 +0800
• 74f9ceffff 调试成套设备新增参数修改 BianLzhaoMin 2024-07-05 17:02:51 +0800
• 092b8068cb Merge remote-tracking branch 'origin/dev-nx' into dev-nx liang.chao 2024-07-05 16:56:29 +0800
• 249b1c1240 预报废退料审核提交和禅道bug修改提交 liang.chao 2024-07-05 16:55:48 +0800
• c9a64f39d4 优化成套设备选择时参数 BianLzhaoMin 2024-07-05 16:55:35 +0800
• 36c5b6eecc 推送租赁 binbin_pan 2024-07-05 16:48:26 +0800
• 0101d23bed 优化成套设备编辑 BianLzhaoMin 2024-07-05 16:47:26 +0800
• 4b7763fcfd 优化退料接收之前的校验 BianLzhaoMin 2024-07-05 16:44:21 +0800
• b25ca75270 优化分页 BianLzhaoMin 2024-07-05 16:03:35 +0800
• 034c429537 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-05 14:47:56 +0800
• 1b85e9d1b9 优化接口以及样式等问题 BianLzhaoMin 2024-07-05 14:47:53 +0800
• b6859923de Merge remote-tracking branch 'origin/dev-nw' into dev-nw 15856 2024-07-05 13:05:36 +0800
• fd39dad8b7 sonar异味优化 15856 2024-07-05 13:05:28 +0800
• b551fe3475 领料出库-定位页面+推送 binbin_pan 2024-07-05 11:00:28 +0800
• 52547c4323 test mashuai 2024-07-05 09:44:14 +0800
• 1ec88a938f Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-05 09:34:13 +0800
• eb6c81a8b6 优化页面，增加报废驳回退料功能 BianLzhaoMin 2024-07-05 09:34:08 +0800
• e732dd2a49 大屏页面调试 mashuai 2024-07-04 15:41:32 +0800
• 8ae7cd430f 大屏二级页面调试 mashuai 2024-07-04 15:22:46 +0800
• c1f55991eb 大屏页面调试 mashuai 2024-07-04 09:26:02 +0800
• d04f23454b 定位页面开发 binbin_pan 2024-07-03 20:05:33 +0800
• 187f1742b0 Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx BianLzhaoMin 2024-07-03 17:51:18 +0800
• 41a735b8cb 报废驳回后退料功能开发 BianLzhaoMin 2024-07-03 17:51:15 +0800
• 7c01a29a73 大屏数据优化 binbin_pan 2024-07-03 17:50:41 +0800
• 9a942b3d87 大屏页面调试 mashuai 2024-07-03 17:31:38 +0800
• 6adb1dc728 定位页面搭建 binbin_pan 2024-07-03 17:10:50 +0800
• e2115c867f 领导发短信优先级未确认，暂时注释逐级发短信代码 mashuai 2024-07-03 11:26:01 +0800
• 22ec75cbf2 定位页面搭建 binbin_pan 2024-07-03 11:04:35 +0800