Commit Graph

592 Commits

Author SHA1 Message Date
zhangdingyu
94184aa185 修补工时录入 2018-12-29 19:13:20 +08:00
chenjianan
615f6a3ae5 delete func 2018-12-29 16:26:18 +08:00
chenjianan
84506007b6 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-29 16:24:36 +08:00
chenjianan
8fc500d46c 优化dialog 2018-12-29 16:24:24 +08:00
liushuai
afbc241d2d Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-29 12:12:07 +08:00
liushuai
d441411fa9 更新 2018-12-29 12:11:59 +08:00
chenjianan
7f61f3e091 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-29 11:10:26 +08:00
chenjianan
1b8e4827f4 console 2018-12-29 11:10:15 +08:00
caoxinyu
3fca8d1d0a Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-29 10:58:13 +08:00
caoxinyu
29ab3b4280 bug 2018-12-29 10:58:08 +08:00
zhangdingyu
654e9b7527 备料到货 2018-12-29 10:06:32 +08:00
caoxinyu
7ee74a318a Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-29 09:34:46 +08:00
caoxinyu
679a6d3c90 bug 2018-12-29 09:34:42 +08:00
chenjianan
2d69c5e288 合同样式 2018-12-29 09:12:38 +08:00
chenjianan
9f8ed21221 按钮禁用 2018-12-29 08:49:18 +08:00
chenjianan
544db2c613 按钮禁用 2018-12-29 08:48:32 +08:00
chenjianan
e1ed93556e 样式 2018-12-28 21:22:48 +08:00
liushuai
2c41c3e306 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-28 20:45:14 +08:00
liushuai
61ce0ae9bf 更新 2018-12-28 20:45:08 +08:00
zhangdingyu
344fe94622 零件工艺制定 2018-12-28 20:41:42 +08:00
zhangdingyu
3b9e6b8cbf 图标 2018-12-28 17:22:53 +08:00
chenjianan
2f1601c9f5 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-28 17:20:46 +08:00
chenjianan
ec38b6cfe6 request 2018-12-28 17:20:32 +08:00
liushuai
3fe0449638 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-28 17:20:21 +08:00
liushuai
4257b3f078 更新 2018-12-28 17:20:16 +08:00
chenjianan
c45e94572a bug 2018-12-28 13:57:25 +08:00
chenjianan
e581a744e0 v2.0 2018-12-28 13:37:00 +08:00
liushuai
0d86d16d0e 更新 2018-12-28 12:44:14 +08:00
liushuai
42335a0458 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-28 12:29:57 +08:00
lixin
90db55365a lxnew 2018-12-28 12:34:14 +08:00
liushuai
75981dca52 更新 2018-12-28 12:29:43 +08:00
lixin
3352fa845b Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-28 10:39:33 +08:00
lixin
bbbf7b0da3 lx 2018-12-28 10:39:27 +08:00
caoxinyu
1c4c9339fd 更新 2018-12-27 18:42:58 +08:00
caoxinyu
bea08a9d72 综合查询 2018-12-27 18:39:03 +08:00
lixin
6d9bc43a5c Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-27 17:31:22 +08:00
lixin
18447662cf lx 2018-12-27 17:31:14 +08:00
zhangdingyu
4e64d62244 零件报废补投 2018-12-27 16:41:06 +08:00
zhangdingyu
b98f8312fc 加工进度修改 2018-12-26 19:24:53 +08:00
lixin
c4f02263aa Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-26 18:58:24 +08:00
lixin
25cbc6f25a lxbug 2018-12-26 18:58:15 +08:00
zhangdingyu
7e182b8cf4 加工进度查询 2018-12-26 14:13:41 +08:00
zhangdingyu
86afdead2f 加工进度修改 2018-12-26 14:11:49 +08:00
lixin
94fcf8db14 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-25 20:08:12 +08:00
lixin
baf94308ab lxtest 2018-12-25 20:08:03 +08:00
liushuai
b12546fb64 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-25 20:05:56 +08:00
liushuai
6f173e5723 更新 2018-12-25 20:05:49 +08:00
chenjianan
a6e05ba121 Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0 2018-12-25 18:30:45 +08:00
chenjianan
c3bab31a7d 发票分角色 2018-12-25 18:30:34 +08:00
zhangdingyu
2ae7154916 外协数据维护 2018-12-25 17:14:16 +08:00