Commit Graph

318 Commits (7732f12e9507576130e6a84baf75527b34733c34)

Author SHA1 Message Date
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
8 months ago
chenhc 8d2c368426 feat: 库存预警 8 months ago
anthonywj d061ea69c2 处方相关修改 8 months ago
anthonywj cca9016ce4 切换分支备份 8 months ago
wangwei 31e87e7c6a 7/2 系统管理 9 months ago
wangwei 98e7a7b264 7/2 基础数据 9 months ago
wangwei 48fe52f69f 7/1 仓库管理 设备管理 查询统计 9 months ago
wangwei c48b677488 5/14 -- 10 months ago
anthonywj 43690f72b9 Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck 10 months ago
anthonywj 74a103a40c 登录密码校验 10 months ago
wangwei 24ea0f3e54 6/4 优化查询发票确认时间 10 months ago
chenhc 835a00383f feat: 修复打印 10 months ago
chenhc 0bec051c9f feat: 修复打印 10 months ago
chenhc 9eb4e5f092 feat: 打印功能增加字段 1 year ago
anthonywj e19e52d3fd 库存盘点功能修改 1 year ago
anthonywj b7823c7246 库存盘点功能修改 1 year ago
chenhc a27627b5bc feat: 设备管理-卡片开发 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
anthonywj b0b9786274 1:东山nginx转发问题(头部参数修改);
2:再次领用;再次申购问题;
1 year ago
anthonywj 20c07311de 库存对比相关修改 1 year ago
anthonywj 2d36d62111 单据类型修改 1 year ago
wj 1e7a037a41 设备相关 1 year ago
yuanwei a1ada9e0b0 集成动态表单 1 year ago
yuanwei 0edb66eaeb 出入库单管理配置 1 year ago
yuanwei 387de87ab4 仓库管理 1 year ago
anthonywj 4e798445a2 查询出入库明细导出Excel问题 1 year ago
anthonywj b71bf52694 单据查询相关修改 1 year ago
anthonywj 47affeb3ef 新增退货补单流程,诏安两个分库问题,单据明细打印问题,证书显示规格型号 1 year ago
anthonywj 28d2fa74a3 库存查询相关修改 1 year ago
wj 267bd274ff 库存对比 1 year ago
anthonywj 6c9b9988c4 项目编码,患者信息,患者处方等修改 1 year ago
anthonywj 3e45eca2fd 领用相关问题修改 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 b5c7b2897d 新增价格先进先出 2 years ago
郑明梁 09109dff96 设备代码提交 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