Commit graph

659 commits

Author SHA1 Message Date
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
shawn
4ce3d0895e 12月31日
12月31日
2019-12-31 20:03:35 +08:00
shawn
211c96461a Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 19:39:49 +08:00
shawn
f709dcb203 销售出库修改
销售出库修改
2019-12-31 19:39:41 +08:00
tczjx58520
1bc335b387 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 18:58:07 +08:00
tczjx58520
862e10351b 12.31 2019-12-31 18:57:54 +08:00
beyond
0181f7cc38 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 18:45:21 +08:00
beyond
d4928c1e7d 备用的 12.31.5 2019-12-31 18:45:12 +08:00
shawn
85b0df7a63 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 18:44:51 +08:00
shawn
8003c126e5 菜单权限
菜单权限
2019-12-31 18:44:31 +08:00
tczjx58520
42dd857852 12.31
不可修改
2019-12-31 18:38:09 +08:00
tczjx58520
ad8ae8a7c7 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 18:35:04 +08:00
tczjx58520
5dc8eae037 12.31
测试
2019-12-31 18:33:32 +08:00
beyond
1a6a42746b Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 18:20:34 +08:00
beyond
61546917e9 beyond 12.31.3 2019-12-31 18:19:10 +08:00
shawn
ea00f82b44 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 18:19:03 +08:00
shawn
36bed6ba50 naveubar
naveubar
2019-12-31 18:18:55 +08:00
tczjx58520
58e077f279 commit
修改文字
2019-12-31 16:34:38 +08:00
shawn
11a3326906 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 15:49:43 +08:00
shawn
18b8f1f580 12月30下午
12月30下午
2019-12-31 15:49:24 +08:00
tczjx58520
60c61fb28c Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 15:48:03 +08:00
tczjx58520
b25ebc3676 12.31
修改收车单,审批流程
2019-12-31 15:47:28 +08:00
beyond
6f5f794a0c Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 15:16:07 +08:00
beyond
89fb3418a5 beyond 12.31.2 2019-12-31 15:14:40 +08:00
tczjx58520
7703dd324e 12.31
换车单完成修改
2019-12-31 12:08:32 +08:00
tczjx58520
65f33376b3 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 11:22:05 +08:00
tczjx58520
033fd23dbb 12.31
修改换车单
2019-12-31 11:20:37 +08:00
beyond
46102ba8bb Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 09:02:34 +08:00
shawn
1056dcd1d7 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 09:02:33 +08:00
shawn
88dd091202 12月30
12月30
2019-12-31 09:02:16 +08:00
beyond
a7f8981b9a Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-31 09:02:09 +08:00
beyond
7b47e0ccb5 beyond 12.31 2019-12-31 09:01:59 +08:00
tczjx58520
bff59bc9df 12.30
收车单ing................
2019-12-30 18:38:09 +08:00
tczjx58520
909f97b168 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-30 18:00:49 +08:00
tczjx58520
9dfa7b2c06 12.30
修改 销售订单 库存调拨
2019-12-30 18:00:20 +08:00
beyond
2bceeebfa1 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-30 14:00:05 +08:00
beyond
3e4b67a382 beyond 12.30.1 2019-12-30 13:59:44 +08:00
tczjx58520
742db06456 12.30
提交
2019-12-30 13:53:18 +08:00
shawn
6b337a931f Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-29 18:25:44 +08:00
shawn
966889d80b 12月29日
12月29日
2019-12-29 18:25:33 +08:00
beyond
0acc1f9cf4 beyond 12.29 2019-12-29 18:22:34 +08:00
shawn
d026663a90 Merge branch 'master' of https://github.com/shawncai/ERP 2019-12-28 18:23:38 +08:00
shawn
77ad0d22f7 12月28日修改
12月28日修改
2019-12-28 18:22:01 +08:00