Commit Graph
1167 Commits
Author SHA1 Message Date
孙广明 47817d9153 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30879

See merge request easycorp/zentaopms!6565
2022-12-15 08:10:30 +00:00
lanzongjun 9d0a087132 * Fix Bug #30879 2022-12-15 16:09:01 +08:00
孙广明 b827ae2002 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909

See merge request easycorp/zentaopms!6549
2022-12-15 07:58:29 +00:00
lanzongjun 72f9a71865 * Fix Bug #30886 2022-12-15 14:51:51 +08:00
田淑杰 6699ab0a60 * Fix bug #30800. 2022-12-15 14:02:23 +08:00
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
lanzongjun afd4d269a2 * Finish Task #79665 2022-12-14 09:33:20 +08:00
孙广明 55c79e0399 * Code for task #79664. 2022-12-13 15:20:09 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
lanzongjun c3d53daa5a * Finish Task #79665 2022-12-12 16:36:32 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
xieqiyu 864ed7a391 * Fix bug#29445. 2022-11-15 09:04:14 +08:00
mayue c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
wangyuting 152364d338 * Finish task #29562. 2022-11-11 02:12:03 +00:00
liuhong f12632a8fb * Fix bug #29451 2022-11-09 02:15:23 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie 32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
tianshujie 8e67ec5de9 * Optimize the form for recording work hours for multi-person tasks. 2022-11-07 11:04:45 +08:00
tianshujie 5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
李玉春 f36d8a321d Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6027
2022-11-04 00:35:50 +00:00
Yagami 16fdf991db * Fix bug #29253. 2022-11-03 16:47:52 +08:00
tianshujie 808c99f318 * Fix bug #29230. 2022-11-03 15:43:39 +08:00
liuhong 8f967da638 * Fix create task display of execution default no choose. 2022-11-03 02:12:06 +00:00
liuhong ad6ee6377b * Resolved feedback #1302. 2022-11-02 05:51:09 +00:00
caoyanyi 13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
tianshujie 5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
caoyanyi 7716ba592e * Adjust code. 2022-10-28 10:39:24 +08:00
caoyanyi 284cade04a * Fix bug #28170. 2022-10-28 10:10:41 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie 354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
caoyanyi 380777ecf8 * Fix bug #28788. 2022-10-21 13:19:54 +08:00
caoyanyi 4b481f534b * Fix bug #28786. 2022-10-21 11:25:54 +08:00
tianshujie ae0c045c02 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 16:06:26 +08:00
tianshujie faabb32285 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 15:53:21 +08:00
李玉春 05e2c8242b Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5824
2022-10-20 06:15:37 +00:00
李玉春 23b1e0db4c Merge branch 'sprint/cyy_72375' into 'sprint/247'
* Modify multi task activate.

See merge request easycorp/zentaopms!5826
2022-10-20 06:04:53 +00:00
曹延义 03e4c78c5f * Modify multi task activate. 2022-10-20 11:25:42 +08:00
tianshujie ca79d11271 * Finish task #72347. 2022-10-20 11:06:14 +08:00
tianshujie d55aedf3e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 11:04:27 +08:00
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
曹延义 6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义 fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +08:00
曹延义 1b80975ac1 * Code for task #72375. 2022-10-19 17:21:35 +08:00
孙广明 020fada011 Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5800
2022-10-19 09:04:21 +00:00
曹延义 3ce6ca1f4f Merge branch 'master' into sprint/247 2022-10-19 15:21:14 +08:00
tianshujie 8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
wangzemei 0b2907217f * replace input component 2022-10-18 09:43:23 +08:00
tianshujie 86929e218d * Finish task #72348. 2022-10-18 09:21:07 +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