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

• 2a164bfcca Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-23 10:41:52 +0800
• a21e52816b 领料申请2 zzyuan 2024-04-23 10:41:45 +0800
• 4408191900 无效json文件删除 BianLzhaoMin 2024-04-23 10:29:56 +0800
• 60562a1fbb 优化 BianLzhaoMin 2024-04-23 10:21:21 +0800
• 3fedcde616 sql提交 liang.chao 2024-04-23 09:35:44 +0800
• 62f2330ffb 成套机具代码提交 liang.chao 2024-04-23 09:19:37 +0800
• f94470a742 测试app问题项修改 csyue 2024-04-22 18:58:46 +0800
• 8b8d2b9f54 优化 BianLzhaoMin 2024-04-22 18:15:42 +0800
• 10994deeb4 退料接收3 zzyuan 2024-04-22 16:07:48 +0800
• 06655c5eff 退料接收修改2 zzyuan 2024-04-22 15:47:54 +0800
• 9d072eea63 退料接收判断 zzyuan 2024-04-22 14:28:40 +0800
• e49086d824 优化 BianLzhaoMin 2024-04-22 13:47:05 +0800
• 3e1db1b125 限制输入字数 binbin_pan 2024-04-22 12:04:29 +0800
• f175c44ba1 整套抱杆 mashuai 2024-04-22 11:28:36 +0800
• 0eabae89df 优化 BianLzhaoMin 2024-04-22 11:24:44 +0800
• 6e1c80d8b0 前端修改zzy zzyuan 2024-04-22 11:24:04 +0800
• b4c3540fb5 退料审核代码提交 liang.chao 2024-04-22 11:19:06 +0800
• a10c3dd8a7 bug mashuai 2024-04-22 10:20:29 +0800
• 546eb704fb 退料接收管理-退料审核-批量审核 binbin_pan 2024-04-22 10:07:03 +0800
• 62c669aa9f fix: bug修复 binbin_pan 2024-04-20 17:55:12 +0800
• b1fee78651 bug修改 liang.chao 2024-04-20 17:29:05 +0800
• 8c7453aa23 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-20 17:03:39 +0800
• 562bb16f2f 工地直转 zzyuan 2024-04-20 17:03:35 +0800
• f10ef57196 问题优化 BianLzhaoMin 2024-04-20 17:03:23 +0800
• e9deecdee5 Merge remote-tracking branch 'origin/dev' into dev mashuai 2024-04-20 16:58:45 +0800
• f1a3e8839b bug mashuai 2024-04-20 16:58:38 +0800
• c180ad60e7 测试问题修改 hayu 2024-04-20 16:58:15 +0800
• 45d551f864 fix: 岗位管理 binbin_pan 2024-04-20 16:42:41 +0800
• 07c77c5ad3 bug mashuai 2024-04-20 16:01:30 +0800
• f2fe043738 fix: 往来单位管理-下拉框校验修复 binbin_pan 2024-04-20 15:57:47 +0800
• 06ad1af47d fix: 用户管理-增加导入失败的原因 binbin_pan 2024-04-20 15:34:19 +0800
• 34aafe3095 fix: 退料接收管理-退料审核-工机具类型下拉框 binbin_pan 2024-04-20 15:20:39 +0800
• a18b6ce0b9 提交页面优化 BianLzhaoMin 2024-04-20 15:01:00 +0800
• 57291ad37e Merge remote-tracking branch 'origin/dev' into dev hayu 2024-04-20 14:55:54 +0800
• a7d8ad5ef8 修饰入库不通过问题修改 hayu 2024-04-20 14:55:38 +0800
• b9d2ebd10a Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-20 14:54:34 +0800
• 97e554d6ac 测试问题修改 BianLzhaoMin 2024-04-20 14:54:26 +0800
• f080f72c32 fix:去除不通过原因字段 jackal 2024-04-20 14:53:47 +0800
• 09f732bae0 fix: 退料接收管理-退料状态下拉项 binbin_pan 2024-04-20 14:46:12 +0800
• 4520e6d1bf Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-20 14:31:49 +0800
• e95c1acf6b Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev zzyuan 2024-04-20 14:31:46 +0800
• 1a30d552ad fix：协议管理导出修改 jackal 2024-04-20 14:30:43 +0800
• 8dc56bcde9 前端领退料模块问题修改 zzyuan 2024-04-20 14:29:59 +0800
• ff93691d19 回滚错误提交 sxu 2024-04-20 14:29:59 +0800
• 00a634cd0b fix conflict sxu 2024-04-20 14:21:17 +0800
• 7126f3e744 往来单位状态 sxu 2024-04-20 14:18:17 +0800
• 0da44483df fix:退料申请bug修改 jackal 2024-04-20 14:10:33 +0800
• 0d457afa9d fix: 仓库管理-仓库货架管理-编辑下拉框报错 binbin_pan 2024-04-20 14:01:11 +0800
• 43ecf26853 解绑问题 sxu 2024-04-20 14:00:22 +0800
• 264bd77a41 bug mashuai 2024-04-20 13:55:53 +0800
• 5a88bafd89 fix:配件新购入库bug修改 jackal 2024-04-20 13:41:35 +0800
• 66f8df4fba fix: 标签绑定管理-标签绑定管理-设置禁用项 binbin_pan 2024-04-20 13:40:04 +0800
• 1202dc7ae7 提交预报废等页面 BianLzhaoMin 2024-04-20 13:26:48 +0800
• 3efa283b3c fix:修改pickerOptions方法，日期可选今天及以后 jackal 2024-04-20 13:10:30 +0800
• 2b64cbfa17 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev sxu 2024-04-20 13:06:13 +0800
• f609921ada 标签绑定历史的排序问题 sxu 2024-04-20 13:03:41 +0800
• b8ff950a16 fix:新购工机具入库bug修改 jackal 2024-04-20 13:00:37 +0800
• bbc9032b70 fix issue manage_type sxu 2024-04-20 12:52:19 +0800
• 8f34479036 fix issue manage_type sxu 2024-04-20 12:52:14 +0800
• c39b231e09 fix:新购机具管理bug修改 jackal 2024-04-20 12:23:39 +0800
• 720ac160e6 任务单号获取修改 hayu 2024-04-20 12:21:00 +0800
• f015b6cad5 Merge remote-tracking branch 'origin/dev' into dev hayu 2024-04-20 11:23:35 +0800
• 54cef0f824 任务单号获取修改 hayu 2024-04-20 11:23:08 +0800
• 4d774e44c9 fix: 退料接收管理-退料申请-重置时间 binbin_pan 2024-04-20 11:12:37 +0800
• 9ae1c69f71 fix:协议管理bug修改 jackal 2024-04-20 10:48:36 +0800
• 3024ae46e7 Merge remote-tracking branch 'origin/dev' into dev liang.chao 2024-04-20 10:43:01 +0800
• 6207d42ee5 重庆机具问题提交 liang.chao 2024-04-20 10:42:49 +0800
• 7b312fbffc 前端问题修改 zzyuan 2024-04-20 10:39:36 +0800
• ae327449a3 领退料问题修改 zzyuan 2024-04-20 10:23:04 +0800
• e4239f4955 fix:退料接受详情修改 jackal 2024-04-19 17:31:55 +0800
• c2dc2a5d40 抱杆配套管理 binbin_pan 2024-04-19 11:08:25 +0800
• bcf6710e01 领料申请-重置查询条件修复 binbin_pan 2024-04-19 10:45:11 +0800
• 9e9fb2da60 名称重复性校验 mashuai 2024-04-18 18:14:09 +0800
• 19edda855d 新增预报废页面 BianLzhaoMin 2024-04-18 17:58:05 +0800
• 03ae671f7b 抱杆配套管理 binbin_pan 2024-04-18 17:43:56 +0800
• 4dc7d58e72 fix mashuai 2024-04-18 17:27:47 +0800
• de7d8a3351 Merge remote-tracking branch 'origin-vpn/dev' into dev-vpn syruan 2024-04-18 16:34:23 +0800
• 4ba7fa1e04 物资LOG日志 syruan 2024-04-18 16:34:01 +0800
• 4fdcf91a45 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev jackal 2024-04-18 16:32:16 +0800
• 1471b2c4ea fix:领料出库页面出库按钮权限修改 jackal 2024-04-18 16:32:11 +0800
• fc5aad9205 抱杆配套管理 binbin_pan 2024-04-18 15:34:34 +0800
• a242f47045 fix:修改 jackal 2024-04-18 13:58:13 +0800
• af01245488 入库盘点 mashuai 2024-04-17 15:32:23 +0800
• 73637df9ac 盘点入库 binbin_pan 2024-04-17 15:08:09 +0800
• 4b39107750 入库盘点 mashuai 2024-04-17 15:07:29 +0800
• 2dcbb2a6d3 盘点入库 binbin_pan 2024-04-17 15:04:37 +0800
• edbc58d08d feat:领料管理添加子数据展示 jackal 2024-04-17 13:51:05 +0800
• 910e64ea51 Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev BianLzhaoMin 2024-04-17 13:23:10 +0800
• 75c19d0d51 优化领料任务申请时保存bug BianLzhaoMin 2024-04-17 13:23:05 +0800
• b677a7ff11 首页催办发送接口调试 BianLzhaoMin 2024-04-17 13:20:11 +0800
• e237ae54fa 抱杆配套管理 binbin_pan 2024-04-17 11:16:29 +0800
• 8ca8b57e9d 退料审核代码提交 liang.chao 2024-04-17 11:11:55 +0800
• 84b7346386 盘点入库 binbin_pan 2024-04-17 10:48:59 +0800
• 4777c2fbb9 FIX mashuai 2024-04-17 10:47:29 +0800
• 82a5bf2cee 往来单位列表创建时间倒叙 hayu 2024-04-17 10:45:01 +0800
• b0e00b40a3 FIX mashuai 2024-04-17 10:38:02 +0800
• 9a7e4f0dc2 领料管理页面展示bug liang.chao 2024-04-17 10:26:01 +0800
• ce1e2d59ff 首页心怎催办逻辑 BianLzhaoMin 2024-04-16 18:01:52 +0800
• 9deec6f550 抱杆配套管理 binbin_pan 2024-04-16 18:01:02 +0800
• 2640c40b17 抱杆配套管理 binbin_pan 2024-04-16 17:28:02 +0800