Commit graph

772 commits

Author SHA1 Message Date
shawn
823e0a2117 使用优惠卷
使用优惠卷
2020-02-04 13:11:19 +08:00
shawn
c71287e791 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-04 11:18:31 +08:00
shawn
6705db5f96 pc端维修修改
pc端维修修改
2020-02-04 11:18:22 +08:00
beyond
f3e6bfea77 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-03 15:21:55 +08:00
beyond
22e5a04bba beyond 2.3 优惠券发放 2020-02-03 15:21:31 +08:00
shawn
24cba2a5ee 优惠卷com
优惠卷com
2020-02-03 13:26:21 +08:00
shawn
7ae6ab3e2b Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-02 17:22:42 +08:00
shawn
e150708453 财务统计修改
财务统计修改
2020-02-02 17:22:25 +08:00
beyond
f8f1667b89 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-02 17:19:21 +08:00
beyond
0482a19422 beyond 2.2 优惠券 2020-02-02 17:19:07 +08:00
shawn
9fe5413db6 配件出库单完成
配件出库单完成
2020-02-01 16:41:12 +08:00
shawn
5140cd8a4a 修改问题
修改问题
2020-01-30 17:46:04 +08:00
shawn
7f77175a22 日常提交
日常提交
2020-01-29 09:47:40 +08:00
shawn
937070138e Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-27 13:52:57 +08:00
shawn
9ea3c30897 提交
提交
2020-01-27 13:52:47 +08:00
beyond
60cef3d65b Merge branch 'master' of github.com:shawncai/ERP 2020-01-22 14:49:38 +08:00
beyond
88f3d4d375 beyond 1.22 2020-01-22 14:49:31 +08:00
tczjx58520
c800e515d7 1.20 修改首付款汇总样式 2020-01-20 16:20:36 +08:00
tczjx58520
2ba7282cfa Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-20 15:42:23 +08:00
tczjx58520
8b2ed117f8 1.20 修改样式 2020-01-20 15:42:07 +08:00
beyond
eb450957f8 Merge branch 'master' of github.com:shawncai/ERP 2020-01-19 15:15:54 +08:00
beyond
af768d7b37 beyond 1.19 2020-01-19 15:15:48 +08:00
shawn
495d7aff9b 调拨单列表问题
调拨单列表问题
2020-01-19 14:09:17 +08:00
shawn
082b19d01b 修改
修改
2020-01-19 10:58:35 +08:00
shawn
11590a72a3 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-18 14:16:24 +08:00
shawn
3e45ff9204 更新
更新
2020-01-18 14:16:16 +08:00
beyond
6c093ad361 Merge branch 'master' of github.com:shawncai/ERP 2020-01-15 16:27:06 +08:00
beyond
ec299b9978 beyond 1.15.2 2020-01-15 16:26:58 +08:00
shawn
d5c03878ae Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-15 14:47:47 +08:00
shawn
5030d292e2 换货单
换货单
2020-01-15 14:47:25 +08:00
tczjx58520
20809ef034 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-15 14:24:11 +08:00
tczjx58520
be41bdd5d8 1.15
修改bug
2020-01-15 14:11:17 +08:00
shawn
25b10cfcc0 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-15 13:51:07 +08:00
shawn
005b4d5ca1 1月15日修改
1月15日修改
2020-01-15 13:50:57 +08:00
beyond
375133498c beyond 1.15 2020-01-15 10:32:06 +08:00
beyond
6156c918e0 beyond1.14.2 2020-01-14 17:34:18 +08:00
tczjx58520
74dd02c360 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-14 16:26:48 +08:00
tczjx58520
2a700ae9f6 1.14
提交bug
2020-01-14 16:26:16 +08:00
beyond
f5f9c5731b Merge branch 'master' of github.com:shawncai/ERP 2020-01-14 15:24:15 +08:00
beyond
105f82d043 beyond 1.14 2020-01-14 15:24:07 +08:00
shawn
4258735785 修改问题
修改问题
2020-01-14 15:14:22 +08:00
shawn
0b4bd8e124 收款单问题
收款单问题
2020-01-14 14:34:07 +08:00
shawn
ace31618ac 1月14号
1月14号
2020-01-14 09:50:46 +08:00
beyond
fb435a3420 Merge branch 'master' of github.com:shawncai/ERP 2020-01-13 17:01:07 +08:00
beyond
3b1ba5aa41 beyond 1.13.2 2020-01-13 16:52:51 +08:00
shawn
2f0bcc78c2 修改777
修改777
2020-01-13 16:52:50 +08:00
shawn
9e8dd80a71 Merge branch 'master' of https://github.com/shawncai/ERP 2020-01-13 15:40:58 +08:00
shawn
ebc0564454 修改
修改
2020-01-13 15:40:42 +08:00
beyond
a406c54bfc Merge branch 'master' of github.com:shawncai/ERP 2020-01-13 15:38:19 +08:00
beyond
8050269706 1.13 2020-01-13 15:38:05 +08:00