371 Commits

Author	SHA1	Message	Date
shijing	680bf77ac3	logoHidden	2022-02-25 13:03:51 +08:00
shilixia	5bfa72f716	xiaoshou	2022-02-25 10:12:06 +08:00
shilixia	0e2cc60409	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-24 08:32:48 +08:00
shilixia	b97c005b83	xiaoshoufahuo	2022-02-24 08:32:29 +08:00
shijing	e00ecae3e7	firstTestreview	2022-02-23 10:52:21 +08:00
shijing	52b0f469d9	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-22 16:31:45 +08:00
shijing	ba3f2cd7b9	fistTestAndFaceLoginChange	2022-02-22 16:31:39 +08:00
shilixia	e8002ed7c5	zaigang	2022-02-22 15:42:20 +08:00
shilixia	f552f995ab	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-21 13:51:00 +08:00
shilixia	01ecc2e30e	xiugai	2022-02-21 13:50:53 +08:00
shijing	6b73a12840	cheeckTableChange	2022-02-21 10:23:22 +08:00
shijing	87e94c7b9f	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-21 09:29:12 +08:00
shijing	aaee37fee2	statisticsStyleChange	2022-02-21 09:29:02 +08:00
shilixia	497b47b227	ddd	2022-02-18 15:31:10 +08:00
shilixia	d4f59b6d6e	ceshi	2022-02-18 15:28:54 +08:00
shijing	76f6def36f	styleAdjust	2022-02-18 15:05:02 +08:00
shijing	2c4f82d393	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-18 10:51:20 +08:00
shijing	ffb7b6ece2	styleAdjust	2022-02-18 10:51:10 +08:00
shilixia	b95e2945db	xial	2022-02-17 15:05:12 +08:00
shilixia	3008f1e2ce	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-17 14:34:04 +08:00
shilixia	9d4238668c	“xial”	2022-02-17 14:33:55 +08:00
shijing	77d1e92109	Form	2022-02-17 14:32:18 +08:00
shijing	0543a90f2b	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-15 14:10:29 +08:00
shijing	b8d658b8b4	faceLogin	2022-02-15 14:10:20 +08:00
shilixia	9e5efe57d4	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-15 13:43:19 +08:00
shilixia	74a7f87e9f	zuoyezhidaoshu	2022-02-15 13:43:09 +08:00
shijing	999ad65320	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-15 10:58:12 +08:00
shijing	f67989c142	bigScreenTextChange&icons	2022-02-15 10:58:03 +08:00
shilixia	438c49d7e1	cishs	2022-02-14 10:59:25 +08:00
shilixia	fc558c042c	xial	2022-02-14 10:58:41 +08:00
shijing	dfe141bf55	iconsChange	2022-02-14 10:57:32 +08:00
shijing	cc741a47a0	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-11 17:07:57 +08:00
shijing	f8cf641e0d	bigScreenAdjust&iconschange	2022-02-11 17:07:47 +08:00
shilixia	089a311768	zuoyezhidaoshbu	2022-02-11 10:56:25 +08:00
shilixia	45ed6d407a	zuoyezhidaoshu	2022-02-11 10:49:14 +08:00
shilixia	09a938a146	zuoyezhidaoshu	2022-02-11 10:47:14 +08:00
shijing	0e178f2f92	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-10 16:35:22 +08:00
shijing	08dc30c659	dumoCheck	2022-02-10 16:35:13 +08:00
shilixia	ef7045b751	chakanyuandingdan	2022-02-10 16:33:53 +08:00
shilixia	fab4ef2571	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-10 16:07:15 +08:00
shilixia	bacddddca0	ciagoudingdanxiang	2022-02-10 16:07:08 +08:00
shijing	37b874036f	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-02-10 09:24:34 +08:00
shijing	fd1115cd36	subProcessCheckChange	2022-02-10 09:24:22 +08:00
shilixia	efdc534a02	caihgudingdan	2022-02-10 09:03:44 +08:00
shilixia	6e90fad047	caigoujilu	2022-02-10 09:00:54 +08:00
shijing	d6915a9f19	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-29 10:53:59 +08:00
shijing	b00d068ac8	Statistics	2022-01-29 10:53:50 +08:00
shilixia	290efe48ce	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-27 15:53:40 +08:00
shilixia	c831b41b61	renyuan	2022-01-27 15:51:02 +08:00
shijing	e6ac8cb90f	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-27 11:28:53 +08:00
shijing	868a96e591	bigScreenModel	2022-01-27 11:28:19 +08:00
shilixia	d551af491a	renyuan	2022-01-27 10:30:48 +08:00
shilixia	2c937c983f	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-26 15:59:59 +08:00
shilixia	6de8c40d60	xiuagi	2022-01-26 15:59:51 +08:00
shijing	09f1937474	searchshiftandaddtwowarnings	2022-01-26 14:00:12 +08:00
shilixia	60f726cda6	ceshi	2022-01-25 09:57:51 +08:00
shilixia	938ebf1e28	denglijiekou	2022-01-25 09:56:14 +08:00
shijing	b3d54ce4c0	InterfaceChange	2022-01-25 09:54:40 +08:00
shijing	84ba98925d	0124	2022-01-25 08:48:05 +08:00
shijing	3eb5c6ac76	首页布局调整	2022-01-24 11:02:18 +08:00
shijing	400173c0cf	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-21 17:14:44 +08:00
shijing	c2d2e2405b	检查记录添加操作人首页微调刷脸签到	2022-01-21 17:14:36 +08:00
shilixia	c35051df0c	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-21 15:19:49 +08:00
shilixia	fcc6cfbade	shebei	2022-01-21 15:19:42 +08:00
shijing	0f8128a5d8	物料安全库存	2022-01-21 10:55:07 +08:00
shijing	d1270c16ab	newStyle	2022-01-21 08:30:22 +08:00
shijing	0796f30cb1	dashPage	2022-01-20 15:45:32 +08:00
shijing	9a31871839	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-17 14:16:44 +08:00
shijing	e07b5a4c5d	somewarnfixandtestshow	2022-01-17 14:16:37 +08:00
shilixia	a14dac9bda	tijiao	2022-01-17 14:13:28 +08:00
shilixia	1c62a21a56	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-17 13:22:05 +08:00
shilixia	f24cfcb9ea	xiugai	2022-01-17 13:21:59 +08:00
shijing	ce4bbd0896	bugfix	2022-01-17 10:32:17 +08:00
shijing	a98de8720a	bugfix	2022-01-17 10:30:24 +08:00
shijing	db83e0224e	bugfix	2022-01-17 10:26:24 +08:00
shilixia	371ee6ecf4	xiugai	2022-01-17 09:04:51 +08:00
shilixia	aa76888a57	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-14 16:46:11 +08:00
shilixia	b7b32b2320	xiugai	2022-01-14 16:46:04 +08:00
shijing	c3b3f52196	clear	2022-01-13 16:50:33 +08:00
shijing	42659b9b85	changes	2022-01-13 16:48:20 +08:00
shijing	ddfe733664	changes	2022-01-13 16:42:26 +08:00
shilixia	36c1158691	xiugai	2022-01-13 16:11:19 +08:00
shilixia	f02e5504f5	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-12 10:35:19 +08:00
shilixia	362df53bd4	liuchengka	2022-01-12 10:34:58 +08:00
shijing	dc3067a101	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-12 10:33:50 +08:00
shijing	46048efa86	punchtheclock	2022-01-12 10:33:37 +08:00
shilixia	f0a3427422	ceshi	2022-01-06 08:40:42 +08:00
shilixia	9fd1e20008	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-06 08:34:53 +08:00
shilixia	c8589cb158	xialiao	2022-01-06 08:34:46 +08:00
shijing	da1bbf36c8	0104	2022-01-04 17:02:55 +08:00
shijing	9fa9b34968	0104	2022-01-04 17:01:20 +08:00
shilixia	1bc22240b7	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2022-01-04 09:44:45 +08:00
shilixia	3b1fefc696	jianyantianjiaqiyong	2022-01-04 09:44:39 +08:00
shijing	801b41221e	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-31 13:20:53 +08:00
shijing	c47b65a625	dashBoard	2021-12-31 13:20:45 +08:00
shilixia	a0186dbdbb	guochengjianyan	2021-12-31 13:19:21 +08:00
shilixia	d031f16be7	ziliangguanli	2021-12-31 09:05:00 +08:00
shilixia	fa867475c3	xial	2021-12-31 08:42:06 +08:00
shijing	319b228508	1230	2021-12-30 17:13:32 +08:00
shilixia	d3401e3fe9	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-30 14:17:37 +08:00
shilixia	5c4c5c7688	xiala	2021-12-30 14:17:29 +08:00
shijing	3ce616de61	1229	2021-12-29 17:02:21 +08:00
shilixia	0ddff915b8	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-29 14:56:38 +08:00
shilixia	561d712641	xial	2021-12-29 14:56:30 +08:00
caoqianming	b5fdd13343	前端调整	2021-12-29 14:51:39 +08:00
shilixia	6e4914b6c8	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-29 14:02:05 +08:00
shilixia	8896cbd718	xiala	2021-12-29 14:01:54 +08:00
shijing	d5c3e627b4	1228	2021-12-28 17:07:12 +08:00
shijing	90f02fd7bb	sssss	2021-12-27 17:09:56 +08:00
shijing	71a0858126	retrial	2021-12-27 10:11:11 +08:00
shijing	2e73713bae	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-23 16:59:18 +08:00
shijing	8825054574	gantt&parameter	2021-12-23 16:59:07 +08:00
shilixia	baef10ec19	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-23 10:19:09 +08:00
shilixia	2cdec7658d	xiugai	2021-12-23 10:19:02 +08:00
shijing	ced9543568	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-23 10:09:43 +08:00
shijing	3433bbc204	workflowFile	2021-12-23 10:09:31 +08:00
shilixia	3772a9b715	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-22 09:46:23 +08:00
shilixia	feffb4eaca	baofei	2021-12-22 09:46:15 +08:00
shijing	ac2dd89df4	ganttchange	2021-12-21 17:01:16 +08:00
shilixia	3c29f07edc	renwuguanl22i	2021-12-20 16:31:27 +08:00
shilixia	be1169e158	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-20 16:26:12 +08:00
shilixia	5a83ffbe80	renwuguanli	2021-12-20 16:26:06 +08:00
shijing	8a36bf26bd	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-20 14:38:13 +08:00
shijing	cd4556a644	ganttTimeRange	2021-12-20 14:38:04 +08:00
shilixia	eef9972931	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-20 14:12:31 +08:00
shilixia	85c8a85594	baofei	2021-12-20 14:12:24 +08:00
shijing	d94b9c4827	ganttBottom	2021-12-20 11:32:25 +08:00
shijing	3ca92c4423	gant1	2021-12-17 16:05:39 +08:00
shijing	88d2e747d9	gantt	2021-12-17 15:11:55 +08:00
shijing	65280b7411	ddd	2021-12-17 09:19:15 +08:00
shijing	f41c41836c	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-16 23:37:45 +08:00
shijing	3a6c31ea77	testRecordandshowgantt	2021-12-16 23:37:32 +08:00
shilixia	e4706e2635	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-16 16:28:19 +08:00
shilixia	e129f7e306	xiugai	2021-12-16 16:28:11 +08:00
shijing	1f83b26fa5	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-15 23:07:28 +08:00
shijing	f34ecf8395	test&gantt	2021-12-15 23:07:12 +08:00
shilixia	d85ac1c7e0	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-13 14:29:13 +08:00
shilixia	70f6ade5e0	xiugai	2021-12-13 14:29:06 +08:00
shijing	2adfc2d712	review	2021-12-13 13:44:44 +08:00
shijing	b4a03a1feb	description	2021-12-10 13:39:17 +08:00
shijing	04fe8bd75f	description	2021-12-10 13:35:37 +08:00
shilixia	c24a68bedc	批量提交	2021-12-10 13:23:44 +08:00
shilixia	6097bcaa62	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-07 15:05:47 +08:00
shilixia	447886c609	junjian	2021-12-07 15:05:41 +08:00
shijing	68162baacc	need.vue	2021-12-06 15:31:20 +08:00
shijing	68288515a4	jianchabioa	2021-12-06 14:12:11 +08:00
shijing	7555ef9dba	needCheckForm	2021-12-06 13:18:20 +08:00
shilixia	bf3bbb0c3a	xiugai	2021-12-06 09:53:02 +08:00
shilixia	58d1ccc9bf	Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop	2021-12-03 15:18:55 +08:00
shilixia	7752f45968	xiugai	2021-12-03 15:18:49 +08:00