chenhc
							
						 | 
						
							
							
							
							
								
							
								d27fee7140
								
							
								
							
						 | 
						
							
							
								
								feat: 用户编辑
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								c64f066a1c
								
							
								
							
						 | 
						
							
							
								
								高级搜索修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								c31d5fa882
								
							
								
							
						 | 
						
							
							
								
								9/11 已完成,上传单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								508eba2a61
								
							
								
							
						 | 
						
							
							
								
								赋码明细修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								31e87e7c6a
								
							
								
							
						 | 
						
							
							
								
								7/2 系统管理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9963ba9943
								
							
								
							
						 | 
						
							
							
								
								feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								6476d6396f
								
							
								
							
						 | 
						
							
							
								
								申购仓库修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								95dc6614c2
								
							
								
							
						 | 
						
							
							
								
								feat: 设备管理开发
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								babbc96b8f
								
							
								
							
						 | 
						
							
							
								
								科室使用出库,采购类型
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								5aa6359c78
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/basic/business/stockOrder.vue
#	src/views/basic/product/UdiInfoSelectLocalUdi.vue
#	src/views/basic/product/product.vue
#	src/views/basic/product/udiInfoManageSp.vue
#	src/views/inout/InvoiceRegByFp.vue
#	src/views/inout/InvoiceRegByOrder.vue
#	src/views/inout/IoAuditedOrder.vue
#	src/views/inout/IoCheckAuditOrder.vue
#	src/views/inout/IoCheckErrorOrder.vue
#	src/views/inout/IoCheckSuccessOrder.vue
#	src/views/inout/IoCreateBusOrder.vue
#	src/views/inout/IoCreateErrorOrder.vue
#	src/views/inout/IoCreateOrder.vue
#	src/views/inout/IoCreateScanOrder.vue
#	src/views/inout/IoDealOrder.vue
#	src/views/inout/IoWaitAllocateOrder.vue
#	src/views/inout/muti/ioOrderMuti.vue
#	src/views/inout/muti/ioOrderMutiAudit.vue
#	src/views/inout/muti/ioOrderMutiSelect.vue
#	src/views/inout/receive/receiveAdd.vue
#	src/views/inout/receive/receiveAudit.vue
#	src/views/inout/receive/receiveMySearch.vue
#	src/views/inout/receive/receiveSearch.vue
#	src/views/inventory/InvPreProducts.vue
#	src/views/inventory/InvProducts.vue
#	src/views/inventory/InvSupPreInProducts.vue
#	src/views/inventory/count/InvCountOrderAudit.vue
#	src/views/inventory/count/InvCountOrderCompleted.vue
#	src/views/inventory/count/InvCountOrderNew.vue
#	src/views/inventory/supInoutSearchOrder.vue
#	src/views/purchase/cert/supCertAudit.vue
#	src/views/purchase/cert/supCertSearch.vue
#	src/views/purchase/purApply/purApply.vue
#	src/views/purchase/purApply/pureApplyAudit.vue
#	src/views/purchase/purApply/pureApplyMySearch.vue
#	src/views/purchase/purApply/pureApplySearch.vue
#	src/views/purchase/purOrder/purOrder.vue
#	src/views/purchase/purOrder/purOrderAudit.vue
#	src/views/purchase/purOrder/purOrderSearch.vue
#	src/views/purchase/purOrder/purOrderSearchDetails.vue
#	src/views/purchase/purPlan/purPlan.vue
#	src/views/purchase/purPlan/purPlanAudit.vue
#	src/views/purchase/purPlan/purPlanSearch.vue
#	src/views/purchase/purPlan/purPlanSearchDetails.vue
#	src/views/remind/invRemindMsg.vue
#	src/views/remind/supCertRemindMsg.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								b0b9786274
								
							
								
							
						 | 
						
							
							
								
								1:东山nginx转发问题(头部参数修改);
							
							
							
							
							
							
							
							2:再次领用;再次申购问题; 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wj
							
						 | 
						
							
							
							
							
								
							
								1e7a037a41
								
							
								
							
						 | 
						
							
							
								
								设备相关
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								387de87ab4
								
							
								
							
						 | 
						
							
							
								
								仓库管理
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								9e9d02b99c
								
							
								
							
						 | 
						
							
							
								
								出入库单管理配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								059ad7a1b4
								
							
								
							
						 | 
						
							
							
								
								采购订单管理配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								0a2d35fa97
								
							
								
							
						 | 
						
							
							
								
								优化事件执行
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								42886ccc72
								
							
								
							
						 | 
						
							
							
								
								初始化动态配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								145adc5f7d
								
							
								
							
						 | 
						
							
							
								
								初始化动态配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								yuanwei
							
						 | 
						
							
							
							
							
								
							
								9cb09bd672
								
							
								
							
						 | 
						
							
							
								
								初始化动态配置
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								47affeb3ef
								
							
								
							
						 | 
						
							
							
								
								新增退货补单流程,诏安两个分库问题,单据明细打印问题,证书显示规格型号
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								3e45eca2fd
								
							
								
							
						 | 
						
							
							
								
								领用相关问题修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								ebe748ee58
								
							
								
							
						 | 
						
							
							
								
								物资字典重复添加问题
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								23d148999e
								
							
								
							
						 | 
						
							
							
								
								领用仓库与当前仓库修改,领用打印等功能
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								bd3d365fbe
								
							
								
							
						 | 
						
							
							
								
								定量界面相关调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								744ef12f24
								
							
								
							
						 | 
						
							
							
								
								定量相关调整
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2043524bf0
								
							
								
							
						 | 
						
							
							
								
								自定义头部参数相关代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								黄泽腾
							
						 | 
						
							
							
							
							
								
							
								2975a35b3f
								
							
								
							
						 | 
						
							
							
								
								设备管理-设备资质
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								35cc8ee9a6
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								薛宇
							
						 | 
						
							
							
							
							
								
							
								5e3900dc1c
								
							
								
							
						 | 
						
							
							
								
								入账库切换上级仓库时,会显示预验收与寄售的仓库
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7d0e897a5c
								
							
								
							
						 | 
						
							
							
								
								修改第三方数据bug
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								278adb8242
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/inout/IoAuditedOrder.vue 
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								193ab67756
								
							
								
							
						 | 
						
							
							
								
								页面优化
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								d92920ecf1
								
							
								
							
						 | 
						
							
							
								
								自动补单时间间隔不应为负数 230522
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								681b44a846
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' into dev
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								cca3ce846e
								
							
								
							
						 | 
						
							
							
								
								bug修复
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								5c24e08b50
								
							
								
							
						 | 
						
							
							
								
								申购单据,采购订单等相关修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								065b4b6b08
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								2cb7e20ca3
								
							
								
							
						 | 
						
							
							
								
								代码备份,
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								f7a2cfc2aa
								
							
								
							
						 | 
						
							
							
								
								修复入账库按货位查询后,库存详情列表无法显示所有条码信息
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								b65353d272
								
							
								
							
						 | 
						
							
							
								
								自动补单时间间隔不应为负数 230522
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								f82383b66f
								
							
								
							
						 | 
						
							
							
								
								业务单自动补单的单据类型名称不支持模糊查询 230519
							
							
							
							
							
						 | 
						
							2 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								0df1f26048
								
							
								
							
						 | 
						
							
							
								
								用户管理-新增:用户名称和角色为必选
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								anthonywj
							
						 | 
						
							
							
							
							
								
							
								07017c3802
								
							
								
							
						 | 
						
							
							
								
								角色删除问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								f2aaf3aff5
								
							
								
							
						 | 
						
							
							
								
								角色管理状态栏添加”全部“,默认值为“正常”。超级管理员改为可删除。
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								schry
							
						 | 
						
							
							
							
							
								
							
								9651eb145c
								
							
								
							
						 | 
						
							
							
								
								用户管理默认值为正常,admin用户禁止删除。用户编辑页面admin的用户账号,用户名称,角色,状态禁止修改
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								dac293fd9e
								
							
								
							
						 | 
						
							
							
								
								修复仓库用户信息查询多点几下出现的数据加载失败问题
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								45fcae8314
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								1178634255
							
						 | 
						
							
							
							
							
								
							
								ae5df67da3
								
							
								
							
						 | 
						
							
							
								
								创库信息刚进页面不能显示数据修复
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								6a6388e23e
								
							
								
							
						 | 
						
							
							
								
								如果角色存在用户关联 就不能给角色禁用
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								 
								郑明梁
							
						 | 
						
							
							
							
							
								
							
								55a6284a02
								
							
								
							
						 | 
						
							
							
								
								修改业务单据bug
							
							
							
							
							
						 | 
						
							3 years ago |