Commit Graph
121 Commits
Author SHA1 Message Date
Yagami 832434a462 * Code for program-browse ipd icon. 2023-05-12 15:00:50 +08:00
tianshujie 2b7cff9090 * Fixed list title color issues. 2023-03-15 09:22:49 +08:00
Yagami fe93b22b68 * Code for program browse icon. 2023-02-22 11:22:29 +08:00
caoyanyi abe3332930 * Fix bug #29224, 29094. 2022-11-03 14:56:55 +08:00
tianshujie 9a4b253718 * Change the color of the program name when hover. 2022-11-03 09:11:33 +08:00
tianshujie c51a1b9233 * Finish task #74082. 2022-10-31 16:58:31 +08:00
tianshujie f080000984 * Finish task #71905. 2022-10-10 14:14:33 +08:00
dingyongliang 6cbce4d471 * fix danger label overlay. 2022-09-30 05:20:38 +00:00
dingyongliang 768f91b1f5 * task #70022, optimize program style. 2022-09-30 05:20:38 +00:00
wangzemei f0e61febec Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_70009 2022-09-28 16:34:31 +08:00
dingyongliang bbd8f8c2e5 * change danger label position. 2022-09-28 08:14:41 +00:00
dingyongliang dfe949d04f * task #70025, change program and project color. 2022-09-28 08:14:38 +00:00
曹延义 e363bb4ef9 Merge branch 'sprint/244' into sprint/244_wangzemei_70009 2022-09-28 15:19:58 +08:00
曹延义 79009a9d80 * Modify checkbox display. 2022-09-27 15:52:29 +08:00
wangzemei 0d0eca9ff8 * finish task#70009 2022-09-26 14:38:18 +08:00
曹延义 b5e9d3e5ba * Code for task #70502. 2022-09-26 11:10:15 +08:00
dingyongliang b708b328ee * hidden all projects. 2022-09-23 08:48:17 +00:00
dingyongliang 41672b5107 * add icon for program. 2022-09-23 08:26:53 +00:00
wangzemei 20ccc81a8a * fix bug 27863 2022-09-23 10:52:47 +08:00
王怡栋 504e24ffff Merge branch 'sprint/241_dyl_70023' into 'master'
* task #70023, adjust danger label position.

See merge request easycorp/zentaopms!5482
2022-09-23 01:04:31 +00:00
李玉春 749463b85b Merge branch 'sprint/241_dyl_70026' into 'master'
* task #70026, replace more icon.

See merge request easycorp/zentaopms!5481
2022-09-22 08:39:23 +00:00
dingyongliang 7416757b1d * task #70023, adjust danger label position. 2022-09-22 06:40:37 +00:00
dingyongliang 6f8533ae78 * task #70026, replace more icon. 2022-09-22 06:17:09 +00:00
dingyongliang 455aa2b0a8 * task #70025, set program title bold. 2022-09-22 01:18:01 +00:00
tianshujie b47cd1b77b * Fixed an issue where the admin could not click on the program. 2022-08-19 11:36:05 +08:00
liuhong bb856c1fce *Finish task #63781. 2022-08-09 02:32:04 +00:00
liuhong 0fa2de0ff8 *Finish task #63781. 2022-08-09 01:23:43 +00:00
xieqiyu e927796641 * Fix bug#25004. 2022-07-28 08:16:07 +08:00
zhouxudong 463b4d0710 * Finish task #57859. 2022-06-24 02:14:08 +00:00
Hao Sun 72d4c854d3 * prevent user move row by click a link. 2022-06-17 07:39:03 +00:00
Hao Sun 775746df0a * optimize program list, support to preserve nested state. 2022-06-17 07:31:51 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
leiyong df87ffddd2 * Finish task#54472. 2022-05-20 03:40:45 +00:00
leiyong 4198e05c9e * Adjust code. 2022-05-19 06:53:37 +00:00
leiyong d92c911062 * Finish task#54469. 2022-05-19 05:15:50 +00:00
leiyong 69fe59f541 * Finish task#54469. 2022-05-19 05:06:43 +00:00
wangyuting2 af47d16938 * Fix bug #22573. 2022-05-18 09:27:14 +08:00
zenggang e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
孙广明 621e257ae1 Merge branch 'sprint189_zg_53653' into 'master'
Finish task#53653,53657

See merge request easycorp/zentaopms!3313
2022-05-11 09:37:07 +00:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
zenggang d8d6ce45f7 * Finish task#53653 2022-05-10 08:58:00 +00:00
zhouxudong 79675da1e0 * Fix bug #220.38. 2022-04-28 05:11:23 +00:00
zhouxudong 5db8ea88b1 * Fix bug #22038. 2022-04-28 05:08:03 +00:00
zhouxudong fd52256122 * Fix bug #22038. 2022-04-28 03:27:09 +00:00
zhouxudong e2aa928abe * Fix bug #22038. 2022-04-28 02:57:42 +00:00
tianshujie e681135a3a * Fix bug #21643. 2022-04-13 14:22:32 +08:00
朱金勇 e1eb543ed7 Merge branch 'app_zry' into 'master'
App zry

See merge request easycorp/zentaopms!2872
2022-04-12 07:28:24 +00:00
zhengrunyu 7d3a91ab39 * Change function name for getBudgetWithUnit. 2022-04-12 09:53:30 +08:00
zhengrunyu fba6ac6a0e * Conversion budget unit. 2022-04-12 08:56:26 +08:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00