Commit Graph

595 Commits (17f58e84d2cd7cde43e8626e72ccd0c61f137d9b)

Author SHA1 Message Date
qiuyt 97f2ff8648 Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter 5 months ago
qiuyt 63c2fa9b12 1、单据上传统计界面开发
2、单据上传设置在呢个价论述时间定时设置 取消起始上传时间更新逻辑 无限循环处理有问题的单据
5 months ago
wangwei 15e943c506 11/19 现场管理已完成单-码明细生产日期显示 5 months ago
qiuyt acc80cbc03 单据上传界面页签界面优化 5 months ago
wangwei 3832fec9bd 11/14 上货工位货架优化 5 months ago
chenhc 7788cbce19 fix:修复 5 months ago
yewj 004bda3db5 确认取货板面调整 5 months ago
wangwei fc04c2547d 11/11 取货操增加药品名称 业务单增加单据类型1器械2药品 5 months ago
wangwei 2046d51ec5 放弃取货槽位 药品数据级别和下级数量过滤小数点 11/11 1.0 5 months ago
qiuyt ccd6ff005a 1单据上传重复上传判断 5 months ago
wangwei 83a1daf289 11/9 页面优化1.0 5 months ago
chenhc 70daf57903 fix:单据明细card 5 months ago
chenhc 10d0276c58 fix:业务类型增加回传参数设置、单据明细card页面 5 months ago
wangwei 130d4d7a0a 11/8 页面优化,扫码剔除功能优化1 5 months ago
yewj fe57fef616 代码备份 5 months ago
chenhc 03fe475973 fix:优化关联关系 5 months ago
chenhc d3fd38b176 fix:优化关联关系 5 months ago
chenhc 0d36b097f4 fix:修复 5 months ago
chenhc 786f290156 fix:放弃上货 5 months ago
yewj b3a7f23d28 代码备份 5 months ago
yewj dbd697822e 工位 5 months ago
wangwei 5acebe350e 11/4 优化1.0 5 months ago
wangwei e56a4a8cfc 11/01 bug优化1.0 5 months ago
chenhc 5029ecd540 fix:业务按货位上架结合 5 months ago
chenhc daca5a6db4 fix:业务按货位上架结合 5 months ago
yewj 344450808d 上货 5 months ago
chenhc 4cc3f3284c fix:业务按货位上架结合 5 months ago
wangwei 3287a4f228 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
# Conflicts:
#	src/views/collect/DealOrder.vue
5 months ago
wangwei f82d9ab036 10/31 上货工位增加货位上架功能 5 months ago
yewj 91fb39d99c 工位上货单据按货位上货,处理单据拆零扫码确认 5 months ago
chenhc f24d422214 fix:上货修改 5 months ago
yewj 08832de135 工位上货单据按货位上货,处理单据拆零扫码确认 5 months ago
wangwei b5b91d7018 10/30 处理单据扫码剔除和工位分格 5 months ago
yewj 7828bbf1aa 高拍仪批量扫码问题 5 months ago
chenhc f6799b0b46 fix:药品关联关系 5 months ago
chenhc 7e7111c510 fix:药品关联关系 5 months ago
wangwei 688a238e2b 10/28 剔除码1.0 5 months ago
chenhc 541cc3770a fix:药品关联关系 5 months ago
chenhc 1301c462e3 fix:药品关联关系 5 months ago
wangwei e54251abf4 10/25 bug优化 1.0 5 months ago
yewj 3df6fea79a 高拍仪批量扫码问题 5 months ago
chenhc 77edb8a07d fix: 修复 6 months ago
yewj 92eb1dc129 代码备份 6 months ago
chenhc 4f720babf1 fix: 修复 6 months ago
chenhc fb7ce6a6fa feat: 药品关联信息 6 months ago
chenhc ace8a4d295 feat: 手工、拼箱关联修改 6 months ago
chenhc 4b6cc4215a feat: 拼箱 6 months ago
wangwei 56927debf5 10/12 bug优化 6 months ago
zane df7e17875e bug 6 months ago
zane 7c69829a27 全部清空仍可提交bug 6 months ago
chenhc 3fe00231f8 feat: 拼箱 6 months ago
chenhc cb027420bb feat: 拼箱 6 months ago
chenhc 35d1d14ca2 feat: 拼箱 6 months ago
chenhc e646485455 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 6 months ago
chenhc 5ec4bed9f5 feat: 拼箱 6 months ago
zane 75d086d9be 废弃 6 months ago
chenhc b0db8f8fd3 feat: 手动关联 6 months ago
chenhc 18d31cf8a9 feat: 手动关联 6 months ago
zane faf615eeee Merge branch '20240912_adapter' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into 20240912_adapter 6 months ago
zane 9f56d4f294 暂存 6 months ago
wangwei 5bbcf2e7f1 10/10 bug优化 6 months ago
chenhc 996f9f7ae0 feat: 修复 6 months ago
chenhc 919a44396b feat: 修复 6 months ago
zane 63c3a9d258 扫码关联 6 months ago
wangwei 017a0f17b5 10/8 页面优化1.0 6 months ago
chenhc fcde54a7de feat: 修复 6 months ago
chenhc 8c513de3ad feat: 切换采集工位、是否自动提交提示 6 months ago
chenhc ce705e4cb0 feat: 切换采集工位 6 months ago
chenhc af03500680 feat: 单据下载-器械 6 months ago
yewj 0b19b7f8c9 代码备份 6 months ago
wangwei fb1a5f7f46 10/8 界面优化 6 months ago
yewj cd3572bcac 切换分支备份 6 months ago
chenhc d6c97cb129 feat: 切换工位 6 months ago
yewj 6c9b93c058 处理单据 6 months ago
wangwei f47ed1578d 9/29 界面优化1.0.2 6 months ago
zane 9cf02706f1 扫码关联 6 months ago
zane 35c6af781d 扫码关联 6 months ago
wangwei 92625c7f4b 9/29 页面优化1.2 6 months ago
chenhc f91acd339f feat: 上货业务选择跳过 6 months ago
chenhc 19d6ecd671 feat: 产品记录 6 months ago
chenhc e2cc7fd3ec feat: 产品记录 6 months ago
chenhc 28255c4e56 feat: 切换工位 6 months ago
chenhc 99c2ba53f8 feat: 切换工位 6 months ago
yewj 6db9098731 处理单据工位问题 6 months ago
yewj 4b27fdeac6 处理单据工位问题 6 months ago
yewj e6000f0c21 bug修改 6 months ago
yewj 529e370475 代码备份 6 months ago
wangwei 6b9791df4c 9/27 现场管理界面优化 6 months ago
zane d2579f3938 上传关联优化 6 months ago
chenhc 1b8dfa2336 feat: 修复 6 months ago
zane 589e843df2 上传关联 6 months ago
wangwei 0860e16732 9/26 优化1.0 6 months ago
chenhc ed070d90b4 feat: 修复 6 months ago
wangwei 0e4f2dbbe1 9/26 优化1.0 6 months ago
wangwei c0fa57a785 9/25 界面优化1.0 6 months ago
zane a706f724a1 筛选bug 6 months ago
zane eacb42fffc 筛选条件bug 6 months ago
wangwei 307923f839 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 6 months ago
zane 7d3b5410f9 工位库存库存码明细无效 6 months ago
wangwei ab4b61cd71 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 6 months ago
wangwei d3ae6838a6 9/25 优化1.0 6 months ago
zane d7c5048e98 上货退货 选入单据 6 months ago
chenhc e26390563e feat: 修复 6 months ago
zane edaaac3c81 统一保存 6 months ago
wangwei 1226166167 9/24 现场管理bug优化 6 months ago
wangwei 1625a19d76 9/23 优化异常单据分页 6 months ago
wangwei 5d2c0ac8e6 9/23 界面优化1.0 6 months ago
yewj 9b104639e5 代码备份 6 months ago
yewj 7f8f6b2876 工位上货问题 7 months ago
wangwei 2c068773f7 9/21 扫码明细翻页 7 months ago
wangwei 8a270d462f 9/21 优化扫码明细翻页1.0 7 months ago
yewj a8cd04d519 待处理单据查询问题 7 months ago
yewj f2e8f300df 代码备份 7 months ago
wangwei fb0d5b8972 9/20 优化定时查询 7 months ago
wangwei bbe2c526a5 9/20 优化1.0 7 months ago
chenhc a64865dcc1 feat: 修复 7 months ago
chenhc f4bbc65cd0 feat: 修复 7 months ago
chenhc 87999a623d feat: 定向查询 7 months ago
wangwei 2150dc4b63 9/20 优化1.0 7 months ago
chenhc 60d4d1b6ae feat: 工位上货选已完成单 7 months ago
wangwei a351c17cb7 Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter 7 months ago
wangwei 467b534718 9/19 追溯码查询1.0 7 months ago
yewj a89c74d555 处理单据 7 months ago
yewj de663da475 单据自动完成 7 months ago
wangwei 27da46bccc 9/18 现场管理优化 7 months ago
chenhc 08f52aa413 feat: 下载单据 7 months ago
wangwei 17cc768cc0 9/18 现场管理工位上下货...搜索优化 7 months ago
chenhc 7c37a6d49b feat: 下载单据 7 months ago
chenhc f595b61e84 feat: 下载单据 7 months ago
wangwei 31d28ace80 9/18 优化药品信息 7 months ago
wangwei f39038f960 9/18 字段查询优化 7 months ago
wangwei 10fad9c0c6 9/17 界面优化1.0 7 months ago
yewj e985790e86 单据配置相关修改 7 months ago
yewj b30a92b8c2 添加回车搜索 7 months ago
yewj dce1da43cf 回车键刷新问题 7 months ago
yewj ea9fc277e8 处理单据 7 months ago
yewj 824f919f39 工位上货多行条码输入 7 months ago
yewj e66329b550 处理单据多行条码输入 7 months ago
yewj 79eafbaa6f 高级查询修改 7 months ago
yewj e719a333c3 高级搜索修改 7 months ago
yewj c64f066a1c 高级搜索修改 7 months ago
wangwei a812a77b9e 9/14 判断当前工位是否已经处理单据 7 months ago
chenhc bf91594971 fix: 扫码明细去复选框 7 months ago
yewj baac26c586 界面修改 7 months ago
yewj 3de399ea37 多码处理 7 months ago
zane 464b40687f 新增关键字搜索 7 months ago
zane 877129f335 优化 7 months ago
wangwei 786d678ac3 9/14 业务类型增加收货方送货方 7 months ago
chenhc 9f0202f6bf fix: 修复原始单据 7 months ago
chenhc eab8ae3753 Merge remote-tracking branch 'origin/dev_ksck_z' into 20240912_adapter
# Conflicts:
#	src/views/collect/CollectOrderNew.vue
7 months ago
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