Commit Graph
194 Commits
Author SHA1 Message Date
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
zhengrunyu 8539bc7883 *Unset required. 2022-01-06 15:19:51 +08:00
liumengyi f8da5c8503 * Fix bug for batch edit. 2022-01-06 13:20:16 +08:00
李玉春 ad0303f83d Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug

See merge request easycorp/zentaopms!1284
2022-01-06 03:34:05 +00:00
zhengrunyu 3c4b34dc9c *Fix bug 2022-01-06 11:32:56 +08:00
孙广明 be84dfdf10 Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code chenge status of parent and fix bug

See merge request easycorp/zentaopms!1280
2022-01-06 03:22:44 +00:00
zhengrunyu 666760a95c *Code bug. 2022-01-06 11:20:27 +08:00
zhengrunyu c0b16334ee *Code chenge status of parent and fix bug 2022-01-06 11:12:29 +08:00
liumengyi b88740a836 * Fix bug #18173. 2022-01-05 17:28:21 +08:00
liumengyi 18f60b7825 * Fix bug #18173. 2022-01-05 14:57:14 +08:00
liumengyi ad55c5197d * Modify code format for kanban and productplan. 2022-01-05 10:53:45 +08:00
zhengrunyu 41eeabc074 *Fix bug 18168. 2022-01-04 15:32:54 +08:00
zhengrunyu f06de76227 *Fix bug 18165. 2022-01-04 14:50:44 +08:00
zhengrunyu 0d05a3aa8c *Code edit. 2022-01-04 12:00:42 +08:00
孙广明 e370a094a9 * Merge code. 2022-01-04 11:08:30 +08:00
zhengrunyu 7e037ff68d *Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit.*Code batchedit. 2022-01-04 10:27:06 +08:00
zhengrunyu 96c9cd54d2 *Code edit. 2022-01-04 09:56:35 +08:00
tianshujie 58a4ebb665 * Modify the code format of productplan mode file. 2022-01-04 09:00:21 +08:00
tianshujie 3c174fbb7f * Optimize the code for judging whether the time is correct. 2022-01-03 13:30:22 +08:00
tianshujie ece63ad3c0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_optimize 2022-01-03 13:21:24 +08:00
tianshujie 0ec08bca7d * Adjust the code. 2021-12-31 15:58:00 +08:00
tianshujie 39a8417b61 * Modify the batch editing plan logic. 2021-12-31 15:49:44 +08:00
孙广明 1d4e589a26 * Fix code style. 2021-12-31 15:05:10 +08:00
孙广明 c4140ad766 * Fix code details. 2021-12-31 13:18:32 +08:00
孙广明 94ddbd4852 Merge branch 'sprint/181_tianshujie_optimize' into 'master'
* Modify the problem of dragging the card.

See merge request easycorp/zentaopms!1227
2021-12-31 05:02:09 +00:00
李玉春 2bb6bb8825 Merge branch 'refactor' into 'master'
Refactor

See merge request easycorp/zentaopms!1229
2021-12-31 04:25:42 +00:00
tianshujie c6794b36f2 * Fix the problem of the activation operation of the card in progress. 2021-12-31 11:22:40 +08:00
孙广明 ad25920cf0 * Refactor code. 2021-12-31 11:06:46 +08:00
liumengyi e0d72a4c25 * Refactoring code for update status. 2021-12-31 09:40:46 +08:00
zhengrunyu eaf5bd6c50 *Fix bug. 2021-12-30 18:21:26 +08:00
孙广明 4c9dcd4af9 Merge branch 'master' into 'sprint/181_zhengrunyu_fixbug'
# Conflicts:
#   module/productplan/model.php
2021-12-30 08:48:11 +00:00
孙广明 a02d19a0c4 * Fix merge code bug. 2021-12-30 16:14:12 +08:00
孙广明 7267c50600 Merge branch 'master' into 'sgm_46670'
# Conflicts:
#   module/productplan/model.php
2021-12-30 08:12:11 +00:00
孙广明 e9c8da2f1e * Finish task #46670. 2021-12-30 16:04:32 +08:00
liumengyi 3602538f9c * Fix bug for update status. 2021-12-30 15:21:09 +08:00
孙广明 86994c2af9 Merge branch 'sprint/181_liumengyi_modify' into 'master'
* Fix bug for task #46654.

See merge request easycorp/zentaopms!1193
2021-12-30 06:44:40 +00:00
zhengrunyu b5348ab449 *Code batchedit time. 2021-12-30 14:35:47 +08:00
liumengyi 6b8e4630ba * Fix bug for task #46654. 2021-12-30 14:23:37 +08:00
tianshujie 4d56aa8bdc * Add card drop-down operation. 2021-12-30 14:02:55 +08:00
zhengrunyu 32430239a5 *code begin and end 2021-12-30 13:34:48 +08:00
liumengyi 8436cbe443 * Modify judgment. 2021-12-30 11:34:27 +08:00
liumengyi 53aa300744 * Add dynamic for parent plan status flow. 2021-12-30 11:25:57 +08:00
孙广明 d4d7ef1074 Merge branch 'master' into 'sprint/181_zhengrunyu_46662'
# Conflicts:
#   module/productplan/lang/en.php
#   module/productplan/lang/zh-cn.php
#   module/productplan/view/browse.html.php
2021-12-30 01:17:44 +00:00
zhengrunyu ea8052baa0 *Finish task 46662 46664 46669. 2021-12-30 09:14:30 +08:00
zhengrunyu d28dcd7d63 *Finish task 46662 46665 46669. 2021-12-30 09:01:44 +08:00
liumengyi 0ed240c378 * Add judgment for plan start. 2021-12-29 17:29:45 +08:00
liumengyi ba9f61de07 * Modify plan status flow judgment method. 2021-12-29 16:31:46 +08:00
tianshujie 2bb67b955f * Modify code logic. 2021-12-29 10:25:28 +08:00
tianshujie 15c13057d0 * Adjust the query plan logic. 2021-12-29 09:36:57 +08:00
tianshujie 6a6322044e Merge branch 'sprint/181_tianshujie_kanban' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_kanban 2021-12-28 16:59:36 +08:00