zhoulei
|
d4dd918141
|
update:二级页面头部优化
|
3 years ago |
guoshuang
|
b3eb52808e
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
b01927802a
|
页面跳转问题修改
|
3 years ago |
|
guoshuang
|
96490ac270
|
版本更新修改
|
3 years ago |
|
guoshuang
|
11491dd5b6
|
领用，报废扫描修改
|
3 years ago |
hou
|
4c05fba940
|
拣配推荐库位 发货退扫功能
|
3 years ago |
|
hou
|
d44f36fd2f
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
a4c5836047
|
DN发货修复
|
3 years ago |
|
guoshuang
|
e2cdc2bf2d
|
重影，库位初始化小问题修改
|
3 years ago |
|
guoshuang
|
d9dcae7729
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
603d1115b5
|
报废，领用关单处理
|
3 years ago |
|
hou
|
93ef44b9a0
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
06205fae00
|
退扫，发货等
|
3 years ago |
|
guoshuang
|
3513666d15
|
拉取库位时传参sendspot问题的修改
|
3 years ago |
|
guoshuang
|
90dea09faa
|
退料国际化修改
|
3 years ago |
|
guoshuang
|
048334b49e
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
78c01c72d7
|
虚拟单交接修改
|
3 years ago |
|
hou
|
9b2be493b8
|
补料
|
3 years ago |
|
hou
|
cefa62b325
|
拣配优化 退料优化
|
3 years ago |
|
hou
|
68e809db99
|
退料修改
|
3 years ago |
|
hou
|
8e719271dd
|
收货优化
|
3 years ago |
|
hou
|
1bb8a1a7f3
|
dn收货 优化
|
3 years ago |
|
hou
|
4017a218db
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
394da1ab36
|
退料数据问题
|
3 years ago |
|
guoshuang
|
fda17f52ae
|
汇总按单按钮国际化修改
|
3 years ago |
|
guoshuang
|
bf097b38c3
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
f6ac94d69e
|
成品报废页面去除展示目标库位
|
3 years ago |
|
hou
|
eefeb6494d
|
成品移库 初始化带出目标库位
|
3 years ago |
|
hou
|
1b12cf2b89
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
b62c7449cf
|
移库
|
3 years ago |
|
guoshuang
|
3fd3fafec5
|
PO退货样式修改
|
3 years ago |
|
guoshuang
|
137da309c3
|
成品下线入库初始化库位问题修改
|
3 years ago |
|
guoshuang
|
cbad6da001
|
虚拟单交接表格数据处理
|
3 years ago |
|
guoshuang
|
4e2bb8a7f4
|
委外出入库明细页面返回上一页跳转问题修复
|
3 years ago |
|
guoshuang
|
ccd63e1970
|
成品入库，移库库位初始化赋值第一条
|
3 years ago |
|
guoshuang
|
43d49494d5
|
成品DN出库修改
|
3 years ago |
|
guoshuang
|
ba93fe0939
|
原材料交接复选框
|
3 years ago |
|
hou
|
22c6bcf2e1
|
no message
|
3 years ago |
|
hou
|
fa88b28d0f
|
小问题修复
|
3 years ago |
|
hou
|
fc61f6ecea
|
原材料（成品）移库 报废 领用 提交后重新调接口
|
3 years ago |
|
hou
|
5bfaf3a96b
|
成品下线 重新校验条码20位
|
3 years ago |
|
hou
|
e8b1639976
|
委外代码混乱问题 显示阴影问题
|
3 years ago |
|
hou
|
a3ba3a3c2b
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
f2e96861e4
|
小问题修复
|
3 years ago |
|
guoshuang
|
6c91fe3b23
|
修改国际化
|
3 years ago |
|
guoshuang
|
2dc328837f
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
e5ee435eeb
|
po退货样式调整
|
3 years ago |
yujw
|
c024de9c26
|
优化
|
3 years ago |
|
hou
|
071f14e64f
|
委外出库 新增关闭订单功能 && 细节调整
|
3 years ago |
|
hou
|
895e6524a5
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
aba39bab83
|
退货页面重构 其他问题修复
|
3 years ago |
|
guoshuang
|
f5f8fe6d95
|
错误信息提示长存
|
3 years ago |
|
guoshuang
|
e883821d89
|
样式调整 jPicker提示国际化
|
3 years ago |
|
hou
|
f6f0688b05
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
cd993b1ec6
|
显示字段修改
|
3 years ago |
|
guoshuang
|
2bd4e5d33d
|
样式 语言包调整
|
3 years ago |
|
guoshuang
|
ce8e17bc95
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
ce59298840
|
样式调整
|
3 years ago |
|
hou
|
d206ffb09a
|
报废
|
3 years ago |
|
hou
|
b4d977da5c
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
5d35b968d7
|
成品报废逻辑调整
|
3 years ago |
|
guoshuang
|
75994a6fde
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
73bed6f7e9
|
成品下线选择库位后输入框聚焦
|
3 years ago |
|
hou
|
37cc22e76f
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
0522101c07
|
补料页面重构
|
3 years ago |
|
guoshuang
|
620ee65dc2
|
样式调整
|
3 years ago |
|
guoshuang
|
7884e6d9a0
|
委外出入库单号去除输入空格
|
3 years ago |
|
hou
|
1d2666563f
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
ad51d995bd
|
委外出库逻辑重构
|
3 years ago |
|
guoshuang
|
86d28e8876
|
样式修改
|
3 years ago |
|
guoshuang
|
20dda9ef55
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
c5e5dc4fc7
|
去除单号前空格
|
3 years ago |
zhoulei
|
69652d36ed
|
feat:封装对象trim通用方法
|
3 years ago |
|
hou
|
0fef691249
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
hou
|
61622fa309
|
样式调整
|
3 years ago |
|
guoshuang
|
bf9e0543a8
|
原材料提示长存提示框
|
3 years ago |
|
guoshuang
|
770eb0a85a
|
原材料提示长存提示框
|
3 years ago |
|
hou
|
81e668033f
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
# Conflicts:
# src/pages/product/inbound/finishProductOffline/index.vue
# src/pages/raw/handover/feeding/Location.vue
# src/pages/raw/handover/returning/index.vue
# src/pages/raw/ingoods/dnReceipt/ImportDN.vue
|
3 years ago |
|
hou
|
23e62928de
|
原材料补料
|
3 years ago |
|
hou
|
74795d1157
|
调整页面
|
3 years ago |
|
hou
|
17e49d7901
|
原材料收货
|
3 years ago |
|
hou
|
15d764bd32
|
小问题修复
|
3 years ago |
|
guoshuang
|
16379be177
|
成品提示信息长存提示框
|
3 years ago |
|
guoshuang
|
a8e3c61057
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
99423b08b2
|
优化英文
|
3 years ago |
|
zhoulei
|
8bb9abbeae
|
feat:全局注入plus,customToast
|
3 years ago |
|
guoshuang
|
9cbb2fd062
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
f912a94094
|
默认工厂号
|
3 years ago |
|
zhoulei
|
ab4b72161c
|
feat:统一开发环境配置项
|
3 years ago |
|
zhoulei
|
ed0c35415c
|
update:自定义弹窗mixin\ts声明
|
3 years ago |
|
guoshuang
|
68c857a073
|
合并冲突
|
3 years ago |
|
guoshuang
|
ed7abdb01e
|
合并冲突
|
3 years ago |
|
guoshuang
|
98fec879d5
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
5c0a89e7eb
|
数据表对其，读写底色区分
|
3 years ago |
|
zhoulei
|
e06fba9800
|
feat:弹窗自定义、输入过滤的临时方案示例；
|
3 years ago |
|
hou
|
2a3d62282e
|
dn收货
|
3 years ago |
|
hou
|
245525ee79
|
修改dn收货
|
3 years ago |
|
guoshuang
|
bd8fa1da88
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
d44f9a90be
|
版本自动更新，数量输入限制
|
3 years ago |
|
hou
|
bc6b90259b
|
更新
|
3 years ago |
|
hou
|
e788d96728
|
dn收货 逻辑修改
|
3 years ago |
|
guoshuang
|
07ec266d02
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
3 years ago |
|
guoshuang
|
6a433eb27d
|
版本自动更新
|
3 years ago |
|
hou
|
aa8c01c51b
|
SAP库位相关
|
3 years ago |
|
hou
|
4899040ab3
|
委外细节
|
4 years ago |
|
hou
|
da81d15c42
|
成品报废 领用 增加 已扫数量展示 && 原材料 报废 领用 可以修改数量 && 其他优化
|
4 years ago |
|
hou
|
a6f447835a
|
DN发货 委外出库
|
4 years ago |
|
hou
|
345268e288
|
成品入库 多选删除问题 其他问题
|
4 years ago |
|
hou
|
77fa0b0730
|
小bug
|
4 years ago |
|
hou
|
4487479a25
|
原材料领用界面重构 && 原材料报废界面重构
|
4 years ago |
|
hou
|
88fd0d77b3
|
新增 -- 成品出库 -- 退扫功能
|
4 years ago |
|
hou
|
c21b64da1c
|
新增 退扫功能
|
4 years ago |
|
guoshuang
|
835292800c
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
guoshuang
|
b6e9078d1b
|
成品报废，领用借用明细
|
4 years ago |
|
hou
|
c7371eeb3c
|
新增 库位盘点页面 修复其他小bug
|
4 years ago |
|
hou
|
20cf59700b
|
修复 盘点小bug
|
4 years ago |
|
guoshuang
|
449d5ed8b4
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
guoshuang
|
9babd49ac1
|
成品出库
|
4 years ago |
|
hou
|
c680596f71
|
新增物料盘点 修复其他小问题
|
4 years ago |
|
hou
|
abbdf211a3
|
重构 领用借用
|
4 years ago |
|
guoshuang
|
f0156e651e
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
guoshuang
|
d463b938de
|
交接调整
|
4 years ago |
|
hou
|
99e916d3b2
|
交接小问题 重构成品报废
|
4 years ago |
|
hou
|
1c66c2140e
|
优化 交接
|
4 years ago |
|
guoshuang
|
65de0c415f
|
交接修复
|
4 years ago |
|
guoshuang
|
ab259a7a14
|
委外出库优化 原材料交接表格展示修改
|
4 years ago |
|
hou
|
7e20f0017d
|
交接（汇总交接&&按单交接）优化
|
4 years ago |
|
hou
|
1afca0deeb
|
拣配（汇总&&交接）代码优化 问题修复
|
4 years ago |
|
guoshuang
|
02e6c0b3cb
|
成品入库 库位展示WMS库位与SAP库位组合
|
4 years ago |
|
hou
|
c9c10dc220
|
成品移库优化 查询明细优化
|
4 years ago |
|
hou
|
76d8b727eb
|
原材料移库页面重构 成品移库页面逻辑重构 其他
|
4 years ago |
|
hou
|
f2e930064c
|
多语言修复 成品出库逻辑修改
|
4 years ago |
|
hou
|
2930741818
|
虚拟库优化 拣配&交接优化
|
4 years ago |
|
hou
|
95bdcdd6e6
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
hou
|
099b2c059e
|
收货
|
4 years ago |
|
zhoulei
|
ae57268d76
|
fix:DN收货自动化带入
|
4 years ago |
|
zhoulei
|
6b0d6f2a95
|
fix:Haier163库位校验
|
4 years ago |
|
zhoulei
|
152dbaa65b
|
fix:筛选对应物料号的仓库列表
|
4 years ago |
|
hou
|
ac069c80cc
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
hou
|
0c005a94b9
|
交接 问题修复
|
4 years ago |
|
guoshuang
|
77e29570b2
|
修改 库位确定
|
4 years ago |
|
guoshuang
|
b73e4bf7c2
|
交接 表格字段展示调整
|
4 years ago |
|
guoshuang
|
5a1850da5c
|
合并代码rabase
|
4 years ago |
|
guoshuang
|
373dcb7d91
|
拣配 校验是否勾选订单
|
4 years ago |
|
yujw
|
88a41d436b
|
库位查询优化、提示英文
|
4 years ago |
|
guoshuang
|
e3712fa74b
|
退料 将筛选的数据信息赋值到退料页面
|
4 years ago |
|
guoshuang
|
ecbcbd38eb
|
DN收货 库位数据为物料SAP相同的所有库位
|
4 years ago |
|
guoshuang
|
832a378608
|
退料库存地点为选择的库位对应SAP
|
4 years ago |
|
guoshuang
|
7620947a98
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
guoshuang
|
60b971fd56
|
修改 拣配 一个物料不能出库相同wms库位
|
4 years ago |
|
yujw
|
483d954af4
|
交接
|
4 years ago |
|
hou
|
04678636b6
|
修复 退料 物料选择问题
|
4 years ago |
|
guoshuang
|
91a2e9ea75
|
修改 退料 筛选页面表格
|
4 years ago |
|
guoshuang
|
6ee6b15841
|
修改 拣配多页面返回问题 页面不默认显示工厂号
|
4 years ago |
|
guoshuang
|
3e6c161670
|
修改 国际化英文
|
4 years ago |
|
zhoulei
|
51304553a5
|
fix:成品盘点时扫描单号，总数累计不准确；逻辑代码优化；
|
4 years ago |
|
zhoulei
|
4c929c23b6
|
fix:修复冲突
|
4 years ago |
|
zhoulei
|
c6caf595b7
|
merge:拉取线上合并代码
|
4 years ago |
|
zhoulei
|
968ce59ea5
|
merge:拉取线上合并代码
|
4 years ago |
|
zhoulei
|
36140e4b56
|
fix:返回物料中poNo为选中的项
|
4 years ago |
|
guoshuang
|
a6f4e24496
|
修改 DN收货相关
|
4 years ago |
|
zhoulei
|
48a10261d7
|
fix:组件jPicker导致下拉缓存的bug
|
4 years ago |
|
zhoulei
|
6c87d3c3aa
|
fix:删除冗余代码
|
4 years ago |
|
zhoulei
|
31b98f80ba
|
fix:优化库位获取逻辑、优化提交后表单重置逻辑；
|
4 years ago |
|
zhoulei
|
60af1f19fd
|
fix:提交验证过滤器
|
4 years ago |
|
zhoulei
|
f02a18a741
|
优化代码
|
4 years ago |
|
zhoulei
|
27c00ecf13
|
fix:DN修复提交时携带的参数
|
4 years ago |
|
zhoulei
|
3ca4594c0d
|
fix:所有下拉选择页面可参考的页面实现;修复原材料dn收货单点下拉问题;
优化重写页面业务逻辑
修复详细页面跳转多级问题(其它页面可参考)
|
4 years ago |
|
zhoulei
|
d6309c5d8f
|
feat dn收货 信息回传修改；
|
4 years ago |
|
zhoulei
|
64a2f1bf24
|
DN单号去除逻辑重写
|
4 years ago |
|
guoshuang
|
9886807e5b
|
Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app
|
4 years ago |
|
guoshuang
|
903bbd680c
|
dn收货部分提交
|
4 years ago |
|
hou
|
08e8cae713
|
版本检查
|
4 years ago |
|
zhoulei
|
264ca4b88c
|
配置项提交
|
4 years ago |
|
zhoulei
|
47e9e411f9
|
解决eslint和prettier conflect
|
4 years ago |
|
zhoulei
|
7930a8beea
|
修正页面错误,完善ts elint
|
4 years ago |
|
zhoulei
|
93652ce231
|
zl feat prettier代码格式化检查测试
|
4 years ago |
|
hou
|
52e8d90221
|
新增 退货
修复 工作区问题
|
4 years ago |
|
hou
|
b573cd8198
|
新增 退货
|
4 years ago |
|
hou
|
a0ea126856
|
修复 委外接口
|
4 years ago |
|
hou
|
02e1a3cb5f
|
修复 明细界面问题
|
4 years ago |
|
hou
|
d709971c6f
|
修改 明细
|
4 years ago |
|
hou
|
87699282a3
|
完善 多语言
|
4 years ago |
|
hou
|
a6e7c0a270
|
修改 明细请求接口
|
4 years ago |
|
hou
|
3228ef1085
|
修复 多次显示重复库位
|
4 years ago |
|
hou
|
0ce807b0c8
|
修改 请求url
|
4 years ago |
|
hou
|
ee1ccd300b
|
新增 DN发货
|
4 years ago |
|
hou
|
b84e0438b7
|
新增 明细页面
|
4 years ago |
|
hou
|
d9a2d9268f
|
no message
|
4 years ago |
|
hou
|
d1cd6ea91a
|
新增 补料 退料 委外
|
4 years ago |
|
hou
|
b10c8adea7
|
完善 补料 退料 委外
|
4 years ago |
|
zhoulei
|
74ef32f2cb
|
noconfilct
|
4 years ago |
|
hou
|
373e650ac3
|
退料 新增库位
|
4 years ago |
|
hou
|
618ef8bc39
|
收货 拣配页面优化；交接问题修复
|
4 years ago |
|
zhoulei
|
2e9e10ce0e
|
收、入库页面接口绑定
|
4 years ago |
|
zhoulei
|
1779a0faf8
|
单号查询
|
4 years ago |
|
zhoulei
|
48fa2c1f59
|
委外出库查询及库位
|
4 years ago |
|
zhoulei
|
908d8a2f17
|
盘点功能提交
|
4 years ago |
|
hou
|
5d2f2ef4f4
|
新增 海外DN收货界面
|
4 years ago |
|
hou
|
1a9a1d04b3
|
Squashed commit of the following:
commit 57fbc39721
Author: zhoulei <zhoulei@kehaida.com>
Date: Fri Nov 12 17:03:18 2021 +0800
修正语法问题部分
commit 3c4d1b09e3
Author: zhoulei <zhoulei@kehaida.com>
Date: Thu Nov 11 15:23:29 2021 +0800
委外入库和出库页面
commit bf3401be34
Author: zhoulei <zhoulei@kehaida.com>
Date: Wed Nov 10 11:22:31 2021 +0800
原材料盘点页面和多语言
# Conflicts:
# src/pages.json
# src/pages/raw/ingoods/index.vue
|
4 years ago |
|
hou
|
f1bf749747
|
收货 退货 拣配界面调整
|
4 years ago |
|
zhoulei
|
57fbc39721
|
修正语法问题部分
|
4 years ago |
|
zhoulei
|
3c4d1b09e3
|
委外入库和出库页面
|
4 years ago |
|
zhoulei
|
bf3401be34
|
原材料盘点页面和多语言
|
4 years ago |
|
zhoulei
|
8a0e0952fa
|
数据不显示临时解决方案
|
4 years ago |
|
hou
|
93c1e665aa
|
修改 结构
|
4 years ago |