Commit Graph

2017 Commits (9a13067e2d93f95171dc0d2debbc383158662906)
 

Author SHA1 Message Date
chenhc beac8a2ade Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
# Conflicts:
#	src/views/collect/CollectOrderNewParent.vue
10 months ago
chenhc 9f0202f6bf fix: 修复原始单据 10 months ago
yewj f69f83edbe 异常单据 10 months ago
chenhc eab8ae3753 Merge remote-tracking branch 'origin/dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/CollectOrderNew.vue
10 months ago
chenhc 6dc00efe2a fix: 修复原始单据 10 months ago
yewj d2fd39d173 代码备份 10 months ago
zane 3685fec793 新增关键字搜索 10 months ago
yewj d0d9d560a0 选择业务单 10 months ago
zane 23a5ec740f 新增关键字搜索 10 months ago
wangwei 91ccc4569f Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
wangwei ed0148cb7c 9/14 优化 10 months ago
chenhc 634db17e69 fix: 修复原始单据 10 months ago
yewj 712bf61b4b 处理单据优化 10 months ago
zane 8f1b394ee2 调整 10 months ago
wangwei b6b6de4ab2 9/14 优化 10 months ago
wangwei 538f865268 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
# Conflicts:
#	src/views/basic/workplace/addBusTypeDialog.vue
10 months ago
wangwei d40b85c835 9/14 优化 10 months ago
yewj 279dad9300 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
yewj c1753e8eb3 代码备份 10 months ago
zane e8ecde7222 新增关键字搜索 10 months ago
yewj f5273d4b38 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
yewj 79ee280132 代码备份 10 months ago
wangwei d1b5dca706 Merge branch '20240912_adapter_z' into 20240912_adapter 10 months ago
yewj 93630730e1 处理单据修改 10 months ago
wangwei aceee3f304 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter_z 10 months ago
wangwei bd17652e35 9/14 优化界面 10 months ago
zane c140bdeadd 新增关键字搜索 10 months ago
yewj d4df6a7d15 Merge branch 'dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/DealOrder.vue
10 months ago
yewj 6edf3450dc 多码添加问题 10 months ago
chenhc 3962860171 fix: 修复处理单据扫码回车 10 months ago
yewj 2734993366 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 10 months ago
yewj f9b8a47e1e Merge branch 'dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/CollectOrderNew.vue
#	src/views/collect/DealOrder.vue
10 months ago
yewj 34df04d874 前端界面修改 10 months ago
zane 40374e3e7b 新增参数 10 months ago
zane 775b34282e 全局菜单变换监听 10 months ago
zane 8d0ad82d04 Squashed commit of the following:
commit bd455ecde5
Author: chenhc <2369838784@qq.com>
Date:   Fri Sep 13 15:27:30 2024 +0800

    fix: 修复

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: 修复
10 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: 修复
10 months ago
chenhc bd455ecde5 fix: 修复 10 months ago
zane 28c34d9a4b 外部环境滴码 10 months ago
chenhc b4b6e9aa2f fix: 修复 10 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: 修复
10 months ago
yewj 376cd87a23 bug修改 10 months ago
chenhc 4ca59f3aec fix: 修复 10 months ago
chenhc d2ef8d6831 fix: 修复 10 months ago
wangwei 8637405823 9/11 药品优化 10 months ago
wangwei d7abef3c81 9/11 药品字典优化 10 months ago
wangwei c31d5fa882 9/11 已完成,上传单据 10 months ago
chenhc 3be0b09194 fix: 修复 10 months ago
chenhc 78fc5bd650 fix: 原始单据分表出来 10 months ago
yewj f93a1a7b66 选择往来单位仓库修改 10 months ago