Commit Graph

58 Commits (a2defe181beaf141e54b032ec50e67856a2efea3)

Author SHA1 Message Date
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
2 years ago
anthonywj 20c07311de 库存对比相关修改 2 years ago
yuanwei 387de87ab4 仓库管理 2 years ago
wj 267bd274ff 库存对比 2 years ago
anthonywj 0759271628 盘点相关功能--盘点方式,部分盘点修改 2 years ago
anthonywj 69e9fb5e3b 盘点界面相关调整 2 years ago
anthonywj f7b6e336ca 设备管理相关代码整理2 2 years ago
郑明梁 7141db0190 科室设备明细代码提交 2 years ago
郑明梁 edf64b5926 科室设备明细代码提交 2 years ago
黄泽腾 b903eae51c 设备管理-设备资质 2 years ago
黄泽腾 2975a35b3f 设备管理-设备资质 2 years ago
郑明梁 de1f89496a 设备代码提交 2 years ago
郑明梁 355c329acc 设备bug修复 2 years ago
郑明梁 dcfcf4b51d 设备bug修复 2 years ago
wangwei c20558049f 报修详情接口 2 years ago
wangwei 825738c92e 报修详情接口 2 years ago
wangwei 235aa003d3 我的巡检任务 2 years ago
wangwei b93a646520 巡检 添加详情 2 years ago
郑明梁 4aa068488c 设备代码提交 2 years ago
wangwei 0f48ec7628 报修单 维保设备清单代码提交 2 years ago
wangwei 0a08c9ebbe 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj 7bfa95b882 平潭配置地址 2 years ago
郑明梁 fe4ba6a28b 库存查询增加货位字段 2 years ago
郑明梁 5da9a04140 物资摆放下架代码提交 2 years ago
郑明梁 cd68fd88d9 物质摆放变更功能代码提交 2 years ago
郑明梁 435cb64d69 物质摆放按单功能代码提交 2 years ago
郑明梁 bb2173be92 物质摆放功能代码提交 2 years ago
x_z 557cce3523 1.修改摆放页面,调整上架功能 2 years ago
x_z 474b71ef13 1.调整摆放页面 2 years ago
wangwei cb50ec7e40 同步 内部码 2 years ago
anthonywj a97b6840e7 代码备份 2 years ago
wangwei 1a96e7259e 同步 部门信息 仓库信息 用户管理 角色管理 2 years ago
x_z 1816cb6fd5 1.修复盘点功能bug 3 years ago
x_z 665d82c0c7 1.初步完成维保单页面 3 years ago
x_z f462ffc5a9 1.修改巡检计划和报修单页面 3 years ago
wangwei e24b326931 设备报修 设备维保页面调整 3 years ago
x_z 1c899faeae 1.调整巡检计划页面 3 years ago
x_z 782c43b058 1.修改设备巡检计划页面 3 years ago
x_z 82359290cf 1.添加部门设备详情和巡检设置页面,对接接口 3 years ago
wangwei 69cbe5846e 巡检计划 设备保修 设备维保页面 3 years ago
x_z 3f14188386 1.添加部门设备详情页面 3 years ago
wangwei d09b220683 修改资产管理页面 及修复bug 3 years ago
郑明梁 5ab5be5225 耗材单据相同产品判断 3 years ago
x_z 03bcef8593 1.添加库存预警设置和消息列表页面
2.添加查询库存产品名称列表接口
3 years ago
anthonywj 64476a29ce 新增患者使用溯源 3 years ago
郑明梁 86eeffe62c 内部码打印代码提交 3 years ago
anthonywj 1d6fcd8a40 预验收功能 3 years ago
x_z 22a296c6b9 1.提交盘点功能相关页面,修改盘点接口地址 3 years ago
x_z 77c31ce9ca 1.添加盘点单据接口文件 3 years ago
x_z fbb126855e 1.初步完成设备管理功能页面 3 years ago