Commit Graph

582 Commits (60a7e4db3c68b10c146b94755f0240b4a39c4005)

Author SHA1 Message Date
chenhc 32ce90f55f feat: 修复 10 months ago
wangwei c0fa57a785 9/25 界面优化1.0 10 months ago
wangwei 76d7b41e85 9/24 1.0 10 months ago
wangwei ab4b61cd71 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
wangwei d3ae6838a6 9/25 优化1.0 10 months ago
yewj 95ea5308f5 禁用层级标识 10 months ago
chenhc e26390563e feat: 修复 10 months ago
wangwei 1226166167 9/24 现场管理bug优化 10 months ago
chenhc 73f1f923de feat: 修复 10 months ago
chenhc b39ac219ac feat: 修复 10 months ago
chenhc 01c4c0b7a5 feat: 修复 10 months ago
wangwei b0cbd964fd 9/23 1.0.1 10 months ago
wangwei 1625a19d76 9/23 优化异常单据分页 10 months ago
yewj bbaa752e2b 处理单据 10 months ago
chenhc d264bbbda7 feat: 修复 10 months ago
wangwei 27da46bccc 9/18 现场管理优化 10 months ago
wangwei 9061cff13d 9/18 现场管理基础数据页面优化 10 months ago
wangwei 5646e914b2 9/18 药品选入优化 10 months ago
wangwei 31d28ace80 9/18 优化药品信息 10 months ago
chenhc 5631131b68 feat: 定时设置结合业务 10 months ago
yewj e985790e86 单据配置相关修改 10 months ago
yewj baac26c586 界面修改 10 months ago
chenhc 2857963e63 fix: 修复原始单据 10 months ago
wangwei 786d678ac3 9/14 业务类型增加收货方送货方 10 months ago
chenhc eab8ae3753 Merge remote-tracking branch 'origin/dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/CollectOrderNew.vue
10 months ago
chenhc 6dc00efe2a fix: 修复原始单据 10 months ago
wangwei 91ccc4569f Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
wangwei ed0148cb7c 9/14 优化 10 months ago
yewj 712bf61b4b 处理单据优化 10 months ago
wangwei b6b6de4ab2 9/14 优化 10 months ago
wangwei 538f865268 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
# Conflicts:
#	src/views/basic/workplace/addBusTypeDialog.vue
10 months ago
wangwei d40b85c835 9/14 优化 10 months ago
yewj c1753e8eb3 代码备份 10 months ago
yewj f5273d4b38 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
yewj 79ee280132 代码备份 10 months ago
wangwei bd17652e35 9/14 优化界面 10 months ago
yewj 34df04d874 前端界面修改 10 months ago
chenhc bd455ecde5 fix: 修复 10 months ago
chenhc 4ca59f3aec fix: 修复 10 months ago
wangwei 8637405823 9/11 药品优化 10 months ago
wangwei d7abef3c81 9/11 药品字典优化 10 months ago
wangwei c31d5fa882 9/11 已完成,上传单据 10 months ago
yewj f93a1a7b66 选择往来单位仓库修改 10 months ago
yewj d377f0d486 界面修改 10 months ago
yewj e96c42cf6f 界面修改 10 months ago
wangwei cc31d125ed 9/10 优化1.0 10 months ago
yewj 4cc05a80f6 业务类型编辑修改 10 months ago
wangwei efd874ce32 9/9 查看常用业务 10 months ago
wangwei d264ae015f 9/9 业务类型增加字段 10 months ago
wangwei 375170c9d1 9/9 业务单据增加顺序号 10 months ago
wangwei 67196e693a 9/9 初始化业务 10 months ago
wangwei e6e71b7486 9/6 youhua 10 months ago
wangwei 1fd70fb642 9/8 优化1.0 10 months ago
wangwei 977ce666bb 9/6 youhua 10 months ago
wangwei 2390c98492 9/6 优化 10 months ago
wangwei f93ef3f269 9/6 药品基础 10 months ago
wangwei 9e6f070390 9/5 药品基础数据 10 months ago
wangwei c96e1b7d9d 9/4 工位基础数据界面优化 10 months ago
wangwei 0111f92c72 9/4 bug 修改 10 months ago
wangwei 34d7c9240b 9/3 工位基础优化 10 months ago
wangwei 116296d138 9/3 追溯码查询 10 months ago
yewj 489baf0f90 单据上传 10 months ago
wangwei 03c521a707 9/2 是否独占库存优化 10 months ago
wangwei 37d5980355 8*31 优化 11 months ago
chenhc bb0d25042a fix: 提交 11 months ago
yewj 9b0d2675c2 工位上货添加业务类型 11 months ago
yewj 9627ed7d73 是否自动赋码,单据处理 11 months ago
wangwei d0430fedd7 8/29 工位业务类型修改 11 months ago
wangwei 423ed6c527 8/29 损耗日志 11 months ago
wangwei 0f3eb56b3d 8/28 药品数据维护 第三方药品维护 11 months ago
chenhc f1de28664f fix: 修改 11 months ago
wangwei beb2212c04 8/27 优化 11 months ago
yewj 3674d21d4c 耗材字典更新流通计量单元问题 11 months ago
wangwei 8708a7157f 8/26 追溯码查询以及工位bug修改 11 months ago
yewj 2a39d0724a 代码备份 11 months ago
wangwei 65a63bfb1b 8/26 优化耗材字典 加入工位预警数量 放开是否拆零 11 months ago
wangwei 2862a53d2b Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
#	src/views/basic/workplace/workplaceManage.vue
11 months ago
wangwei b56b0e37ac 8/26 工位组别修改 11 months ago
yewj 8773163a35 界面配置一些微调 11 months ago
wangwei b27d09891f 8/25 界面优化 11 months ago
wangwei b5a8326912 8/25 组别修改 11 months ago
wangwei 13c6f20a1f Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 11 months ago
wangwei beeab0ea8f 8/25 业务类型关联第三方单据 11 months ago
yewj 8cdc58b3ae Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 11 months ago
yewj 7e774badf3 界面配置一些微调 11 months ago
chenhc e7232c0d2f fix: 统一分割加切横线 11 months ago
yewj 2e38cfdc34 界面扫码的一些调整 11 months ago
yewj da62e9963f 代码备份 11 months ago
yewj e5bb9d4788 工位的界面相关修改 11 months ago
wangwei 1ab7a15fd1 8/23 是否拆零隐藏 业务类型增加单据流通方式 11 months ago
wangwei 4218e6b6ec 8/23 界面优化 11 months ago
wangwei 48e1445c1b 8/23 优化 11 months ago
wangwei b68e4b0d30 8/23 工位负责人优化 11 months ago
yewj 83ea4171dc Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 11 months ago
yewj b989cdc708 代码备份 11 months ago
wangwei bdd47dc070 8/22 工位优化 11 months ago
chenhc 4d7d7f06a7 feat: 业务类型、分页12 11 months ago
yewj c8780b0f19 问题处理 11 months ago
wangwei 91945f4e09 8/22 工位调整 第三方单据调整 11 months ago
chenhc b49c1e3c11 feat: 处理单据选择单据类型 11 months ago
chenhc d00421cd37 feat: 器械参数设置 11 months ago
yewj 5924599d1e 掃碼問題處理 11 months ago
wangwei 6be9e6002b 8/21 界面优化 11 months ago
wangwei 24d0b25bf3 8/21 界面优化 11 months ago
wangwei 1e9d7c4cf6 8/21 优化 11 months ago
wangwei 0b421419ab 8/20 界面优化+用户绑定单据类型 11 months ago
wangwei a4906a972e 8/19 工位库存预警数调整 11 months ago
wangwei 80bb30e7d0 8/19 工位提醒是否插入 11 months ago
chenhc 5bd73d9e6f feat: 工位上货页面控制 11 months ago
wangwei 664dcda581 8/17 模板打印 11 months ago
chenhc 7231cd8229 feat: 单据页面状态字段、是否拆零开启 11 months ago
wangwei 89bacd4fc4 8/17 页面优化 11 months ago
wangwei 7cc82ec060 8/16 工位界面优化 11 months ago
wangwei e2de060da8 用户搜索 部门 11 months ago
wangwei 02a4efe8a2 调整 组别非必选 11 months ago
wangwei 44664c615a 调整 11 months ago
wangwei 54e0304357 优化 1.3 11 months ago
wangwei bd3bed2794 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 11 months ago
chenhc 6a19e6fa33 feat: 页面修改-业务类型、来源系统 11 months ago
wangwei 3b72f1b607 1.2 增加往来单位类型 11 months ago
wangwei 68b805ef2c 优化 1.0 11 months ago
wangwei 77ade51f3c 优化 11 months ago
wangwei 6c9cf27e42 8*16 工位 11 months ago
wangwei 4b0a4936a6 8/15 工位界面优化 11 months ago
anthonywj 6bd0ca936d 界面优化 11 months ago
wangwei f026c5ed39 工位管理 1.0 11 months ago
wangwei 7732f12e95 工位分组调整 11 months ago
wangwei b8f0702a4a 工位优化 11 months ago
wangwei 2ab3282abc 工位维护 11 months ago
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 药品字典修改 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
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 患者出库远程搜索,证书预览问题,创建人,审核人等问题 2 years 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