chenhc
|
2f5aea5ecc
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
chenhc
|
a27627b5bc
|
feat: 设备管理-卡片开发
|
2 years ago |
anthonywj
|
1ad28adf4a
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
anthonywj
|
f6742a38cd
|
出入库明细单据生成优化
|
2 years ago |
|
chenhc
|
95dc6614c2
|
feat: 设备管理开发
|
2 years ago |
|
chenhc
|
b04eab404b
|
feat: 审核开关-业务页面修改
|
2 years ago |
|
chenhc
|
e72c3871f0
|
feat: 审核开关
|
2 years ago |
|
anthonywj
|
b81dde75c8
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
anthonywj
|
61a4363b9b
|
平潭出库明细调整
|
2 years ago |
|
chenhc
|
fa33dc0f57
|
feat: 审核流程配置功能
|
2 years ago |
|
chenhc
|
d37972bc83
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
chenhc
|
81294d4104
|
feat: 审核流程配置功能
|
2 years ago |
|
anthonywj
|
09ba95c75c
|
领用选择库存产品问题
|
2 years ago |
|
anthonywj
|
0532a3a0e3
|
第三方出库明细修改
|
2 years ago |
|
anthonywj
|
09d7bf67bc
|
界面配置相关bug修改
|
2 years ago |
|
anthonywj
|
37ba046b02
|
新增耗材分类
|
2 years ago |
|
anthonywj
|
52037a478e
|
出入库明细修改，批次号先进先出
|
2 years ago |
|
anthonywj
|
64e2b9214b
|
库存明细手动下载
|
2 years ago |
|
chenhc
|
c79dbcda45
|
feat: 代码保存
|
2 years ago |
|
anthonywj
|
1bdbc9beb5
|
项目组套新增供应商ID
|
2 years ago |
|
anthonywj
|
275449e3b1
|
登录界面配置
|
2 years ago |
|
anthonywj
|
02c424aaab
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
2 years ago |
|
chenhc
|
060f7ea48f
|
feat: 三方出入库明细功能
|
2 years ago |
|
anthonywj
|
ce7acde9b8
|
选择库存产品仓库问题
|
2 years ago |
|
anthonywj
|
0d1b7f81b4
|
选择库存产品仓库问题
|
2 years ago |
|
chenhc
|
4838ccad06
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
8707d9fa03
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
fb0f39c860
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
8468687d27
|
feat: 保存代码
|
2 years ago |
|
chenhc
|
69d896c406
|
Merge branch '20231126-yw' into dev_ksck
|
2 years ago |
|
chenhc
|
aaa806200d
|
feat: 代码保存
|
2 years ago |
|
anthonywj
|
1056d3e1c6
|
选择库存产品，
|
2 years ago |
|
anthonywj
|
5a9cda84a3
|
Merge branch '20231126-yw' into dev_ksck
|
2 years ago |
|
chenhc
|
066630cf5d
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
chenhc
|
2318737957
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
anthonywj
|
036216949a
|
Merge branch '20231126-yw' into dev_ksck
|
2 years ago |
|
chenhc
|
b7a65bded3
|
feat: 耗材字典新增功能
|
2 years ago |
|
anthonywj
|
57687a0c65
|
新增产品属性
|
2 years ago |
|
anthonywj
|
babbc96b8f
|
科室使用出库，采购类型
|
2 years ago |
|
anthonywj
|
05ad40a7d8
|
界面配置引起的单据删除，编辑等问题
|
2 years ago |
|
anthonywj
|
a223cc521d
|
备份
|
2 years ago |
yuanwei
|
695723fcf4
|
bug修改
|
2 years ago |
|
yuanwei
|
bd843ffc42
|
界面展示处理
|
2 years ago |
|
yuanwei
|
8a48704f89
|
解决冲突
|
2 years 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
|
2 years 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
|
2 years ago |
|
yuanwei
|
39af4919d6
|
查询提交
|
2 years ago |
|
anthonywj
|
4d1eb8e33f
|
新增生产企业字典维护
|
2 years ago |
|
anthonywj
|
346d257e66
|
新增第三方生产企业
|
2 years ago |
|
anthonywj
|
606658afe3
|
单据详情 页面展示问题
|
2 years ago |
