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
|
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 |
|
郑明梁
|
9f0e7f0fb9
|
多次使用出库新增功能代码提交
|
2 years ago |
CTP
|
910ca85c12
|
Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame
|
2 years ago |
|
CTP
|
78434fb5cc
|
物资字典维护 默认分类隐藏
|
2 years ago |
|
schry
|
52491972c6
|
解决预警时间单位框长度与其他不一致
|
2 years ago |
|
schry
|
d8b354d397
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
CTP
|
449c751f9b
|
Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame
|
2 years ago |
|
CTP
|
d0d95c6f0c
|
物资字典维护 分类换行bug
|
2 years ago |
|
schry
|
511ecdfdaa
|
this.getList();
|
2 years ago |
|
郑明梁
|
8422f6c362
|
修改di字段显示nameCode
|
2 years ago |
|
郑明梁
|
16040a9dd6
|
下载方法修改不读config
|
2 years ago |
|
郑明梁
|
c552f012d2
|
同步物资页面
|
2 years ago |
|
wangwei
|
bbbc0d379e
|
全局 搜索按钮统一改为查询 输入框变为可清除 重置数据未清空等问题
|
2 years ago |
|
CTP
|
ebd772e015
|
最下方横向滚动条 隐藏
|
2 years ago |
|
郑明梁
|
64c747078f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
6b273a82aa
|
页面样式私有化
|
2 years ago |
|
CTP
|
316b65985f
|
Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame
|
2 years ago |
|
CTP
|
43100c9245
|
物资字典维护 表格纵向滚动条隐藏
|
2 years ago |
|
郑明梁
|
444d12d594
|
修改单据bug
|
2 years ago |
|
CTP
|
d8ee05854a
|
物资字典维护 分类换行显示
|
2 years ago |
|
郑明梁
|
e1de4bcb1f
|
往来单位选入产品判断产品未空
|
2 years ago |
|
wangwei
|
936f3377e8
|
修改bug
|
2 years ago |
|
anthonywj
|
3370dc596f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
abeae655e3
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
wangwei
|
27089e6e64
|
修改bug
|
2 years ago |
|
郑明梁
|
a51046509d
|
院内分类代码提交（需同步）
|
2 years ago |
|
wangwei
|
c8bbac3a4b
|
恢复 供应商器械信息 选入产品按钮
|
2 years ago |
|
anthonywj
|
51d0dcf4af
|
物资字典参数
|
2 years ago |
|
anthonywj
|
fa1288f2d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
a42ff823f5
|
单据审核验收外网兼容委托验收，
|
2 years ago |
|
郑明梁
|
0a55f859cd
|
去除没用代码
|
2 years ago |
|
anthonywj
|
4d62fd3877
|
物资字典代码迁移
|
2 years ago |
|
wangwei
|
d5cc3891ae
|
修改bug
|
2 years ago |
|
anthonywj
|
ccd953f054
|
单据流转相关修改
|
2 years ago |
|
wangwei
|
40be27a804
|
修改bug
|
2 years ago |
|
anthonywj
|
f51139f3d0
|
相关界面修改
|
2 years ago |
|
anthonywj
|
951c1ac0e6
|
耗材字典相关迁移
|
2 years ago |
|
郑明梁
|
cd6039e262
|
修改耗材维护编辑页面
|
2 years ago |
|
郑明梁
|
dfc353f454
|
修改耗材字典样式
|
2 years ago |
|
郑明梁
|
8de62cfb13
|
耗材字典维护编辑添加院内分类
|
2 years ago |
|
郑明梁
|
304011057a
|
耗材字典样式修改
|
2 years ago |
|
anthonywj
|
da3e2ed648
|
耗材字典界面修改
|
2 years ago |
|
anthonywj
|
eea09d08ff
|
耗材字典中对产品标识进行编辑，所显示的数据信息有误
|
2 years ago |
|
郑明梁
|
6bd46385a6
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
a58c949899
|
产品添加预警设置
|
2 years ago |
|
anthonywj
|
2dd1338b92
|
耗材字典解绑问题，编辑菜单问题
|
2 years ago |
x_z
|
0e02f7f4a2
|
1.修复耗材字典相关bug
|
2 years ago |
|
anthonywj
|
9ccf855f7b
|
耗材字典相关修改，新增集采，配送
|
2 years ago |
|
郑明梁
|
8a3c844d99
|
修改院内分类功能代码
|
2 years ago |
|
郑明梁
|
4de861a0f2
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
0fc3fa2f6d
|
修改院内分类功能代码
|
2 years ago |
|
wangwei
|
62d91d7620
|
修改bug
|
2 years ago |
|
郑明梁
|
09d43ab662
|
耗材字典维护功能修改
|
2 years ago |
|
郑明梁
|
a56913828a
|
修改业务bug
|
2 years ago |
|
郑明梁
|
4988381692
|
耗材字典院内分类功能代码提交
|
2 years ago |
|
郑明梁
|
d57f1780b4
|
耗材字典院内分类功能代码提交
|
2 years ago |
|
wangwei
|
16e836e670
|
修改bug
|
2 years ago |
|
x_z
|
26bf6d4bc3
|
1.修复耗材字典页面bug
|
2 years ago |
|
wangwei
|
99a95f49ba
|
修改耗材字典导出问题
|
2 years ago |
|
wangwei
|
8babcb2144
|
修改bug
|
2 years ago |
|
郑明梁
|
8d9cabe802
|
修改单据bug
|
2 years ago |
|
wangwei
|
d2d5a7bb86
|
修改bug
|
2 years ago |
|
wangwei
|
793573e95e
|
修改bug
|
2 years ago |
|
wangwei
|
d8f32a3052
|
修改bug
|
2 years ago |
|
wangwei
|
8ada113c37
|
修改bug
|
2 years ago |
|
wangwei
|
423867e026
|
修改bug
|
2 years ago |
|
wangwei
|
68969a977c
|
修改bug
|
2 years ago |
|
wangwei
|
53437e81e1
|
修改bug
|
2 years ago |
|
anthonywj
|
e0ac888248
|
验收，
|
2 years ago |
|
wangwei
|
d54eb43046
|
修改bug
|
2 years ago |
|
wangwei
|
6adc3d46f9
|
修改bug
|
2 years ago |
|
wangwei
|
13bc398a23
|
修改bug
|
2 years ago |
|
wangwei
|
2b6ee0ef4a
|
修改bug
|
2 years ago |
|
wangwei
|
ef0a9c0e25
|
修改bug
|
2 years ago |
|
wangwei
|
e141ca4aad
|
修改bug
|
2 years ago |
|
wangwei
|
9f90b61134
|
修改bug
|
2 years ago |
|
wangwei
|
713dda4d2a
|
修改bug
|
2 years ago |
|
anthonywj
|
5917ad0428
|
新增单据，选入产品页面
|
2 years ago |
|
郑明梁
|
ba15834a86
|
供应商器械信息代码提交
|
2 years ago |
|
郑明梁
|
41f2177f4e
|
耗材字典导入导出代码提交
|
2 years ago |
|
anthonywj
|
9b510d18aa
|
耗材字典修改，选入，更新完善
|
3 years ago |
|
anthonywj
|
a7ef3b0d5d
|
耗材字典新增包装单位字段
|
3 years ago |
|
anthonywj
|
68d20627e0
|
1.系统管理相关问题修复，重命名；
2.耗材字典相关代码提交
|
3 years ago |
