Commit Graph
-
9e224b1Merge pull request '开发IP更新' (#158) from wangxy into develop by 2021-12-29 16:30:41 +0800 -
72d2693(refs/pull/158/head) 开发IP更新 by 2021-12-29 16:29:58 +0800 -
6141d4dMerge pull request '一维表导入去掉起始列字段' (#157) from wangxy into develop by 2021-12-29 16:24:26 +0800 -
e74bed8(refs/pull/157/head) 一维表导入去掉起始列字段 by 2021-12-29 16:23:51 +0800 -
9fba128优化 by 2021-12-29 15:38:51 +0800 -
f50a337Merge pull request '一维表导入' (#156) from wangxy into develop by 2021-12-29 14:49:48 +0800 -
102c0f2(refs/pull/156/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-29 14:49:19 +0800 -
ebc4fe3一维表导入 by 2021-12-29 14:48:42 +0800 -
33ff2adMerge pull request '主生产计划添加分页' (#155) from xuxiaoming into develop by 2021-12-29 14:44:38 +0800 -
7c95e99(refs/pull/155/head) Merge branch 'develop' into xuxiaoming by 2021-12-29 14:43:06 +0800 -
db4d1c4主生产计划添加分页 by 2021-12-29 14:43:05 +0800 -
af75f7aMerge pull request '新增一维表导入、错误查看页面' (#154) from wangxy into develop by 2021-12-29 13:23:23 +0800 -
c452db7(refs/pull/154/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-29 11:04:10 +0800 -
e72d573优化 by 2021-12-29 11:00:49 +0800 -
969c1af新增错误查看页面 by 2021-12-29 10:56:37 +0800 -
aa71a43Merge branch 'develop' into xuxiaoming by 2021-12-29 10:47:56 +0800 -
76aed9d重构主生产计划部分代码 by 2021-12-29 10:47:55 +0800 -
68bd7bdMerge pull request '加物料库存资源配置' (#153) from xuxiaoming into develop by 2021-12-29 10:09:03 +0800 -
10ad8ea(refs/pull/153/head) Merge branch 'develop' into xuxiaoming by 2021-12-29 10:08:02 +0800 -
b79e888添加物料库存资源配置 by 2021-12-29 10:08:00 +0800 -
e24760aMerge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-29 09:19:02 +0800 -
17925cf以为表导入 by 2021-12-29 09:18:44 +0800 -
e38066fMerge pull request '修改客户树叶子节点' (#152) from xuxiaoming into develop by 2021-12-29 00:07:29 +0800 -
9b23f62(refs/pull/152/head) Merge branch 'develop' into xuxiaoming by 2021-12-29 00:06:50 +0800 -
d740fb7修改客户树叶子节点 by 2021-12-29 00:06:49 +0800 -
9c31bf8一维表导入按钮调整 by 2021-12-28 20:56:03 +0800 -
b158c88Merge pull request '修改主生产计划进度条' (#151) from xuxiaoming into develop by 2021-12-28 20:40:05 +0800 -
0449a71(refs/pull/151/head) 修改主生产计划进度条 by 2021-12-28 20:39:20 +0800 -
83b5df2一维表导入 by 2021-12-28 20:34:44 +0800 -
95d255eMerge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into xuxiaoming by 2021-12-28 17:20:23 +0800 -
4d1754d修改柱状图 by 2021-12-28 17:19:26 +0800 -
083baf9Merge pull request '客户需求管理工作台拖拽优化' (#150) from wangxy into develop by 2021-12-28 15:41:24 +0800 -
594038aMerge pull request '降级vue' (#149) from lingxiao into develop by 2021-12-28 15:39:39 +0800 -
0cfcea7(refs/pull/150/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-28 15:38:53 +0800 -
b8fa95b客户需求管理工作台拖拽优化 by 2021-12-28 15:37:38 +0800 -
7498e08(refs/pull/149/head, refs/pull/148/head, refs/pull/147/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao by 2021-12-28 15:27:55 +0800 -
74333ce降级vue by 2021-12-28 15:26:18 +0800 -
363712aMerge pull request '修改物料资源提交表单' (#146) from xuxiaoming into develop by 2021-12-28 15:17:21 +0800 -
940af05(refs/pull/146/head) 修改物料资源提交表单 by 2021-12-28 15:15:50 +0800 -
8ab8d6bMerge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-28 13:51:58 +0800 -
ec515c3修改物料资源1 by 2021-12-28 13:49:07 +0800 -
7f92c26Merge pull request '修改物料资源' (#145) from xuxiaoming into develop by 2021-12-28 13:44:21 +0800 -
27188a3(refs/pull/145/head) 修改物料资源 by 2021-12-28 13:43:40 +0800 -
f52f6e5Merge branch 'develop' into xuxiaoming by 2021-12-28 13:37:32 +0800 -
e44b4b6更新物料表单 by 2021-12-28 13:37:32 +0800 -
994cbe9test by 2021-12-28 09:24:57 +0800 -
aa7d347Merge pull request '添加用户关联员工' (#144) from xuxiaoming into develop by 2021-12-27 18:03:31 +0800 -
79e3db7(refs/pull/144/head) 添加用户关联员工 by 2021-12-27 18:02:47 +0800 -
bcbfb11添加用户关联员工 by 2021-12-27 18:02:30 +0800 -
26de41bMerge pull request 'header高度调整' (#143) from lingxiao into develop by 2021-12-27 17:37:55 +0800 -
91117ad(refs/pull/143/head) header高度调整 by 2021-12-27 17:31:06 +0800 -
26cc719header高度调整 by 2021-12-27 17:24:18 +0800 -
5429745Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao by 2021-12-27 17:00:45 +0800 -
314e02bMerge pull request '优化主生产计划' (#142) from xuxiaoming into develop by 2021-12-27 14:16:58 +0800 -
f1cf839(refs/pull/142/head, refs/pull/141/head) Merge branch 'develop' into xuxiaoming by 2021-12-27 14:15:46 +0800 -
f44ed07优化主生产计划 by 2021-12-27 14:15:45 +0800 -
fe48c43Merge pull request '物料库存资源配置' (#140) from wangxy into develop by 2021-12-27 13:57:52 +0800 -
9a13281(refs/pull/140/head) 物料库存资源配置 by 2021-12-27 13:57:17 +0800 -
7f0fa68物料库存资源配置物料ID增加筛选功能 by 2021-12-27 13:52:18 +0800 -
998aec1Merge pull request '偏差分析默认所有偏差' (#139) from wangxy into develop by 2021-12-27 13:25:02 +0800 -
3f76448(refs/pull/139/head) 偏差分析默认所有偏差 by 2021-12-27 13:24:32 +0800 -
a3ce401Merge pull request '客户需求管理工作台优化' (#138) from wangxy into develop by 2021-12-27 13:19:10 +0800 -
c395fe0(refs/pull/138/head) 客户需求管理工作台优化 by 2021-12-27 13:18:32 +0800 -
9771c4cMerge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao by 2021-12-27 11:08:35 +0800 -
74a9711Merge pull request '替换lock' (#137) from wangxy into develop by 2021-12-27 11:08:17 +0800 -
9c29195(refs/pull/137/head) 替换lock by 2021-12-27 11:07:07 +0800 -
79dd5c8回退element-plus by 2021-12-27 11:01:24 +0800 -
8c55291Merge pull request '修改主生产计划保存逻辑' (#136) from xuxiaoming into develop by 2021-12-27 10:13:52 +0800 -
cd0edbd(refs/pull/136/head) Merge branch 'develop' into xuxiaoming by 2021-12-27 10:12:43 +0800 -
9e54034修改主生产计划保存逻辑 by 2021-12-27 10:12:43 +0800 -
a660180合并冲突 by 2021-12-27 09:45:32 +0800 -
bdbbb98覆盖lock by 2021-12-27 09:41:13 +0800 -
22b5de4合并冲突 by 2021-12-27 09:39:27 +0800 -
b946763升级elemint、vue版本 by 2021-12-27 09:37:54 +0800 -
fb9892f合并代码 by 2021-12-26 19:51:34 +0800 -
3a0fd29Merge pull request '优化' (#135) from wangxy into develop by 2021-12-26 19:44:29 +0800 -
2b5379c(refs/pull/135/head) 优化 by 2021-12-26 19:43:58 +0800 -
18b2baeMerge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy by 2021-12-26 19:42:09 +0800 -
f0ed41f更新element中文 by 2021-12-26 19:34:48 +0800 -
4e1aa1cMerge pull request '合并冲突' (#134) from lingxiao into develop by 2021-12-26 19:30:01 +0800 -
9ff3ab4Merge pull request '修改页码' (#133) from xuxiaoming into develop by 2021-12-26 19:29:08 +0800 -
efdb569(refs/pull/133/head) Merge branch 'develop' into xuxiaoming by 2021-12-26 19:28:23 +0800 -
82f9b6d修改页码 by 2021-12-26 19:28:23 +0800 -
a989705(refs/pull/134/head) 合并冲突 by 2021-12-26 19:28:05 +0800 -
0c75f43lock by 2021-12-26 19:23:46 +0800 -
a0ef88d配置调整 by 2021-12-26 16:48:48 +0800 -
ba99a40Merge pull request '修改时间模型错误' (#132) from xuxiaoming into develop by 2021-12-25 18:46:42 +0800 -
51e0fc1(refs/pull/132/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop by 2021-12-25 18:45:49 +0800 -
84fbfd4修改时间模型错误 by 2021-12-25 18:45:49 +0800 -
a7b27aalog by 2021-12-25 18:15:07 +0800 -
adc8d77Merge pull request '修复表单不能编辑' (#131) from xuxiaoming into develop by 2021-12-25 16:16:54 +0800 -
d52ee0c(refs/pull/131/head) 修复表单不能编辑 by 2021-12-25 16:15:20 +0800 -
02366b6Merge branch 'develop' into xuxiaoming by 2021-12-25 15:58:41 +0800 -
4b04b59修复已知bug by 2021-12-25 15:58:40 +0800 -
87ef774修复部署脚本 by 2021-12-25 14:16:42 +0800 -
a531ccb主生产数据调整 by 2021-12-24 20:49:24 +0800 -
8625612Merge pull request 'mds正式环境IP' (#130) from wangxy into develop by 2021-12-24 19:29:57 +0800 -
f1eeca7(refs/pull/130/head) mds正式环境IP by 2021-12-24 19:29:16 +0800 -
556e990Merge pull request '优化' (#129) from wangxy into develop by 2021-12-24 17:22:16 +0800 -
50f09fb(refs/pull/129/head) 优化 by 2021-12-24 17:21:25 +0800