|  wangwei | 44664c615a | 调整 | 1 year ago | 
				
					
						|  wangwei | 54e0304357 | 优化 1.3 | 1 year ago | 
				
					
						|  wangwei | bd3bed2794 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  chenhc | 6a19e6fa33 | feat: 页面修改-业务类型、来源系统 | 1 year ago | 
				
					
						|  wangwei | 3b72f1b607 | 1.2 增加往来单位类型 | 1 year ago | 
				
					
						|  chenhc | a9bbcfd46a | feat: 页面修改 | 1 year ago | 
				
					
						|  wangwei | 68b805ef2c | 优化 1.0 | 1 year ago | 
				
					
						|  wangwei | 77ade51f3c | 优化 | 1 year ago | 
				
					
						|  wangwei | 059fcc6cd8 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | 6c9cf27e42 | 8*16 工位 | 1 year ago | 
				
					
						|  anthonywj | ce6c7edd67 | 界面优化 | 1 year ago | 
				
					
						|  wangwei | 4b0a4936a6 | 8/15 工位界面优化 | 1 year ago | 
				
					
						|  anthonywj | 6bd0ca936d | 界面优化 | 1 year ago | 
				
					
						|  chenhc | e03b76929d | feat: 页面修改 | 1 year ago | 
				
					
						|  chenhc | 931f3cfdf7 | feat: 优化右上角用户信息 | 1 year ago | 
				
					
						|  chenhc | e35352fe89 | feat: 优化细节 | 1 year ago | 
				
					
						|  anthonywj | 78d53333d9 | 界面优化 | 1 year ago | 
				
					
						|  chenhc | f657d09fd3 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z # Conflicts:
#	src/views/collect/DealOrder.vue | 1 year ago | 
				
					
						|  chenhc | 7a02984a5a | feat: 跳转禁止工位选择 | 1 year ago | 
				
					
						|  wangwei | befef4a762 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | f026c5ed39 | 工位管理 1.0 | 1 year ago | 
				
					
						|  anthonywj | 79c5246b53 | 界面优化 | 1 year ago | 
				
					
						|  anthonywj | 1fbd67ef43 | 单据备份 | 1 year ago | 
				
					
						|  anthonywj | dec80e5657 | 单据备份 | 1 year ago | 
				
					
						|  wangwei | 7732f12e95 | 工位分组调整 | 1 year ago | 
				
					
						|  wangwei | b8f0702a4a | 工位优化 | 1 year ago | 
				
					
						|  wangwei | 2ab3282abc | 工位维护 | 1 year ago | 
				
					
						|  chenhc | 3f6a01eac1 | feat: 页面跳转 | 1 year ago | 
				
					
						|  wangwei | 505084249d | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | 07a15df433 | 8/14 工位管理 | 1 year ago | 
				
					
						|  anthonywj | 1d1acf2686 | 单据备份 | 1 year ago | 
				
					
						|  chenhc | 2aa9cffc7f | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck_z # Conflicts:
