100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
朱文强	02ac7ee486	Merge pull request '修改bug' (#44) from zwq into develop ... 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 ... 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 ... 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 ... Reviewed-on: #41	2022-03-08 14:35:40 +08:00
gtz217	b6d0d32b6f	update dashboard	2022-03-08 14:34:48 +08:00
朱文强	9f42c5e33e	Merge pull request '更新工艺' (#40) from zwq into develop ... 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 ... Reviewed-on: #39	2022-03-08 09:02:19 +08:00
zwq	4743fdc191	更新工艺	2022-03-08 09:01:47 +08:00
gtz217	cf888de5d8	Merge branch 'develop' into gtz	2022-03-07 20:42:39 +08:00
gtz217	ba3983e085	update dashboard	2022-03-07 20:42:06 +08:00
高天泽	c9d77e20a0	Merge pull request 'dashboard' (#38) from gtz into develop ... Reviewed-on: #38	2022-03-07 19:49:47 +08:00
gtz217	1ed431e10a	update	2022-03-07 19:48:14 +08:00
朱文强	cbcbe5ccfa	Merge pull request '更新' (#37) from zwq into develop ... 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 ... 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 ... Reviewed-on: #35	2022-03-07 09:07:28 +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 ... 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
Fanzink	581ca3d60b	''	2022-03-04 10:48:30 +08:00
Fanzink	cb7718c340	''	2022-03-04 10:47:28 +08:00
朱文强	7501849be6	Merge pull request '更新' (#30) from zwq into develop ... Reviewed-on: #30	2022-03-04 10:45:43 +08:00
Fanzink	2a4fdeef04	'不动vue.config.js'	2022-03-04 10:45:12 +08:00
zwq	33a27dd810	更新	2022-03-04 10:44:28 +08:00
Fanzink	8801c44b98	Merge branch 'develop' into fzq	2022-03-03 20:49:39 +08:00
Fanzink	04cc50f504	'基础资料部分'	2022-03-03 20:48:59 +08:00
朱文强	878c9b22f7	Merge pull request 'eslint版本' (#28) from dy into develop ... Reviewed-on: #28	2022-03-03 16:59:38 +08:00
dengyan	037071350a	eslint	2022-03-03 16:57:29 +08:00
dengyan	56f59f533d	Merge branch 'develop' into dy	2022-03-03 16:51:40 +08:00
dengyan	d9559db959	设备稼动率	2022-03-03 16:51:09 +08:00
朱文强	8966dec79a	Merge pull request '修改菜单，增加质量管理' (#26) from zwq into develop ... Reviewed-on: #26	2022-03-03 16:15:37 +08:00
zwq	9513fb484b	修改菜单，增加质量管理	2022-03-03 16:15:01 +08:00
朱文强	68193ecfb3	Merge pull request '更新' (#25) from zwq into develop ... Reviewed-on: #25	2022-03-02 11:04:49 +08:00
zwq	5a42c80256	更新	2022-03-02 11:03:56 +08:00
Fanzink	ffdcbf6fa7	修改vue.config.js	2022-02-28 15:53:44 +08:00
Fanzink	f655b4d718	''	2022-02-28 15:48:39 +08:00
Fanzink	a0adee8ce5	''	2022-02-28 15:45:50 +08:00
朱文强	0cd8970053	Merge pull request '更新' (#24) from zwq into develop ... Reviewed-on: #24	2022-02-28 10:59:14 +08:00
zwq	597934be2e	更新	2022-02-28 10:58:51 +08:00