Commit Graph
1120 Commits
Author SHA1 Message Date
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
wangzemei 0b2907217f * replace input component 2022-10-18 09:43:23 +08:00
wangzemei 7075426106 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349 2022-10-18 08:56:26 +08:00
wangzemei 5064fc3669 * update createTaskTeam style 2022-10-17 16:45:59 +08:00
tianshujie f9b2fd0aff * Fix bug #28531. 2022-10-17 15:46:56 +08:00
tianshujie bafc9a6020 * Fix bug #28528. 2022-10-17 13:54:11 +08:00
tianshujie 92692a6e9b * Finish task #70498. 2022-10-11 16:07:34 +08:00
guofeilong 7716314f4a * fix bug in trigger event finish 2022-10-11 08:00:24 +00:00
tianshujie 715aa2e4a4 * Finish task #70498. 2022-10-11 10:47:14 +08:00
tianshujie 9c05622f2f * Finish task #70498. 2022-10-11 10:05:22 +08:00
tianshujie 77a912f3d9 * Finish task #70498. 2022-10-11 09:22:32 +08:00
tianshujie 42fbc75fc3 * Finish task #70498. 2022-10-11 09:16:19 +08:00
tianshujie 294cbe7edc * Finish task #70498. 2022-10-11 09:13:31 +08:00
tianshujie 6e1ebabb80 * Finish task #70498. 2022-10-11 09:11:21 +08:00
tianshujie 42cc38b87d Merge branch 'sprint/244_tianshujie_70498' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498 2022-10-10 16:20:25 +08:00
wangzemei f7a8569d2e * modify team style 2022-10-10 13:30:35 +08:00
tianshujie 1b6949c8fb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498 2022-09-30 10:52:47 +08:00
tianshujie e8757d4692 * Finish task #70498. 2022-09-29 14:51:52 +08:00
王怡栋 fe8d365582 Merge branch 'master_27982' into 'master'
Master 27982

See merge request easycorp/zentaopms!5602
2022-09-29 05:50:26 +00:00
曹延义 480f5db2d0 * Modify multi task estimate order. 2022-09-29 09:08:19 +08:00
liuhong 419e054101 *Fix bug #27982 and Adjust code. 2022-09-28 07:38:07 +00:00
李玉春 af0256eecb Merge branch 'sprint/cyy_task' into 'sprint/244'
* Modify language.

See merge request easycorp/zentaopms!5554
2022-09-27 05:25:12 +00:00
曹延义 f74af95c5e * Adjust code. 2022-09-27 10:04:34 +08:00
曹延义 0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00
tianshujie fa4fee7fbb * Fix bug #27949. 2022-09-26 16:54:36 +08:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
2022-09-23 16:05:19 +00:00
王怡栋 bb5b178c49 Merge branch 'master_liuhong_27190' into 'master'
*Fix bug #27190.

See merge request easycorp/zentaopms!5516
2022-09-23 05:52:56 +00:00
tianshujie a20a8b6cdf * Fix bug #27871. 2022-09-23 13:49:57 +08:00
liuhong 047cd27da8 *Fix bug #27190 for adjust code. 2022-09-23 05:43:34 +00:00
liuhong 9f309bdeab *Fix bug #27190. 2022-09-23 05:39:06 +00:00
曹延义 8ce8855258 * Modify edit multi task. 2022-09-23 11:52:00 +08:00
王怡栋 16d1f76ca0 Merge branch 'sprint/cyy_optimize' into 'master'
* Optimize record estimate style.

See merge request easycorp/zentaopms!5499
2022-09-23 02:04:15 +00:00
曹延义 a02d6c751e * Optimize record style. 2022-09-23 09:46:31 +08:00
tianshujie 3d210a3666 * Finish task #70098. 2022-09-23 09:15:01 +08:00
tianshujie 6fd346708e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task 2022-09-23 08:08:42 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
tianshujie 4908ead6e8 * Finish task #70098. 2022-09-22 18:03:03 +08:00
tianshujie 52fb3e71f7 * Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096. 2022-09-22 16:58:27 +08:00
曹延义 e500e05598 * Finish task #70093. 2022-09-22 16:21:56 +08:00
曹延义 b82fe4e667 * Finish task #70099. 2022-09-22 16:00:42 +08:00
曹延义 0ece96c860 * Finish task #70100. 2022-09-22 15:23:18 +08:00
wangyidong 47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +08:00
wangyidong d6f395cc1b * fix bug #27012. 2022-09-16 15:00:21 +08:00
wangyidong bb9aa91422 * adjust for finish page style. 2022-09-14 17:34:28 +08:00
wangyidong 8db145922d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-14 13:40:05 +08:00
wangyidong 2b75baa004 * fix bug #27472. 2022-09-14 13:39:40 +08:00
sunguangming 3b8b7d2681 * Add lang 'my' to task. 2022-09-14 08:57:53 +08:00
wangyidong 383bee843a * adjust for delete effort logic. 2022-09-13 17:22:13 +08:00
wangyidong 2ba29dd574 * adjust for effort when restart task. 2022-09-13 13:04:01 +08:00
孙广明 65b1d28408 * Code for recordestimate view. 2022-09-13 10:55:29 +08:00