wangwei
							
						 | 
						
							
							
							
							
								
							
								7c28245709
								
							
								
							
						 | 
						
							
							
								
								9/2 下载处方信息
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								f402942cc7
								
							
								
							
						 | 
						
							
							
								
								界面修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								45318cc15a
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								37d5980355
								
							
								
							
						 | 
						
							
							
								
								8*31 优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e738114261
								
							
								
							
						 | 
						
							
							
								
								fix: 工位联动业务类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								4500b55b94
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								bb0d25042a
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								09970d4ee7
								
							
								
							
						 | 
						
							
							
								
								界面修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9667cec491
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								fb6239c0e8
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								6ed14e5e29
								
							
								
							
						 | 
						
							
							
								
								界面修改,拆零新增损耗出库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								4e42bcb419
								
							
								
							
						 | 
						
							
							
								
								8/19
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								cfbf91c07f
								
							
								
							
						 | 
						
							
							
								
								8/30 根据追溯码出库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5157b0de09
								
							
								
							
						 | 
						
							
							
								
								界面调整
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								259dcfbc76
								
							
								
							
						 | 
						
							
							
								
								bug 修改码替换相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e8dc69d26a
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								4fa9b3f3a7
								
							
								
							
						 | 
						
							
							
								
								工位状态异常
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								c4c6bcd75f
								
							
								
							
						 | 
						
							
							
								
								存量预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								247b00e50e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ksck_z' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								04c0b1101d
								
							
								
							
						 | 
						
							
							
								
								界面调整
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								b7688afd7d
								
							
								
							
						 | 
						
							
							
								
								界面调整
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								d800d56f5b
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								aa23cf08a0
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'dev_ksck_z' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								0a31ca5331
								
							
								
							
						 | 
						
							
							
								
								存量预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								593ee4065d
								
							
								
							
						 | 
						
							
							
								
								bug修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b2207905b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								17e1ee22b7
								
							
								
							
						 | 
						
							
							
								
								8/30 损耗出库
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								ec2bb507ff
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/collect/CollectOrderTabs.vue 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a244b1e241
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9b0d2675c2
								
							
								
							
						 | 
						
							
							
								
								工位上货添加业务类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								6786afe220
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9627ed7d73
								
							
								
							
						 | 
						
							
							
								
								是否自动赋码,单据处理
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								f1bcc1a802
								
							
								
							
						 | 
						
							
							
								
								库存预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f75d9efc2f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								e0e489b857
								
							
								
							
						 | 
						
							
							
								
								8/30 切换业务提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								4304ad6c0d
								
							
								
							
						 | 
						
							
							
								
								fix:分页修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								528e5477b9
								
							
								
							
						 | 
						
							
							
								
								库存条件整合
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								f84de49369
								
							
								
							
						 | 
						
							
							
								
								8/30 接口修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								5614c6ee80
								
							
								
							
						 | 
						
							
							
								
								8/29 优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d0430fedd7
								
							
								
							
						 | 
						
							
							
								
								8/29 工位业务类型修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								60083984f9
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								cbf3a4b623
								
							
								
							
						 | 
						
							
							
								
								8/29 logo
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								423ed6c527
								
							
								
							
						 | 
						
							
							
								
								8/29 损耗日志
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								618c85e722
								
							
								
							
						 | 
						
							
							
								
								损耗出库界面修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a99b50ff2a
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								b8781fb399
								
							
								
							
						 | 
						
							
							
								
								fix: 提交
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								26762bc8bc
								
							
								
							
						 | 
						
							
							
								
								fix: tabs修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								0f3eb56b3d
								
							
								
							
						 | 
						
							
							
								
								8/28 药品数据维护 第三方药品维护
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								f1de28664f
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9569c8e54a
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								cbb58dcbf6
								
							
								
							
						 | 
						
							
							
								
								fix: 焦点获取
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								7cab8c36dc
								
							
								
							
						 | 
						
							
							
								
								8/27 切换业务类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2cd63ea639
								
							
								
							
						 | 
						
							
							
								
								8/27 置顶
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								dd850f36d5
								
							
								
							
						 | 
						
							
							
								
								库存预警
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								d2e3311b08
								
							
								
							
						 | 
						
							
							
								
								8/27 界面优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								6417ae5910
								
							
								
							
						 | 
						
							
							
								
								fix: 面包屑+tabs页组件+logo
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								9d655f827c
								
							
								
							
						 | 
						
							
							
								
								右上角布局修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								45f95cd7b6
								
							
								
							
						 | 
						
							
							
								
								8/27 调整工位编码
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								beb2212c04
								
							
								
							
						 | 
						
							
							
								
								8/27 优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								1996e3def9
								
							
								
							
						 | 
						
							
							
								
								fix: 面包屑+tabs页组件修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								3674d21d4c
								
							
								
							
						 | 
						
							
							
								
								耗材字典更新流通计量单元问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								8708a7157f
								
							
								
							
						 | 
						
							
							
								
								8/26 追溯码查询以及工位bug修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2e40ee4406
								
							
								
							
						 | 
						
							
							
								
								工位上货问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2a39d0724a
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								5bd837cf26
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								35552beacd
								
							
								
							
						 | 
						
							
							
								
								fix: 面包屑+tabs页组件
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								65a63bfb1b
								
							
								
							
						 | 
						
							
							
								
								8/26 优化耗材字典 加入工位预警数量 放开是否拆零
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								zane
							
						 | 
						
							
							
							
							
								
							
								3da939259a
								
							
								
							
						 | 
						
							
							
								
								置顶 排序时间
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								a7fe8da292
								
							
								
							
						 | 
						
							
							
								
								fix: 面包屑+tabs页组件
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								2862a53d2b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/basic/workplace/workplaceManage.vue 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b56b0e37ac
								
							
								
							
						 | 
						
							
							
								
								8/26 工位组别修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								8773163a35
								
							
								
							
						 | 
						
							
							
								
								界面配置一些微调
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								60c7fd5ad1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b27d09891f
								
							
								
							
						 | 
						
							
							
								
								8/25 界面优化
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								47c2c2b4c7
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								7fee144c33
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								b5a8326912
								
							
								
							
						 | 
						
							
							
								
								8/25 组别修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								13c6f20a1f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								beeab0ea8f
								
							
								
							
						 | 
						
							
							
								
								8/25 业务类型关联第三方单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								7b5549675c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								6b415942a1
								
							
								
							
						 | 
						
							
							
								
								界面配置一些微调
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								8a35d2ee69
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9b01797ad7
								
							
								
							
						 | 
						
							
							
								
								fix: 修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								8cdc58b3ae
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								7e774badf3
								
							
								
							
						 | 
						
							
							
								
								界面配置一些微调
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								e7232c0d2f
								
							
								
							
						 | 
						
							
							
								
								fix: 统一分割加切横线
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								a116abc56d
								
							
								
							
						 | 
						
							
							
								
								扫码问题
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								2e38cfdc34
								
							
								
							
						 | 
						
							
							
								
								界面扫码的一些调整
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								da62e9963f
								
							
								
							
						 | 
						
							
							
								
								代码备份
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								e5bb9d4788
								
							
								
							
						 | 
						
							
							
								
								工位的界面相关修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								6a7607c794
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
							
							
							# Conflicts:
