Commit Graph

353 Commits (60c7fd5ad16f59d3f0731bc76fc5a969aebde414)

Author SHA1 Message Date
wangwei 505084249d Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 11 months ago
wangwei 07a15df433 8/14 工位管理 11 months 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
11 months ago
anthonywj b7d34809b9 处方赋码相关界面调整 11 months ago
anthonywj 3be141f636 处方赋码相关修改 11 months ago
wangwei 4582bed984 8/9 药品单据管理 11 months ago
wangwei 70e2c0878a 8/02 供应商药品选入 11 months ago
wangwei 8339b4f557 8/02 药品 11 months ago
wangwei f2fb9d768b 8/02 1.1 增加选入收费项目详情 11 months ago
wangwei 627e4dd863 1.1 11 months ago
wangwei 83a3738550 8/02 选入收费项目 11 months ago
anthonywj f12f5b877c 药品字典修改 11 months ago
anthonywj 1546c7846a 药品字典修改 11 months ago
anthonywj e7ad1240e8 切换分支备份 11 months ago
wangwei dcad3a1795 修改 7/30 1.2 11 months ago
wangwei b6cfa3023a 7/29 1.1 12 months ago
wangwei ee1532a61c 7/29 12 months ago
anthonywj 8473abb54c 切换分支备份 12 months ago
wangwei 6a6ab65aae 1.1 7/27 12 months ago
wangwei ea5deddfd2 1.1 12 months 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 128b6f43d7 7/1 单据管理 按钮 loading 1 year ago
wangwei c48b677488 5/14 -- 1 year ago
chenhc 7320ff9035 feat: 0531增加是否需要扫码字段 1 year ago
anthonywj dd64406dc3 新增耗材类别 1 year ago
chenhc 1082b0cdff feat: 设备管理优化-0514-设备卡片 1 year ago
chenhc 08472d5700 feat: 设备管理优化-0512-增加移除设备的审批流程 1 year ago
chenhc 51bd03f4a7 feat: 术式和登录页修改 1 year ago
chenhc 4bb9e864d6 feat: 术士套包嵌入单据页面 1 year ago
chenhc 18354266cf feat: 术士套包、定数包功能开发优化 1 year ago
chenhc 70e98093c5 feat: 术士套包、定数包功能开发 1 year ago
chenhc 9cbb373439 feat: 术士套包、定数包功能开发 1 year ago
chenhc e2bf6de0b1 feat: 产品增加采购类型校验 1 year ago
chenhc 461beff613 feat: 定数包项目 1 year ago
chenhc 3852bd3a6a feat: 医保分类树优化 1 year ago
chenhc 2c0b597385 feat: 科室医保分类功能 1 year ago
chenhc 280aeea409 feat: 科室医保分类功能 1 year ago
chenhc a187bcb9c0 feat: 增加页面的医保耗材信息调用功能 1 year ago
anthonywj f6742a38cd 出入库明细单据生成优化 1 year ago
anthonywj b81dde75c8 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj 61a4363b9b 平潭出库明细调整 1 year ago
chenhc d37972bc83 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
chenhc 81294d4104 feat: 审核流程配置功能 1 year ago
anthonywj 0532a3a0e3 第三方出库明细修改 1 year ago
anthonywj 37ba046b02 新增耗材分类 1 year ago
anthonywj 52037a478e 出入库明细修改,批次号先进先出 1 year ago
anthonywj 1bdbc9beb5 项目组套新增供应商ID 1 year ago
chenhc fb0f39c860 feat: 三方出入库明细功能 1 year ago
anthonywj 1056d3e1c6 选择库存产品, 1 year ago
anthonywj 036216949a Merge branch '20231126-yw' into dev_ksck 1 year ago
chenhc b7a65bded3 feat: 耗材字典新增功能 1 year ago
anthonywj 57687a0c65 新增产品属性 1 year ago
anthonywj babbc96b8f 科室使用出库,采购类型 1 year ago
yuanwei 695723fcf4 bug修改 1 year ago
yuanwei bd843ffc42 界面展示处理 1 year ago
yuanwei 8a48704f89 解决冲突 1 year 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
1 year 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
1 year ago
anthonywj 4d1eb8e33f 新增生产企业字典维护 1 year ago
anthonywj b0b9786274 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
1 year ago
anthonywj 78b9c0169e 集采拆单问题 1 year ago
anthonywj 20c07311de 库存对比相关修改 1 year ago
anthonywj 95848a6a23 患者出库远程搜索,证书预览问题,创建人,审核人等问题 1 year ago
anthonywj defd93e0ac 患者信息下载修改,自定义汇总统计 2 years ago
anthonywj 27ab0dce11 患者信息修改 2 years ago
anthonywj 0b6d619a5c 设备修改,患者信息下载修整 2 years ago
anthonywj 2d36d62111 单据类型修改 2 years ago
anthonywj 97b1c992e0 临床出库选择患者信息问题,设备打印问题 2 years ago
anthonywj 59f5475cfb 临床出库患者处方问题 2 years ago
anthonywj bc9b29329f 患者处方下载,使用耗材解析等 2 years ago
wj 1e7a037a41 设备相关 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
yuanwei 0a2d35fa97 优化事件执行 2 years ago
yuanwei f078db3410 字典功能处理 2 years ago
yuanwei 1595dbaa7c 字典功能处理 2 years ago
yuanwei cba58fec93 字典功能处理 2 years ago
yuanwei 42886ccc72 初始化动态配置 2 years ago
yuanwei 145adc5f7d 初始化动态配置 2 years ago
yuanwei 9cb09bd672 初始化动态配置 2 years ago
anthonywj 84751e92e9 单据类型,飞书相关bug修改,汇总统计修改 2 years ago
anthonywj 4d5c58454d 项目组套下载更新 2 years ago
anthonywj 42e8475e8e 患者信息,处方信息下载,首次登录选择当前部门仓库问题 2 years ago
anthonywj 3dd3db0524 新增物价类别 2 years ago
anthonywj 28d2fa74a3 库存查询相关修改 2 years ago
wj b819d48351 患者管理 2 years ago
anthonywj 6c9b9988c4 项目编码,患者信息,患者处方等修改 2 years ago
anthonywj 84905777f7 领用,发票,日月季年 2 years ago
anthonywj ebe748ee58 物资字典重复添加问题 2 years ago
anthonywj 744ef12f24 定量相关调整 2 years ago
anthonywj b5c7b2897d 新增价格先进先出 2 years ago
anthonywj 9859b53f8a 添加价格 2 years ago
anthonywj 5c1cdf6bc8 单据编辑状态 2 years ago
anthonywj d3371db702 代码备份 2 years ago
anthonywj da3de18d73 切换分支备份 2 years ago