郑明梁
							
						 | 
						
							
							
							
							
								
							
								5c7cc65722
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ee10756c23
								
							
								
							
						 | 
						
							
							
								
								修改重置导致数据问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								74d0205da4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/inventory/DeviceInspectTakeSelect.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								48c10a8607
								
							
								
							
						 | 
						
							
							
								
								设备任务名称修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								e9e4407c36
								
							
								
							
						 | 
						
							
							
								
								设备相关名称修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								567496fc3a
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								51c2ebc91b
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								dbc353df20
								
							
								
							
						 | 
						
							
							
								
								修改设备bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								323ad630d1
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								c90d072571
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								355c329acc
								
							
								
							
						 | 
						
							
							
								
								设备bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								356eae8f0c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								7136b422c5
								
							
								
							
						 | 
						
							
							
								
								设备bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								bc5156fb99
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								965b85e25a
								
							
								
							
						 | 
						
							
							
								
								富文本编辑证书
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5101975f0e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								dcfcf4b51d
								
							
								
							
						 | 
						
							
							
								
								设备bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								4c7262235d
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into dev2.0
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								1d80455fc3
								
							
								
							
						 | 
						
							
							
								
								富文本相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								58001af180
								
							
								
							
						 | 
						
							
							
								
								设备报修bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								3650244bf1
								
							
								
							
						 | 
						
							
							
								
								设备维保模块切换部门后,仓库信息没有自动置空
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								5533b41c9d
								
							
								
							
						 | 
						
							
							
								
								业务领用码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								241318b12c
								
							
								
							
						 | 
						
							
							
								
								新增维保记录选择好设备后,仍能切换仓库保存成功
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								ae654bf3b0
								
							
								
							
						 | 
						
							
							
								
								业务领用码提交
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								8e271c0795
								
							
								
							
						 | 
						
							
							
								
								新增报修单模块切换仓库后点击重置,仓库下拉框信息不会重置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								f858688cf6
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								06f5df034e
								
							
								
							
						 | 
						
							
							
								
								发票DI编码字段展示
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								0b56958b01
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								170e49c13e
								
							
								
							
						 | 
						
							
							
								
								选入优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								2c62bd4349
								
							
								
							
						 | 
						
							
							
								
								提示信息有误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								6639f1f065
								
							
								
							
						 | 
						
							
							
								
								新增领用库存产品录入列表中,跳转页码后产品数据显示有误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								63f1d38393
								
							
								
							
						 | 
						
							
							
								
								领用距离重置刷新问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								ff59ac09b4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								06f61cfea3
								
							
								
							
						 | 
						
							
							
								
								选择申购部门后,申购仓库下拉框还会显示其它部门所属的仓库信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								89e6ba7b9c
								
							
								
							
						 | 
						
							
							
								
								同步设置中的数据同步设置字段排版不齐
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								9994f78b20
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								849237a9f1
								
							
								
							
						 | 
						
							
							
								
								切换分支备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								6b45f52678
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								9ef1be6023
								
							
								
							
						 | 
						
							
							
								
								盘点单驳回后提示框有问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								f52b38f12e
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								83e8be4e6c
								
							
								
							
						 | 
						
							
							
								
								进入查询申购单模块,申购部门会默认显示一级部门‘协和医院平潭分院’
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								e2ee199b92
								
							
								
							
						 | 
						
							
							
								
								审核申购单据窗口字段排列不齐
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								f6e4cc2524
								
							
								
							
						 | 
						
							
							
								
								明细列表中的‘DI/物资编码’字段显示有误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								f6c53dd3c9
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								8aa5423449
								
							
								
							
						 | 
						
							
							
								
								按发票登记:“发票编码”和“发票代码”字段错误
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								da2987f29b
								
							
								
							
						 | 
						
							
							
								
								新增采购计划进入产品录入窗口,列表不会自动展示产品信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								1af9c423cf
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								eda20d51c1
								
							
								
							
						 | 
						
							
							
								
								代码还原注册备案号选项
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2e1e69a0b1
								
							
								
							
						 | 
						
							
							
								
								巡检 报修 页面 字段调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								80a5fce9e5
								
							
								
							
						 | 
						
							
							
								
								巡检任务 加上报修类型和紧急程度
							
							
							
							
							
						 | 
						
							2 years ago |