#	.env.production
#	src/views/basic/product/productEdit.vue
#	src/views/thirdSys/invOrder/thrInvOrder.vue | 1 year ago | 
				
					
						|  chenhc | f528e377a8 | feat: 首页复制 | 1 year ago | 
				
					
						|  chenhc | 4618002fcd | feat: 首页复制 | 1 year ago | 
				
					
						|  chenhc | ccb622b77e | feat: 收费明细下载加上时分秒 | 1 year ago | 
				
					
						|  anthonywj | 3c7934de18 | 业务单据管理 | 1 year ago | 
				
					
						|  chenhc | 8d2c368426 | feat: 库存预警 | 1 year ago | 
				
					
						|  anthonywj | 3499764f8a | 代码备份 | 1 year ago | 
				
					
						|  wangwei | 668308d5a8 | 8/12 药品管理字段调整 | 1 year ago | 
				
					
						|  anthonywj | a690e9a4c2 | 上货管理 | 1 year ago | 
				
					
						|  anthonywj | b7d34809b9 | 处方赋码相关界面调整 | 1 year ago | 
				
					
						|  anthonywj | 3be141f636 | 处方赋码相关修改 | 1 year ago | 
				
					
						|  wangwei | 4582bed984 | 8/9 药品单据管理 | 1 year ago | 
				
					
						|  wangwei | 70e2c0878a | 8/02 供应商药品选入 | 1 year ago | 
				
					
						|  anthonywj | 8df5afbcfd | 药品出入库相关修改 | 1 year ago | 
				
					
						|  wangwei | 8339b4f557 | 8/02 药品 | 1 year ago | 
				
					
						|  anthonywj | d061ea69c2 | 处方相关修改 | 1 year ago | 
				
					
						|  anthonywj | 5c5fe6e6e3 | 处方分配 | 1 year ago | 
				
					
						|  anthonywj | 6a09ddf530 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | f2fb9d768b | 8/02 1.1 增加选入收费项目详情 | 1 year ago | 
				
					
						|  wangwei | 627e4dd863 | 1.1 | 1 year ago | 
				
					
						|  wangwei | 83a3738550 | 8/02 选入收费项目 | 1 year ago | 
				
					
						|  anthonywj | 5470175486 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  chenhc | d9ff0c6370 | feat: 处方下载 | 1 year ago | 
				
					
						|  anthonywj | cca9016ce4 | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | bdd65f9696 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  anthonywj | bd9a549f05 | 拆零页面修改 | 1 year ago | 
				
					
						|  wangwei | 083ba120fe | 新增单据选入药品查看药品详情 | 1 year ago | 
				
					
						|  anthonywj | 3cc2940116 | 拆零出库新增,退回,查询修改 | 1 year ago | 
				
					
						|  anthonywj | ded37366ae | 新增处方下载,处方赋码等界面 | 1 year ago | 
				
					
						|  anthonywj | f12f5b877c | 药品字典修改 | 1 year ago | 
				
					
						|  anthonywj | 1546c7846a | 药品字典修改 | 1 year ago | 
				
					
						|  anthonywj | e7ad1240e8 | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | b0fd2f54c5 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | a77f994644 | 修改 7/31 字段 | 1 year ago | 
				
					
						|  anthonywj | 6bdb0ee05d | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | 1074be6e44 | 切换分支备份 | 1 year ago | 
				
					
						|  wangwei | dcad3a1795 | 修改 7/30 1.2 | 1 year ago | 
				
					
						|  anthonywj | 21f3309ce5 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | c927636091 | 修改 7/30 1.0 | 1 year ago | 
				
					
						|  anthonywj | 9800f0ef1d | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | 3f0486c891 | 单据编辑删除条码 | 1 year ago | 
				
					
						|  anthonywj | 6405797811 | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | 7817ecb760 | 药品单据管理界面配置修改 | 1 year ago | 
				
					
						|  anthonywj | 95ecb5d38e | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | af5b637bc7 | Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z | 1 year ago | 
				
					
						|  wangwei | b6cfa3023a | 7/29 1.1 | 1 year ago | 
				
					
						|  wangwei | ee1532a61c | 7/29 | 1 year ago | 
				
					
						|  chenhc | ae0057f02a | feat: 药品出入库明细、汇总、入账库 | 1 year ago | 
				
					
						|  anthonywj | 8473abb54c | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | faeca9c70a | 切换分支备份 | 1 year ago | 
				
					
						|  anthonywj | 508eba2a61 | 赋码明细修改 | 1 year ago | 
				
					
						|  wangwei | 6a6ab65aae | 1.1 7/27 | 1 year ago | 
				
					
						|  wangwei | ea5deddfd2 | 1.1 | 1 year ago | 
				
					
						|  anthonywj | 22c9ba4dd1 | 收费项目相关修改 | 1 year ago | 
				
					
						|  chenhc | 6861612025 | feat: 0702-扫码校验功能 | 1 year ago | 
				
					
						|  wangwei | 31e87e7c6a | 7/2 系统管理 | 1 year ago | 
				
					
						|  wangwei | 98e7a7b264 | 7/2 基础数据 | 1 year ago | 
				
					
						|  wangwei | 48fe52f69f | 7/1 仓库管理 设备管理 查询统计 | 1 year ago | 
				
					
						|  wangwei | d54de7a4a2 | 7/1 业务管理 | 1 year ago | 
				
					
						|  wangwei | 128b6f43d7 | 7/1 单据管理 按钮 loading | 1 year ago | 
				
					
						|  wangwei | c48b677488 | 5/14 -- | 1 year ago | 
				
					
						|  anthonywj | 43690f72b9 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 1 year ago | 
				
					
						|  anthonywj | 74a103a40c | 登录密码校验 | 1 year ago | 
				
					
						|  chenhc | 3acb091dcc | feat: 0606修复重置 | 1 year ago | 
				
					
						|  wangwei | 24ea0f3e54 | 6/4 优化查询发票确认时间 | 1 year ago | 
				
					
						|  wangwei | 804239fc38 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 1 year ago | 
				
					
						|  chenhc | 7320ff9035 | feat: 0531增加是否需要扫码字段 | 1 year ago | 
				
					
						|  chenhc | 464692e1d4 | feat: 0531科室出库 | 1 year ago | 
				
					
						|  chenhc | 835a00383f | feat: 修复打印 | 1 year ago | 
				
					
						|  chenhc | 0bec051c9f | feat: 修复打印 | 1 year ago | 
				
					
						|  wangwei | 9e04f823a5 | 5/28 同步计划 | 1 year ago | 
				
					
						|  anthonywj | dd64406dc3 | 新增耗材类别 | 1 year ago | 
				
					
						|  chenhc | 047e21f940 | feat: 0527开发论证功能 | 1 year ago | 
				
					
						|  chenhc | 9756e10322 | feat: 0523开发论证功能 | 1 year ago | 
				
					
						|  chenhc | cf320a66c1 | feat: 0523开发询价模块 | 1 year ago | 
				
					
						|  chenhc | 3456cf88b5 | feat: 0523开发询价模块 | 1 year ago | 
				
					
						|  chenhc | 474c6d9e89 | feat: 0521 优化 | 1 year ago | 
				
					
						|  chenhc | cdf674f190 | feat: 0521 优化 | 1 year ago | 
				
					
						|  chenhc | fc6c10fac0 | feat: 0520 优化 | 1 year ago | 
				
					
						|  wangwei | 21154d9d74 | 5/20 接口更改 | 1 year ago | 
				
					
						|  wangwei | a1f90adfe2 | 5/20 --更改接口 | 1 year ago | 
				
					
						|  wangwei | 8939089d3e | 5/14 --报修诊断 按钮 | 1 year ago | 
				
					
						|  wangwei | 4bab29f2fa | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 1 year ago | 
				
					
						|  chenhc | 3a4a2ae630 | feat: 0517优化 | 1 year ago | 
				
					
						|  wangwei | e18aaf4220 | 5/17 保养计划 优化 | 1 year ago | 
				
					
						|  chenhc | 82f3c53bea | feat: 0517优化 | 1 year ago | 
				
					
						|  chenhc | 2987836967 | feat: 0517优化 | 1 year ago | 
				
					
						|  chenhc | 9e36fe67e4 | feat: 0516优化 | 1 year ago | 
				
					
						|  chenhc | 4249e1bdd6 | feat: 设备管理优化-0515-设备卡片-子页面 | 1 year ago | 
				
					
						|  chenhc | f01464aa8b | feat: 设备管理优化-0515-设备卡片-开启部分子页面 | 1 year ago | 
				
					
						|  wangwei | 5e52b074c7 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 1 year ago | 
				
					
						|  chenhc | 4d708b6730 | feat: 设备管理优化-0515-设备卡片-采购订单 | 1 year ago | 
				
					
						|  wangwei | b50f56f717 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 1 year ago | 
				
					
						|  chenhc | 1082b0cdff | feat: 设备管理优化-0514-设备卡片 | 1 year ago | 
				
					
						|  wangwei | 088e9aba7b | 5/14 --保养计划 | 1 year ago | 
				
					
						|  chenhc | b9b77e1a1c | feat: 设备管理优化-0514-合同管理 | 1 year ago | 
				
					
						|  chenhc | 2f55d9eb30 | feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 | 1 year ago | 
				
					
						|  chenhc | ca2f8ec806 | feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理 | 1 year ago | 
				
					
						|  chenhc | 9fdb69c5a2 | feat: 设备管理优化-0513-合同管理复制 | 1 year ago | 
				
					
						|  chenhc | 08472d5700 | feat: 设备管理优化-0512-增加移除设备的审批流程 | 1 year ago | 
				
					
						|  chenhc | b39d16f0dc | feat: 设备管理优化-0512-增加移除类型 | 1 year ago | 
				
					
						|  chenhc | d228e1d9e7 | feat: 设备管理优化-0510-密码框修复 | 1 year ago | 
				
					
						|  chenhc | 008df9574b | feat: 设备管理优化-0510 | 1 year ago | 
				
					
						|  chenhc | 8a9940ae25 | feat: 设备管理优化 | 1 year ago | 
				
					
						|  chenhc | 00ccec1ebf | feat: 设备管理优化 | 2 years ago | 
				
					
						|  chenhc | 2ca04c2165 | feat: 优化 | 2 years ago | 
				
					
						|  chenhc | 329a1a324e | feat: 提交 | 2 years ago | 
				
					
						|  chenhc | e673b2a932 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | 9963ba9943 | feat: 本部门保修单、报修单大厅、我的报修单、我的维修单 | 2 years ago | 
				
					
						|  anthonywj | 5d7a4cfc23 | 设备巡检任务处理 | 2 years ago | 
				
					
						|  anthonywj | 5fc6e1cb3d | 巡检计划相关修改 | 2 years ago | 
				
					
						|  chenhc | 24abcee7e9 | feat: 设备入库、变更、报废 | 2 years ago | 
				
					
						|  chenhc | 531a873e99 | feat: 设备信息增加字段 | 2 years ago | 
				
					
						|  chenhc | 38332f992f | feat: 设备变更、设备入库 | 2 years ago | 
				
					
						|  chenhc | 1bacd26f51 | feat: 提交 | 2 years ago | 
				
					
						|  anthonywj | fff23823d7 | 发票打印问题 | 2 years ago | 
				
					
						|  anthonywj | 1af061d244 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  anthonywj | 6476d6396f | 申购仓库修改 | 2 years ago | 
				
					
						|  chenhc | 6a651fb516 | feat: 注释掉术式按钮 | 2 years ago | 
				
					
						|  anthonywj | eaf4b616ab | 登录密码验证 | 2 years ago | 
				
					
						|  chenhc | 51bd03f4a7 | feat: 术式和登录页修改 | 2 years ago | 
				
					
						|  chenhc | 4bb9e864d6 | feat: 术士套包嵌入单据页面 | 2 years ago | 
				
					
						|  chenhc | 18354266cf | feat: 术士套包、定数包功能开发优化 | 2 years ago | 
				
					
						|  chenhc | 70e98093c5 | feat: 术士套包、定数包功能开发 | 2 years ago | 
				
					
						|  chenhc | 9cbb373439 | feat: 术士套包、定数包功能开发 | 2 years ago | 
				
					
						|  anthonywj | f8c3f714b8 | 科室出库修改 | 2 years ago | 
				
					
						|  anthonywj | 7c1485060c | 科室出库修改 | 2 years ago | 
				
					
						|  chenhc | e892b1794e | feat: 新增业务单据加上单据类型过滤物资录入 | 2 years ago | 
				
					
						|  chenhc | e2bf6de0b1 | feat: 产品增加采购类型校验 | 2 years ago | 
				
					
						|  chenhc | 80e01b2516 | feat: 定数包项目 | 2 years ago | 
				
					
						|  chenhc | 461beff613 | feat: 定数包项目 | 2 years ago | 
				
					
						|  chenhc | 3852bd3a6a | feat: 医保分类树优化 | 2 years ago | 
				
					
						|  chenhc | 9eb4e5f092 | feat: 打印功能增加字段 | 2 years ago | 
				
					
						|  chenhc | 896d398d50 | feat: 第三方明细下载增加字段 | 2 years ago | 
				
					
						|  chenhc | 2c0b597385 | feat: 科室医保分类功能 | 2 years ago | 
				
					
						|  chenhc | 280aeea409 | feat: 科室医保分类功能 | 2 years ago | 
				
					
						|  chenhc | 752f8c5eb0 | feat: 科室出库-优化--扫码页面未完善 | 2 years ago | 
				
					
						|  chenhc | 74761827a5 | feat: 科室出库 | 2 years ago | 
				
					
						|  anthonywj | e19e52d3fd | 库存盘点功能修改 | 2 years ago | 
				
					
						|  chenhc | 29e487fc68 | feat: 优化 | 2 years ago | 
				
					
						|  chenhc | 7ebdbd097c | feat: 优化 | 2 years ago | 
				
					
						|  chenhc | 7634e21828 | Merge remote-tracking branch 'origin/dev_20240306' into dev_ksck | 2 years ago | 
				
					
						|  anthonywj | b7823c7246 | 库存盘点功能修改 | 2 years ago | 
				
					
						|  chenhc | d9575e989e | feat: 第三方单据增加toBillNo字段展示 | 2 years ago | 
				
					
						|  chenhc | a187bcb9c0 | feat: 增加页面的医保耗材信息调用功能 | 2 years ago | 
				
					
						|  chenhc | 3da3083c5c | feat: 设备管理-设备登记-动态加载子组件 | 2 years ago | 
				
					
						|  chenhc | 2f5aea5ecc | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | a27627b5bc | feat: 设备管理-卡片开发 | 2 years ago | 
				
					
						|  anthonywj | 1ad28adf4a | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  anthonywj | f6742a38cd | 出入库明细单据生成优化 | 2 years ago | 
				
					
						|  chenhc | 95dc6614c2 | feat: 设备管理开发 | 2 years ago | 
				
					
						|  chenhc | b04eab404b | feat: 审核开关-业务页面修改 | 2 years ago | 
				
					
						|  chenhc | e72c3871f0 | feat: 审核开关 | 2 years ago | 
				
					
						|  anthonywj | b81dde75c8 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  anthonywj | 61a4363b9b | 平潭出库明细调整 | 2 years ago | 
				
					
						|  chenhc | fa33dc0f57 | feat: 审核流程配置功能 | 2 years ago | 
				
					
						|  chenhc | d37972bc83 | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | 81294d4104 | feat: 审核流程配置功能 | 2 years ago | 
				
					
						|  anthonywj | 09ba95c75c | 领用选择库存产品问题 | 2 years ago | 
				
					
						|  anthonywj | 0532a3a0e3 | 第三方出库明细修改 | 2 years ago | 
				
					
						|  anthonywj | 09d7bf67bc | 界面配置相关bug修改 | 2 years ago | 
				
					
						|  anthonywj | 37ba046b02 | 新增耗材分类 | 2 years ago | 
				
					
						|  anthonywj | 52037a478e | 出入库明细修改,批次号先进先出 | 2 years ago | 
				
					
						|  anthonywj | 64e2b9214b | 库存明细手动下载 | 2 years ago | 
				
					
						|  chenhc | c79dbcda45 | feat: 代码保存 | 2 years ago | 
				
					
						|  anthonywj | 1bdbc9beb5 | 项目组套新增供应商ID | 2 years ago | 
				
					
						|  anthonywj | 275449e3b1 | 登录界面配置 | 2 years ago | 
				
					
						|  anthonywj | 02c424aaab | Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | 060f7ea48f | feat: 三方出入库明细功能 | 2 years ago | 
				
					
						|  anthonywj | ce7acde9b8 | 选择库存产品仓库问题 | 2 years ago | 
				
					
						|  anthonywj | 0d1b7f81b4 | 选择库存产品仓库问题 | 2 years ago | 
				
					
						|  chenhc | 4838ccad06 | feat: 三方出入库明细功能 | 2 years ago | 
				
					
						|  chenhc | 8707d9fa03 | feat: 三方出入库明细功能 | 2 years ago | 
				
					
						|  chenhc | fb0f39c860 | feat: 三方出入库明细功能 | 2 years ago | 
				
					
						|  chenhc | 8468687d27 | feat: 保存代码 | 2 years ago | 
				
					
						|  chenhc | 69d896c406 | Merge branch '20231126-yw' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | aaa806200d | feat: 代码保存 | 2 years ago | 
				
					
						|  anthonywj | 1056d3e1c6 | 选择库存产品, | 2 years ago | 
				
					
						|  anthonywj | 5a9cda84a3 | Merge branch '20231126-yw' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | 066630cf5d | feat: 项目组套和三方出入库明细 | 2 years ago | 
				
					
						|  chenhc | 2318737957 | feat: 项目组套和三方出入库明细 | 2 years ago | 
				
					
						|  anthonywj | 036216949a | Merge branch '20231126-yw' into dev_ksck | 2 years ago | 
				
					
						|  chenhc | b7a65bded3 | feat: 耗材字典新增功能 | 2 years ago | 
				
					
						|  anthonywj | 57687a0c65 | 新增产品属性 | 2 years ago | 
				
					
						|  anthonywj | babbc96b8f | 科室使用出库,采购类型 | 2 years ago | 
				
					
						|  anthonywj | 05ad40a7d8 | 界面配置引起的单据删除,编辑等问题 | 2 years ago | 
				
					
						|  anthonywj | a223cc521d | 备份 | 2 years ago | 
				
					
						|  yuanwei | 695723fcf4 | bug修改 | 2 years ago | 
				
					
						|  yuanwei | bd843ffc42 | 界面展示处理 | 2 years ago | 
				
					
						|  yuanwei | 8a48704f89 | 解决冲突 | 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 | 
				
					
						|  yuanwei | 1d92b1114c | 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 | 
				
					
						|  yuanwei | 39af4919d6 | 查询提交 | 2 years ago | 
				
					
						|  anthonywj | 4d1eb8e33f | 新增生产企业字典维护 | 2 years ago | 
				
					
						|  anthonywj | 346d257e66 | 新增第三方生产企业 | 2 years ago | 
				
					
						|  anthonywj | 606658afe3 | 单据详情 页面展示问题 | 2 years ago | 
				
					
						|  anthonywj | b0b9786274 | 1:东山nginx转发问题(头部参数修改); 2:再次领用;再次申购问题; | 2 years ago | 
				
					
						|  anthonywj | 266cf0c93c | 再次申购 | 2 years ago | 
				
					
						|  anthonywj | 78b9c0169e | 集采拆单问题 | 2 years ago | 
				
					
						|  anthonywj | 20c07311de | 库存对比相关修改 | 2 years ago | 
				
					
						|  anthonywj | 95848a6a23 | 患者出库远程搜索,证书预览问题,创建人,审核人等问题 | 2 years ago | 
				
					
						|  anthonywj | dca51b45d9 | 设备入库相关修改 | 2 years ago | 
				
					
						|  anthonywj | defd93e0ac | 患者信息下载修改,自定义汇总统计 | 2 years ago | 
				
					
						|  anthonywj | 37b4d97b99 | 患者信息修改 | 2 years ago | 
				
					
						|  anthonywj | 27ab0dce11 | 患者信息修改 | 2 years ago | 
				
					
						|  anthonywj | 0b6d619a5c | 设备修改,患者信息下载修整 | 2 years ago | 
				
					
						|  anthonywj | 2d36d62111 | 单据类型修改 | 2 years ago | 
				
					
						|  anthonywj | 304cd0e055 | 患者处方 | 2 years ago | 
				
					
						|  anthonywj | 97b1c992e0 | 临床出库选择患者信息问题,设备打印问题 | 2 years ago | 
				
					
						|  anthonywj | 59f5475cfb | 临床出库患者处方问题 | 2 years ago | 
				
					
						|  anthonywj | bc9b29329f | 患者处方下载,使用耗材解析等 | 2 years ago | 
				
					
						|  wj | 1e7a037a41 | 设备相关 | 2 years ago | 
				
					
						|  yuanwei | f8384b4fb8 | 配送管理 | 2 years ago | 
				
					
						|  yuanwei | da3c08fa77 | 我是供应商 | 2 years ago | 
				
					
						|  yuanwei | a1ada9e0b0 | 集成动态表单 | 2 years ago | 
				
					
						|  yuanwei | 0edb66eaeb | 出入库单管理配置 | 2 years ago | 
				
					
						|  yuanwei | 248adc6b50 | Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw # Conflicts:
#	src/views/basic/product/product.vue | 2 years ago | 
				
					
						|  yuanwei | 387de87ab4 | 仓库管理 | 2 years ago | 
				
					
						|  anthonywj | 486e2c7176 | 第三方产品信息接口上传接口 | 2 years ago |