Commit Graph
53350 Commits
Author SHA1 Message Date
guofeilong b2000c4403 * Adjust code . 2023-04-04 13:10:24 +08:00
caoyanyi 16a94c471b * Modify page style. 2023-04-04 13:07:53 +08:00
caoyanyi ff5509e5d5 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 11:57:50 +08:00
caoyanyi 308c12095b * Optimize page style. 2023-04-04 11:57:29 +08:00
wangyidong b65f7996a8 * code for task #89905. 2023-04-04 11:29:59 +08:00
王怡栋 3824aecf9e Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7305
2023-04-04 03:23:33 +00:00
caoyanyi bf4de54980 * Code for bug #33706. 2023-04-04 11:21:39 +08:00
wangyidong 5983e62864 * code for task #89905. 2023-04-04 11:16:39 +08:00
wangyidong f6c0c0e14f * code for task #89905. 2023-04-04 11:16:39 +08:00
王怡栋 cefeb5dbe2 Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7304
2023-04-04 03:14:41 +00:00
tianshujie a3e64446b4 * Fix jump link for execution document library. 2023-04-04 11:05:17 +08:00
liugang 56dc716e6e + Add privilege of annualData. 2023-04-04 02:57:45 +00:00
caoyanyi 9313f05b4a * Code for task #89917. 2023-04-04 10:57:03 +08:00
caoyanyi fae1a8a1b1 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 10:56:59 +08:00
guofeilong c40a50987a * Adjust code . 2023-04-04 10:54:34 +08:00
tianshujie bcfd37f6e4 * Fix bug #33697. 2023-04-04 10:54:30 +08:00
tianshujie 52a40837df * Fix bug #33617. 2023-04-04 10:33:46 +08:00
liugang 0d19218860 * Display the annualData by fetch. 2023-04-04 02:33:40 +00:00
王怡栋 6f82b846c4 Merge branch 'release/zentaopms_18.3' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7303
2023-04-04 02:25:02 +00:00
tianshujie 6d075a59c2 * Fix bug #33635. 2023-04-04 10:24:16 +08:00
王怡栋 0e02cf6cda Merge branch 'daitingting_replace_grouppriv' into 'master'
* Replace screen grouppriv instead of update.

See merge request easycorp/zentaopms!7302
2023-04-04 02:18:17 +00:00
caoyanyi e165bf1cfd * Remove unused code. 2023-04-04 10:12:29 +08:00
tianshujie 0280b418b2 * Fix bug #33688. 2023-04-04 10:04:51 +08:00
tianshujie 8273eb56ff * Fix bug #33635. 2023-04-04 09:58:50 +08:00
caoyanyi 32a7ced719 * Code for bug #33693. 2023-04-04 09:58:11 +08:00
tianshujie dd4f6dd90b * Fix bug #33639. 2023-04-04 09:55:58 +08:00
caoyanyi 8e6fe16197 * Modify back url cookie set. 2023-04-04 09:53:28 +08:00
daitingting b78e369044 * Replace screen grouppriv instead of update. 2023-04-04 09:53:26 +08:00
王怡栋 8db2bb9bde Merge branch 'dev/gfl_zui_files_refactors' into 'master'
* ZUI: files refactors .

See merge request easycorp/zentaopms!7301
2023-04-04 01:49:49 +00:00
孙广明 f8163a7155 Merge branch 'sprint/scx_dimension2pms' into 'master'
* Move createDimension to pms.

See merge request easycorp/zentaopms!7300
2023-04-04 01:45:51 +00:00
tianshujie 5d7165ea95 * Fix bug #33637. 2023-04-04 09:45:26 +08:00
宋辰轩 3502de4b7b * Move createDimension to pms. 2023-04-04 09:42:52 +08:00
tianshujie f5158ac6e0 * Fix bug #33647. 2023-04-04 09:33:06 +08:00
guofeilong 2b0f6ad5f2 * ZUI: files refactors . 2023-04-04 09:32:17 +08:00
tianshujie ebcf8e9b05 * Fix bug #33660. 2023-04-04 09:28:17 +08:00
liugang 07a3a4c3da * Remove annualData privilege. 2023-04-04 01:12:11 +00:00
孙广明 9175f890e9 Merge branch 'sprint/scx_add-default-dimension' into 'master'
* Create default dimension no matter zentao version.

See merge request easycorp/zentaopms!7295
2023-04-04 01:11:22 +00:00
王怡栋 65c87cf5b6 Merge branch 'release/zentaopms_18.3' into 'master'
* Fixing SQL problems

See merge request easycorp/zentaopms!7299
2023-04-04 00:34:27 +00:00
王怡栋 fdad7cdd73 Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Finish task #90147.

See merge request easycorp/zentaopms!7297
2023-04-04 00:33:53 +00:00
tianshujie 2d28c823d2 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 18:31:24 +08:00
tianshujie 5ada3019fe * Fixing SQL problems. 2023-04-03 18:31:03 +08:00
liugang 7d919baf3c * Sort the privileges of pivot module, finish task #90073. 2023-04-03 09:27:29 +00:00
王怡栋 aa919a2021 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7298
2023-04-03 09:16:18 +00:00
caoyanyi ec2e0276de * Optimize api page style. 2023-04-03 17:11:27 +08:00
guofeilong 489ae36491 * Adjust code . 2023-04-03 17:06:54 +08:00
liugang 4b5b9bd85a * Assign dimension ID to the view page. 2023-04-03 08:58:29 +00:00
wangyuting2 8ca58ff327 * Finish task #90147. 2023-04-03 16:52:58 +08:00
王怡栋 a3b7c7fe0b Merge branch 'dev/gfl_add_class_checkbox-indeterminate-block' into 'master'
Dev/gfl add class checkbox indeterminate block

See merge request easycorp/zentaopms!7296
2023-04-03 08:41:58 +00:00
郭飞龙 2200faa625 * Adjust code . 2023-04-03 08:41:12 +00:00
guofeilong e2328f2051 * Adjust code . 2023-04-03 16:21:04 +08:00