Commit Graph

595 Commits (17f58e84d2cd7cde43e8626e72ccd0c61f137d9b)

Author SHA1 Message Date
chenhc 6dc00efe2a fix: 修复原始单据 7 months ago
yewj d2fd39d173 代码备份 7 months ago
zane 3685fec793 新增关键字搜索 7 months ago
yewj d0d9d560a0 选择业务单 7 months ago
zane 23a5ec740f 新增关键字搜索 7 months ago
chenhc 634db17e69 fix: 修复原始单据 7 months ago
yewj 712bf61b4b 处理单据优化 7 months ago
zane 8f1b394ee2 调整 7 months ago
yewj 279dad9300 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 7 months ago
yewj c1753e8eb3 代码备份 7 months ago
zane e8ecde7222 新增关键字搜索 7 months ago
wangwei d1b5dca706 Merge branch '20240912_adapter_z' into 20240912_adapter 7 months ago
yewj 93630730e1 处理单据修改 7 months ago
wangwei aceee3f304 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter_z 7 months ago
wangwei bd17652e35 9/14 优化界面 7 months ago
zane c140bdeadd 新增关键字搜索 7 months ago
yewj d4df6a7d15 Merge branch 'dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/DealOrder.vue
7 months ago
yewj 6edf3450dc 多码添加问题 7 months ago
chenhc 3962860171 fix: 修复处理单据扫码回车 7 months ago
yewj 2734993366 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 7 months ago
yewj f9b8a47e1e Merge branch 'dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/CollectOrderNew.vue
#	src/views/collect/DealOrder.vue
7 months ago
yewj 34df04d874 前端界面修改 7 months ago
zane 775b34282e 全局菜单变换监听 7 months ago
zane e9ffc06d0f Squashed commit of the following:
commit b4b6e9aa2f
Author: chenhc <2369838784@qq.com>
Date:   Fri Sep 13 11:26:25 2024 +0800

    fix: 修复

commit 376cd87a23
Author: yewj <yewj@123.com>
Date:   Fri Sep 13 09:10:38 2024 +0800

    bug修改

commit 4ca59f3aec
Author: chenhc <2369838784@qq.com>
Date:   Thu Sep 12 17:55:48 2024 +0800

    fix: 修复

commit d2ef8d6831
Author: chenhc <2369838784@qq.com>
Date:   Thu Sep 12 14:20:30 2024 +0800

    fix: 修复
7 months ago
zane 28c34d9a4b 外部环境滴码 7 months ago
chenhc b4b6e9aa2f fix: 修复 7 months ago
zane 2729a1783e Squashed commit of the following:
commit 376cd87a23
Author: yewj <yewj@123.com>
Date:   Fri Sep 13 09:10:38 2024 +0800

    bug修改

commit 4ca59f3aec
Author: chenhc <2369838784@qq.com>
Date:   Thu Sep 12 17:55:48 2024 +0800

    fix: 修复

commit d2ef8d6831
Author: chenhc <2369838784@qq.com>
Date:   Thu Sep 12 14:20:30 2024 +0800

    fix: 修复
