xuxiaoming
|
e44b4b6985
|
更新物料表单
|
3 years ago |
wangxy
|
994cbe93ba
|
test
|
3 years ago |
xuxiaoming
|
aa7d347fdd
|
Merge pull request '添加用户关联员工' (#144) from xuxiaoming into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/144
|
3 years ago |
xuxiaoming
|
79e3db72ab
|
添加用户关联员工
|
3 years ago |
xuxiaoming
|
bcbfb1123f
|
添加用户关联员工
|
3 years ago |
Liwei
|
26de41b239
|
Merge pull request 'header高度调整' (#143) from lingxiao into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/143
|
3 years ago |
liwei
|
91117adc67
|
header高度调整
|
3 years ago |
liwei
|
26cc719eca
|
header高度调整
|
3 years ago |
liwei
|
54297451c0
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao
|
3 years ago |
xuxiaoming
|
314e02bf3e
|
Merge pull request '优化主生产计划' (#142) from xuxiaoming into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/142
|
3 years ago |
xuxiaoming
|
f1cf839d48
|
Merge branch 'develop' into xuxiaoming
|
3 years ago |
xuxiaoming
|
f44ed077f8
|
优化主生产计划
|
3 years ago |
wangxy
|
fe48c43974
|
Merge pull request '物料库存资源配置' (#140) from wangxy into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/140
|
3 years ago |
wangxy
|
9a1328116c
|
物料库存资源配置
|
3 years ago |
wangxy
|
7f0fa684ee
|
物料库存资源配置物料ID增加筛选功能
|
3 years ago |
wangxy
|
998aec1368
|
Merge pull request '偏差分析默认所有偏差' (#139) from wangxy into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/139
|
3 years ago |
wangxy
|
3f7644887a
|
偏差分析默认所有偏差
|
3 years ago |
wangxy
|
a3ce401ea4
|
Merge pull request '客户需求管理工作台优化' (#138) from wangxy into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/138
|
3 years ago |
wangxy
|
c395fe0fac
|
客户需求管理工作台优化
|
3 years ago |
liwei
|
9771c4c3a4
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao
|
3 years ago |
wangxy
|
74a9711f3f
|
Merge pull request '替换lock' (#137) from wangxy into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/137
|
3 years ago |
wangxy
|
9c291958b4
|
替换lock
|
3 years ago |
wangxy
|
79dd5c873c
|
回退element-plus
|
3 years ago |
xuxiaoming
|
8c55291f16
|
Merge pull request '修改主生产计划保存逻辑' (#136) from xuxiaoming into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/136
|
3 years ago |
xuxiaoming
|
cd0edbd86e
|
Merge branch 'develop' into xuxiaoming
|
3 years ago |
xuxiaoming
|
9e540346a9
|
修改主生产计划保存逻辑
|
3 years ago |
liwei
|
a6601808fd
|
合并冲突
|
3 years ago |
liwei
|
bdbbb981b5
|
覆盖lock
|
3 years ago |
liwei
|
22b5de4d2c
|
合并冲突
|
3 years ago |
liwei
|
b94676329a
|
升级elemint、vue版本
|
3 years ago |
lingxiao
|
fb9892f586
|
合并代码
|
3 years ago |
wangxy
|
3a0fd29283
|
Merge pull request '优化' (#135) from wangxy into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/135
|
3 years ago |
wangxy
|
2b5379c2bf
|
优化
|
3 years ago |
wangxy
|
18b2baeb33
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy
# Conflicts:
# yarn.lock
|
3 years ago |
wangxy
|
f0ed41f26c
|
更新element中文
|
3 years ago |
Liwei
|
4e1aa1cf76
|
Merge pull request '合并冲突' (#134) from lingxiao into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/134
|
3 years ago |
xuxiaoming
|
9ff3ab46b0
|
Merge pull request '修改页码' (#133) from xuxiaoming into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/133
|
3 years ago |
xuxiaoming
|
efdb569324
|
Merge branch 'develop' into xuxiaoming
|
3 years ago |
xuxiaoming
|
82f9b6d5f2
|
修改页码
|
3 years ago |
lingxiao
|
a98970578f
|
合并冲突
|
3 years ago |
lingxiao
|
0c75f431ec
|
lock
|
3 years ago |
lingxiao
|
a0ef88dfbb
|
配置调整
|
3 years ago |
xuxiaoming
|
ba99a4020e
|
Merge pull request '修改时间模型错误' (#132) from xuxiaoming into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/132
|
3 years ago |
xuxiaoming
|
51e0fc1340
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop
|
3 years ago |
xuxiaoming
|
84fbfd4c11
|
修改时间模型错误
|
3 years ago |
liwei
|
a7b27aae15
|
log
|
3 years ago |
xuxiaoming
|
adc8d776ac
|
Merge pull request '修复表单不能编辑' (#131) from xuxiaoming into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/131
|
3 years ago |
xuxiaoming
|
d52ee0c0dc
|
修复表单不能编辑
|
3 years ago |
xuxiaoming
|
02366b6537
|
Merge branch 'develop' into xuxiaoming
|
3 years ago |
xuxiaoming
|
4b04b59d77
|
修复已知bug
|
3 years ago |