Yang
							
						 | 
						
							
							
							
							
								
							
								3c9872155b
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								00022dc472
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								e84c566314
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								d594af6475
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								7d137d8d5e
								
							
								
							
						 | 
						
							
							
								
								新增物料路线
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								22128711a3
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								e3b3412f2d
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								744180f92e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								a832835a35
								
							
								
							
						 | 
						
							
							
								
								物料分类流程新增
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								1767971f66
								
							
								
							
						 | 
						
							
							
								
								修改替代料确认
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								0359982c54
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								f752414cf5
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								b079c81336
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								81f236087f
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								81d0bd6931
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								2d1abb7546
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/Order/components/ShowMaterial.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								ab705b4739
								
							
								
							
						 | 
						
							
							
								
								commit by yzf
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								443ed7e53a
								
							
								
							
						 | 
						
							
							
								
								固定列更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								a7b738cd34
								
							
								
							
						 | 
						
							
							
								
								升级layui-vue至1.6.6
							
							
							
							
							
							
							
							删除各种debugger 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								116e7ac736
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								3cf26c95a7
								
							
								
							
						 | 
						
							
							
								
								新增替代物料选择
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								e1eba856e9
								
							
								
							
						 | 
						
							
							
								
								固定列设置2
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								74b402655c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								50c936de4e
								
							
								
							
						 | 
						
							
							
								
								固定列编辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 Yang
							
						 | 
						
							
							
							
							
								
							
								aa8def0782
								
							
								
							
						 | 
						
							
							
								
								添加选择类型步骤
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								b323576f7a
								
							
								
							
						 | 
						
							
							
								
								视图编辑页面增加配方视图
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								74c9509c86
								
							
								
							
						 | 
						
							
							
								
								删除了一个未使用的样式
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 leo
							
						 | 
						
							
							
							
							
								
							
								35277458a5
								
							
								
							
						 | 
						
							
							
								
								初始化
							
							
							
							
							
						 | 
						
							3 years ago |