Commit Graph

1304 Commits (9fdb69c5a21b72942099af02e11de0699210e2fd)

Author SHA1 Message Date
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
黄泽腾 83e8be4e6c 进入查询申购单模块,申购部门会默认显示一级部门‘协和医院平潭分院’ 2 years ago
黄泽腾 e2ee199b92 审核申购单据窗口字段排列不齐 2 years ago
黄泽腾 f6e4cc2524 明细列表中的‘DI/物资编码’字段显示有误 2 years ago
黄泽腾 f6c53dd3c9 bug修复 2 years ago
黄泽腾 8aa5423449 按发票登记:“发票编码”和“发票代码”字段错误 2 years ago
黄泽腾 da2987f29b 新增采购计划进入产品录入窗口,列表不会自动展示产品信息 2 years ago
黄泽腾 1af9c423cf Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 eda20d51c1 代码还原注册备案号选项 2 years ago
wangwei 2e1e69a0b1 巡检 报修 页面 字段调整 2 years ago
wangwei 80a5fce9e5 巡检任务 加上报修类型和紧急程度 2 years ago
郑明梁 ce9b753f7d 设备巡检任务代码提交 2 years ago
wangwei 061984dc29 报修调整 2 years ago
郑明梁 ecbfa33423 设备报修代码提交 2 years ago
郑明梁 c169921baf 去掉设备计划级别代码 2 years ago
郑明梁 9c321847ef 设备计划代码提交 2 years ago
wangwei 235aa003d3 我的巡检任务 2 years ago
郑明梁 2848f1f0bf 设备计划代码提交 2 years ago
郑明梁 0a047acb1b 设备计划代码提交 2 years ago
wangwei b93a646520 巡检 添加详情 2 years ago
郑明梁 4aa068488c 设备代码提交 2 years ago
wangwei 8ed569504c 报修 页面优化 bug修改 2 years ago
anthonywj 0a0b487333 预验收选入时增加过滤条件 2 years ago
wangwei 0f48ec7628 报修单 维保设备清单代码提交 2 years ago
黄泽腾 ab781e1742 字段更正 2 years ago
黄泽腾 c2025502be 字段更正 2 years ago
黄泽腾 73a7145ab1 字段更正 2 years ago
黄泽腾 dd8548c17a 注册备案证号选择 2 years ago
黄泽腾 c911228b78 注册备案证号选择 2 years ago
薛宇 a015b6f4c6 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 5af72b0b06 资质审核证书显示错误 230526 2 years ago
郑明梁 d300f868f6 单据上传增加上传状态 2 years ago
wangwei 0a08c9ebbe 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
wangwei 140720d4e7 按钮提示文字不全 2 years ago
郑明梁 8bf70e3107 业务单没有注册证号 2 years ago
郑明梁 4ec48c7e94 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 aeb6218691 采购订单修改bug 2 years ago
薛宇 636204db8b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei dbc008b4a5 内部码 去掉单据的已审核 待审核状态 2 years ago
薛宇 375acda365 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 29dc1ac139 bug修改 2 years ago
黄泽腾 e340de87c6 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 5f86f75f4d 发票字段更正 2 years ago
郑明梁 c342391e65 发票bug修复 2 years ago
薛宇 28fd822925 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 767c7ad844 代码恢复 2 years ago
wangwei e6bc979c68 修改按发票登记 分页问题 2 years ago
薛宇 6540442dd6 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6a104a0b7d 点击“开始盘点”,提示“保存成功”,但暂无数据 2 years ago
黄泽腾 20a6d7d135 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 da3a4e8b50 点击“开始盘点”,提示“保存成功”,但暂无数据 2 years ago
wangwei 01d53edb7c 修改复制生成单据 填写备注 生成之后备注为空 问题 2 years ago
郑明梁 cb7e6f031e 单据修改往来单位为空问题 2 years ago
薛宇 a681536737 库存查询的注册/备案号显示多个 2 years ago
黄泽腾 af6c849789 新增盘点单界面优化 2 years ago
anthonywj 6f1c10572e bug修改 2 years ago
薛宇 c4e3bd77df Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 e450b6f4c0 申购修改 2 years ago
薛宇 5c76856bf0 编辑养护页面 2 years ago
黄泽腾 b6fe555ab7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 9d94731048 物资上架-货位 按单上架是没选择仓库不应该显示货位 2 years ago
wangwei 39104ffc27 修改临床出库预验收以草稿保存 再次打开 往来信息显示不正确问题 2 years ago
薛宇 db1a148984 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 dcffcb534c 页面样式修改 2 years ago
wangwei 54b611dd1c 修改 新增单据审核 分段扫码扫完一次后,在扫第二次报格式错误问题 2 years ago
薛宇 668e90e83f 新增整库盘点可以根据货位盘点,预期应不可以 2 years ago
薛宇 e033821846 切换版本号 2 years ago
郑明梁 80606281db 申购bug修改 2 years ago
薛宇 5a34ef0b13 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 49b89a0a3c “完成审核”按钮未判断审核数量 2 years ago
anthonywj c755110006 上传单据确认状态 2 years ago
郑明梁 864de16933 申购bug修改 2 years ago
wangwei a59c2229ad DI绑定多个产品ID窗口,进入详情页面中的提交按钮禁用 2 years ago
郑明梁 aa551ec5ba Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 5bc9fa5f6f 发票bug修改 2 years ago
anthonywj 1615483e52 单据详情分页 2 years ago
anthonywj c09dec108a 诊断第三方单据相关修改 2 years ago
郑明梁 73c0d662b8 申购功能修改 2 years ago
黄泽腾 f6984285db 往来单位查询 2 years ago
黄泽腾 daed241d03 代码备份 2 years ago
黄泽腾 f24355678c 供应商发票字段修改 2 years ago
黄泽腾 6210b057f0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 30889bf30e 无三期业务单配/拣货提交业务单时,会受到’有三期业务单配/拣货‘单据类型的影响 2 years ago
郑明梁 b20a6b5f7e 明细打印增加查询条件字段 2 years ago
郑明梁 36f31c390e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 c998dcbc32 明细打印增加查询条件字段 2 years ago
薛宇 3db91eb5c6 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 3ed63b68ce 建议在“同步设置”页面,添加扫码单据类型功能模块:新增一个 搜索框功能 2 years ago
郑明梁 1ad11ce8bb 三期出现重复序列号问题 2 years ago
黄泽腾 21a81abb3c 供应商发票字段修改 2 years ago
黄泽腾 6af25a9825 供应商发票页面优化问题 2 years ago
郑明梁 b0ed79f417 三期补齐修改 2 years ago
黄泽腾 f1a8cede4c 新增往来单位搜索 2 years ago
黄泽腾 36ff69c782 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 e1d2d66033 新增往来单位搜索代码备份 2 years ago
郑明梁 a5dc9a870d Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 edfd5d5a26 采购订单取消供应商控制 2 years ago
anthonywj d41c2d1f77 单据复制修改 2 years ago
wangwei 04f3232481 修改 bug 2 years ago
郑明梁 903f85d242 三期补齐有数据不能修改 2 years ago
wangwei 4f5ebf9c08 修改 bug 2 years ago
郑明梁 c9fb1e04a7 单据备注字段查询 2 years ago
薛宇 5b7264f3e5 同步设置功能,同步至自助平台或管理系统的扫码单据只能单线选择 2 years ago
薛宇 be608383e7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 35cc8ee9a6 代码备份 2 years ago
anthonywj 89798943ea Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj c913a1554c 注册备案证号为空问题 2 years ago
anthonywj f0c24f83c6 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 1187779bb5 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
郑明梁 adb1715c4a 单据新增预验收库存不足 2 years ago
郑明梁 6fa583a088 备注字段查询 2 years ago
薛宇 5e3900dc1c 入账库切换上级仓库时,会显示预验收与寄售的仓库 2 years ago
黄泽腾 ce9f770c74 往来单位信息维护的 往来单位类型 跟 单据类型 里的 往来单位类型 不一致 2 years ago
黄泽腾 4048adddce Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 0b6f964eb5 供应商器械信息模块可以重复选入产品 2 years ago
wangwei 8b3d59be35 修改 bug 2 years ago
wangwei 458ca89f5f 修改 bug 2 years ago
wangwei 88fc636c44 内部码选入单据时加上判断 2 years ago
wangwei 9be928c396 修改 采购订单选完供应商,录入产品编辑改供应商 保存后供应商没改问题 2 years ago
薛宇 63812b826b Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 bb289a3f86 入账库查询的预警设置无法正常显示 2 years ago
1178634255 b42de9c907 供应商器械信息:锁定、退回提示错误 2 years ago
anthonywj 98283e2362 Merge branch 'master' into dev 2 years ago
anthonywj 4da4cc0ed4 合并代码备份 2 years ago
郑明梁 b7a076ff6f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 190d80057e 内部码问题修复 2 years ago
薛宇 179002c209 待配货单据——编辑窗口中的往来信息显示有误 2 years ago
薛宇 e6dee7afcf Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 9551c97e1c 近效期弹框提醒错误 2 years ago
anthonywj 7ad9da3636 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 78fe874ec0 多次出库bug修复 2 years ago
wangwei 2ac9a973fe 修改 业务单自动补单:采购订单生成带票送货单 生成的单据不会显示来源 2 years ago
1178634255 477f6d80f7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 da376b7997 片仔癀诊断--销售出库单不显示注册/备案号 2 years ago
wangwei 3da22d3eaf 弹窗标题修改 2 years ago
1178634255 752229805d 优化供应商发票-确认页面标题 2 years ago
wangwei 24d8541a24 修改 操作栏固定问题 物资资质重新审核提示错误问题 2 years ago
anthonywj cdfeb08a8d Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei bb320ae78c 修改发票登记 重复勾选物资 再次登记提示信息不正确 2 years ago
郑明梁 7da361ce1e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 962073207c 发票代码提交 2 years ago
wangwei e0ee28b253 修改新增单据草稿保存,再次打开 往来信息 显示有误问题 2 years ago
anthonywj 8f267d67b0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
schry ade4cc1a5c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
schry e8589d9dc4 资质填报设置,底下 编辑产品资质设置,产地选项显示错误 2 years ago
anthonywj bd5f896816 Merge branch 'dev' into ywj_dev
# Conflicts:
#	.env.production
2 years ago
郑明梁 41269a2bd0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 7cea8707a8 修复待校验单据耗材字典不存在bug 2 years ago
schry 6aafe12f49 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
schry bc6189f144 物资类别——选入-耗材产品窗口中的字段顺序问题 2 years ago
wangwei 7d0e897a5c 修改第三方数据bug 2 years ago
schry e0a0695a87 现在养护记录,编辑养护状态后,点击“保存”没效果 2 years ago
1178634255 3863a23f35 单据备注字段添加 2 years ago
schry 278adb8242 Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
#	src/views/inout/IoAuditedOrder.vue
2 years ago
1178634255 2c03209a2c 单据新增备注字段
(cherry picked from commit 210793bcb7)

