anthonywj
|
61a4363b9b
|
平潭出库明细调整
|
1 year ago |
chenhc
|
d37972bc83
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
81294d4104
|
feat: 审核流程配置功能
|
1 year ago |
|
anthonywj
|
0532a3a0e3
|
第三方出库明细修改
|
1 year ago |
|
anthonywj
|
37ba046b02
|
新增耗材分类
|
1 year ago |
|
anthonywj
|
52037a478e
|
出入库明细修改，批次号先进先出
|
1 year ago |
|
anthonywj
|
1bdbc9beb5
|
项目组套新增供应商ID
|
1 year ago |
|
chenhc
|
fb0f39c860
|
feat: 三方出入库明细功能
|
1 year ago |
|
anthonywj
|
1056d3e1c6
|
选择库存产品，
|
1 year ago |
|
anthonywj
|
036216949a
|
Merge branch '20231126-yw' into dev_ksck
|
1 year ago |
|
chenhc
|
b7a65bded3
|
feat: 耗材字典新增功能
|
1 year ago |
|
anthonywj
|
57687a0c65
|
新增产品属性
|
1 year ago |
|
anthonywj
|
babbc96b8f
|
科室使用出库，采购类型
|
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 |
|
anthonywj
|
4d1eb8e33f
|
新增生产企业字典维护
|
1 year ago |
|
anthonywj
|
b0b9786274
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
|
1 year ago |
|
anthonywj
|
78b9c0169e
|
集采拆单问题
|
1 year ago |
|
anthonywj
|
20c07311de
|
库存对比相关修改
|
1 year ago |
|
anthonywj
|
95848a6a23
|
患者出库远程搜索，证书预览问题，创建人，审核人等问题
|
1 year ago |
|
anthonywj
|
defd93e0ac
|
患者信息下载修改，自定义汇总统计
|
2 years ago |
|
anthonywj
|
27ab0dce11
|
患者信息修改
|
2 years ago |
|
anthonywj
|
0b6d619a5c
|
设备修改，患者信息下载修整
|
2 years ago |
|
anthonywj
|
2d36d62111
|
单据类型修改
|
2 years ago |
|
anthonywj
|
97b1c992e0
|
临床出库选择患者信息问题，设备打印问题
|
2 years ago |
|
anthonywj
|
59f5475cfb
|
临床出库患者处方问题
|
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 |
|
yuanwei
|
387de87ab4
|
仓库管理
|
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
|
84751e92e9
|
单据类型，飞书相关bug修改，汇总统计修改
|
2 years ago |
|
anthonywj
|
4d5c58454d
|
项目组套下载更新
|
2 years ago |
|
anthonywj
|
42e8475e8e
|
患者信息，处方信息下载，首次登录选择当前部门仓库问题
|
2 years ago |
|
anthonywj
|
3dd3db0524
|
新增物价类别
|
2 years ago |
|
anthonywj
|
28d2fa74a3
|
库存查询相关修改
|
2 years ago |
|
wj
|
b819d48351
|
患者管理
|
2 years ago |
|
anthonywj
|
6c9b9988c4
|
项目编码，患者信息，患者处方等修改
|
2 years ago |
|
anthonywj
|
84905777f7
|
领用，发票，日月季年
|
2 years ago |
|
anthonywj
|
ebe748ee58
|
物资字典重复添加问题
|
2 years ago |
|
anthonywj
|
744ef12f24
|
定量相关调整
|
2 years ago |
|
anthonywj
|
b5c7b2897d
|
新增价格先进先出
|
2 years ago |
|
anthonywj
|
9859b53f8a
|
添加价格
|
2 years ago |
|
anthonywj
|
5c1cdf6bc8
|
单据编辑状态
|
2 years ago |
|
anthonywj
|
d3371db702
|
代码备份
|
2 years ago |
|
anthonywj
|
da3de18d73
|
切换分支备份
|
2 years ago |
|
anthonywj
|
59d52457b4
|
新增单据类型，有三期业务单校验方式
|
2 years ago |
|
anthonywj
|
2043524bf0
|
自定义头部参数相关代码备份
|
2 years ago |
黄泽腾
|
ccd45bee85
|
新增申购单点击产品录入时显示系统繁忙
|
2 years ago |
薛宇
|
06f61cfea3
|
选择申购部门后，申购仓库下拉框还会显示其它部门所属的仓库信息
|
2 years ago |
wangwei
|
dbc008b4a5
|
内部码 去掉单据的已审核 待审核状态
|
2 years ago |
|
anthonywj
|
6f1c10572e
|
bug修改
|
2 years ago |
|
薛宇
|
e033821846
|
切换版本号
|
2 years ago |
郑明梁
|
adb1715c4a
|
单据新增预验收库存不足
|
2 years ago |
|
黄泽腾
|
ce9f770c74
|
往来单位信息维护的 往来单位类型 跟 单据类型 里的 往来单位类型 不一致
|
2 years ago |
|
黄泽腾
|
4048adddce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
黄泽腾
|
0b6f964eb5
|
供应商器械信息模块可以重复选入产品
|
2 years ago |
|
wangwei
|
458ca89f5f
|
修改 bug
|
2 years ago |
|
wangwei
|
88fc636c44
|
内部码选入单据时加上判断
|
2 years ago |
|
1178634255
|
b42de9c907
|
供应商器械信息：锁定、退回提示错误
|
2 years ago |
|
郑明梁
|
190d80057e
|
内部码问题修复
|
2 years ago |
|
anthonywj
|
8f267d67b0
|
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 |
|
schry
|
bc6189f144
|
物资类别——选入-耗材产品窗口中的字段顺序问题
|
2 years ago |
|
schry
|
278adb8242
|
Merge remote-tracking branch 'origin/master' into dev
# Conflicts:
# src/views/inout/IoAuditedOrder.vue
|
2 years ago |
|
郑明梁
|
95fde11ea2
|
bug修复
|
2 years ago |
|
schry
|
c2beaf4df2
|
进入“往来单位信息维护”，默认显示 供应商信息 ，选择“全部”查询也是显示供应商类型的往来单位信息
|
2 years ago |
|
郑明梁
|
213d38cbb5
|
定数包bug修复
|
2 years ago |
|
schry
|
193ab67756
|
页面优化
|
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
|
f89cbb5340
|
切换分支代码备份
|
2 years ago |
|
郑明梁
|
ad9baf08ac
|
多次出库bug修复
|
2 years ago |
|
anthonywj
|
f8a186618a
|
分类第三方产品信息问题
|
2 years ago |
|
anthonywj
|
bdf245e83d
|
代码备份
|
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 |
|
anthonywj
|
35403f6fab
|
业务流程相关优化，基础信息修改
|
2 years ago |
|
wangwei
|
7c5e51fa72
|
物资类别bug修改
|
2 years ago |
|
wangwei
|
3c83f74caa
|
分类
|
2 years ago |
|
郑明梁
|
5f66b56e77
|
物资类别代码提交
|
2 years ago |
|
郑明梁
|
b84e3dc1a6
|
修改bug
|
2 years ago |
|
wangwei
|
201375c6d5
|
单据排序
|
2 years ago |
