Commit Graph

1187 Commits

Author SHA1 Message Date
liumengyi
df8366e1ad * Modify code format. 2022-01-20 14:55:06 +08:00
liumengyi
e2e794c27f * Finish task #48011. 2022-01-20 14:49:16 +08:00
王怡栋
49cf88b669 Merge branch 'sprint/183_tianshujie_48012' into 'master'
* Achieve smooth refresh of completed tasks.

See merge request easycorp/zentaopms!1516
2022-01-20 05:50:27 +00:00
tianshujie
7383bb566d * Modify the question. 2022-01-20 13:49:21 +08:00
tianshujie
ee15a96157 * Achieve smooth refresh of completed tasks. 2022-01-20 13:41:20 +08:00
tianshujie
b22eed4a6d * Fix bug #18783,18780. 2022-01-20 11:15:33 +08:00
孙广明
f30562f520 Merge branch 'sprint/183_zhouxin_47980' into 'master'
Finish task #47980.

See merge request easycorp/zentaopms!1496
2022-01-19 09:32:28 +00:00
朱金勇
4cb8d68e80 Merge branch 'sprint/183_zhouxudong_trans47958' into 'master'
*Finish task #47958.

See merge request easycorp/zentaopms!1497
2022-01-19 06:51:01 +00:00
zhouxudong
a7fa427b91 *Finish task #47958. 2022-01-19 14:29:23 +08:00
zhouxin
919e91b029 Finish task #47980. 2022-01-19 05:51:01 +00:00
liumengyi
cca28df709 * Fix bug and add sql file. 2022-01-19 13:13:08 +08:00
孙广明
fdac2458cb Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18481.

See merge request easycorp/zentaopms!1490
2022-01-19 03:17:59 +00:00
liumengyi
361d245ac6 * Remove useless variables. 2022-01-19 11:13:43 +08:00
liumengyi
2d10aedf4b * Remove useless code. 2022-01-19 09:04:11 +08:00
孙广明
0c17431df8 Merge branch 'sprint/182_tianshujie_18692' into 'master'
* Fix bug #18692.

See merge request easycorp/zentaopms!1491
2022-01-19 01:02:24 +00:00
王怡栋
f3a6122cbe Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1492
2022-01-19 01:01:42 +00:00
liumengyi
a1c6cfadcc * Modify required item judgment method. 2022-01-19 09:01:29 +08:00
tianshujie
bb1d4c3839 * Adjust code of kanban. 2022-01-19 09:01:12 +08:00
孙广明
66a5f99982 * Fix bug. 2022-01-19 09:00:07 +08:00
tianshujie
f7d97ebe33 * Fix bug #18692. 2022-01-19 08:49:09 +08:00
liumengyi
eb31aac6a1 * Encapsulation function for bug #18481. 2022-01-18 17:29:52 +08:00
liumengyi
8f924a7f05 * Fix bug #18481. 2022-01-18 17:23:54 +08:00
tianshujie
29e8966c33 * Fix drag sort issue. 2022-01-18 16:18:15 +08:00
tianshujie
daf29be42b * Fix bug #18520. 2022-01-18 16:01:25 +08:00
liumengyi
c587ac5863 * Fix bug #18671. 2022-01-18 14:46:38 +08:00
tianshujie
f579b6c7b2 * Fix bug #18664. 2022-01-18 14:23:06 +08:00
王怡栋
d19fa0e6ef Merge branch 'sgm_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!1470
2022-01-18 05:37:41 +00:00
孙广明
c9948abdec * Fix bug. 2022-01-18 13:35:06 +08:00
孙广明
266341191b Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18629.

See merge request easycorp/zentaopms!1468
2022-01-18 05:21:16 +00:00
liumengyi
42a352dc20 * Fix bug #18629. 2022-01-18 13:18:44 +08:00
liumengyi
a7c944d3e5 * Fix bug #18629. 2022-01-18 13:16:20 +08:00
孙广明
1935c26418 Merge branch 'sprint/182_tianshujie_18646' into 'master'
* Fix bug #18640,18646.

See merge request easycorp/zentaopms!1464
2022-01-18 05:12:30 +00:00
tianshujie
545d7f2e24 * Modify the code. 2022-01-18 13:06:50 +08:00
tianshujie
f257fe3e5a * Fix bug #18633. 2022-01-18 11:26:31 +08:00
liumengyi
b27b06929c * Fix bug #18644. 2022-01-18 11:19:04 +08:00
liumengyi
a0921f1c7d * Fix bug #18638, #18644. 2022-01-18 10:49:53 +08:00
孙广明
172b4ade25 Merge branch 'sprint/182_tianshujie_bug' into 'master'
Sprint/182 tianshujie bug

See merge request easycorp/zentaopms!1458
2022-01-18 02:03:09 +00:00
hufangzhou
cc3abb1c0b * Add the data-contextmenu to parent column. 2022-01-18 09:55:19 +08:00
孙广明
fb8fd8b7de Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18584, #18594.

See merge request easycorp/zentaopms!1453
2022-01-18 01:32:19 +00:00
tianshujie
e03ce5b677 * Fix bug #18575. 2022-01-18 09:32:07 +08:00
liumengyi
098622ffae * Fix bug #18619. 2022-01-18 09:29:04 +08:00
孙广明
139f1dbcac * Fix delay bug. 2022-01-18 09:18:13 +08:00
liumengyi
c377f3b54c * Fix bug #18584, #18594. 2022-01-18 09:03:30 +08:00
孙广明
07c98e7e1a Merge branch 'sprint/182_tianshujie_kanban' into 'master'
* Fix bug #18578,18536.

See merge request easycorp/zentaopms!1450
2022-01-18 00:50:11 +00:00
liumengyi
dd99e46107 * Fix bug #18619. 2022-01-18 08:17:21 +08:00
tianshujie
cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
liumengyi
deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
孙广明
c29afeee58 Merge branch 'sprint/182_tianshujie_18496' into 'master'
* Fix bug #18496.

See merge request easycorp/zentaopms!1446
2022-01-17 09:25:52 +00:00
tianshujie
3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
孙广明
48473a63dc Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18598, #18592, #18589, #18584, #18569, #18533, #18462.

See merge request easycorp/zentaopms!1444
2022-01-17 08:31:47 +00:00