薛宇
							
						 | 
						
							
							
							
							
								
							
								7b080d394b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/purchase/company/supCompanyAduditDialog.vue
#	src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
#	src/views/purchase/product/supProductAuditDialog.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								c484698cec
								
							
								
							
						 | 
						
							
							
								
								富文本编辑资质上传
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								f9b3e2a684
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								7a964a2451
								
							
								
							
						 | 
						
							
							
								
								富文本编辑器添加资质证书
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								sunhb
							
						 | 
						
							
							
							
							
								
							
								834626858f
								
							
								
							
						 | 
						
							
							
								
								修改查询采购订单模块中的’申购数量‘字段名
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								sunhb
							
						 | 
						
							
							
							
							
								
							
								27f757be67
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/inout/DialogCreateOrder.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								sunhb
							
						 | 
						
							
							
							
							
								
							
								67caad496c
								
							
								
							
						 | 
						
							
							
								
								收货仓库与单据类型位置更换
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								c023e61c35
								
							
								
							
						 | 
						
							
							
								
								字段调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								71e4270bf0
								
							
								
							
						 | 
						
							
							
								
								统一字段
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								811efa737c
								
							
								
							
						 | 
						
							
							
								
								同步设置中的数据同步设置字段排版不齐
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								eaa77161de
								
							
								
							
						 | 
						
							
							
								
								添加预览
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8f0811b450
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								cef3eccc5c
								
							
								
							
						 | 
						
							
							
								
								注册备案号选择优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								dd5ce87aee
								
							
								
							
						 | 
						
							
							
								
								还原代码
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								c60e10aa41
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								087eaf70a6
								
							
								
							
						 | 
						
							
							
								
								选入物资字典选择单个注册证件备案号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								ce325bc45c
								
							
								
							
						 | 
						
							
							
								
								新增配送产品资质信息审核拒绝后 重新提交弹出的提示有误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								130ffcafb4
								
							
								
							
						 | 
						
							
							
								
								按发票登记 字段顺序调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4f12490bdd
								
							
								
							
						 | 
						
							
							
								
								修改 企业资质提交审核 弹出提示信息不正确
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								94b713dd5a
								
							
								
							
						 | 
						
							
							
								
								单据类型修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								411201d17e
								
							
								
							
						 | 
						
							
							
								
								查询单据类型加上搜索
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								616fdd4642
								
							
								
							
						 | 
						
							
							
								
								内部码查询问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								6679d7842c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								691693987e
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								ea77fe873e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								fd530f53f5
								
							
								
							
						 | 
						
							
							
								
								采购订单处理”页面的紧急程度字段显示修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								6eaf9aea2b
								
							
								
							
						 | 
						
							
							
								
								隐藏选入单据按钮
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								74d0b1b87b
								
							
								
							
						 | 
						
							
							
								
								修改bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6ed5424b89
								
							
								
							
						 | 
						
							
							
								
								查询出入库单 切换仓库查询  total不变化问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								42f7da0483
								
							
								
							
						 | 
						
							
							
								
								发票登记显示问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								7e95fb3425
								
							
								
							
						 | 
						
							
							
								
								送货单指定的‘注册备案号’,流转自动补单成到货、入库单后会发生变化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								8ccbcdcc23
								
							
								
							
						 | 
						
							
							
								
								供应商账号的入院物资维护,多级包装信息显示错误;且切换包装层级查看信息时,底下包装信息栏不会有变化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								0fc118ce2d
								
							
								
							
						 | 
						
							
							
								
								单据新增序列号重复问题修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1dc77e2516
								
							
								
							
						 | 
						
							
							
								
								修改单据审核、验收窗口不扫入条码直接添加 报系统繁忙问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								55681a9565
								
							
								
							
						 | 
						
							
							
								
								发票bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								038b2ff673
								
							
								
							
						 | 
						
							
							
								
								开票日期提示信息更正
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								18a0023826
								
							
								
							
						 | 
						
							
							
								
								按发票登记窗口字段排列与按单据登记窗口字段排列不一致
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								13ff04e14b
								
							
								
							
						 | 
						
							
							
								
								审核送货单模块可以审核入库单,预期应不可以
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								ae3631ca75
								
							
								
							
						 | 
						
							
							
								
								修改 按发票登记 分页问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								9d2ad22209
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								69f74df34d
								
							
								
							
						 | 
						
							
							
								
								重置优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								303eda7a23
								
							
								
							
						 | 
						
							
							
								
								备注栏UI显示错位 230523
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								2c12de5757
								
							
								
							
						 | 
						
							
							
								
								发票登记进行勾选取消操作后,点击登记报错系统繁忙
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								d276659287
								
							
								
							
						 | 
						
							
							
								
								供应商发票-单据发票信息无法分页
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								aa8d1ca4f8
								
							
								
							
						 | 
						
							
							
								
								扫码数量错误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								fd887632cc
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								c71ef3f02d
								
							
								
							
						 | 
						
							
							
								
								物资字典维护中 选入院内字典时 院内字典过长导致系统繁忙
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								de95207af2
								
							
								
							
						 | 
						
							
							
								
								内部码打印 点击选入会自动选入全部产品
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								8b92adeb19
								
							
								
							
						 | 
						
							
							
								
								生产企业显示问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								45a1267c6a
								
							
								
							
						 | 
						
							
							
								
								查询采购订单备注
							
							
							
							
							
						 | 
						
							2 years ago |