# Conflicts:
#	src/layout/components/Navbar.vue
2 years ago
schry 5b8a987bb6 单据备注添加
(cherry picked from commit e0d1fd6925)
2 years ago
schry e0d1fd6925 单据备注添加 2 years ago
郑明梁 95fde11ea2 bug修复 2 years ago
1178634255 967fe4cf5e Merge remote-tracking branch 'origin/master' 2 years ago
1178634255 34b60e8c58 编辑发票信息关闭后变成暂无数据 2 years ago
schry c2beaf4df2 进入“往来单位信息维护”,默认显示 供应商信息 ,选择“全部”查询也是显示供应商类型的往来单位信息 2 years ago
1178634255 210793bcb7 单据新增备注字段 2 years ago
郑明梁 213d38cbb5 定数包bug修复 2 years ago
郑明梁 d718bfc60d 修复单据选入多个产品问题 2 years ago
schry efb6b0055d 盘点单驳回后提示框有问题 2 years ago
anthonywj 88ff28e3ca 单据详情新增DI/物资编码,申购新增备注字段 2 years ago
wangwei 568873c673 新增出入库单 di绑定多个产品 产品重复问题 和资质预警重置数据不清空问题 2 years ago
郑明梁 58de2582ae 去除debugger 2 years ago
郑明梁 f7b4e0b28c 特殊单填写往来单位时多个产品传错往来单位id问题 2 years ago
schry 193ab67756 页面优化 2 years ago
schry ca96a3f746 Merge remote-tracking branch 'origin/master' 2 years ago
schry c11f8e4b3a 导出产品信息窗口执行‘结果全部导出’操作,导出的文件数据为空 2 years ago
1178634255 0474f4323b 供应商发票信息中的预览界面无法手动关闭 2 years ago
1178634255 ca7d0b41b2 代码备份 2 years ago
1178634255 fc6e17a699 新增扫码单模块到待校验单据模块,备注会消失 2 years ago
schry 4904f8109e 新增使用出库审核拒绝后,不会显示‘拒绝’状态 2 years ago
schry 4d0902c7c2 选入预验收库单窗口点击重置按钮,’创建时间‘信息没有联动清除 2 years ago
schry 880500b80c Merge remote-tracking branch 'origin/master' 2 years ago
schry d92920ecf1 自动补单时间间隔不应为负数 230522 2 years ago
1178634255 15d9403e3f 编辑单据页面:往来信息显示错误 2 years ago
anthonywj 85cfa41118 Merge branch 'dev' into ywj_dev
# Conflicts:
#	.env.production
#	src/views/basic/busType/bussinessTypeModify.vue
2 years ago
郑明梁 e8a74e7347 修改bug 2 years ago
郑明梁 25f5cc3f06 定速包代码提交 2 years ago
anthonywj f478762ee2 查询申购单 2 years ago
anthonywj e713afdd3a 第三方单据上传过滤,单据上传新增起始时间 2 years ago
anthonywj ebdd11e4e4 单据提交问题修改 2 years ago
anthonywj a22b6520d7 UDI待校验修改 2 years ago
anthonywj 9ff096566c 单据类型上传设置 2 years ago
wangwei 4f8397fcb9 报告预览bug
(cherry picked from commit 97de905cc9)
2 years ago
anthonywj a9b1ea3f75 切换分支提交 2 years ago
anthonywj f89cbb5340 切换分支代码备份 2 years ago
wangwei 97de905cc9 报告预览bug 2 years ago
郑明梁 53e1977b90 申购新增保存按钮 2 years ago
郑明梁 ad9baf08ac 多次出库bug修复 2 years ago
anthonywj f8a186618a 分类第三方产品信息问题 2 years ago
anthonywj bdf245e83d 代码备份 2 years ago
anthonywj 8a7b3bd549 Merge branch 'master' into dev 2 years ago
郑明梁 ed6ccdf059 单据上传bug修复 2 years ago
郑明梁 a588de2584 新增申购单选入申购新增物资类别搜索 2 years ago
wangwei 80b5d25852 修改bug 2 years ago
郑明梁 2f0a089af0 客户信息代码提交 2 years ago
wangwei 3831410f89 报告 支持pdf 2 years ago
郑明梁 6d0b59fe30 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 c73efd994e bug修复代码提交 2 years ago
anthonywj 681b44a846 Merge branch 'master' into dev 2 years ago