 zhengrunyu
|
919ea9d8d0
|
*Fix bug 18290.
|
2022-01-11 10:28:33 +08:00 |
|
|
zhengrunyu
|
412d143578
|
*Code bug
|
2022-01-07 09:39:54 +08:00 |
|
|
zhengrunyu
|
325a57c292
|
*Code edit and batchedit.
|
2022-01-07 09:27:39 +08:00 |
|
|
zhengrunyu
|
8539bc7883
|
*Unset required.
|
2022-01-06 15:19:51 +08:00 |
|
|
zhengrunyu
|
ea5a484019
|
*Fix bug.
|
2022-01-06 14:31:08 +08:00 |
|
|
zhengrunyu
|
f2874479c2
|
*Adjust code.
|
2022-01-06 14:16:18 +08:00 |
|
|
zhengrunyu
|
133316ba45
|
*Adjust code.
|
2022-01-06 14:03:25 +08:00 |
|
|
zhengrunyu
|
c0b16334ee
|
*Code chenge status of parent and fix bug
|
2022-01-06 11:12:29 +08:00 |
|
|
李玉春
|
76a3ebdd7b
|
Merge branch 'sprint/181_zhengrunyu_18165' into 'master'
*Fixbug 18172.
See merge request easycorp/zentaopms!1257
|
2022-01-04 08:50:03 +00:00 |
|
|
zhengrunyu
|
18a744763f
|
*Fixbug 18172.
|
2022-01-04 16:47:33 +08:00 |
|
|
liumengyi
|
cc2601a4d5
|
* Add maximum width for plan title.
|
2022-01-04 16:08:38 +08:00 |
|
|
孙广明
|
feb80b05d5
|
* Fix productplan bug.
|
2022-01-04 10:18:48 +08:00 |
|
|
孙广明
|
ba570f1467
|
* Code for task 46671.
|
2022-01-04 09:27:44 +08:00 |
|
|
tianshujie
|
39a8417b61
|
* Modify the batch editing plan logic.
|
2021-12-31 15:49:44 +08:00 |
|
|
tianshujie
|
1f1e56c28f
|
* Optimize batch editing plan code.
|
2021-12-31 13:41:01 +08:00 |
|
|
孙广明
|
56717fe06e
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Modify judgment.
See merge request easycorp/zentaopms!1230
|
2021-12-31 05:03:28 +00: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 |
|
|
liumengyi
|
b7af7a3754
|
* Modify judgment.
|
2021-12-31 13:00:10 +08:00 |
|
|
李玉春
|
2bb6bb8825
|
Merge branch 'refactor' into 'master'
Refactor
See merge request easycorp/zentaopms!1229
|
2021-12-31 04:25:42 +00:00 |
|
|
李玉春
|
b0d7ba1708
|
Merge branch 'sgm_46671' into 'master'
* Finish task #46671.
See merge request easycorp/zentaopms!1222
|
2021-12-31 04:19:26 +00:00 |
|
|
孙广明
|
c871137c66
|
* Fix code style.
|
2021-12-31 11:17:42 +08:00 |
|
|
tianshujie
|
28881d6e76
|
* Modify the problem of dragging the card.
|
2021-12-31 11:03:01 +08:00 |
|
|
liumengyi
|
3dd747f40a
|
* Modify judgment for split chid plan.
|
2021-12-31 10:59:37 +08:00 |
|
|
孙广明
|
101be0c103
|
* Finish task #46671.
|
2021-12-31 09:53:32 +08:00 |
|
|
liumengyi
|
0894fd4898
|
* Modify judgment for split child plan.
|
2021-12-31 09:47:22 +08:00 |
|
|
liumengyi
|
e0d72a4c25
|
* Refactoring code for update status.
|
2021-12-31 09:40:46 +08:00 |
|
|
tianshujie
|
7b3bab2c4a
|
* Fix bug #18094,#18077.
|
2021-12-31 08:57:08 +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 |
|
|
zhengrunyu
|
a3e758269a
|
*Code batchedit
|
2021-12-30 16:38:50 +08:00 |
|
|
孙广明
|
7af8683be4
|
Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master'
* Modify print label code of plan list.
See merge request easycorp/zentaopms!1212
|
2021-12-30 08:33:36 +00:00 |
|
|
liumengyi
|
abd52e3141
|
* Modify print label code of plan list.
|
2021-12-30 16:25:32 +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
|
ebe4c65807
|
* Add child Label.
|
2021-12-30 15:11:43 +08:00 |
|
|
liumengyi
|
9ecbdf2509
|
* Modify the judged data type.
|
2021-12-30 14:33:20 +08:00 |
|
|
liumengyi
|
e3933a0f88
|
* Modify judgment for task#46654.
|
2021-12-30 14:26:35 +08:00 |
|
|
liumengyi
|
6b8e4630ba
|
* Fix bug for task #46654.
|
2021-12-30 14:23:37 +08:00 |
|
|
zhengrunyu
|
32430239a5
|
*code begin and end
|
2021-12-30 13:34:48 +08:00 |
|
|
孙广明
|
d6296cf071
|
Merge branch 'sprint/181_tianshujie_46672' into 'master'
*Finish task #46672.
See merge request easycorp/zentaopms!1188
|
2021-12-30 03:30:11 +00:00 |
|
|
tianshujie
|
08723126ea
|
* Finish task #46672.
|
2021-12-30 11:02:42 +08:00 |
|
|
zhengrunyu
|
b304022ec6
|
*Finish task 46665.
|
2021-12-30 09:29:08 +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
|
d28dcd7d63
|
*Finish task 46662 46665 46669.
|
2021-12-30 09:01:44 +08:00 |
|
|
tianshujie
|
137281f8fb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/181_tianshujie_46672
|
2021-12-30 08:40:26 +08:00 |
|
|
tianshujie
|
cc81db0ddc
|
* Finish task #46667.
|
2021-12-30 08:24:38 +08:00 |
|
|
孙广明
|
7b23296aa0
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Modify plan status flow judgment method.
See merge request easycorp/zentaopms!1180
|
2021-12-29 09:16:30 +00:00 |
|
|
liumengyi
|
1250dca867
|
* Modify plan flow button.
|
2021-12-29 17:13:16 +08:00 |
|
|
liumengyi
|
ba9f61de07
|
* Modify plan status flow judgment method.
|
2021-12-29 16:31:46 +08:00 |
|
|
tianshujie
|
f9f726270e
|
* Finish task #46667.
|
2021-12-29 14:35:09 +08:00 |
|