wangwei
							
						 | 
						
							
							
							
							
								
							
								508290c55e
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								816d823ae8
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								93ef486cb6
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								179c45c11b
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1f3a5a194e
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0e16c65c33
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e78c684357
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c5757c5717
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								4f5cafbea7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/otherChange' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/inventory/InvProducts.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								bdccf33206
								
							
								
							
						 | 
						
							
							
								
								1.修复耗材字典等页面的bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7133a05082
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								08146523ba
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b026b80860
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7bd410db7d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/otherChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dd79ead175
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5406c968df
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1b9f793f0e
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c144d18085
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a478dc5f2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								863f621c77
								
							
								
							
						 | 
						
							
							
								
								1.修复扫码单据添加条码校验库存失败问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5c3b48db5a
								
							
								
							
						 | 
						
							
							
								
								同步管理系统2.0代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a8fa4c900d
								
							
								
							
						 | 
						
							
							
								
								1.修复资质审核页面分页无效问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1a71ff0925
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/otherChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								211ed2f712
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/zhairh' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								23af0b9963
								
							
								
							
						 | 
						
							
							
								
								产品信息编辑问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a6933194a6
								
							
								
							
						 | 
						
							
							
								
								产品信息编辑问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								b1137eec45
								
							
								
							
						 | 
						
							
							
								
								修改只有一个仓库搜索问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7a77e1d438
								
							
								
							
						 | 
						
							
							
								
								同步管理系统代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9408eee9be
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/otherChange' into zhairh
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/purchase/purPlanEditDialog.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f31dbef3d5
								
							
								
							
						 | 
						
							
							
								
								单据查询页面只留一个分库,申购计划相关bug修改,
							
							
							
							
							
							
							
							第三方产品信息审核问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								03cb78449c
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9da0f2bcbe
								
							
								
							
						 | 
						
							
							
								
								DI产品信息国家库同步更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								9f8360274f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/otherChange' into zhairh
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								29c0caf01d
								
							
								
							
						 | 
						
							
							
								
								1.注释无用校验
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1ecb8cf958
								
							
								
							
						 | 
						
							
							
								
								DI产品信息国家库同步更新
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								617b728178
								
							
								
							
						 | 
						
							
							
								
								修改一二级程度bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ba166ea6bc
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7942a0fb49
								
							
								
							
						 | 
						
							
							
								
								同步仓库代码
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								aae47452ef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/featFunction' into otherChange
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/basic/invWarehouse.vue
#	src/views/thrsys/thrOrderNew.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								9b8d8945cc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/otherChange' into featFunction
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/purchase/purApplyEditDiaolog.vue
#	src/views/purchase/purPlanEditDialog.vue
#	src/views/purchase/pureApplyDetailDialog.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5867c1386d
								
							
								
							
						 | 
						
							
							
								
								修改bug已经去除采购管理的仓库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								20f161e327
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								zhengmingliang
							
						 | 
						
							
							
							
							
								
							
								3010f2ad31
								
							
								
							
						 | 
						
							
							
								
								去除仓库功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								79666b0f1d
								
							
								
							
						 | 
						
							
							
								
								测试
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0bd1b0316a
								
							
								
							
						 | 
						
							
							
								
								业务选择
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								86854eb947
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								407598ca56
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eced49f01c
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a5afc83cd3
								
							
								
							
						 | 
						
							
							
								
								单据流转设置改动,采购管理优化,bug处理
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								a0e2060caa
								
							
								
							
						 | 
						
							
							
								
								修改bug已经去除采购管理的仓库
							
							
							
							
							
						 | 
						
							3 years ago |