xiaoning
							
						 | 
						
							
							
							
							
								
							
								066213c959
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								f0202bb97c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/jhzxgl/pwjhFK.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								91184501d5
								
							
								
							
						 | 
						
							
							
								
								pgd
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								67b05510b7
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								9d0f2c35a9
								
							
								
							
						 | 
						
							
							
								
								1.预配盘和前方需求相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								33a0db5dbd
								
							
								
							
						 | 
						
							
							
								
								1.预配盘相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								bc53bde3b5
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
									
								
								 董哲奇
							
						 | 
						
							
							
							
							
								
							
								a59ae3aef9
								
							
								
							
						 | 
						
							
							
								
								1.增加摆放位置相关功能
							
							
							
							
							
							
							
							2.增加采购计划到货情况查询
3.增加预配盘相关页面 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								36608310aa
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/jhzxgl/dhqdFK.vue
#	src/views/jhzxgl/dmjhD.vue
#	src/views/jhzxgl/dmjhFK.vue
#	src/views/jhzxgl/pkjhD.vue
#	src/views/jhzxgl/pkjhFK.vue
#	src/views/jhzxgl/qgjhFK.vue
#	src/views/jhzxgl/qmjhFK.vue
#	src/views/jhzxgl/sljhFK.vue
#	src/views/jhzxgl/tzjhFK.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b35aeb1971
								
							
								
							
						 | 
						
							
							
								
								pgd
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								af38e985bb
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								0f77695eb4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								449fdc7db4
								
							
								
							
						 | 
						
							
							
								
								修正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								7193ec2e17
								
							
								
							
						 | 
						
							
							
								
								xn
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								2d65162ecc
								
							
								
							
						 | 
						
							
							
								
								bom copy
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								4b48349d72
								
							
								
							
						 | 
						
							
							
								
								盘工单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								782021f31d
								
							
								
							
						 | 
						
							
							
								
								修正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								d209ff4e2b
								
							
								
							
						 | 
						
							
							
								
								XN
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								822503496c
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								6fa1c3af24
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								53c3ea7d2e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								5683227407
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								5da99ce30f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								f0055b22b7
								
							
								
							
						 | 
						
							
							
								
								三月滚动明细修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								4cf214794a
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								a9f04c5a64
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								312c2943fd
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								c26ae7ad5c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://www.sanduolantoyoga.com/xiaoning/gjerp_ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								593f41cb41
								
							
								
							
						 | 
						
							
							
								
								update
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b38fe7b0c3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								b1772301cc
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								172a957b3d
								
							
								
							
						 | 
						
							
							
								
								改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								baa8cc7047
								
							
								
							
						 | 
						
							
							
								
								改名称
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								0ecc9f2f28
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								2983e15601
								
							
								
							
						 | 
						
							
							
								
								改登录背景
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								8a7108767a
								
							
								
							
						 | 
						
							
							
								
								改登录背景
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								26023cf72e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								fa8911680c
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								0b14534d7c
								
							
								
							
						 | 
						
							
							
								
								排产
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								6b8dfc40fe
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								214f30c634
								
							
								
							
						 | 
						
							
							
								
								改错
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xiaoning
							
						 | 
						
							
							
							
							
								
							
								9d26dbeab0
								
							
								
							
						 | 
						
							
							
								
								中日程分解
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								7859ff8649
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								cdcbe63d75
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								90bf3e8496
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								56ff9ed959
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								
								 xhj
							
						 | 
						
							
							
							
							
								
							
								379e0a5852
								
							
								
							
						 | 
						
							
							
								
								基础数据
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								4786eff560
								
							
								
							
						 | 
						
							
							
								
								update 线表
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								25df152799
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://www.sanduolantoyoga.com/xiaoning/gjerp_ui
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								xiezuo003
							
						 | 
						
							
							
							
							
								
							
								bc29c47007
								
							
								
							
						 | 
						
							
							
								
								update 设计、计划管控中心部分页面
							
							
							
							
							
						 | 
						
							2 years ago |