Commit Graph

1318 Commits (20231126-yw)
 

Author SHA1 Message Date
chenhc aaa806200d feat: 代码保存 1 year ago
chenhc 066630cf5d feat: 项目组套和三方出入库明细 1 year ago
chenhc 2318737957 feat: 项目组套和三方出入库明细 1 year ago
chenhc b7a65bded3 feat: 耗材字典新增功能 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