161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Fanzink	aae6117db7	Merge branch 'develop' into fzq	2022-03-16 16:15:16 +08:00
Fanzink	99f92f6891	'报表更新'	2022-03-16 16:14:50 +08:00
朱文强	d8424e1752	Merge pull request '修改bug' (#66) from zwq into develop ... Reviewed-on: #66	2022-03-16 14:19:58 +08:00
zwq	598f49e378	修改bug	2022-03-16 14:19:28 +08:00
朱文强	982c25fa0b	Merge pull request '修改bug' (#65) from zwq into develop ... Reviewed-on: #65	2022-03-16 10:13:21 +08:00
zwq	2756e75aaf	修改bug	2022-03-16 10:12:36 +08:00
朱文强	74883db1c0	Merge pull request 'fzq' (#64) from fzq into develop ... Reviewed-on: #64	2022-03-16 09:55:55 +08:00
范志钦	643277e1c7	更新 'src/lang/i18n/zh/module/basicData.js'	2022-03-16 09:53:24 +08:00
范志钦	4a834c3dc1	更新 'src/lang/i18n/en/module/basicData.js'	2022-03-16 09:53:04 +08:00
范志钦	6b20524a5f	更新 'src/lang/i18n/zh/module/basicData.js'	2022-03-16 09:52:02 +08:00
Fanzink	f219b55d0c	'更新'	2022-03-16 09:43:13 +08:00
Fanzink	79b7fe0eec	'更新'	2022-03-16 09:41:00 +08:00
朱文强	2329a20c4f	Merge pull request 'zwq' (#63) from zwq into develop ... Reviewed-on: #63	2022-03-16 09:00:59 +08:00
zwq	7aba931c94	提交	2022-03-16 08:58:59 +08:00
zwq	176fd99cd1	Merge branch 'test' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into zwq	2022-03-16 08:42:53 +08:00
朱文强	77fbbb630b	Merge pull request '仓库翻译' (#62) from zwq into develop ... Reviewed-on: #62	2022-03-15 17:04:29 +08:00
zwq	18b932afa1	仓库翻译	2022-03-15 17:04:06 +08:00
高天泽	251d507db7	Merge pull request 'gtz' (#61) from gtz into test ... Reviewed-on: #61	2022-03-15 16:59:59 +08:00
gtz217	8502f5d7d1	Merge branch 'develop' into gtz	2022-03-15 16:59:11 +08:00
gtz217	9eea286c08	i18n dashboard	2022-03-15 16:58:48 +08:00
朱文强	d4e0384e10	Merge pull request '修改bug' (#60) from zwq into develop ... Reviewed-on: #60	2022-03-15 14:38:09 +08:00
zwq	983be7801c	修改bug	2022-03-15 14:37:40 +08:00
朱文强	d725cb7a0c	Merge pull request '修改bug' (#59) from zwq into develop ... Reviewed-on: #59	2022-03-15 11:21:10 +08:00
zwq	ef8a7ef497	修改bug	2022-03-15 11:20:36 +08:00
朱文强	6ac3fcb572	Merge pull request 'fzq' (#58) from fzq into develop ... Reviewed-on: #58	2022-03-15 10:09:07 +08:00
Fanzink	3e6389f0eb	'更新'	2022-03-15 09:55:49 +08:00
Fanzink	afde4d5225	'更新'	2022-03-15 09:12:22 +08:00
高天泽	8da50584fc	Merge pull request 'gtz' (#57) from gtz into develop ... Reviewed-on: #57	2022-03-14 17:00:11 +08:00
gtz217	2351e96c9e	Merge branch 'develop' into gtz	2022-03-14 16:59:06 +08:00
gtz217	5277788174	update	2022-03-14 16:58:27 +08:00
朱文强	127092be26	Merge pull request '修改bug' (#56) from zwq into develop ... Reviewed-on: #56	2022-03-14 11:00:08 +08:00
zwq	21d45adf22	修改bug	2022-03-14 10:59:13 +08:00
朱文强	3d3c802d01	Merge pull request 'fzq' (#55) from fzq into develop ... Reviewed-on: #55	2022-03-14 10:56:52 +08:00
Fanzink	4263eb79a0	''	2022-03-13 14:45:13 +08:00
Fanzink	7775d15b67	''	2022-03-13 14:44:14 +08:00
高天泽	d21c69e883	Merge pull request 'gtz' (#54) from gtz into develop ... Reviewed-on: #54	2022-03-12 14:25:29 +08:00
gtz217	4921ba62ed	update	2022-03-12 14:24:40 +08:00
gtz217	c58d4fb90b	Merge branch 'develop' into test	2022-03-12 11:32:21 +08:00
朱文强	f273bd32de	Merge pull request '仓库管理-工序库位关联' (#53) from zwq into develop ... Reviewed-on: #53	2022-03-11 16:39:54 +08:00
zwq	7fd51b5211	仓库管理-工序库位关联	2022-03-11 16:38:54 +08:00
gtz217	5dda7cd772	Merge branch 'develop' into gtz	2022-03-11 10:37:48 +08:00
gtz217	60fb71791a	update dashborad number to string	2022-03-11 10:37:20 +08:00
朱文强	e7629a6ea0	Merge pull request '修改bug' (#52) from zwq into develop ... 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 ... 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 ... 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 ... Reviewed-on: #49	2022-03-10 16:55:54 +08:00