shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-12-29 11:33:05 +08:00
Code Issues Projects Releases Packages Wiki Activity
763 commits 6 branches 0 tags 77 MiB
Commit graph

763 commits

This branch
This branch
All branches
Author SHA1 Message Date
shawn
f4f5236b60 销售出库单更新 
销售出库单更新
 2020-02-14 13:28:31 +08:00
shawn
d39ceb4fe3 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-14 09:44:49 +08:00
shawn
689a08bf06 修改问题的合并 
修改问题的合并
 2020-02-14 09:15:51 +08:00
beyond
f591090263 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-13 19:16:54 +08:00
beyond
c8a1056cc9 beyond 2.13修改 2020-02-13 18:58:25 +08:00
shawn
1973d0d009 提交代码 
提交代码
 2020-02-13 10:40:51 +08:00
shawn
9b6952eb56 修复中英文表字段对应， 修复期初库存修改时改变审核状态和单据状态问题，货位添加了删除功能 
修复中英文表字段对应， 修复期初库存修改时改变审核状态和单据状态问题，货位添加了删除功能
 2020-02-12 12:37:46 +08:00
shawn
6926a1e015 代码更新 
代码更新
 2020-02-12 07:31:29 +08:00
shawn
9e1205ca02 修改界面 
修改界面
 2020-02-11 09:42:56 +08:00
shawn
5b4ab23168 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 17:56:54 +08:00
shawn
5f94846615 修改合并 
修改合并
 2020-02-10 17:56:44 +08:00
beyond
2fb9b8ff3b Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 12:46:51 +08:00
beyond
e590781ee9 beyond 2.10修改 2020-02-10 12:46:38 +08:00
shawn
c5dcdf1fea Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 12:46:04 +08:00
shawn
d345edd027 财务修改 
财务修改
 2020-02-10 12:45:57 +08:00
beyond
e0648bd289 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-10 12:20:14 +08:00
shawn
879bd30858 财务修改 
财务修改
 2020-02-10 11:49:10 +08:00
beyond
2d53264db4 beyond 2.9 修改 2020-02-10 11:48:39 +08:00
shawn
28b50e4f3a 财务更新 
财务更新
 2020-02-09 17:51:08 +08:00
shawn
04dea29df5 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-08 09:38:32 +08:00
shawn
dd4c2f7c0d 元宵节更新 
元宵节更新
 2020-02-08 09:38:25 +08:00
beyond
13a2eff017 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-07 19:36:48 +08:00
beyond
74521abe5a beyond 2.7 配件出库修改 2020-02-07 19:36:37 +08:00
shawn
9f175b39b4 修改员工门店 
修改员工门店
 2020-02-07 17:40:40 +08:00
shawn
8a9a3e83ed 修改提示文字为英文 
修改提示文字为英文
 2020-02-07 11:24:40 +08:00
beyond
187a4cfdc5 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-07 09:21:23 +08:00
beyond
e70e2f8bea beyond 2.7 修改 2020-02-07 09:21:08 +08:00
shawn
cca5bd3b94 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-07 09:06:18 +08:00
shawn
e0de496f34 修改问题 
修改问题
 2020-02-07 09:06:10 +08:00
tczjx58520
343674297a 修改bug 2月5日 2020-02-05 21:46:12 +08:00
tczjx58520
49eecf3a56 修改bug 2020-02-05 21:44:30 +08:00
tczjx58520
973d2e0250 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-05 19:17:26 +08:00
tczjx58520
289b39e0aa 2.5 
完成完成度
 2020-02-05 19:16:44 +08:00
beyond
6adb97dd46 beyond 2.5 优惠券使用 2020-02-05 18:27:09 +08:00
tczjx58520
f517f16048 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-04 20:51:00 +08:00
tczjx58520
e3dc4101d9 2.4 销售计划 
模块基本完成，还有细节需要完善
 2020-02-04 20:50:46 +08:00
beyond
147be75173 beyond 2.4 销售出库单使用优惠券 2020-02-04 20:04:13 +08:00
shawn
3950ead756 修改优惠卷 
修改优惠卷
 2020-02-04 15:45:15 +08:00
beyond
17eb789e3d beyond 2.4 up 2020-02-04 15:30:04 +08:00
beyond
f4c0afecb6 Merge branch 'master' of https://github.com/shawncai/ERP 2020-02-04 13:19:49 +08:00
beyond
e0c946070f beyond 2.4 优惠券模块完成 2020-02-04 13:19:35 +08:00
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