anthonywj
							
						 | 
						
							
							
							
							
								
							
								b00b20df14
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	public/config.json
#	src/views/warehouse/IOSearchOrder.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								188df87d80
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8ce0b0bea8
								
							
								
							
						 | 
						
							
							
								
								扫码单据查询分库显示代码问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								622ddfc517
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eebae3b15a
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	public/config.json
#	src/views/basic/basicCompanyProducts.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								490d9036d0
								
							
								
							
						 | 
						
							
							
								
								单据复制一二次复核
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e01f5a578
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b5b6914607
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								eb85982e0c
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	public/config.json
#	public/打包设置.txt
#	src/views/basic/invWarehouse.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								0c377f3dbe
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								fe2e1872ac
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								dcb4bfa4b7
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								4f627ff310
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								625727248d
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/warehouse/IOErrorOrder.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e7cd1f93e
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ca7a6beaa0
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1cea6b08f4
								
							
								
							
						 | 
						
							
							
								
								1.修复分页加载页面不同步问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								1e262dc046
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c07fcf5025
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								02c70ab039
								
							
								
							
						 | 
						
							
							
								
								备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								e5dc7837bf
								
							
								
							
						 | 
						
							
							
								
								1.新增业务单据查询产品信息添加供应商参数
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								ce0fbb5a1c
								
							
								
							
						 | 
						
							
							
								
								1.修复按钮被挤压位移问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								fd5fc9c266
								
							
								
							
						 | 
						
							
							
								
								1.修复分库添加用户和单据类型数据未刷新问题
							
							
							
							
							
							
							
							2.修复分页导致搜索无数据问题 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								7cff854bff
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/warehouse/stockHospOrderNew.vue 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								d0bdadf07e
								
							
								
							
						 | 
						
							
							
								
								1.修复分页bug
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
								
							
								39b37e9fb5
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/fencang' into fencang
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								76589b7861
								
							
								
							
						 | 
						
							
							
								
								单据管理默认选择仓库,分库
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bf7b40c505
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								308d478661
								
							
								
							
						 | 
						
							
							
								
								1.删除不需要的复选框
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								479161fdad
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								c435d5b024
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'fencang' into busUser
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								90318b801c
								
							
								
							
						 | 
						
							
							
								
								新增业务单选择所选部门
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								3537986f6a
								
							
								
							
						 | 
						
							
							
								
								1.修复校验异常单据页面选择业务单据提示异常信息问题
							
							
							
							
							
							
							
							2.修复分页bug 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								c9e51e3f9a
								
							
								
							
						 | 
						
							
							
								
								1.扫码单据编辑列表添加实际数量字段
							
							
							
							
							
							
							
							2.根据同步设置判断是否启用相关功能按钮
3.修复部分已知bug 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								83d7e37447
								
							
								
							
						 | 
						
							
							
								
								商品条码转UDI码bug
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								03163a1fe7
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								1da604bf23
								
							
								
							
						 | 
						
							
							
								
								1.切换单据类型不清除往来单位数据
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								x_z
							
						 | 
						
							
							
							
							
								
							
								b4b6e58cf9
								
							
								
							
						 | 
						
							
							
								
								1.修复异常单据详情数量显示错误问题
							
							
							
							
							
							
							
							2.修复一些页面的分页bug 
							
						 | 
						
							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 |