Commit Graph

236 Commits (c6c5fc82822af2f1a5d0461dcdf586b22b747611)

Author SHA1 Message Date
wangwei 8637405823 9/11 药品优化 10 months ago
wangwei d7abef3c81 9/11 药品字典优化 10 months ago
wangwei c31d5fa882 9/11 已完成,上传单据 10 months ago
yewj d377f0d486 界面修改 10 months ago
wangwei cc31d125ed 9/10 优化1.0 10 months ago
wangwei 67196e693a 9/9 初始化业务 10 months ago
wangwei 977ce666bb 9/6 youhua 10 months ago
wangwei 2390c98492 9/6 优化 11 months ago
wangwei f93ef3f269 9/6 药品基础 11 months ago
wangwei 9e6f070390 9/5 药品基础数据 11 months ago
wangwei 0111f92c72 9/4 bug 修改 11 months ago
chenhc bb0d25042a fix: 提交 11 months ago
wangwei 423ed6c527 8/29 损耗日志 11 months ago
wangwei 0f3eb56b3d 8/28 药品数据维护 第三方药品维护 11 months ago
chenhc f1de28664f fix: 修改 11 months ago
yewj 3674d21d4c 耗材字典更新流通计量单元问题 11 months ago
wangwei 65a63bfb1b 8/26 优化耗材字典 加入工位预警数量 放开是否拆零 11 months ago
wangwei 1ab7a15fd1 8/23 是否拆零隐藏 业务类型增加单据流通方式 11 months ago
yewj c8780b0f19 问题处理 11 months ago
chenhc b49c1e3c11 feat: 处理单据选择单据类型 11 months ago
chenhc d00421cd37 feat: 器械参数设置 11 months ago
chenhc 7231cd8229 feat: 单据页面状态字段、是否拆零开启 11 months ago
anthonywj 6bd0ca936d 界面优化 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 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 增加选入收费项目详情 12 months ago
wangwei 627e4dd863 1.1 12 months ago
wangwei 83a3738550 8/02 选入收费项目 12 months ago
anthonywj f12f5b877c 药品字典修改 12 months ago
anthonywj 1546c7846a 药品字典修改 12 months ago
anthonywj e7ad1240e8 切换分支备份 12 months ago
wangwei dcad3a1795 修改 7/30 1.2 12 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
chenhc 6861612025 feat: 0702-扫码校验功能 1 year ago
wangwei 98e7a7b264 7/2 基础数据 1 year ago
wangwei c48b677488 5/14 -- 1 year ago
chenhc 7320ff9035 feat: 0531增加是否需要扫码字段 1 year ago
chenhc 9cbb373439 feat: 术士套包、定数包功能开发 1 year ago
chenhc a187bcb9c0 feat: 增加页面的医保耗材信息调用功能 1 year ago
anthonywj 0532a3a0e3 第三方出库明细修改 1 year ago
anthonywj 37ba046b02 新增耗材分类 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 20c07311de 库存对比相关修改 2 years ago
anthonywj 97b1c992e0 临床出库选择患者信息问题,设备打印问题 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
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 3dd3db0524 新增物价类别 2 years ago
anthonywj 28d2fa74a3 库存查询相关修改 2 years ago
anthonywj ebe748ee58 物资字典重复添加问题 2 years ago
anthonywj 9859b53f8a 添加价格 2 years ago
anthonywj 2043524bf0 自定义头部参数相关代码备份 2 years ago
薛宇 06f61cfea3 选择申购部门后,申购仓库下拉框还会显示其它部门所属的仓库信息 2 years ago
anthonywj 6f1c10572e bug修改 2 years ago
薛宇 e033821846 切换版本号 2 years ago
黄泽腾 0b6f964eb5 供应商器械信息模块可以重复选入产品 2 years ago
1178634255 b42de9c907 供应商器械信息:锁定、退回提示错误 2 years ago
schry e8589d9dc4 资质填报设置,底下 编辑产品资质设置,产地选项显示错误 2 years ago
schry bc6189f144 物资类别——选入-耗材产品窗口中的字段顺序问题 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
郑明梁 25f5cc3f06 定速包代码提交 2 years ago
郑明梁 ad9baf08ac 多次出库bug修复 2 years ago
anthonywj f8a186618a 分类第三方产品信息问题 2 years ago
anthonywj 681b44a846 Merge branch 'master' into dev 2 years ago
郑明梁 9ff6a78404 Merge remote-tracking branch 'origin/dev' into test 2 years ago
郑明梁 dcb3a7c034 提交测试文件后面会删掉 2 years ago
anthonywj 5c24e08b50 申购单据,采购订单等相关修改 2 years ago
wangwei 91fd4e92ea 物资字典维护 权限控制显示字段 2 years ago
wangwei aba280e124 物资类别bug修改 2 years ago
wangwei 7c5e51fa72 物资类别bug修改 2 years ago
wangwei 3c83f74caa 分类 2 years ago
郑明梁 5f66b56e77 物资类别代码提交 2 years ago
郑明梁 b84e3dc1a6 修改bug 2 years ago