7 months ago
yewj 376cd87a23 bug修改 7 months ago
chenhc d2ef8d6831 fix: 修复 7 months ago
wangwei c31d5fa882 9/11 已完成,上传单据 7 months ago
chenhc 3be0b09194 fix: 修复 7 months ago
chenhc 78fc5bd650 fix: 原始单据分表出来 7 months ago
yewj f93a1a7b66 选择往来单位仓库修改 7 months ago
yewj d377f0d486 界面修改 7 months ago
wangwei 8697a9fe3d 9/10 优化 7 months ago
yewj f397bccf92 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
yewj e96c42cf6f 界面修改 7 months ago
wangwei c9d5c38149 9/6 优化1.2 7 months ago
wangwei cc31d125ed 9/10 优化1.0 7 months ago
yewj 4cc05a80f6 业务类型编辑修改 7 months ago
wangwei efd874ce32 9/9 查看常用业务 7 months ago
chenhc 98dc1e8104 fix: 修改 7 months ago
yewj 0c5000cd3b 代码备份 7 months ago
wangwei 67196e693a 9/9 初始化业务 7 months ago
yewj 0697e895f4 单据提交是否完全赋码问题! 7 months ago
chenhc c9902949ae fix: ui边距对其 7 months ago
wangwei 1fd70fb642 9/8 优化1.0 7 months ago
yewj 2bb48e087b 单据处理扫码单生成问题 7 months ago
yewj 7161b32147 界面修改 7 months ago
chenhc cd968e044e fix: 扫码明细颜色说明 7 months ago
wangwei c112d7c040 9/6 youhua 7 months ago
wangwei fc467f5618 9/6 youhua 7 months ago
wangwei 88c2bfa93f 9/6 优化工位 7 months ago
zane 3860a49acf 重置bug 7 months ago
wangwei 227fa031bc 9/6 优化 7 months ago
zane 13c7698c42 单据异常处理 7 months ago
yewj a7f6dda10a 界面修改 7 months ago
yewj 6aebccf9bc 界面修改 7 months ago
chenhc 787ffd326b fix: 拉取处方加工位入参 7 months ago
chenhc 0965d17312 fix: 页面工位业务类型联动 7 months ago
yewj 8f96d271c8 界面修改 7 months ago
chenhc 000d8d3871 fix: 不触发根据业务激活tabs 7 months ago
chenhc dde3f51e4d fix: 触发处方下载 7 months ago
yewj 5e8e80b3d3 界面修改 7 months ago
wangwei 1df603d497 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
wangwei 0111f92c72 9/4 bug 修改 7 months ago
chenhc c9598fc915 fix: 颜色区分 7 months ago
chenhc 1fe3da1b15 fix: 处理单据初始化修复 7 months ago
wangwei aa29ed5192 9/3 页面优化 7 months ago
wangwei 116296d138 9/3 追溯码查询 7 months ago
yewj 489baf0f90 单据上传 7 months ago
wangwei 1e89f6f3b5 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
wangwei 0c77dde5e4 9/2 损耗出库 7 months ago
chenhc d4d481fea8 fix: 工位上下货页面修改 7 months ago
zane 1b0384ed77 单据上传 7 months ago
chenhc 280459dee9 fix: 工位上下货页面修改 7 months ago
wangwei 87cd2e183e 9/2 下载处方信息判断 7 months ago
chenhc 7200fb6012 fix: 工位上下货页面修改 7 months ago
chenhc 286e3555ef fix: 工位上下货页面修改 7 months ago
wangwei 7c28245709 9/2 下载处方信息 7 months ago
yewj f402942cc7 界面修改 7 months ago
wangwei 45318cc15a Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
wangwei 37d5980355 8*31 优化 7 months ago
chenhc e738114261 fix: 工位联动业务类型 7 months ago
chenhc 4500b55b94 fix: 提交 7 months ago
yewj 09970d4ee7 界面修改 7 months ago
chenhc 9667cec491 fix: 提交 7 months ago
chenhc fb6239c0e8 fix: 提交 7 months ago
yewj 6ed14e5e29 界面修改,拆零新增损耗出库 7 months ago
wangwei 4e42bcb419 8/19 7 months ago
wangwei cfbf91c07f 8/30 根据追溯码出库 7 months ago
yewj 5157b0de09 界面调整 7 months ago
yewj 259dcfbc76 bug 修改码替换相关修改 7 months ago
chenhc e8dc69d26a fix: 提交 7 months ago
zane 4fa9b3f3a7 工位状态异常 7 months ago
zane c4c6bcd75f 存量预警 7 months ago
zane 247b00e50e Merge branch 'dev_ksck_z' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into dev_ksck_z 7 months ago
yewj 04c0b1101d 界面调整 7 months ago
yewj b7688afd7d 界面调整 7 months ago
chenhc d800d56f5b fix: 提交 7 months ago
zane aa23cf08a0 Merge branch 'dev_ksck_z' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into dev_ksck_z 7 months ago
zane 0a31ca5331 存量预警 7 months ago
yewj 593ee4065d bug修改 7 months ago
wangwei b2207905b7 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
wangwei 17e1ee22b7 8/30 损耗出库 7 months ago
chenhc ec2bb507ff Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
#	src/views/collect/CollectOrderTabs.vue
7 months ago
chenhc a244b1e241 fix: 提交 7 months ago
yewj 9b0d2675c2 工位上货添加业务类型 7 months ago
chenhc 6786afe220 fix: 提交 7 months ago
yewj 9627ed7d73 是否自动赋码,单据处理 7 months ago
zane f1bcc1a802 库存预警 7 months ago
wangwei f75d9efc2f Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
wangwei e0e489b857 8/30 切换业务提交 7 months ago
zane 4304ad6c0d fix:分页修改 7 months ago
zane 528e5477b9 库存条件整合 7 months ago
wangwei 5614c6ee80 8/29 优化 7 months ago
chenhc 60083984f9 fix: 提交 7 months ago
wangwei cbf3a4b623 8/29 logo 7 months ago
wangwei 423ed6c527 8/29 损耗日志 7 months ago
yewj 618c85e722 损耗出库界面修改 7 months ago
chenhc a99b50ff2a fix: 提交 7 months ago
chenhc b8781fb399 fix: 提交 7 months ago
chenhc 26762bc8bc fix: tabs修改 7 months ago
wangwei 0f3eb56b3d 8/28 药品数据维护 第三方药品维护 7 months ago
chenhc 9569c8e54a fix: 修改 7 months ago
chenhc cbb58dcbf6 fix: 焦点获取 7 months ago
wangwei 7cab8c36dc 8/27 切换业务类型 7 months ago
wangwei 2cd63ea639 8/27 置顶 7 months ago
zane dd850f36d5 库存预警 7 months ago
wangwei d2e3311b08 8/27 界面优化 7 months ago
chenhc 6417ae5910 fix: 面包屑+tabs页组件+logo 7 months ago
yewj 9d655f827c 右上角布局修改 7 months ago
wangwei 45f95cd7b6 8/27 调整工位编码 7 months ago
wangwei beb2212c04 8/27 优化 7 months ago
chenhc 1996e3def9 fix: 面包屑+tabs页组件修改 7 months ago
yewj 3674d21d4c 耗材字典更新流通计量单元问题 7 months ago
wangwei 8708a7157f 8/26 追溯码查询以及工位bug修改 7 months ago
yewj 2e40ee4406 工位上货问题 7 months ago
yewj 5bd837cf26 代码备份 7 months ago
chenhc 35552beacd fix: 面包屑+tabs页组件 7 months ago
zane 3da939259a 置顶 排序时间 7 months ago
chenhc a7fe8da292 fix: 面包屑+tabs页组件 7 months ago
chenhc 47c2c2b4c7 fix: 修改 7 months ago
chenhc 7fee144c33 fix: 修改 7 months ago
wangwei 13c6f20a1f Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
wangwei beeab0ea8f 8/25 业务类型关联第三方单据 7 months ago
chenhc 7b5549675c Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
yewj 6b415942a1 界面配置一些微调 7 months ago
chenhc 8a35d2ee69 fix: 修改 7 months ago
chenhc 9b01797ad7 fix: 修改 7 months ago
yewj 8cdc58b3ae Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 7 months ago
yewj 7e774badf3 界面配置一些微调 7 months ago
chenhc e7232c0d2f fix: 统一分割加切横线 7 months ago
yewj a116abc56d 扫码问题 7 months ago
yewj 2e38cfdc34 界面扫码的一些调整 7 months ago
yewj da62e9963f 代码备份 8 months ago
yewj e5bb9d4788 工位的界面相关修改 8 months ago
yewj 6a7607c794 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
#	src/views/collect/DealOrder.vue
8 months ago
yewj 21b01ae12c 确认单据 8 months ago
chenhc 9aa7e01059 fix: 减一页面同步刷新 8 months ago
chenhc 62dbf72e15 fix: 获取业务单据类型 8 months ago
chenhc 844dceba9b fix: 获取业务单据类型 8 months ago
yewj 1926b45bea Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
yewj 8783e9ddfd 页面修改 8 months ago
chenhc c829947bb9 fix: 业务类型窗口名、上货页面获取工位 8 months ago
wangwei 1785bc97d3 8/23 工位上货 实际数量隐藏 8 months ago
wangwei 1f83cdf04a 8/23 信息提醒注释 8 months ago
wangwei 24e37f84da 8/19 筛选工位优化 8 months ago
wangwei e4bd8dd8f9 8/23 优化 8 months ago
chenhc 5febc6afd4 feat: 修改同步页面 8 months ago
yewj f919cf3177 扫码明细问题 8 months ago
wangwei fbf5f3b75e 8/22 页面优化 8 months ago
yewj 83ea4171dc Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
yewj b989cdc708 代码备份 8 months ago
wangwei bdd47dc070 8/22 工位优化 8 months ago
chenhc 4d7d7f06a7 feat: 业务类型、分页12 8 months ago
chenhc 2174f8c21f feat: 处理单据切换界面下拉单据 8 months ago
yewj 6baee8400f 代码备份 8 months ago
yewj e4f342e844 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
yewj c8780b0f19 问题处理 8 months ago
chenhc fe150a67bb Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
chenhc a042c46bb7 feat: 处理单据切换界面 8 months ago
wangwei 91945f4e09 8/22 工位调整 第三方单据调整 8 months ago
chenhc b49c1e3c11 feat: 处理单据选择单据类型 8 months ago
yewj 7a4e887948 代码格式化 8 months ago
yewj 5924599d1e 掃碼問題處理 8 months ago
wangwei 6be9e6002b 8/21 界面优化 8 months ago
wangwei 24d0b25bf3 8/21 界面优化 8 months ago
anthonywj 03db883f21 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
anthonywj 098bafb8eb 代码备份 8 months ago
wangwei 0b421419ab 8/20 界面优化+用户绑定单据类型 8 months ago
chenhc 43bf5cb409 feat: 修改 8 months ago
chenhc d8ba602a02 feat: 修改 8 months ago
anthonywj a2defe181b 界面备份 8 months ago
chenhc 603d3a2cda feat: 修改处理单据扫码减一 8 months ago
anthonywj b18629e574 扫码问题 8 months ago
anthonywj efaea39904 扫码详情 8 months ago
anthonywj f7ac2750ba 代码备份2222 8 months ago
wangwei 048294806e Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
wangwei 992797a4c3 8/19 界面优化 8 months ago
chenhc df978debe8 feat: 修改 8 months ago
wangwei b33fb24f32 8/19 界面优化 8 months ago
wangwei 68d95678a3 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
#	src/views/collect/PanelOrderDeal.vue
8 months ago
wangwei fd4cf12854 8/19 正在处理页面 点击处理跳转带入工位code 8 months ago
anthonywj 455aaf2b9e Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
anthonywj a989ea2a62 减一,删除方法 8 months ago
wangwei d2b4fe22ef Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
wangwei 2a1fc45b72 8/19 选入单据过滤已完成的 8 months ago
anthonywj 9dbf996f51 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
#	src/views/collect/IoCreateOrder.vue
#	src/views/collect/IoCreateOrderBlank.vue
8 months ago
anthonywj 7ae5c17e35 界面优化 8 months ago
chenhc 4dc436eaf1 feat: 修改 8 months ago
wangwei 741917baf3 8/19 当前工位读取全部工位 8 months ago
wangwei b57570ef5d 8/19 现场作业展示全部工位 8 months ago
chenhc 5bd73d9e6f feat: 工位上货页面控制 8 months ago
anthonywj f82191cc55 界面优化 8 months ago
anthonywj 91b973e372 界面优化 8 months ago
anthonywj 048fd0a0fe 界面优化 8 months ago
wangwei aa8a7ddf22 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
wangwei 664dcda581 8/17 模板打印 8 months ago
anthonywj 8a2c150945 绑定工位,以及页面修改 8 months ago
chenhc b1738480bb Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
chenhc 43b6803df4 feat: 工位上货页面控制 8 months ago
wangwei 37d4f0c8e8 绑定工位 取消多选 8 months ago
anthonywj f4971f044e Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z 8 months ago
anthonywj f33188e242 处方修改 8 months ago
chenhc 7231cd8229 feat: 单据页面状态字段、是否拆零开启 8 months ago
chenhc 5eaf46f45e feat: 现场作业修改 8 months ago
anthonywj 6cb99e90b8 替换接口 8 months ago
anthonywj 54be1e8778 界面优化 8 months ago
chenhc d8b9851d91 feat: 页面修改 8 months ago
chenhc a9bbcfd46a feat: 页面修改 8 months ago
anthonywj ce6c7edd67 界面优化 8 months ago
anthonywj 6bd0ca936d 界面优化 8 months ago
chenhc e03b76929d feat: 页面修改 8 months ago
chenhc 931f3cfdf7 feat: 优化右上角用户信息 8 months ago
chenhc e35352fe89 feat: 优化细节 8 months ago
anthonywj 78d53333d9 界面优化 8 months ago
chenhc f657d09fd3 Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
#	src/views/collect/DealOrder.vue
8 months ago
chenhc 7a02984a5a feat: 跳转禁止工位选择 8 months ago
anthonywj 79c5246b53 界面优化 8 months ago
anthonywj 1fbd67ef43 单据备份 8 months ago
anthonywj dec80e5657 单据备份 8 months ago
chenhc 3f6a01eac1 feat: 页面跳转 8 months ago
anthonywj 1d1acf2686 单据备份 8 months ago
anthonywj 3c7934de18 业务单据管理 8 months ago