leo
/
LAPP_GAAS_GFrame_WEBFRONT
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity

Commit Graph

  • 4f10330 Merge pull request '订单管理功能完善' (#28) from feature_supplier into develop by Liwei 2021-05-19 10:49:06 +0800
  • 1e0b0b3 (refs/pull/28/head) 订单管理功能完善 by wangxy 2021-05-19 10:38:37 +0800
  • 8324836 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-19 10:14:36 +0800
  • 0f504d4 Merge pull request '隐藏没开发完的功能' (#27) from feature_supplier into develop by Liwei 2021-05-19 10:14:23 +0800
  • 07fb5aa Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-19 10:09:59 +0800
  • 6cb0579 导航添加方案提醒 by liwei 2021-05-19 10:05:33 +0800
  • 83d839f (refs/pull/27/head, refs/pull/26/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-05-18 20:41:54 +0800
  • 4a138ec Merge pull request '取值' (#25) from liwei into develop by 王新尧 2021-05-18 20:41:21 +0800
  • 6b1a6c4 隐藏没开发完的功能 by wangxy 2021-05-18 20:40:07 +0800
  • 8c6f53f (refs/pull/25/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-18 20:39:47 +0800
  • 3d93270 格式 by liwei 2021-05-18 20:39:35 +0800
  • 8cf4d1e Merge pull request 'EODS扭矩功能页面' (#24) from feature_supplier into develop by Liwei 2021-05-18 19:18:27 +0800
  • 57db4e9 (refs/pull/24/head) EODS扭矩功能页面 by wangxy 2021-05-18 19:15:18 +0800
  • 9adec31 Merge pull request '占比取两位小数' (#23) from liwei into develop by 王新尧 2021-05-18 19:13:19 +0800
  • e1c0c0a (refs/pull/23/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-18 19:08:47 +0800
  • 76d1229 甘特图占比保留2位 by liwei 2021-05-18 19:08:32 +0800
  • f8fa202 Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-05-18 14:57:01 +0800
  • f5438c8 广州正式服务ip by wangxy 2021-05-18 14:56:25 +0800
  • 96add6c Merge pull request '甘特图调整' (#22) from liwei into develop by 王新尧 2021-05-18 14:41:57 +0800
  • 6280d20 (refs/pull/22/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-18 14:29:52 +0800
  • 1e083e8 甘特图对接 by liwei 2021-05-18 14:29:38 +0800
  • 7f7f3fa Merge pull request '新增产品视图；返工，缺陷数据采集功能完善' (#21) from feature_supplier into develop by Liwei 2021-05-18 13:58:55 +0800
  • 3a4fd84 (refs/pull/21/head) 新增产品视图；返工，缺陷数据采集功能完善 by wangxy 2021-05-18 13:55:58 +0800
  • 120ee80 设置甘特图间隔大小 by liwei 2021-05-17 16:57:21 +0800
  • c4f57f5 Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-17 15:25:28 +0800
  • 7387657 动态追加色值 by liwei 2021-05-17 15:25:10 +0800
  • 41a1583 Merge pull request '订单管理增加锁定色值' (#20) from feature_supplier into develop by Liwei 2021-05-17 15:23:24 +0800
  • d353fe6 (refs/pull/20/head) 订单管理增加锁定色值 by wangxy 2021-05-17 15:21:31 +0800
  • 68b78f0 Merge pull request '资源占比' (#19) from liwei into develop by 王新尧 2021-05-14 17:07:45 +0800
  • 0340892 (refs/pull/19/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-14 17:05:20 +0800
  • b2a39e6 资源占比 by liwei 2021-05-14 17:05:00 +0800
  • 78e81bc Merge pull request '订单管理功能完善，代码优化' (#18) from feature_supplier into develop by Liwei 2021-05-14 16:11:25 +0800
  • 34725ba (refs/pull/18/head) 订单管理功能完善，代码优化 by wangxy 2021-05-14 16:07:59 +0800
  • f0bf97b Merge pull request '添加缩放' (#17) from liwei into develop by 王新尧 2021-05-14 09:31:10 +0800
  • d582e1e (refs/pull/17/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-13 17:45:51 +0800
  • 1bf82fc 缩放 by liwei 2021-05-13 17:45:24 +0800
  • e301cd4 (feature_newLogin) Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_newLogin by wangxy 2021-05-13 15:02:46 +0800
  • 8dc3c3c Merge pull request '供应商门户默认班组时间优化' (#16) from feature_supplier into develop by Liwei 2021-05-13 13:13:37 +0800
  • f1841f3 Merge pull request '添加工作时间' (#15) from liwei into develop by 王新尧 2021-05-13 13:11:15 +0800
  • 2c4d7e8 (refs/pull/15/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-13 11:34:20 +0800
  • 30ea00b 添加不可用时间 by liwei 2021-05-13 11:34:09 +0800
  • 13deb26 (refs/pull/16/head) 供应商门户默认班组时间优化 by wangxy 2021-05-13 11:30:28 +0800
  • 1bd86de 工序维护功能完善 by wangxy 2021-05-13 10:49:56 +0800
  • 3827a34 Merge pull request '日模型功能完善' (#14) from feature_supplier into develop by Liwei 2021-05-13 09:10:09 +0800
  • 3f18613 (refs/pull/14/head) 日模型功能完善 by wangxy 2021-05-12 18:50:26 +0800
  • b704ecf Merge pull request '关联待排任务' (#13) from liwei into develop by 王新尧 2021-05-12 09:20:39 +0800
  • 972e8fe (refs/pull/13/head, refs/pull/12/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-12 08:59:45 +0800
  • 38c2c95 Merge pull request 'feature_supplier' (#11) from feature_supplier into develop by Liwei 2021-05-11 18:15:55 +0800
  • 30ff45b (refs/pull/11/head) 供应商门户功能优化 by wangxy 2021-05-11 18:12:07 +0800
  • d02a9dc Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei by liwei 2021-05-11 18:11:18 +0800
  • ec8a5e9 关联待排任务 by liwei 2021-05-11 18:11:07 +0800
  • 2475177 供应商门户增加刷新按钮功能，样式优化 by wangxy 2021-05-10 17:50:56 +0800
  • ba97608 Merge pull request '质量管理工作台模块增加登录验证功能，优化E-ODS代码' (#10) from feature_supplier into develop by Liwei 2021-05-10 15:01:10 +0800
  • d6a8656 (refs/pull/10/head) 质量管理工作台模块增加登录验证功能，优化E-ODS代码 by wangxy 2021-05-10 14:56:24 +0800
  • 4235c02 Merge pull request 'liwei' (#9) from liwei into develop by 王新尧 2021-05-10 09:31:07 +0800
  • 5e9147c (refs/pull/9/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into develop by liwei 2021-05-08 18:18:09 +0800
  • 8b432ce 排班计划 by liwei 2021-05-08 18:17:59 +0800
  • b7756f5 Merge pull request '订单管理优化，空文件增加template模板' (#8) from feature_supplier into develop by weichenglei 2021-05-08 15:57:13 +0800
  • ae8e265 (refs/pull/8/head) 订单管理优化，空文件增加template模板 by wangxy 2021-05-08 15:54:13 +0800
  • 6da65e9 Merge pull request '工厂模型关于时间的转义' (#7) from feature_supplier into develop by weichenglei 2021-05-07 17:46:17 +0800
  • 0d7b3c6 (refs/pull/7/head) 工厂模型关于时间的转义 by wangxy 2021-05-07 17:42:42 +0800
  • a1791cd 订单管理增加隐藏字段 by wangxy 2021-05-07 13:27:21 +0800
  • 1a40bb2 Merge pull request '新增功能' (#6) from feature_supplier into develop by weichenglei 2021-05-07 10:52:10 +0800
  • 26b5a1e (refs/pull/6/head) Merge branch 'develop' into feature_supplier by weichenglei 2021-05-07 10:51:06 +0800
  • e7cbf82 订单管理的状态增加颜色背景区分，供应商门户增加订单解析页面，需求批次，需求明细优化 by wangxy 2021-05-07 09:20:22 +0800
  • 8ebe2de 产线定义优化 by wangxy 2021-05-06 13:38:53 +0800
  • e40717e 修改供应商门户菜单路径 by wangxy 2021-05-06 12:56:55 +0800
  • 1d42e8e 订单管理优化 by wangxy 2021-05-06 12:33:45 +0800
  • 24b3500 供应商门户字段修改，工厂模型字段映射完善 by wangxy 2021-05-06 12:24:18 +0800
  • 3989b7d 订单管理增加修改删除撤销功能 by wangxy 2021-04-30 17:36:08 +0800
  • fbb705a Merge pull request '新增工厂模型，供应商门户变更，EODS，订单解析，订单管理页面' (#5) from feature_supplier into develop by weichenglei 2021-04-30 16:50:52 +0800
  • 069db65 (refs/pull/5/head) Merge branch 'develop' of 101.201.121.115:leo/LAPP_GAAS_GFrame_WEBFRONT into feature_supplier by wangxy 2021-04-30 16:35:54 +0800
  • 8eb48eb 新增订单解析 订单管理页面 by wangxy 2021-04-30 16:16:56 +0800
  • c72e653 供应商门户变更需求，以及人员班组出勤率，EODS修改等 by wangxy 2021-04-29 16:45:27 +0800
  • 125e1b2 Eods，人员班组，班组效率，工位定义，产线关联工位，报工人员定义，项目定义等页面 by wangxy 2021-04-29 10:00:24 +0800
  • 2004b58 工厂模型新增页面 by wangxy 2021-04-28 11:12:54 +0800
  • a7be7a9 工厂模型物料主数据页面 by wangxy 2021-04-26 13:56:59 +0800
  • 04e05f6 标准属性页面 by wangxy 2021-04-23 11:11:40 +0800
  • c7d8661 工厂模型-状态颜色定义页面增删改查功能 by wangxy 2021-04-22 21:02:05 +0800
  • 080af00 基础单位定义页面、成本中心定义页面增删改查功能 by wangxy 2021-04-21 11:06:03 +0800
  • bd1d792 工厂模型模块静态页面以及一些页面表格的增删改查功能实现 by wangxy 2021-04-20 17:50:40 +0800
  • 9d0881f 工厂模型模块菜单栏以及对应页面新增 by wangxy 2021-04-14 13:15:56 +0800
  • 4543c76 人工触发工单抽屉搭建和接口联调 by wangxy 2021-04-13 17:33:46 +0800
  • fc2a715 新增人员和维护服务绑定 by wangxy 2021-04-09 17:37:28 +0800
  • ad3136e Merge pull request '①维护工单管理页面需求变更②新增人员绑定资产' (#4) from feature_supplier into develop by weichenglei 2021-04-09 14:37:52 +0800
  • c2bb6dd (refs/pull/4/head) 维护工单管理修改筛选条件和列表字段 by wangxy 2021-04-09 14:04:51 +0800
  • 332c381 人员列表绑定资产 by wangxy 2021-04-09 13:10:15 +0800
  • c35379a update:视图维护页面绘制及接口调试 by luanss 2021-04-01 16:22:38 +0800
  • 6efdef4 update:供应商添加省市区字段 by luanss 2021-04-01 13:41:57 +0800
  • 82eea15 update:供应商状态过滤添加全部选项；添加id列； by luanss 2021-04-01 09:35:16 +0800
  • bc11592 update:供应商添加时限及物料说明列及筛选条件;E-ODS添加视频兼容；添加维护缺陷页面及接口调试 by luanss 2021-03-31 15:41:45 +0800
  • 4adfba6 update:绘制包装类型页面及接口调试 by luanss 2021-03-30 14:29:36 +0800
  • fccc1ed update：修改维护工单状态判断；修改logo背景颜色 by luanss 2021-03-30 11:28:44 +0800
  • 1ef3def update:供应商模块页面绘制及接口调试；维护工单修改状态bug；绘制维护页面及接口调试 by luanss 2021-03-30 11:19:56 +0800
  • 0e5c7bb update：添加供应商页面icon；绘制供应商列表页面； by luanss 2021-03-22 17:32:04 +0800
  • ee3e39d Merge pull request 'feature_defectdata' (#3) from feature_defectdata into develop by luanshanshan 2021-03-22 17:14:48 +0800
  • e6050f4 (refs/pull/3/head) update:反包接口调试 by luanss 2021-03-22 17:09:59 +0800
  • ba67b59 update by luanss 2021-03-19 17:04:00 +0800
  • be90cc4 Merge pull request 'feature_pack' (#2) from feature_pack into develop by weichenglei 2021-03-19 15:53:46 +0800
  • 3cc42af update：缺陷页面绘制接口调试 by luanss 2021-03-19 15:40:08 +0800