Commit Graph
1261 Commits
Author SHA1 Message Date
tianshujie b4530e1a74 * Fix bug #28184. 2022-09-30 09:19:15 +08:00
李玉春 7d24a5ce0d Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug

See merge request easycorp/zentaopms!5633
2022-09-30 00:58:12 +00:00
tianshujie fc8f8117a3 * Fix bug #28184. 2022-09-29 18:14:13 +08:00
xieqiyu bc0aba20b9 * Fix bug#27008. 2022-09-29 08:42:57 +00:00
曹延义 feb98f882c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug 2022-09-29 09:16:40 +08:00
李玉春 befe790a5f Merge branch 'sprint/244_tianshujie_70482' into 'sprint/244'
Sprint/244 tianshujie 70482

See merge request easycorp/zentaopms!5600
2022-09-29 01:08:46 +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
tianshujie c96db5b857 * Finish task #70482. 2022-09-28 15:31:44 +08:00
曹延义 e363bb4ef9 Merge branch 'sprint/244' into sprint/244_wangzemei_70009 2022-09-28 15:19:58 +08:00
tianshujie 51fb885b08 * Finish task #70482. 2022-09-28 15:10:49 +08:00
曹延义 b232a4eb68 * Modify batch edit project for program page. 2022-09-28 14:45:20 +08:00
曹延义 d231cad850 * Modify batch edit style. 2022-09-28 14:32:19 +08:00
tianshujie 0266e470c9 * Finish task #70009. 2022-09-28 11:23:40 +08:00
tianshujie e033345aea * Finish task #70009. 2022-09-28 11:18:17 +08:00
tianshujie 3979c28fb2 * Finish task #70487. 2022-09-28 11:05:50 +08:00
曹延义 46474331ba * Modify batch edit style for product list page. 2022-09-28 11:00:45 +08:00
曹延义 ca5110623e * Add project checkbox style. 2022-09-28 10:09:32 +08:00
tianshujie 4f8bc6a9ad * Finish task #70489,70488. 2022-09-28 10:06:55 +08:00
曹延义 6cb187bec1 * Modify product page style. 2022-09-27 16:26:24 +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
tianshujie e82f1f6d6a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_bug 2022-09-26 08:12:31 +08:00
朱金勇 d3911c77e6 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5518
2022-09-23 16:05:19 +00:00
dingyongliang b708b328ee * hidden all projects. 2022-09-23 08:48:17 +00:00
tianshujie e553730c29 * Finish task #70202. 2022-09-23 16:33:56 +08:00
dingyongliang 41672b5107 * add icon for program. 2022-09-23 08:26:53 +00:00
tianshujie 5bfe67480a * Fix bug #27547. 2022-09-23 13:07:34 +08:00
曹延义 7488846987 * Modify budget calc. 2022-09-23 13:01:45 +08: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
王怡栋 5c39464bc6 Merge branch 'sprint/241_dyl_70021' into 'master'
* task #70021, rm showClose btn.

See merge request easycorp/zentaopms!5457
2022-09-21 09:14:45 +00:00
王怡栋 2b39a8f8f6 Merge branch 'sprint/241_dyl_70027' into 'master'
* task #70027, rm project icon.

See merge request easycorp/zentaopms!5456
2022-09-21 09:14:24 +00:00
dingyongliang f311f9d411 * task #70027, rm project icon. 2022-09-21 06:34:20 +00:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
dingyongliang b435a95dd7 * task #70021, rm showClose btn. 2022-09-20 08:58:13 +00:00
tianshujie 29bd1d6588 * Update test case of program module. 2022-09-14 10:37:05 +08:00
tianshujie 73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +08:00
liumengyi 2bb576415a * Fix bug #26298. 2022-09-05 11:22:12 +08:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00:00
李玉春 0bc581b21c Merge branch 'sprint/235' into 'master'
Sprint/235

See merge request easycorp/zentaopms!5216
2022-08-31 08:19:32 +00:00
zenggang 6c48f5ec97 * Finish task#67260 2022-08-30 06:39:36 +00:00
孙广明 1e1ddeb0b0 Merge branch 'sprint/235_tianshujie_26758' into 'sprint/235'
* Fix bug #26758,  #25942., #23957.

See merge request easycorp/zentaopms!5176
2022-08-29 06:53:31 +00:00