Commit Graph

120 Commits

Author SHA1 Message Date
zwq
7fd51b5211 仓库管理-工序库位关联 2022-03-11 16:38:54 +08:00
e7629a6ea0 Merge pull request '修改bug' (#52) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #52
2022-03-11 09:51:02 +08:00
zwq
633313c34e 修改bug 2022-03-11 09:50:41 +08:00
7a798d354b Merge pull request '修改bug' (#51) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #51
2022-03-11 09:20:30 +08:00
zwq
ddcae6d119 修改bug 2022-03-11 09:20:02 +08:00
cf1e32049c Merge pull request 'fzq' (#50) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #50
2022-03-11 08:26:17 +08:00
Fanzink
44411b19cd '修改bug' 2022-03-10 21:17:31 +08:00
Fanzink
7afe3c3ec7 '修改bug' 2022-03-10 21:15:33 +08:00
c5f564797b Merge pull request '修改bug' (#49) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #49
2022-03-10 16:55:54 +08:00
zwq
0b6f2ea996 修改bug 2022-03-10 16:55:35 +08:00
3a8debc3be Merge pull request 'zwq' (#48) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #48
2022-03-10 16:50:13 +08:00
zwq
2876f44536 修改bug 2022-03-10 16:49:41 +08:00
zwq
6361c3a47f 修改bug 2022-03-10 16:45:20 +08:00
73ac7e04ce Merge pull request '修改bug' (#47) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #47
2022-03-10 14:31:13 +08:00
zwq
0adf1dad1e 修改bug 2022-03-10 14:30:33 +08:00
77f1831fc2 Merge pull request '修改bug' (#46) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #46
2022-03-09 16:46:11 +08:00
zwq
3112915398 修改bug 2022-03-09 16:45:21 +08:00
507b9da319 Merge pull request '更新-仓库-工序' (#45) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #45
2022-03-09 15:19:56 +08:00
zwq
6b6eb66145 更新-仓库-工序 2022-03-09 15:19:23 +08:00
02ac7ee486 Merge pull request '修改bug' (#44) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #44
2022-03-09 14:50:35 +08:00
zwq
83fdc49dbb 修改bug 2022-03-09 14:50:07 +08:00
68902f0f6c Merge pull request '增加仓库-工序-提示' (#43) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #43
2022-03-09 14:32:55 +08:00
zwq
76dba55bae 增加仓库-工序-提示 2022-03-09 14:32:25 +08:00
66302849a3 Merge pull request '仓库-工序存储区管理' (#42) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #42
2022-03-09 14:20:05 +08:00
zwq
238d8ba41c 仓库-工序存储区管理 2022-03-09 14:19:03 +08:00
27786fb197 Merge pull request 'update dashboard' (#41) from gtz into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #41
2022-03-08 14:35:40 +08:00
b6d0d32b6f update dashboard 2022-03-08 14:34:48 +08:00
9f42c5e33e Merge pull request '更新工艺' (#40) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #40
2022-03-08 09:11:55 +08:00
zwq
a2adcc0fd3 更新工艺 2022-03-08 09:11:34 +08:00
0c0679cb1e Merge pull request '更新工艺' (#39) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39
2022-03-08 09:02:19 +08:00
zwq
4743fdc191 更新工艺 2022-03-08 09:01:47 +08:00
cf888de5d8 Merge branch 'develop' into gtz 2022-03-07 20:42:39 +08:00
ba3983e085 update dashboard 2022-03-07 20:42:06 +08:00
c9d77e20a0 Merge pull request 'dashboard' (#38) from gtz into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #38
2022-03-07 19:49:47 +08:00
1ed431e10a update 2022-03-07 19:48:14 +08:00
cbcbe5ccfa Merge pull request '更新' (#37) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2022-03-07 09:32:02 +08:00
zwq
a214eb9bad 更新 2022-03-07 09:31:40 +08:00
e3be286a50 Merge pull request '更新' (#36) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #36
2022-03-07 09:17:49 +08:00
zwq
f5a003876f 更新 2022-03-07 09:17:12 +08:00
de76ca416c Merge pull request 'fzq' (#35) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #35
2022-03-07 09:07:28 +08:00
Fanzink
95afd175a3 '' 2022-03-07 08:43:56 +08:00
Fanzink
9f1a4226c3 '' 2022-03-07 08:41:20 +08:00
Fanzink
90344983b3 Merge branch 'develop' into fzq 2022-03-06 19:36:56 +08:00
Fanzink
97997681a2 '工序库位+报表' 2022-03-06 19:36:26 +08:00
Fanzink
82f44b5a62 '基础+报表' 2022-03-05 19:43:42 +08:00
28316462aa Merge pull request 'fzq' (#32) from fzq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
2022-03-04 11:18:40 +08:00
Fanzink
b5081ba279 '不动vue.config.js' 2022-03-04 11:12:33 +08:00
Fanzink
913e03230e '' 2022-03-04 11:01:51 +08:00
Fanzink
81e92cdb3f '不动vue.config.js' 2022-03-04 10:59:43 +08:00
Fanzink
aec5bcaf85 '' 2022-03-04 10:58:39 +08:00