Commit Graph

132 Commits (05ad40a7d8370425a4a4eeadf50373a9586742e2)

Author SHA1 Message Date
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
郑明梁 1436535711 物资查询增加是否可用 2 years ago
1178634255 d2b3151670 修复输入框可以输入负数 2 years ago
1178634255 f61148166b 修复输入框输入较大数值会报错 2 years ago
anthonywj 2cb7e20ca3 代码备份, 2 years ago