Commit Graph

55 Commits

Author SHA1 Message Date
wangyidong
9ef211ef57 * code for task #84544. 2023-02-21 15:32:37 +08:00
liumengyi
6520a56bee * Fix bug of browse gantt. 2023-02-20 02:04:33 +00:00
hufangzhou
75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
王怡栋
9331b9856a Merge branch 'master' into 'zentaopms_wangyuting'
# Conflicts:
#   module/programplan/view/gantt.html.php
2023-02-08 08:30:14 +00:00
wangyuting2
ab16894c06 * Optimize page css. 2023-02-08 16:17:16 +08:00
wangyuting2
afaa89f8fd * Fix bug #27242. 2023-02-08 16:03:35 +08:00
liumengyi
5e179c8b05 * Finish task #83215, #83210. 2023-01-30 15:39:20 +08:00
liuhong
7bbeded716 * Adjust code. 2023-01-09 05:22:53 +00:00
xieqiyu
4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
lanzongjun
3e2648ab5e * Fix Bug #30240 2022-11-25 09:34:57 +08:00
lanzongjun
8ef4f02bf8 * Fix bug #29442#29695 2022-11-18 15:38:59 +08:00
lanzongjun
0b2bb1a273 * Fix bug #29442#29695 2022-11-18 15:18:57 +08:00
王怡栋
fc592d33d2 Merge branch 'fixbug' into 'master'
* Fix bug #29820.

See merge request easycorp/zentaopms!6169
2022-11-16 01:58:37 +00:00
tanghucheng
d626bfbaef * Fix bug #29820. 2022-11-16 08:49:31 +08:00
王怡栋
575854c7dd Merge branch 'fixbug' into 'master'
* Fix bug #29749.

See merge request easycorp/zentaopms!6153
2022-11-15 05:31:35 +00:00
tanghucheng
9835f45987 * Fix bug #29749. 2022-11-15 13:09:44 +08:00
xieqiyu
5ee8a7e1ac * Fix bug#29441. 2022-11-14 14:46:19 +08:00
tanghucheng
f017fddb67 * Add gantt icon. 2022-11-10 15:37:08 +08:00
tanghucheng
1ca5456053 * Fix bug #29006. 2022-10-27 13:35:31 +08:00
tanghucheng
ae7589b5e4 * Fix bug #29016,#29006,#29020. 2022-10-27 10:44:59 +08:00
tanghucheng
d96d6bb803 * Finish task #73234,73242. 2022-10-27 08:09:26 +08:00
tanghucheng
e06a98bd09 * Code for task #73235. 2022-10-25 16:26:10 +08:00
tianshujie
80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
wangzemei
b37f3e8d42 * fix bug 28416 2022-10-11 10:32:35 +08:00
曹延义
0bff4d85fd * Fix bug #28360. 2022-10-10 15:49:57 +08:00
wangzemei
f0c3b79018 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878 2022-10-09 15:42:16 +08:00
曹延义
b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
wangzemei
ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
tianshujie
ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +08:00
liuhong
a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
zenggang
262ab9e5cd * Fix sprint211 problems. 2022-08-05 05:19:47 +00:00
wangyidong
f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
wangyuting2
afba28db68 * Add project execution approval menu. 2022-08-03 16:48:10 +08:00
zenggang
8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
mayue
e31f207b0b * Fix bug #25358. 2022-07-15 10:45:23 +08:00
zhouxudong
ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
zhouxudong
729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +00:00
孙广明
5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
孙广明
bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
孙广明
2557d4ba30 * Code for execution list. 2022-07-12 17:30:14 +08:00
孙广明
8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
孙广明
c56ec2cbe4 * Add stage name. 2022-07-12 14:08:35 +08:00
孙广明
4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
孙广明
daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
孙广明
f507af4cd0 * Code for stage list. 2022-07-11 18:19:27 +08:00
guofeilong
7c8366682c * Add function addTR atempt to enclosure ajaxFunc 2022-07-08 09:38:23 +00:00
guofeilong
819323633f * Fix write mistake 2022-07-08 09:21:23 +00:00
guofeilong
b018809f53 * add click func to this two button 2022-07-08 09:17:35 +00:00
孙广明
1afa07c083 * Code for task list. 2022-07-08 13:37:28 +08:00