#	src/views/collect/DealOrder.vue 
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								21b01ae12c
								
							
								
							
						 | 
						
							
							
								
								确认单据
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1ab7a15fd1
								
							
								
							
						 | 
						
							
							
								
								8/23 是否拆零隐藏 业务类型增加单据流通方式
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								9aa7e01059
								
							
								
							
						 | 
						
							
							
								
								fix: 减一页面同步刷新
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								62dbf72e15
								
							
								
							
						 | 
						
							
							
								
								fix: 获取业务单据类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								844dceba9b
								
							
								
							
						 | 
						
							
							
								
								fix: 获取业务单据类型
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								1926b45bea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								yewj
							
						 | 
						
							
							
							
							
								
							
								8783e9ddfd
								
							
								
							
						 | 
						
							
							
								
								页面修改
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								chenhc
							
						 | 
						
							
							
							
							
								
							
								c829947bb9
								
							
								
							
						 | 
						
							
							
								
								fix: 业务类型窗口名、上货页面获取工位
							
							
							
							
							
						 | 
						
							1 year ago | 
						
					
				
					
						
							
							
								 
								wangwei
							
						 | 
						
							
							
							
							
								
							
								1785bc97d3
								
							
								
							
						 | 
						
							
							
								
								8/23 工位上货 实际数量隐藏
							
							
							
							
							
						 | 
						
							1 year ago |