yewj
|
95ea5308f5
|
禁用层级标识
|
9 months ago |
chenhc
|
e26390563e
|
feat: 修复
|
9 months ago |
zane
|
edaaac3c81
|
统一保存
|
9 months ago |
|
chenhc
|
4da4427ccf
|
feat: 修复密码框小眼睛问题
|
9 months ago |
wangwei
|
1226166167
|
9/24 现场管理bug优化
|
9 months ago |
|
chenhc
|
73f1f923de
|
feat: 修复
|
9 months ago |
|
chenhc
|
b39ac219ac
|
feat: 修复
|
9 months ago |
|
chenhc
|
01c4c0b7a5
|
feat: 修复
|
9 months ago |
|
yewj
|
c4ed68cc80
|
单据查询post
|
10 months ago |
|
wangwei
|
b0cbd964fd
|
9/23 1.0.1
|
10 months ago |
|
wangwei
|
1625a19d76
|
9/23 优化异常单据分页
|
10 months ago |
|
wangwei
|
5d2c0ac8e6
|
9/23 界面优化1.0
|
10 months ago |
|
yewj
|
9b104639e5
|
代码备份
|
10 months ago |
|
yewj
|
7f8f6b2876
|
工位上货问题
|
10 months ago |
|
wangwei
|
2c068773f7
|
9/21 扫码明细翻页
|
10 months ago |
|
wangwei
|
8a270d462f
|
9/21 优化扫码明细翻页1.0
|
10 months ago |
|
yewj
|
a8cd04d519
|
待处理单据查询问题
|
10 months ago |
|
yewj
|
f2e8f300df
|
代码备份
|
10 months ago |
|
yewj
|
bbaa752e2b
|
处理单据
|
10 months ago |
|
wangwei
|
fb0d5b8972
|
9/20 优化定时查询
|
10 months ago |
|
wangwei
|
bbe2c526a5
|
9/20 优化1.0
|
10 months ago |
|
chenhc
|
d264bbbda7
|
feat: 修复
|
10 months ago |
|
chenhc
|
a64865dcc1
|
feat: 修复
|
10 months ago |
|
chenhc
|
f4bbc65cd0
|
feat: 修复
|
10 months ago |
|
chenhc
|
87999a623d
|
feat: 定向查询
|
10 months ago |
|
wangwei
|
2150dc4b63
|
9/20 优化1.0
|
10 months ago |
|
chenhc
|
60d4d1b6ae
|
feat: 工位上货选已完成单
|
10 months ago |
|
wangwei
|
a351c17cb7
|
Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter
|
10 months ago |
|
wangwei
|
467b534718
|
9/19 追溯码查询1.0
|
10 months ago |
|
yewj
|
a89c74d555
|
处理单据
|
10 months ago |
|
yewj
|
de663da475
|
单据自动完成
|
10 months ago |
|
wangwei
|
27da46bccc
|
9/18 现场管理优化
|
10 months ago |
|
chenhc
|
08f52aa413
|
feat: 下载单据
|
10 months ago |
|
wangwei
|
9061cff13d
|
9/18 现场管理基础数据页面优化
|
10 months ago |
|
wangwei
|
5646e914b2
|
9/18 药品选入优化
|
10 months ago |
|
wangwei
|
17cc768cc0
|
9/18 现场管理工位上下货...搜索优化
|
10 months ago |
|
chenhc
|
7c37a6d49b
|
feat: 下载单据
|
10 months ago |
|
chenhc
|
f595b61e84
|
feat: 下载单据
|
10 months ago |
|
wangwei
|
31d28ace80
|
9/18 优化药品信息
|
10 months ago |
|
chenhc
|
5631131b68
|
feat: 定时设置结合业务
|
10 months ago |
|
wangwei
|
f39038f960
|
9/18 字段查询优化
|
10 months ago |
|
wangwei
|
10fad9c0c6
|
9/17 界面优化1.0
|
10 months ago |
|
yewj
|
e985790e86
|
单据配置相关修改
|
10 months ago |
|
yewj
|
b30a92b8c2
|
添加回车搜索
|
10 months ago |
|
yewj
|
dce1da43cf
|
回车键刷新问题
|
10 months ago |
|
yewj
|
4061a36d18
|
打包部署无法使用问题
|
10 months ago |
|
yewj
|
374db5a966
|
替换logo
|
10 months ago |
|
yewj
|
ea9fc277e8
|
处理单据
|
10 months ago |
|
yewj
|
824f919f39
|
工位上货多行条码输入
|
10 months ago |
|
yewj
|
e66329b550
|
处理单据多行条码输入
|
10 months ago |
|
yewj
|
79eafbaa6f
|
高级查询修改
|
10 months ago |
|
yewj
|
e719a333c3
|
高级搜索修改
|
10 months ago |
|
yewj
|
c64f066a1c
|
高级搜索修改
|
10 months ago |
|
wangwei
|
a812a77b9e
|
9/14 判断当前工位是否已经处理单据
|
10 months ago |
|
chenhc
|
bf91594971
|
fix: 扫码明细去复选框
|
10 months ago |
|
yewj
|
baac26c586
|
界面修改
|
10 months ago |
|
chenhc
|
2857963e63
|
fix: 修复原始单据
|
10 months ago |
|
yewj
|
3de399ea37
|
多码处理
|
10 months ago |
|
zane
|
464b40687f
|
新增关键字搜索
|
10 months ago |
|
zane
|
877129f335
|
优化
|
10 months ago |
|
wangwei
|
786d678ac3
|
9/14 业务类型增加收货方送货方
|
10 months ago |
|
chenhc
|
9f0202f6bf
|
fix: 修复原始单据
|
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 |
|
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 |
