shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2025-01-06 07:22:06 +08:00
Code Issues Projects Releases Packages Wiki Activity
651 commits 6 branches 0 tags 77 MiB
Commit graph

651 commits

This branch
This branch
All branches
Author SHA1 Message Date
beyond
e9a890acf1 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 18:40:47 +08:00
beyond
ec4dbf3d08 beyond 1.7.3 2020-01-07 18:40:38 +08:00
shawn
846a68a6c1 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 18:40:14 +08:00
shawn
880c30563e 1月7号合并代码（下午6点半） 
1月7号合并代码（下午6点半）
 2020-01-07 18:39:54 +08:00
beyond
e37c2d08ed 1.7beyond 2 2020-01-07 18:35:19 +08:00
beyond
c49775e90f Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 10:00:10 +08:00
beyond
abde2d0dd9 beyond1.7 2020-01-07 10:00:02 +08:00
shawn
6cbfe50d00 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-07 09:59:14 +08:00
shawn
4a66283972 修改物品分类1月7号 
修改物品分类1月7号
 2020-01-07 09:58:53 +08:00
tczjx58520
87e452f10e Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-06 18:44:01 +08:00
tczjx58520
002bf53214 commit 
1.6
 2020-01-06 18:43:44 +08:00
shawn
552f364091 更新换货单问题 
更新换货单问题
 2020-01-06 10:19:47 +08:00
shawn
b645656c14 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-06 09:20:35 +08:00
shawn
50d5fa4841 报表提交1月6号 
报表提交1月6号
 2020-01-06 09:20:26 +08:00
beyond
42c2d38fa1 beyond 1.5.2 2020-01-05 18:20:12 +08:00
beyond
1cc8f4b795 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-05 11:45:55 +08:00
shawn
b72f3744e9 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-05 11:45:54 +08:00
shawn
f93e1fbaec 修改价格1月5号 
修改价格1月5号
 2020-01-05 11:45:46 +08:00
beyond
da31bfc5d5 beyond 1.5 2020-01-05 11:45:36 +08:00
beyond
f6838f47e4 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-04 14:46:27 +08:00
beyond
60b63bcc3a beyond 1.4.2 2020-01-04 14:46:08 +08:00
shawn
c5203538ae 修改调拨问题 
修改调拨问题
 2020-01-04 14:45:05 +08:00
beyond
746c6dfa8e Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-04 09:53:29 +08:00
shawn
d170cbed74 修改凭证1月4号 
修改凭证1月4号
 2020-01-04 09:53:29 +08:00
beyond
db0bec6c44 beyond 1.4 2020-01-04 09:52:44 +08:00
beyond
4dfab1bf88 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-03 18:33:35 +08:00
beyond
2c5e4d9fca beyond 1.3 2020-01-03 18:33:23 +08:00
shawn
0e1e85c975 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-03 18:33:23 +08:00
shawn
e117fb4239 1月3号 
1月3号
 2020-01-03 18:33:04 +08:00
tczjx58520
32ded157cd 1.3 
修改bug若干
 2020-01-03 18:08:50 +08:00
tczjx58520
415ae60ae5 1.3 
新建审批流程默认选中
 2020-01-03 11:30:57 +08:00
tczjx58520
95aabf2f5e 1.3 
修改错吴
 2020-01-03 11:05:50 +08:00
beyond
82df510cf4 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-03 10:51:25 +08:00
beyond
407741f5e4 beyond 1.3.1 2020-01-03 10:51:08 +08:00
tczjx58520
a27fdf8d6b 1.3修改 
trycatch
 2020-01-03 09:44:38 +08:00
tczjx58520
83fb39863e Update MyDetail3.vue 2020-01-02 21:00:41 +08:00
shawn
ac94c1e416 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-02 18:27:54 +08:00
shawn
ee244d577d 1月2号 
1月2号
 2020-01-02 18:27:43 +08:00
beyond
1775c4edf0 beyond 1.2.6 2020-01-02 18:26:38 +08:00
beyond
b653874ec7 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-02 18:07:02 +08:00
beyond
ec3cd855eb 修改 1.2.3 2020-01-02 18:06:51 +08:00
tczjx58520
83c7464b8e 1.2 修改库位 
修改库位默认多选
 2020-01-02 17:33:00 +08:00
tczjx58520
7291fc2787 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-02 15:44:27 +08:00
tczjx58520
64e0f93a21 2020 1.2 
1/2bug修改
 2020-01-02 15:44:14 +08:00
beyond
3427c61a81 beyond 1.2 2020-01-02 15:08:40 +08:00
tczjx58520
cd7dc783e9 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-02 14:40:32 +08:00
tczjx58520
1f589b1610 1.2 
菜单栏管理修改（能用）
 2020-01-02 14:37:20 +08:00
beyond
b115604062 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 20:13:31 +08:00
shawn
d4300b10ea 修改 
修改
 2019-12-31 20:12:53 +08:00
beyond
a064f12438 beyond 12.31.5 2019-12-31 20:12:17 +08:00