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

• 3dcca77cf0 bug修复 15856 2024-04-16 10:37:42 +0800
• f4068ec667 首页新增查看按钮跳转对应页面并携带参数 BianLzhaoMin 2024-04-15 18:03:00 +0800
• c93b3fa75a 退料接收撤回功能 zzyuan 2024-04-15 17:47:54 +0800
• 77c6616c64 退料审核代码提交 liang.chao 2024-04-15 16:42:26 +0800
• 09dd56414a 退料接收撤回代码提交 liang.chao 2024-04-15 16:03:44 +0800
• 37784d49e7 Merge remote-tracking branch 'origin/dev' into dev csyue 2024-04-15 15:46:20 +0800
• f17a656374 int类型变量命名 csyue 2024-04-15 15:42:23 +0800
• ad46244534 FIX mashuai 2024-04-15 13:54:22 +0800
• d771ed2975 Merge remote-tracking branch 'origin/dev' into dev 15856 2024-04-15 09:43:03 +0800
• ecb952183c bug修复 15856 2024-04-15 09:42:52 +0800
• b91aeb2ccf 新购入库问题修改 hayu 2024-04-15 09:40:05 +0800
• 273780187a 新购入库问题修改 hayu 2024-04-13 13:31:25 +0800
• 376020f506 计划借调管理初版 mashuai 2024-04-12 18:02:20 +0800
• eafbcb5640 Merge remote-tracking branch 'origin/dev' into dev liang.chao 2024-04-12 17:22:01 +0800
• d5384b25b3 bug修改 liang.chao 2024-04-12 17:21:21 +0800
• 8bb53bf1d1 测试问题修改 zzyuan 2024-04-12 17:20:16 +0800
• 1ecf314a2a bug修改 liang.chao 2024-04-12 17:18:48 +0800
• 5eb3fdf54a fix:去除debugger jackal 2024-04-12 17:11:36 +0800
• 77c740164c 物资LOG日志 syruan 2024-04-12 16:19:28 +0800
• c83193c9a9 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-12 14:56:24 +0800
• 1c89edaa77 优化测试bug BianLzhaoMin 2024-04-12 14:56:20 +0800
• 4725ba9d56 Merge remote-tracking branch 'origin/dev' into dev mashuai 2024-04-12 14:27:16 +0800
• 86bfcdae12 计划借调管理初版 mashuai 2024-04-12 14:27:08 +0800
• 02d80977fe feat:计划管理计划借调管理页面导出功能 jackal 2024-04-12 14:25:41 +0800
• 3fea17aa5e 标签绑定管理-需求隐藏解绑按钮 binbin_pan 2024-04-12 13:22:30 +0800
• af2ac1b0b2 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev jackal 2024-04-12 13:18:54 +0800
• a34c0f55e2 领退了测试问题修改 zzyuan 2024-04-12 13:18:29 +0800
• 21005bbfed feat:计划借调列表查询接口联调 jackal 2024-04-12 13:16:05 +0800
• 4683c1ca32 固定编码修改-zzy zhouzy062 2024-04-12 09:15:40 +0800
• 12d22b9181 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev jackal 2024-04-12 09:02:20 +0800
• 6deb17db59 新购入库问题修改 hayu 2024-04-11 18:28:20 +0800
• 3face37c91 feat:计划借调管理接口联调 jackal 2024-04-11 18:01:25 +0800
• 2ee6e711c1 bug修改 liang.chao 2024-04-11 18:00:57 +0800
• 02d87beddb Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-11 16:41:59 +0800
• 65d7677fe6 日志管理页面接口添加 BianLzhaoMin 2024-04-11 16:41:47 +0800
• e139c80eb3 退料申请+重庆-当前在用量无显示修复 binbin_pan 2024-04-11 14:18:36 +0800
• b6e5577d7b 领料审批修改2 zhouzy062 2024-04-11 14:04:37 +0800
• d98daff25c fix:模糊查询，分页功能优化 mashuai 2024-04-11 13:06:32 +0800
• 28d34ce4fa Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-11 11:30:18 +0800
• ffaf9ccc18 优化日期查询 重置清空查询问题 BianLzhaoMin 2024-04-11 11:30:14 +0800
• a8a98ce041 领料查询-表单重置修复 binbin_pan 2024-04-11 10:46:32 +0800
• ab0426e0f8 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-11 10:44:00 +0800
• 47e5291148 修改结算管理金额展示问题 BianLzhaoMin 2024-04-11 10:41:14 +0800
• 1784251cf3 功能优化 hayu 2024-04-11 10:40:04 +0800
• 0f1474569f 仓库管理-货架配置管理-查询修复 binbin_pan 2024-04-11 09:47:04 +0800
• 6f9a52bece Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev jackal 2024-04-11 09:44:41 +0800
• 5d7df9f110 fix:协议管理页面无法预览附件图片 jackal 2024-04-11 09:43:05 +0800
• 5da7fcdbad 功能优化 hayu 2024-04-10 18:24:20 +0800
• 93139ffd5a bug及退料接收代码提交 liang.chao 2024-04-10 17:48:09 +0800
• 5d53605f80 标段工程管理-修复新增按钮多次提交 binbin_pan 2024-04-10 17:30:49 +0800
• dbae114b07 优化bug BianLzhaoMin 2024-04-10 17:29:44 +0800
• dd057e25e6 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-10 17:27:24 +0800
• 95fd6e0a11 优化bug BianLzhaoMin 2024-04-10 17:24:03 +0800
• 4ed4059fc2 工程项目管理-修复新增按钮多次提交 binbin_pan 2024-04-10 17:22:09 +0800
• c69a2e9f5e 前端修改 zhouzy062 2024-04-10 17:19:06 +0800
• eff89495bd Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zhouzy062 2024-04-10 17:11:33 +0800
• 9e17aa838f Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zhouzy062 2024-04-10 17:11:30 +0800
• 1a01065287 单位类型管理-修复新增按钮多次提交 binbin_pan 2024-04-10 17:04:07 +0800
• 47b20769eb 测试问题前端修改 zhouzy062 2024-04-10 17:04:07 +0800
• f29da14bac 往来单位管理-修复新增按钮多次提交 binbin_pan 2024-04-10 16:48:20 +0800
• b9dd07af15 领料出库-协议管理-修复输入框自动填充 binbin_pan 2024-04-10 16:14:53 +0800
• 5c1bf635a8 fix mashuai 2024-04-10 16:08:19 +0800
• c58b78a130 fix:协议管理页面编辑按钮失效修改 jackal 2024-04-10 16:01:12 +0800
• ab8bd22d41 fix：计划管理 jackal 2024-04-10 15:12:25 +0800
• 5443d78201 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev jackal 2024-04-10 15:09:48 +0800
• 7ef5aa2fb5 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-10 14:47:52 +0800
• 7671165df5 优化重置表单查询条件时，表单内容无法选择问题 BianLzhaoMin 2024-04-10 14:47:42 +0800
• bb8d41c879 往来单位管理-不能导出选中数据 修复 binbin_pan 2024-04-10 14:43:40 +0800
• f832eb9f35 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-10 10:46:59 +0800
• e2acd9e40e 新增库存日志页面 BianLzhaoMin 2024-04-10 10:46:48 +0800
• 18bb04f1f7 领料接口对接 zhouzy062 2024-04-09 17:51:39 +0800
• ad2c9e0db4 feat：计划管理新增页面开发 jackal 2024-04-09 15:10:31 +0800
• 8df7bf0faf Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zhouzy062 2024-04-08 17:21:42 +0800
• 95918a1669 退料接收接口对接 zhouzy062 2024-04-08 17:21:40 +0800
• 035de35c26 移动端token策略处理 syruan 2024-04-08 15:08:12 +0800
• a40363f3e5 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zhouzy062 2024-04-08 09:01:57 +0800
• 2c9bf10d8f 前端上线代码优化 zhouzy062 2024-04-08 09:01:54 +0800
• 5337305463 退料入库 binbin_pan 2024-04-07 17:59:33 +0800
• d936851fb6 退料入库 binbin_pan 2024-04-07 17:46:16 +0800
• 033f4ba75f 回退短信和文件上传 15856 2024-04-07 16:23:09 +0800
• ffa3c54014 上传换成腾讯的cos 15856 2024-04-07 15:58:14 +0800
• 29df08846a 功能优化 hayu 2024-04-07 15:52:57 +0800
• 816857a29d 退料入库 binbin_pan 2024-04-07 15:32:29 +0800
• 22b8403eaf Merge remote-tracking branch 'origin/dev' into dev mashuai 2024-04-07 14:29:28 +0800
• a815a24790 退料入库 mashuai 2024-04-07 14:29:02 +0800
• 4a5d3f299d 重庆领料审批前端修改 zhouzy062 2024-04-07 14:26:47 +0800
• 695b281b8a Merge branch 'dev-cq' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq zhouzy062 2024-04-07 14:02:44 +0800
• 634820a657 重庆领料审批修改 zhouzy062 2024-04-07 14:02:18 +0800
• 1dbfb3f562 优化import引用，新增重庆领料确认接口 syruan 2024-04-07 13:44:14 +0800
• c1d81433dd 获取当前用户所属公司 liang.chao 2024-04-07 13:17:18 +0800
• 06eae84768 Merge branch 'dev' into dev-cq liang.chao 2024-04-07 09:52:50 +0800
• d0efce8e97 Merge remote-tracking branch 'origin/dev' into dev liang.chao 2024-04-07 09:43:38 +0800
• e0b9cd2ab5 退料接收后台代码提交 liang.chao 2024-04-07 09:43:24 +0800
• 943c8b60f5 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zhouzy062 2024-04-07 09:39:35 +0800
• 597c6cfc96 测试问题修改 zhouzy062 2024-04-07 09:39:32 +0800
• 902c5015ac bug提交 liang.chao 2024-04-03 17:20:33 +0800
• e5cf171d6d 数量盘点入库-优化 binbin_pan 2024-04-03 16:48:59 +0800
• a2cc2bb7c6 短信通知换成腾讯sms 15856 2024-04-03 16:47:18 +0800
• 1d961865dd Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev songyang 2024-04-03 16:41:27 +0800
• 2b22485a41 Merge remote-tracking branch 'origin/dev' into dev 15856 2024-04-03 16:41:21 +0800