Commit Graph

1408 Commits (7732f12e9507576130e6a84baf75527b34733c34)

Author SHA1 Message Date
chenhc 2f5aea5ecc Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
chenhc a27627b5bc feat: 设备管理-卡片开发 1 year ago
anthonywj 1ad28adf4a Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj f6742a38cd 出入库明细单据生成优化 1 year ago
chenhc 95dc6614c2 feat: 设备管理开发 1 year ago
chenhc b04eab404b feat: 审核开关-业务页面修改 1 year ago
chenhc e72c3871f0 feat: 审核开关 1 year ago
anthonywj b81dde75c8 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
anthonywj 61a4363b9b 平潭出库明细调整 1 year ago
chenhc fa33dc0f57 feat: 审核流程配置功能 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 09ba95c75c 领用选择库存产品问题 1 year ago
anthonywj 0532a3a0e3 第三方出库明细修改 1 year ago
anthonywj 09d7bf67bc 界面配置相关bug修改 1 year ago
anthonywj 37ba046b02 新增耗材分类 1 year ago
anthonywj 52037a478e 出入库明细修改,批次号先进先出 1 year ago
anthonywj 64e2b9214b 库存明细手动下载 1 year ago
chenhc c79dbcda45 feat: 代码保存 1 year ago
anthonywj 1bdbc9beb5 项目组套新增供应商ID 1 year ago
anthonywj 275449e3b1 登录界面配置 1 year ago
anthonywj 02c424aaab Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 1 year ago
chenhc 060f7ea48f feat: 三方出入库明细功能 1 year ago
anthonywj ce7acde9b8 选择库存产品仓库问题 1 year ago
anthonywj 0d1b7f81b4 选择库存产品仓库问题 1 year ago
chenhc 4838ccad06 feat: 三方出入库明细功能 1 year ago
chenhc 8707d9fa03 feat: 三方出入库明细功能 1 year ago
chenhc fb0f39c860 feat: 三方出入库明细功能 1 year ago
chenhc 8468687d27 feat: 保存代码 1 year ago
chenhc 69d896c406 Merge branch '20231126-yw' into dev_ksck 1 year ago
chenhc aaa806200d feat: 代码保存 1 year ago
anthonywj 1056d3e1c6 选择库存产品, 1 year ago
anthonywj 5a9cda84a3 Merge branch '20231126-yw' into dev_ksck 1 year ago
chenhc 066630cf5d feat: 项目组套和三方出入库明细 1 year ago
chenhc 2318737957 feat: 项目组套和三方出入库明细 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
anthonywj 05ad40a7d8 界面配置引起的单据删除,编辑等问题 1 year ago
anthonywj a223cc521d 备份 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
yuanwei 39af4919d6 查询提交 1 year ago
anthonywj 4d1eb8e33f 新增生产企业字典维护 1 year ago
anthonywj 346d257e66 新增第三方生产企业 1 year ago
anthonywj 606658afe3 单据详情 页面展示问题 1 year ago
anthonywj b0b9786274 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
1 year ago
anthonywj 266cf0c93c 再次申购 1 year ago
anthonywj 78b9c0169e 集采拆单问题 1 year ago
anthonywj 20c07311de 库存对比相关修改 1 year ago
anthonywj 95848a6a23 患者出库远程搜索,证书预览问题,创建人,审核人等问题 1 year ago
anthonywj dca51b45d9 设备入库相关修改 1 year ago
anthonywj defd93e0ac 患者信息下载修改,自定义汇总统计 1 year ago
anthonywj 37b4d97b99 患者信息修改 1 year ago
anthonywj 27ab0dce11 患者信息修改 1 year ago
anthonywj 0b6d619a5c 设备修改,患者信息下载修整 1 year ago
anthonywj 2d36d62111 单据类型修改 1 year ago
anthonywj 304cd0e055 患者处方 1 year ago
anthonywj 97b1c992e0 临床出库选择患者信息问题,设备打印问题 1 year ago
anthonywj 59f5475cfb 临床出库患者处方问题 1 year ago
anthonywj bc9b29329f 患者处方下载,使用耗材解析等 1 year ago
wj 1e7a037a41 设备相关 1 year ago
yuanwei f8384b4fb8 配送管理 1 year ago
yuanwei da3c08fa77 我是供应商 1 year ago
yuanwei a1ada9e0b0 集成动态表单 1 year ago
yuanwei 0edb66eaeb 出入库单管理配置 1 year ago
yuanwei 248adc6b50 Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw
# Conflicts:
#	src/views/basic/product/product.vue
1 year ago
yuanwei 387de87ab4 仓库管理 1 year ago
anthonywj 486e2c7176 第三方产品信息接口上传接口 1 year ago
yuanwei 48a98ae006 出入库单管理配置 1 year ago
yuanwei 9e9d02b99c 出入库单管理配置 1 year ago
yuanwei 059ad7a1b4 采购订单管理配置 1 year ago
yuanwei dd3b01e1d5 计划管理配置 1 year ago
yuanwei 9620345b5f 申购管理配置 1 year ago
yuanwei 2951e1b9ea Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw 1 year ago
yuanwei e0ec2f32a1 领用管理提交 1 year ago
yuanwei e89765c167 优化页面 1 year ago
anthonywj 4e798445a2 查询出入库明细导出Excel问题 1 year ago
yuanwei 0a2d35fa97 优化事件执行 1 year ago
yuanwei f078db3410 字典功能处理 1 year ago
yuanwei 1595dbaa7c 字典功能处理 1 year ago
yuanwei cba58fec93 字典功能处理 1 year ago
anthonywj b71bf52694 单据查询相关修改 1 year ago
yuanwei 42886ccc72 初始化动态配置 1 year ago
yuanwei 145adc5f7d 初始化动态配置 1 year ago
yuanwei 9cb09bd672 初始化动态配置 1 year ago
anthonywj 2c1cf912eb 采购订单,申购订单打印功能 1 year ago
anthonywj 84751e92e9 单据类型,飞书相关bug修改,汇总统计修改 1 year ago
anthonywj 4d5c58454d 项目组套下载更新 1 year ago
anthonywj 42e8475e8e 患者信息,处方信息下载,首次登录选择当前部门仓库问题 1 year ago
anthonywj 3dd3db0524 新增物价类别 1 year ago
anthonywj 47affeb3ef 新增退货补单流程,诏安两个分库问题,单据明细打印问题,证书显示规格型号 1 year ago
anthonywj 2a0e10c1c3 申购仓库加到货仓库 1 year ago
anthonywj 1f7b3a0557 申购仓库修改 1 year ago
anthonywj 28d2fa74a3 库存查询相关修改 1 year ago
wj f4c8838925 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 1 year ago
wj b819d48351 患者管理 1 year ago
anthonywj 0f72ded45d Merge remote-tracking branch 'origin/dev2.0' into dev2.0 1 year ago
anthonywj 1bc4abc405 领用备注添加产品名称 1 year ago
wj 267bd274ff 库存对比 1 year ago
anthonywj 4399e5a71d 领用备注修改 1 year ago
anthonywj 6c9b9988c4 项目编码,患者信息,患者处方等修改 1 year ago
anthonywj d446e346a8 领用相关问题修改 1 year ago
anthonywj 3e45eca2fd 领用相关问题修改 1 year ago
anthonywj 499779d04f 领用相关问题修改 1 year ago
anthonywj 84905777f7 领用,发票,日月季年 1 year ago
wj fdc60ee5f5 组件提交 1 year ago
wj 0beaaaf318 组件提交 1 year ago
anthonywj 0759271628 盘点相关功能--盘点方式,部分盘点修改 1 year ago
anthonywj 69e9fb5e3b 盘点界面相关调整 1 year ago
anthonywj f7b6e336ca 设备管理相关代码整理2 1 year ago
anthonywj dd8ddcf80f 设备管理相关代码整理 1 year ago
anthonywj ebe748ee58 物资字典重复添加问题 1 year ago
anthonywj 23d148999e 领用仓库与当前仓库修改,领用打印等功能 1 year ago
anthonywj d4ff3a8297 定量界面相关调整 1 year ago
anthonywj bd3d365fbe 定量界面相关调整 1 year ago
anthonywj 744ef12f24 定量相关调整 1 year ago
anthonywj b5c7b2897d 新增价格先进先出 2 years ago
anthonywj b0eff74354 密码超时修改等 2 years ago
anthonywj 9859b53f8a 添加价格 2 years ago
anthonywj 5c1cdf6bc8 单据编辑状态 2 years ago
anthonywj 0055477982 单据提交日志相关界面修改 2 years ago
anthonywj d3371db702 代码备份 2 years ago
anthonywj 2cd5e86cff Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 09109dff96 设备代码提交 2 years ago
anthonywj da3de18d73 切换分支备份 2 years ago
郑明梁 9dec12457b 设备代码提交 2 years ago
郑明梁 12e67bdfd4 设备代码提交 2 years ago
郑明梁 d29583a78e 设备代码提交 2 years ago
郑明梁 b86029a981 设置字段修改 2 years ago
anthonywj fa5c5a60be 设备登记相关 2 years ago
郑明梁 7141db0190 科室设备明细代码提交 2 years ago
郑明梁 edf64b5926 科室设备明细代码提交 2 years ago
郑明梁 be65268e44 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
黄泽腾 fb3996cc57 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
黄泽腾 38312821e6 设备管理-技术资料 2 years ago
郑明梁 c179cb749f Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj 59d52457b4 新增单据类型,有三期业务单校验方式 2 years ago
郑明梁 f917adbd3b Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj 2043524bf0 自定义头部参数相关代码备份 2 years ago
郑明梁 c5d84b5028 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/views/inventory/DeptDeviceDetail.vue
2 years ago
郑明梁 23272e69af 设备领用代码提交 2 years ago
黄泽腾 b903eae51c 设备管理-设备资质 2 years ago
郑明梁 83d3472710 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 973d91fdfd 设备领用审核代码提交 2 years ago
黄泽腾 05d23b9c7b 设备管理-设备资质 2 years ago
黄泽腾 2975a35b3f 设备管理-设备资质 2 years ago
郑明梁 d074ff5bea 设备领用审核代码提交 2 years ago
郑明梁 37e59aa571 设备领用代码提交 2 years ago
郑明梁 f0ed4bf9c8 设备领用代码提交 2 years ago
anthonywj 849ac6875d 设备相关 2 years ago
黄泽腾 2c701ef1c1 新增申购单点击产品录入时显示系统繁忙 2 years ago
黄泽腾 ccd45bee85 新增申购单点击产品录入时显示系统繁忙 2 years ago
黄泽腾 43b160528a 发票删除弹出多余信息错误 2 years ago
郑明梁 de1f89496a 设备代码提交 2 years ago
黄泽腾 15accfab61 代码备份 2 years ago
黄泽腾 c108a20366 资质富文本还原 2 years ago
郑明梁 cc06bca172 设备增加搜索条件 2 years ago
郑明梁 327d741759 增加搜索条件 2 years ago
郑明梁 5c7cc65722 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
郑明梁 ee10756c23 修改重置导致数据问题 2 years ago
wangwei 74d0205da4 Merge remote-tracking branch 'origin/dev' into dev2.0
# Conflicts:
#	src/views/inventory/DeviceInspectTakeSelect.vue
2 years ago
郑明梁 48c10a8607 设备任务名称修改 2 years ago
anthonywj e9e4407c36 设备相关名称修改 2 years ago
anthonywj 567496fc3a 切换分支备份 2 years ago
anthonywj 51c2ebc91b 切换分支备份 2 years ago
wangwei dbc353df20 修改设备bug 2 years ago
郑明梁 c90d072571 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 355c329acc 设备bug修复 2 years ago
郑明梁 356eae8f0c Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 7136b422c5 设备bug修复 2 years ago
薛宇 bc5156fb99 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
薛宇 965b85e25a 富文本编辑证书 2 years ago
郑明梁 5101975f0e Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 dcfcf4b51d 设备bug修复 2 years ago
薛宇 4c7262235d Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
薛宇 1d80455fc3 富文本相关 2 years ago
郑明梁 58001af180 设备报修bug修复 2 years ago
黄泽腾 3650244bf1 设备维保模块切换部门后,仓库信息没有自动置空 2 years ago
郑明梁 5533b41c9d 业务领用码提交 2 years ago
黄泽腾 241318b12c 新增维保记录选择好设备后,仍能切换仓库保存成功 2 years ago
郑明梁 ae654bf3b0 业务领用码提交 2 years ago
黄泽腾 8e271c0795 新增报修单模块切换仓库后点击重置,仓库下拉框信息不会重置 2 years ago
黄泽腾 f858688cf6 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 06f5df034e 发票DI编码字段展示 2 years ago
薛宇 0b56958b01 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 170e49c13e 选入优化 2 years ago
薛宇 2c62bd4349 提示信息有误 2 years ago
薛宇 6639f1f065 新增领用库存产品录入列表中,跳转页码后产品数据显示有误 2 years ago
黄泽腾 63f1d38393 领用距离重置刷新问题 2 years ago
薛宇 ff59ac09b4 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 06f61cfea3 选择申购部门后,申购仓库下拉框还会显示其它部门所属的仓库信息 2 years ago
黄泽腾 89e6ba7b9c 同步设置中的数据同步设置字段排版不齐 2 years ago
薛宇 6b45f52678 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 9ef1be6023 盘点单驳回后提示框有问题 2 years ago
黄泽腾 f52b38f12e bug修复 2 years ago