Commit Graph
52745 Commits
Author SHA1 Message Date
qixinzhi 8d2de9f85a * Update go-view dist. 2023-03-27 17:24:53 +08:00
wangyuting2 2e7c57e7dd * Upgrade to new goview. 2023-03-27 15:21:36 +08:00
daitingting 9cf1b954a3 * Upgrade vars of report to filters of pivot. 2023-03-24 13:52:15 +08:00
xieqiyu c53a2ff5e5 * Code for task#86981. 2023-03-24 05:40:41 +00:00
xieqiyu d655beb156 * Code for task#86981. 2023-03-24 02:41:55 +00:00
xieqiyu 3412fe2fad * Code for task#86981. 2023-03-23 06:16:48 +00:00
wangyuting2 fe2c72be75 * Adjust screen image css. 2023-03-23 13:41:54 +08:00
wangyuting2 c162f1e4c0 * Finish task #88445 and #88444. 2023-03-23 13:29:54 +08:00
xieqiyu 395ba38d89 * Code for task#86981. 2023-03-23 05:27:20 +00:00
xieqiyu 83bc0d9f32 * Code for task#86981. 2023-03-23 02:28:54 +00:00
daitingting 7220ef5507 * Process layout of dashboard. 2023-03-23 10:14:38 +08:00
qixinzhi 511240d0fa Merge branch 'master' into sprint/biz17 2023-03-22 17:15:46 +08:00
daitingting 089b5c5e66 * Upgrade filters. 2023-03-22 14:46:52 +08:00
daitingting 5b51aa844f * Backup chart table. 2023-03-22 10:12:39 +08:00
王怡栋 a4b69c17bc Merge branch 'dev/bug_#33115' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7259
2023-03-22 01:17:23 +00:00
wangyuting2 e76c81721f * Adjust bi sql. 2023-03-22 08:48:49 +08:00
daitingting ca216c4758 * Upgrade table chart to pivot. 2023-03-21 09:04:35 +00:00
wangyidong 6ecac70d85 * fix bug #33172. zentaopms_18.3 2023-03-21 15:44:47 +08:00
guofeilong acc21a3a4f * Adjust code . 2023-03-21 14:36:32 +08:00
hufangzhou 8660cc9663 * Remove the unsed code. 2023-03-21 14:18:26 +08:00
孙广明 da041f4b6c Merge branch 'sprint/hufangzhou_bug_closeBtn' into 'master'
* Fix bug for double close button.

See merge request easycorp/zentaopms!7258
2023-03-21 06:14:00 +00:00
hufangzhou 94d2b4de67 * Fix bug for double close button. 2023-03-21 14:12:50 +08:00
孙广明 5f20f3ad9c Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33127.

See merge request easycorp/zentaopms!7257
2023-03-21 06:04:36 +00:00
Yagami 3f307b913d * Fix bug #33154. 2023-03-21 14:02:36 +08:00
liumengyi 7d1d39187f * Fix bug #33139. 2023-03-21 05:39:04 +00:00
王怡栋 57d9038f3a Merge branch 'revertCode' into 'master'
* Revert the code.

See merge request easycorp/zentaopms!7256
2023-03-21 05:29:37 +00:00
王怡栋 cf737b035e Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33139, #33127

See merge request easycorp/zentaopms!7255
2023-03-21 05:27:39 +00:00
王怡栋 f51c04d4fc Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7252
2023-03-21 05:26:30 +00:00
王怡栋 0c1008f8a1 Merge branch 'hufangzhou_bug_33117' into 'master'
* Fix bug #33117.

See merge request easycorp/zentaopms!7250
2023-03-21 05:25:30 +00:00
hufangzhou d29643cf57 * Revert the code. 2023-03-21 13:25:02 +08:00
wangyidong b5127c2bb8 * fix bug #33100. 2023-03-21 13:15:17 +08:00
孙广明 f5e25fe88d Merge branch 'sprint/scx_taskapi' into 'master'
* Fix bug for task multi.

See merge request easycorp/zentaopms!7254
2023-03-21 05:12:33 +00:00
liumengyi 1037f1aa82 * Fix bug #33139. 2023-03-21 03:27:35 +00:00
liumengyi 346ce0c994 * Fix bug #33140. 2023-03-21 03:25:20 +00:00
宋辰轩 4a3b0fa07e * Fix bug for task multi. 2023-03-21 11:23:09 +08:00
caoyanyi 799b3b366f * Code for bug #33144. 2023-03-21 11:19:24 +08:00
caoyanyi 2d3f0d3dcb * Code for bug #33141. 2023-03-21 10:59:07 +08:00
王怡栋 b75042e76a Merge branch 'fixbug_gfl' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7251
2023-03-21 02:56:41 +00:00
guofeilong e56d215568 * Adjust code . 2023-03-21 10:53:20 +08:00
tianshujie 01857a4874 * Fix bug #33138. 2023-03-21 10:51:12 +08:00
hufangzhou fed2f109b3 * Fix bug #33117. 2023-03-21 10:44:49 +08:00
daitingting f439868d08 * ProcessChart and processReport when upgrade. 2023-03-21 02:34:08 +00:00
liumengyi c5083612cb * Fix bug #33127. 2023-03-21 02:31:54 +00:00
王怡栋 e24c179ac6 Merge branch 'bugfix/32166_lmy' into 'master'
* Fix bug #32166.

See merge request easycorp/zentaopms!7247
2023-03-21 02:27:38 +00:00
王怡栋 0c814c654a Merge branch 'hufangzhou_33128' into 'master'
* Fix bug #33128.

See merge request easycorp/zentaopms!7249
2023-03-21 02:27:20 +00:00
王怡栋 79638d0470 Merge branch 'hufangzhou_bug_33101' into 'master'
* Fix bug #33101.

See merge request easycorp/zentaopms!7246
2023-03-21 02:27:00 +00:00
hufangzhou f6ec44cd06 * Fix bug #33128. 2023-03-21 10:20:06 +08:00
孙广明 b45263bd5f Merge branch 'hufangzhou_32962' into 'master'
* Fix bug #32962.

See merge request easycorp/zentaopms!7248
2023-03-21 02:10:55 +00:00
hufangzhou f33fe4ed04 * Fix bug #32962. 2023-03-21 10:08:41 +08:00
liumengyi f06b94926e * Fix bug #32166. 2023-03-21 01:32:36 +00:00