anthonywj
							
						 | 
						
							
							
							
							
								
							
								7cff854bff
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/warehouse/stockHospOrderNew.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c7ce4b4cdc
								
							
								
							
						 | 
						
							
							
								
								1.修复部分页面格式问题,字段未对应问题,分页bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								d100f66e67
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								15586eb805
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5655e6a1aa
								
							
								
							
						 | 
						
							
							
								
								2级bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bf7b40c505
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c435d5b024
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c9e51e3f9a
								
							
								
							
						 | 
						
							
							
								
								1.扫码单据编辑列表添加实际数量字段
							
							
							
							
							
							
							
							2.根据同步设置判断是否启用相关功能按钮
3.修复部分已知bug 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								03163a1fe7
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								7a0c579c0c
								
							
								
							
						 | 
						
							
							
								
								1.修复bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c1b226883f
								
							
								
							
						 | 
						
							
							
								
								新增部门,单据类型关联用户,代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d46cc1d8bf
								
							
								
							
						 | 
						
							
							
								
								1.修改搜索框提示信息
							
							
							
							
							
							
							
							2.切换单据类型同步清空往来信息
3.修复点击空白处关闭弹窗的问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7b30d8d568
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e2ea62f5a7
								
							
								
							
						 | 
						
							
							
								
								1.修复bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								3fdba1b862
								
							
								
							
						 | 
						
							
							
								
								1.修复分页导致查询失效问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6ffbf5845e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/fencang' into fencang
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								07c12382be
								
							
								
							
						 | 
						
							
							
								
								bug修改,UDI国家库更新下载最新版本
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								5ef2389190
								
							
								
							
						 | 
						
							
							
								
								1.仓库添加关联用户和单据类型候选列表页添加分页功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c0b743da77
								
							
								
							
						 | 
						
							
							
								
								1.仓库字典分仓绑定的用户和单据类型添加分页查询
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								84c26a83eb
								
							
								
							
						 | 
						
							
							
								
								1.修复重置搜索条件后页码未跟随重置的问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2356320a64
								
							
								
							
						 | 
						
							
							
								
								仓库字典禁用启用
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								168c7c8fc4
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e991f114d1
								
							
								
							
						 | 
						
							
							
								
								bug修改,同步设置联动控制按钮是否可用
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								73749c373f
								
							
								
							
						 | 
						
							
							
								
								bug修改,同步设置联动控制按钮是否可用
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8aca9b7fce
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								8ddaf41fef
								
							
								
							
						 | 
						
							
							
								
								1.添加业务单据类型增加校验
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								51ba4490c5
								
							
								
							
						 | 
						
							
							
								
								1.修复添加删除分仓展示错误问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								038ee5a59a
								
							
								
							
						 | 
						
							
							
								
								业务单据,扫码单据类型配置修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								4eca66d3e2
								
							
								
							
						 | 
						
							
							
								
								1.修改第三方单据分页查询,重置操作逻辑
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e97729ddc2
								
							
								
							
						 | 
						
							
							
								
								1.分仓列表展示主仓库名称
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								f48cc07214
								
							
								
							
						 | 
						
							
							
								
								新增第三方仓库分库等功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								de5762c689
								
							
								
							
						 | 
						
							
							
								
								1.修复超级用户查看补录单据无当前仓库和分库信息问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								469c651b1f
								
							
								
							
						 | 
						
							
							
								
								单据配货选择库存产品信息问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								689604a29b
								
							
								
							
						 | 
						
							
							
								
								1.修复禅道bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								a4c9a80ed5
								
							
								
							
						 | 
						
							
							
								
								1.修复部分查询问题,单据编辑保存数量校验放在后端实时校验
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3811e418ce
								
							
								
							
						 | 
						
							
							
								
								产品信息编辑问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								703e78b06a
								
							
								
							
						 | 
						
							
							
								
								产品关联新增计量单位关联
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5000ad82b4
								
							
								
							
						 | 
						
							
							
								
								bug修改,业务单据打印功能
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e57be77e1
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ac7124d4c7
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								06c55ffca2
								
							
								
							
						 | 
						
							
							
								
								扫码单据类型补单默认仓库与分库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0db79ad504
								
							
								
							
						 | 
						
							
							
								
								委托验收补单问题,单独分库默认第一个
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								516c4382b4
								
							
								
							
						 | 
						
							
							
								
								1.委托验收设置,接受委托仓库和接收委托分库实现切换联动,规避脏数据问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								48f437d366
								
							
								
							
						 | 
						
							
							
								
								1.调整样式,隐藏仓库用户主管显示,委托验收页面显示分库和委托验收分库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								a96a38ee65
								
							
								
							
						 | 
						
							
							
								
								禅道上bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e6a492ad18
								
							
								
							
						 | 
						
							
							
								
								1.修改委托验收仓库和分库联动
							
							
							
							
							
							
							
							2.添加分库名称时进行非空判断 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								2b9edf5537
								
							
								
							
						 | 
						
							
							
								
								1.分库添加用户操作添加校验,不选择用户时给出提示,不关闭弹窗
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0f92be9513
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/fencang' into fencang
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								763af59199
								
							
								
							
						 | 
						
							
							
								
								仓库编辑会创建多个修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								8f1c2a587f
								
							
								
							
						 | 
						
							
							
								
								1.删除打印代码,测试Jenkins前端自动化部署
							
							
							
							
							
						 | 
						
							3 years ago |