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 |
|
yewj
|
d377f0d486
|
界面修改
|
10 months ago |
|
wangwei
|
8697a9fe3d
|
9/10 优化
|
10 months ago |
|
yewj
|
f397bccf92
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
yewj
|
e96c42cf6f
|
界面修改
|
10 months ago |
|
wangwei
|
c9d5c38149
|
9/6 优化1.2
|
10 months ago |
|
wangwei
|
cc31d125ed
|
9/10 优化1.0
|
10 months ago |
|
yewj
|
4cc05a80f6
|
业务类型编辑修改
|
10 months ago |
|
wangwei
|
efd874ce32
|
9/9 查看常用业务
|
10 months ago |
|
chenhc
|
98dc1e8104
|
fix: 修改
|
10 months ago |
|
wangwei
|
d264ae015f
|
9/9 业务类型增加字段
|
10 months ago |
|
wangwei
|
375170c9d1
|
9/9 业务单据增加顺序号
|
10 months ago |
|
yewj
|
0c5000cd3b
|
代码备份
|
10 months ago |
|
wangwei
|
67196e693a
|
9/9 初始化业务
|
10 months ago |
|
yewj
|
0697e895f4
|
单据提交是否完全赋码问题！
|
10 months ago |
|
wangwei
|
53a3d38bae
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
e6e71b7486
|
9/6 youhua
|
10 months ago |
|
chenhc
|
c9902949ae
|
fix: ui边距对其
|
10 months ago |
|
wangwei
|
1fd70fb642
|
9/8 优化1.0
|
10 months ago |
|
yewj
|
2bb48e087b
|
单据处理扫码单生成问题
|
10 months ago |
|
yewj
|
7161b32147
|
界面修改
|
10 months ago |
|
chenhc
|
cd968e044e
|
fix: 扫码明细颜色说明
|
10 months ago |
|
wangwei
|
c112d7c040
|
9/6 youhua
|
10 months ago |
|
wangwei
|
fc467f5618
|
9/6 youhua
|
10 months ago |
|
wangwei
|
88c2bfa93f
|
9/6 优化工位
|
10 months ago |
|
wangwei
|
b24a5969b0
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
977ce666bb
|
9/6 youhua
|
10 months ago |
|
zane
|
3860a49acf
|
重置bug
|
10 months ago |
|
zane
|
ad43c3b64a
|
产品类型
|
10 months ago |
|
wangwei
|
227fa031bc
|
9/6 优化
|
10 months ago |
|
zane
|
13c7698c42
|
单据异常处理
|
10 months ago |
|
wangwei
|
2390c98492
|
9/6 优化
|
10 months ago |
|
wangwei
|
f93ef3f269
|
9/6 药品基础
|
10 months ago |
|
yewj
|
a7f6dda10a
|
界面修改
|
10 months ago |
|
yewj
|
6aebccf9bc
|
界面修改
|
10 months ago |
|
wangwei
|
4d4b7995e5
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
9e6f070390
|
9/5 药品基础数据
|
10 months ago |
|
chenhc
|
787ffd326b
|
fix: 拉取处方加工位入参
|
10 months ago |
|
chenhc
|
0965d17312
|
fix: 页面工位业务类型联动
|
10 months ago |
|
yewj
|
8f96d271c8
|
界面修改
|
10 months ago |
|
chenhc
|
000d8d3871
|
fix: 不触发根据业务激活tabs
|
10 months ago |
|
chenhc
|
dde3f51e4d
|
fix: 触发处方下载
|
10 months ago |
|
yewj
|
5e8e80b3d3
|
界面修改
|
10 months ago |
|
wangwei
|
c96e1b7d9d
|
9/4 工位基础数据界面优化
|
10 months ago |
|
wangwei
|
1df603d497
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
0111f92c72
|
9/4 bug 修改
|
10 months ago |
|
chenhc
|
c9598fc915
|
fix: 颜色区分
|
10 months ago |
|
chenhc
|
1fe3da1b15
|
fix: 处理单据初始化修复
|
10 months ago |
|
wangwei
|
34d7c9240b
|
9/3 工位基础优化
|
10 months ago |
|
wangwei
|
aa29ed5192
|
9/3 页面优化
|
10 months ago |
|
wangwei
|
116296d138
|
9/3 追溯码查询
|
10 months ago |
|
yewj
|
489baf0f90
|
单据上传
|
10 months ago |
|
wangwei
|
03c521a707
|
9/2 是否独占库存优化
|
10 months ago |
|
wangwei
|
1e89f6f3b5
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
0c77dde5e4
|
9/2 损耗出库
|
10 months ago |
|
chenhc
|
d4d481fea8
|
fix: 工位上下货页面修改
|
10 months ago |
|
zane
|
1b0384ed77
|
单据上传
|
10 months ago |
|
chenhc
|
280459dee9
|
fix: 工位上下货页面修改
|
10 months ago |
|
wangwei
|
87cd2e183e
|
9/2 下载处方信息判断
|
10 months ago |
|
chenhc
|
7200fb6012
|
fix: 工位上下货页面修改
|
10 months ago |
|
chenhc
|
286e3555ef
|
fix: 工位上下货页面修改
|
10 months ago |
|
wangwei
|
7c28245709
|
9/2 下载处方信息
|
10 months ago |
|
yewj
|
f402942cc7
|
界面修改
|
10 months ago |
|
wangwei
|
45318cc15a
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
37d5980355
|
8*31 优化
|
10 months ago |
|
chenhc
|
e738114261
|
fix: 工位联动业务类型
|
10 months ago |
|
chenhc
|
4500b55b94
|
fix: 提交
|
10 months ago |
|
chenhc
|
bb0d25042a
|
fix: 提交
|
10 months ago |
|
yewj
|
09970d4ee7
|
界面修改
|
10 months ago |
|
chenhc
|
9667cec491
|
fix: 提交
|
10 months ago |
|
chenhc
|
fb6239c0e8
|
fix: 提交
|
10 months ago |
|
yewj
|
6ed14e5e29
|
界面修改，拆零新增损耗出库
|
10 months ago |
|
wangwei
|
4e42bcb419
|
8/19
|
10 months ago |
|
wangwei
|
cfbf91c07f
|
8/30 根据追溯码出库
|
10 months ago |
|
yewj
|
5157b0de09
|
界面调整
|
10 months ago |
|
yewj
|
259dcfbc76
|
bug 修改码替换相关修改
|
10 months ago |
|
chenhc
|
e8dc69d26a
|
fix: 提交
|
10 months ago |
|
zane
|
4fa9b3f3a7
|
工位状态异常
|
10 months ago |
|
zane
|
c4c6bcd75f
|
存量预警
|
10 months ago |
|
zane
|
247b00e50e
|
Merge branch 'dev_ksck_z' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into dev_ksck_z
|
10 months ago |
|
yewj
|
04c0b1101d
|
界面调整
|
10 months ago |
|
yewj
|
b7688afd7d
|
界面调整
|
10 months ago |
|
chenhc
|
d800d56f5b
|
fix: 提交
|
10 months ago |
|
zane
|
aa23cf08a0
|
Merge branch 'dev_ksck_z' of http://116.204.71.86:3000/UDI/udiwms-vue-frame into dev_ksck_z
|
10 months ago |
|
zane
|
0a31ca5331
|
存量预警
|
10 months ago |
|
yewj
|
593ee4065d
|
bug修改
|
10 months ago |
|
wangwei
|
b2207905b7
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
17e1ee22b7
|
8/30 损耗出库
|
10 months ago |
|
chenhc
|
ec2bb507ff
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
# src/views/collect/CollectOrderTabs.vue
|
10 months ago |
|
chenhc
|
a244b1e241
|
fix: 提交
|
10 months ago |
|
yewj
|
9b0d2675c2
|
工位上货添加业务类型
|
10 months ago |
|
chenhc
|
6786afe220
|
fix: 提交
|
10 months ago |
|
yewj
|
9627ed7d73
|
是否自动赋码，单据处理
|
10 months ago |
|
zane
|
f1bcc1a802
|
库存预警
|
10 months ago |
|
wangwei
|
f75d9efc2f
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
e0e489b857
|
8/30 切换业务提交
|
10 months ago |
|
zane
|
4304ad6c0d
|
fix:分页修改
|
10 months ago |
|
zane
|
528e5477b9
|
库存条件整合
|
10 months ago |
|
wangwei
|
f84de49369
|
8/30 接口修改
|
10 months ago |
|
wangwei
|
5614c6ee80
|
8/29 优化
|
10 months ago |
|
wangwei
|
d0430fedd7
|
8/29 工位业务类型修改
|
10 months ago |
|
chenhc
|
60083984f9
|
fix: 提交
|
10 months ago |
|
wangwei
|
cbf3a4b623
|
8/29 logo
|
10 months ago |
|
wangwei
|
423ed6c527
|
8/29 损耗日志
|
10 months ago |
|
yewj
|
618c85e722
|
损耗出库界面修改
|
10 months ago |
|
chenhc
|
a99b50ff2a
|
fix: 提交
|
10 months ago |
|
chenhc
|
b8781fb399
|
fix: 提交
|
10 months ago |
|
chenhc
|
26762bc8bc
|
fix: tabs修改
|
10 months ago |
|
wangwei
|
0f3eb56b3d
|
8/28 药品数据维护 第三方药品维护
|
10 months ago |
|
chenhc
|
f1de28664f
|
fix: 修改
|
10 months ago |
|
chenhc
|
9569c8e54a
|
fix: 修改
|
10 months ago |
|
chenhc
|
cbb58dcbf6
|
fix: 焦点获取
|
10 months ago |
|
wangwei
|
7cab8c36dc
|
8/27 切换业务类型
|
10 months ago |
|
wangwei
|
2cd63ea639
|
8/27 置顶
|
10 months ago |
|
zane
|
dd850f36d5
|
库存预警
|
10 months ago |
|
wangwei
|
d2e3311b08
|
8/27 界面优化
|
10 months ago |
|
chenhc
|
6417ae5910
|
fix: 面包屑+tabs页组件+logo
|
10 months ago |
|
yewj
|
9d655f827c
|
右上角布局修改
|
10 months ago |
|
wangwei
|
45f95cd7b6
|
8/27 调整工位编码
|
10 months ago |
|
wangwei
|
beb2212c04
|
8/27 优化
|
10 months ago |
|
chenhc
|
1996e3def9
|
fix: 面包屑+tabs页组件修改
|
10 months ago |
|
yewj
|
3674d21d4c
|
耗材字典更新流通计量单元问题
|
10 months ago |
|
wangwei
|
8708a7157f
|
8/26 追溯码查询以及工位bug修改
|
10 months ago |
|
yewj
|
2e40ee4406
|
工位上货问题
|
10 months ago |
|
yewj
|
2a39d0724a
|
代码备份
|
10 months ago |
|
yewj
|
5bd837cf26
|
代码备份
|
10 months ago |
|
chenhc
|
35552beacd
|
fix: 面包屑+tabs页组件
|
10 months ago |
|
wangwei
|
65a63bfb1b
|
8/26 优化耗材字典 加入工位预警数量 放开是否拆零
|
10 months ago |
|
zane
|
3da939259a
|
置顶 排序时间
|
10 months ago |
|
chenhc
|
a7fe8da292
|
fix: 面包屑+tabs页组件
|
10 months ago |
|
wangwei
|
2862a53d2b
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
# src/views/basic/workplace/workplaceManage.vue
|
10 months ago |
|
wangwei
|
b56b0e37ac
|
8/26 工位组别修改
|
10 months ago |
|
yewj
|
8773163a35
|
界面配置一些微调
|
10 months ago |
|
wangwei
|
60c7fd5ad1
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
b27d09891f
|
8/25 界面优化
|
10 months ago |
|
chenhc
|
47c2c2b4c7
|
fix: 修改
|
10 months ago |
|
chenhc
|
7fee144c33
|
fix: 修改
|
10 months ago |
|
wangwei
|
b5a8326912
|
8/25 组别修改
|
10 months ago |
|
wangwei
|
13c6f20a1f
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
wangwei
|
beeab0ea8f
|
8/25 业务类型关联第三方单据
|
10 months ago |
|
chenhc
|
7b5549675c
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
yewj
|
6b415942a1
|
界面配置一些微调
|
10 months ago |
|
chenhc
|
8a35d2ee69
|
fix: 修改
|
10 months ago |
|
chenhc
|
9b01797ad7
|
fix: 修改
|
10 months ago |
|
yewj
|
8cdc58b3ae
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
10 months ago |
|
yewj
|
7e774badf3
|
界面配置一些微调
|
10 months ago |
|
chenhc
|
e7232c0d2f
|
fix: 统一分割加切横线
|
10 months ago |
|
yewj
|
a116abc56d
|
扫码问题
|
10 months ago |
|
yewj
|
2e38cfdc34
|
界面扫码的一些调整
|
11 months ago |
|
yewj
|
da62e9963f
|
代码备份
|
11 months ago |
|
yewj
|
e5bb9d4788
|
工位的界面相关修改
|
11 months ago |
|
yewj
|
6a7607c794
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
# src/views/collect/DealOrder.vue
|
11 months ago |
|
yewj
|
21b01ae12c
|
确认单据
|
11 months ago |
|
wangwei
|
1ab7a15fd1
|
8/23 是否拆零隐藏 业务类型增加单据流通方式
|
11 months ago |
|
chenhc
|
9aa7e01059
|
fix: 减一页面同步刷新
|
11 months ago |
|
chenhc
|
62dbf72e15
|
fix: 获取业务单据类型
|
11 months ago |
|
chenhc
|
844dceba9b
|
fix: 获取业务单据类型
|
11 months ago |
|
yewj
|
1926b45bea
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
yewj
|
8783e9ddfd
|
页面修改
|
11 months ago |
|
chenhc
|
c829947bb9
|
fix: 业务类型窗口名、上货页面获取工位
|
11 months ago |
|
wangwei
|
1785bc97d3
|
8/23 工位上货 实际数量隐藏
|
11 months ago |
|
wangwei
|
1f83cdf04a
|
8/23 信息提醒注释
|
11 months ago |
|
wangwei
|
4218e6b6ec
|
8/23 界面优化
|
11 months ago |
|
wangwei
|
24e37f84da
|
8/19 筛选工位优化
|
11 months ago |
|
wangwei
|
48e1445c1b
|
8/23 优化
|
11 months ago |
|
wangwei
|
b68e4b0d30
|
8/23 工位负责人优化
|
11 months ago |
|
wangwei
|
e4bd8dd8f9
|
8/23 优化
|
11 months ago |
|
chenhc
|
5febc6afd4
|
feat: 修改同步页面
|
11 months ago |
|
yewj
|
f919cf3177
|
扫码明细问题
|
11 months ago |
|
wangwei
|
fbf5f3b75e
|
8/22 页面优化
|
11 months ago |
|
yewj
|
83ea4171dc
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
yewj
|
b989cdc708
|
代码备份
|
11 months ago |
|
wangwei
|
bdd47dc070
|
8/22 工位优化
|
11 months ago |
|
chenhc
|
4d7d7f06a7
|
feat: 业务类型、分页12
|
11 months ago |
|
chenhc
|
2174f8c21f
|
feat: 处理单据切换界面下拉单据
|
11 months ago |
|
yewj
|
6baee8400f
|
代码备份
|
11 months ago |
|
yewj
|
e4f342e844
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
yewj
|
c8780b0f19
|
问题处理
|
11 months ago |
|
chenhc
|
fe150a67bb
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
chenhc
|
a042c46bb7
|
feat: 处理单据切换界面
|
11 months ago |
|
wangwei
|
91945f4e09
|
8/22 工位调整 第三方单据调整
|
11 months ago |
|
chenhc
|
b49c1e3c11
|
feat: 处理单据选择单据类型
|
11 months ago |
|
chenhc
|
d00421cd37
|
feat: 器械参数设置
|
11 months ago |
|
yewj
|
7a4e887948
|
代码格式化
|
11 months ago |
|
yewj
|
5924599d1e
|
掃碼問題處理
|
11 months ago |
|
wangwei
|
6be9e6002b
|
8/21 界面优化
|
11 months ago |
|
wangwei
|
24d0b25bf3
|
8/21 界面优化
|
11 months ago |
|
wangwei
|
1e9d7c4cf6
|
8/21 优化
|
11 months ago |
anthonywj
|
03db883f21
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
anthonywj
|
098bafb8eb
|
代码备份
|
11 months ago |
|
wangwei
|
0b421419ab
|
8/20 界面优化+用户绑定单据类型
|
11 months ago |
|
chenhc
|
43bf5cb409
|
feat: 修改
|
11 months ago |
|
chenhc
|
d8ba602a02
|
feat: 修改
|
11 months ago |
|
anthonywj
|
a2defe181b
|
界面备份
|
11 months ago |
|
chenhc
|
603d3a2cda
|
feat: 修改处理单据扫码减一
|
11 months ago |
|
anthonywj
|
b18629e574
|
扫码问题
|
11 months ago |
|
anthonywj
|
efaea39904
|
扫码详情
|
11 months ago |
|
anthonywj
|
f7ac2750ba
|
代码备份2222
|
11 months ago |
|
wangwei
|
048294806e
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
992797a4c3
|
8/19 界面优化
|
11 months ago |
|
chenhc
|
df978debe8
|
feat: 修改
|
11 months ago |
|
wangwei
|
b33fb24f32
|
8/19 界面优化
|
11 months ago |
|
wangwei
|
68d95678a3
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
# src/views/collect/PanelOrderDeal.vue
|
11 months ago |
|
wangwei
|
fd4cf12854
|
8/19 正在处理页面 点击处理跳转带入工位code
|
11 months ago |
|
anthonywj
|
455aaf2b9e
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
anthonywj
|
a989ea2a62
|
减一，删除方法
|
11 months ago |
|
wangwei
|
d2b4fe22ef
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
2a1fc45b72
|
8/19 选入单据过滤已完成的
|
11 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
|
11 months ago |
|
anthonywj
|
7ae5c17e35
|
界面优化
|
11 months ago |
|
chenhc
|
4dc436eaf1
|
feat: 修改
|
11 months ago |
|
wangwei
|
741917baf3
|
8/19 当前工位读取全部工位
|
11 months ago |
|
wangwei
|
b57570ef5d
|
8/19 现场作业展示全部工位
|
11 months ago |
|
wangwei
|
a4906a972e
|
8/19 工位库存预警数调整
|
11 months ago |
|
wangwei
|
80bb30e7d0
|
8/19 工位提醒是否插入
|
11 months ago |
|
chenhc
|
5bd73d9e6f
|
feat: 工位上货页面控制
|
11 months ago |
|
anthonywj
|
f82191cc55
|
界面优化
|
11 months ago |
|
anthonywj
|
91b973e372
|
界面优化
|
11 months ago |
|
anthonywj
|
048fd0a0fe
|
界面优化
|
11 months ago |
|
wangwei
|
aa8a7ddf22
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
664dcda581
|
8/17 模板打印
|
11 months ago |
|
anthonywj
|
8a2c150945
|
绑定工位，以及页面修改
|
11 months ago |
|
chenhc
|
b1738480bb
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
chenhc
|
43b6803df4
|
feat: 工位上货页面控制
|
11 months ago |
|
wangwei
|
37d4f0c8e8
|
绑定工位 取消多选
|
11 months ago |
|
anthonywj
|
f4971f044e
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
anthonywj
|
f33188e242
|
处方修改
|
11 months ago |
|
chenhc
|
7231cd8229
|
feat: 单据页面状态字段、是否拆零开启
|
11 months ago |
|
chenhc
|
5eaf46f45e
|
feat: 现场作业修改
|
11 months ago |
|
wangwei
|
89bacd4fc4
|
8/17 页面优化
|
11 months ago |
|
wangwei
|
76bd5b2f81
|
8/17 药品单据管理界面优化 去除规格型号
|
11 months ago |
|
anthonywj
|
6cb99e90b8
|
替换接口
|
11 months ago |
|
wangwei
|
7cc82ec060
|
8/16 工位界面优化
|
11 months ago |
|
anthonywj
|
54be1e8778
|
界面优化
|
11 months ago |
|
chenhc
|
d8b9851d91
|
feat: 页面修改
|
11 months ago |
|
wangwei
|
e2de060da8
|
用户搜索 部门
|
11 months ago |
|
wangwei
|
02a4efe8a2
|
调整 组别非必选
|
11 months ago |
|
wangwei
|
44664c615a
|
调整
|
11 months ago |
|
wangwei
|
54e0304357
|
优化 1.3
|
11 months ago |
|
wangwei
|
bd3bed2794
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
chenhc
|
6a19e6fa33
|
feat: 页面修改-业务类型、来源系统
|
11 months ago |
|
wangwei
|
3b72f1b607
|
1.2 增加往来单位类型
|
11 months ago |
|
chenhc
|
a9bbcfd46a
|
feat: 页面修改
|
11 months ago |
|
wangwei
|
68b805ef2c
|
优化 1.0
|
11 months ago |
|
wangwei
|
77ade51f3c
|
优化
|
11 months ago |
|
wangwei
|
059fcc6cd8
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
6c9cf27e42
|
8*16 工位
|
11 months ago |
|
anthonywj
|
ce6c7edd67
|
界面优化
|
11 months ago |
|
wangwei
|
4b0a4936a6
|
8/15 工位界面优化
|
11 months ago |
|
anthonywj
|
6bd0ca936d
|
界面优化
|
11 months ago |
|
chenhc
|
e03b76929d
|
feat: 页面修改
|
11 months ago |
|
chenhc
|
931f3cfdf7
|
feat: 优化右上角用户信息
|
11 months ago |
|
chenhc
|
e35352fe89
|
feat: 优化细节
|
11 months ago |
|
anthonywj
|
78d53333d9
|
界面优化
|
11 months ago |
|
chenhc
|
f657d09fd3
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
# Conflicts:
# src/views/collect/DealOrder.vue
|
11 months ago |
|
chenhc
|
7a02984a5a
|
feat: 跳转禁止工位选择
|
11 months ago |
|
wangwei
|
befef4a762
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
f026c5ed39
|
工位管理 1.0
|
11 months ago |
|
anthonywj
|
79c5246b53
|
界面优化
|
11 months ago |
|
anthonywj
|
1fbd67ef43
|
单据备份
|
11 months ago |
|
anthonywj
|
dec80e5657
|
单据备份
|
11 months ago |
|
wangwei
|
7732f12e95
|
工位分组调整
|
11 months ago |
|
wangwei
|
b8f0702a4a
|
工位优化
|
11 months ago |
|
wangwei
|
2ab3282abc
|
工位维护
|
11 months ago |
|
chenhc
|
3f6a01eac1
|
feat: 页面跳转
|
11 months ago |
|
wangwei
|
505084249d
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
07a15df433
|
8/14 工位管理
|
11 months ago |
|
anthonywj
|
1d1acf2686
|
单据备份
|
11 months ago |
|
chenhc
|
2aa9cffc7f
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck_z
# Conflicts:
# .env.production
# src/views/basic/product/productEdit.vue
# src/views/thirdSys/invOrder/thrInvOrder.vue
|
11 months ago |
|
chenhc
|
f528e377a8
|
feat: 首页复制
|
11 months ago |
|
chenhc
|
4618002fcd
|
feat: 首页复制
|
11 months ago |
|
chenhc
|
ccb622b77e
|
feat: 收费明细下载加上时分秒
|
11 months ago |
|
anthonywj
|
3c7934de18
|
业务单据管理
|
11 months ago |
|
chenhc
|
8d2c368426
|
feat: 库存预警
|
11 months ago |
|
anthonywj
|
3499764f8a
|
代码备份
|
11 months ago |
|
wangwei
|
668308d5a8
|
8/12 药品管理字段调整
|
11 months ago |
|
anthonywj
|
a690e9a4c2
|
上货管理
|
11 months ago |
|
anthonywj
|
b7d34809b9
|
处方赋码相关界面调整
|
11 months ago |
|
anthonywj
|
3be141f636
|
处方赋码相关修改
|
11 months ago |
|
wangwei
|
4582bed984
|
8/9 药品单据管理
|
11 months ago |
|
wangwei
|
70e2c0878a
|
8/02 供应商药品选入
|
11 months ago |
|
anthonywj
|
8df5afbcfd
|
药品出入库相关修改
|
11 months ago |
|
wangwei
|
8339b4f557
|
8/02 药品
|
11 months ago |
|
anthonywj
|
d061ea69c2
|
处方相关修改
|
11 months ago |
|
anthonywj
|
5c5fe6e6e3
|
处方分配
|
11 months ago |
|
anthonywj
|
6a09ddf530
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
f2fb9d768b
|
8/02 1.1 增加选入收费项目详情
|
11 months ago |
|
wangwei
|
627e4dd863
|
1.1
|
11 months ago |
|
wangwei
|
83a3738550
|
8/02 选入收费项目
|
11 months ago |
|
anthonywj
|
5470175486
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
chenhc
|
d9ff0c6370
|
feat: 处方下载
|
11 months ago |
|
anthonywj
|
cca9016ce4
|
切换分支备份
|
11 months ago |
|
anthonywj
|
bdd65f9696
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
anthonywj
|
bd9a549f05
|
拆零页面修改
|
11 months ago |
|
wangwei
|
083ba120fe
|
新增单据选入药品查看药品详情
|
11 months ago |
|
anthonywj
|
3cc2940116
|
拆零出库新增，退回，查询修改
|
11 months ago |
|
anthonywj
|
ded37366ae
|
新增处方下载，处方赋码等界面
|
11 months ago |
|
anthonywj
|
f12f5b877c
|
药品字典修改
|
11 months ago |
|
anthonywj
|
1546c7846a
|
药品字典修改
|
11 months ago |
|
anthonywj
|
e7ad1240e8
|
切换分支备份
|
11 months ago |
|
anthonywj
|
b0fd2f54c5
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
a77f994644
|
修改 7/31 字段
|
11 months ago |
|
anthonywj
|
6bdb0ee05d
|
切换分支备份
|
11 months ago |
|
anthonywj
|
1074be6e44
|
切换分支备份
|
11 months ago |
|
wangwei
|
dcad3a1795
|
修改 7/30 1.2
|
11 months ago |
|
anthonywj
|
21f3309ce5
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
c927636091
|
修改 7/30 1.0
|
11 months ago |
|
anthonywj
|
9800f0ef1d
|
切换分支备份
|
11 months ago |
|
anthonywj
|
3f0486c891
|
单据编辑删除条码
|
11 months ago |
|
anthonywj
|
6405797811
|
切换分支备份
|
11 months ago |
|
anthonywj
|
7817ecb760
|
药品单据管理界面配置修改
|
11 months ago |
|
anthonywj
|
95ecb5d38e
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
af5b637bc7
|
Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z
|
11 months ago |
|
wangwei
|
b6cfa3023a
|
7/29 1.1
|
11 months ago |
|
wangwei
|
ee1532a61c
|
7/29
|
11 months ago |
|
chenhc
|
ae0057f02a
|
feat: 药品出入库明细、汇总、入账库
|
11 months ago |
|
anthonywj
|
8473abb54c
|
切换分支备份
|
11 months ago |
|
anthonywj
|
faeca9c70a
|
切换分支备份
|
11 months ago |
|
anthonywj
|
508eba2a61
|
赋码明细修改
|
11 months ago |
|
wangwei
|
6a6ab65aae
|
1.1 7/27
|
11 months ago |
|
wangwei
|
ea5deddfd2
|
1.1
|
12 months ago |
|
anthonywj
|
22c9ba4dd1
|
收费项目相关修改
|
12 months ago |
|
chenhc
|
6861612025
|
feat: 0702-扫码校验功能
|
1 year ago |
|
wangwei
|
31e87e7c6a
|
7/2 系统管理
|
1 year ago |
|
wangwei
|
98e7a7b264
|
7/2 基础数据
|
1 year ago |
|
wangwei
|
48fe52f69f
|
7/1 仓库管理 设备管理 查询统计
|
1 year ago |
|
wangwei
|
d54de7a4a2
|
7/1 业务管理
|
1 year ago |
|
wangwei
|
128b6f43d7
|
7/1 单据管理 按钮 loading
|
1 year ago |
|
wangwei
|
c48b677488
|
5/14 --
|
1 year ago |
|
anthonywj
|
43690f72b9
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
anthonywj
|
74a103a40c
|
登录密码校验
|
1 year ago |
|
chenhc
|
3acb091dcc
|
feat: 0606修复重置
|
1 year ago |
|
wangwei
|
24ea0f3e54
|
6/4 优化查询发票确认时间
|
1 year ago |
|
wangwei
|
804239fc38
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
7320ff9035
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
464692e1d4
|
feat: 0531科室出库
|
1 year ago |
|
chenhc
|
835a00383f
|
feat: 修复打印
|
1 year ago |
|
chenhc
|
0bec051c9f
|
feat: 修复打印
|
1 year ago |
|
wangwei
|
9e04f823a5
|
5/28 同步计划
|
1 year ago |
|
anthonywj
|
dd64406dc3
|
新增耗材类别
|
1 year ago |
|
chenhc
|
047e21f940
|
feat: 0527开发论证功能
|
1 year ago |
|
chenhc
|
9756e10322
|
feat: 0523开发论证功能
|
1 year ago |
|
chenhc
|
cf320a66c1
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
3456cf88b5
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
474c6d9e89
|
feat: 0521 优化
|
1 year ago |
|
chenhc
|
cdf674f190
|
feat: 0521 优化
|
1 year ago |
|
chenhc
|
fc6c10fac0
|
feat: 0520 优化
|
1 year ago |
|
wangwei
|
21154d9d74
|
5/20 接口更改
|
1 year ago |
|
wangwei
|
a1f90adfe2
|
5/20 --更改接口
|
1 year ago |
|
wangwei
|
8939089d3e
|
5/14 --报修诊断 按钮
|
1 year ago |
|
wangwei
|
4bab29f2fa
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
3a4a2ae630
|
feat: 0517优化
|
1 year ago |
|
wangwei
|
e18aaf4220
|
5/17 保养计划 优化
|
1 year ago |
|
chenhc
|
82f3c53bea
|
feat: 0517优化
|
1 year ago |
|
chenhc
|
2987836967
|
feat: 0517优化
|
1 year ago |
|
chenhc
|
9e36fe67e4
|
feat: 0516优化
|
1 year ago |
|
chenhc
|
4249e1bdd6
|
feat: 设备管理优化-0515-设备卡片-子页面
|
1 year ago |
|
chenhc
|
f01464aa8b
|
feat: 设备管理优化-0515-设备卡片-开启部分子页面
|
1 year ago |
|
wangwei
|
5e52b074c7
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
4d708b6730
|
feat: 设备管理优化-0515-设备卡片-采购订单
|
1 year ago |
|
wangwei
|
b50f56f717
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
1082b0cdff
|
feat: 设备管理优化-0514-设备卡片
|
1 year ago |
|
wangwei
|
088e9aba7b
|
5/14 --保养计划
|
1 year ago |
|
chenhc
|
b9b77e1a1c
|
feat: 设备管理优化-0514-合同管理
|
1 year ago |
|
chenhc
|
2f55d9eb30
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
ca2f8ec806
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
9fdb69c5a2
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
|
chenhc
|
08472d5700
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
chenhc
|
b39d16f0dc
|
feat: 设备管理优化-0512-增加移除类型
|
1 year ago |
|
chenhc
|
d228e1d9e7
|
feat: 设备管理优化-0510-密码框修复
|
1 year ago |
|
chenhc
|
008df9574b
|
feat: 设备管理优化-0510
|
1 year ago |
|
chenhc
|
8a9940ae25
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
00ccec1ebf
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
2ca04c2165
|
feat: 优化
|
1 year ago |
|
chenhc
|
329a1a324e
|
feat: 提交
|
1 year ago |
|
chenhc
|
e673b2a932
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
9963ba9943
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
1 year ago |
|
anthonywj
|
5d7a4cfc23
|
设备巡检任务处理
|
1 year ago |
|
anthonywj
|
5fc6e1cb3d
|
巡检计划相关修改
|
1 year ago |
|
chenhc
|
24abcee7e9
|
feat: 设备入库、变更、报废
|
1 year ago |
|
chenhc
|
531a873e99
|
feat: 设备信息增加字段
|
1 year ago |
|
chenhc
|
38332f992f
|
feat: 设备变更、设备入库
|
1 year ago |
|
chenhc
|
1bacd26f51
|
feat: 提交
|
1 year ago |
|
anthonywj
|
fff23823d7
|
发票打印问题
|
1 year ago |
|
anthonywj
|
1af061d244
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
anthonywj
|
6476d6396f
|
申购仓库修改
|
1 year ago |
|
chenhc
|
6a651fb516
|
feat: 注释掉术式按钮
|
1 year ago |
|
anthonywj
|
eaf4b616ab
|
登录密码验证
|
1 year ago |
|
chenhc
|
51bd03f4a7
|
feat: 术式和登录页修改
|
1 year ago |
|
chenhc
|
4bb9e864d6
|
feat: 术士套包嵌入单据页面
|
1 year ago |
|
chenhc
|
18354266cf
|
feat: 术士套包、定数包功能开发优化
|
1 year ago |
|
chenhc
|
70e98093c5
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
chenhc
|
9cbb373439
|
feat: 术士套包、定数包功能开发
|
1 year ago |
|
anthonywj
|
f8c3f714b8
|
科室出库修改
|
1 year ago |
|
anthonywj
|
7c1485060c
|
科室出库修改
|
1 year ago |
|
chenhc
|
e892b1794e
|
feat: 新增业务单据加上单据类型过滤物资录入
|
1 year ago |
|
chenhc
|
e2bf6de0b1
|
feat: 产品增加采购类型校验
|
1 year ago |
|
chenhc
|
80e01b2516
|
feat: 定数包项目
|
1 year ago |
|
chenhc
|
461beff613
|
feat: 定数包项目
|
1 year ago |
|
chenhc
|
3852bd3a6a
|
feat: 医保分类树优化
|
1 year ago |
|
chenhc
|
9eb4e5f092
|
feat: 打印功能增加字段
|
1 year ago |
|
chenhc
|
896d398d50
|
feat: 第三方明细下载增加字段
|
1 year ago |
|
chenhc
|
2c0b597385
|
feat: 科室医保分类功能
|
1 year ago |
|
chenhc
|
280aeea409
|
feat: 科室医保分类功能
|
1 year ago |
|
chenhc
|
752f8c5eb0
|
feat: 科室出库-优化--扫码页面未完善
|
1 year ago |
|
chenhc
|
74761827a5
|
feat: 科室出库
|
1 year ago |
|
anthonywj
|
e19e52d3fd
|
库存盘点功能修改
|
1 year ago |
|
chenhc
|
29e487fc68
|
feat: 优化
|
1 year ago |
|
chenhc
|
7ebdbd097c
|
feat: 优化
|
1 year ago |
|
chenhc
|
7634e21828
|
Merge remote-tracking branch 'origin/dev_20240306' into dev_ksck
|
1 year ago |
|
anthonywj
|
b7823c7246
|
库存盘点功能修改
|
1 year ago |
|
chenhc
|
d9575e989e
|
feat: 第三方单据增加toBillNo字段展示
|
1 year ago |
|
chenhc
|
a187bcb9c0
|
feat: 增加页面的医保耗材信息调用功能
|
1 year ago |
|
chenhc
|
3da3083c5c
|
feat: 设备管理-设备登记-动态加载子组件
|
1 year ago |
|
chenhc
|
2f5aea5ecc
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
a27627b5bc
|
feat: 设备管理-卡片开发
|
1 year ago |
|
anthonywj
|
1ad28adf4a
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
anthonywj
|
f6742a38cd
|
出入库明细单据生成优化
|
1 year ago |
|
chenhc
|
95dc6614c2
|
feat: 设备管理开发
|
1 year ago |
|
chenhc
|
b04eab404b
|
feat: 审核开关-业务页面修改
|
1 year ago |
|
chenhc
|
e72c3871f0
|
feat: 审核开关
|
1 year ago |
|
anthonywj
|
b81dde75c8
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
anthonywj
|
61a4363b9b
|
平潭出库明细调整
|
1 year ago |
|
chenhc
|
fa33dc0f57
|
feat: 审核流程配置功能
|
1 year ago |
|
chenhc
|
d37972bc83
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
81294d4104
|
feat: 审核流程配置功能
|
1 year ago |
|
anthonywj
|
09ba95c75c
|
领用选择库存产品问题
|
1 year ago |
|
anthonywj
|
0532a3a0e3
|
第三方出库明细修改
|
1 year ago |
|
anthonywj
|
09d7bf67bc
|
界面配置相关bug修改
|
1 year ago |
|
anthonywj
|
37ba046b02
|
新增耗材分类
|
1 year ago |
|
anthonywj
|
52037a478e
|
出入库明细修改，批次号先进先出
|
1 year ago |
|
anthonywj
|
64e2b9214b
|
库存明细手动下载
|
1 year ago |
|
chenhc
|
c79dbcda45
|
feat: 代码保存
|
1 year ago |
|
anthonywj
|
1bdbc9beb5
|
项目组套新增供应商ID
|
1 year ago |
|
anthonywj
|
275449e3b1
|
登录界面配置
|
1 year ago |
|
anthonywj
|
02c424aaab
|
Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck
|
1 year ago |
|
chenhc
|
060f7ea48f
|
feat: 三方出入库明细功能
|
1 year ago |
|
anthonywj
|
ce7acde9b8
|
选择库存产品仓库问题
|
1 year ago |
|
anthonywj
|
0d1b7f81b4
|
选择库存产品仓库问题
|
1 year ago |
|
chenhc
|
4838ccad06
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
8707d9fa03
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
fb0f39c860
|
feat: 三方出入库明细功能
|
1 year ago |
|
chenhc
|
8468687d27
|
feat: 保存代码
|
1 year ago |
|
chenhc
|
69d896c406
|
Merge branch '20231126-yw' into dev_ksck
|
1 year ago |
|
chenhc
|
aaa806200d
|
feat: 代码保存
|
1 year ago |
|
anthonywj
|
1056d3e1c6
|
选择库存产品，
|
1 year ago |
|
anthonywj
|
5a9cda84a3
|
Merge branch '20231126-yw' into dev_ksck
|
1 year ago |
|
chenhc
|
066630cf5d
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
chenhc
|
2318737957
|
feat: 项目组套和三方出入库明细
|
1 year ago |
|
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 |
|
anthonywj
|
05ad40a7d8
|
界面配置引起的单据删除，编辑等问题
|
1 year ago |
|
anthonywj
|
a223cc521d
|
备份
|
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 |
|
yuanwei
|
39af4919d6
|
查询提交
|
1 year ago |
|
anthonywj
|
4d1eb8e33f
|
新增生产企业字典维护
|
1 year ago |
|
anthonywj
|
346d257e66
|
新增第三方生产企业
|
1 year ago |
|
anthonywj
|
606658afe3
|
单据详情 页面展示问题
|
1 year ago |
|
anthonywj
|
b0b9786274
|
1：东山nginx转发问题(头部参数修改);
2：再次领用；再次申购问题；
|
1 year ago |
|
anthonywj
|
266cf0c93c
|
再次申购
|
1 year ago |
