Commit Graph

851 Commits

Author SHA1 Message Date
Yagami
b78b515fa8 * Fix execution delay label error. 2023-04-10 09:20:43 +08:00
tianshujie
52a40837df * Fix bug #33617. 2023-04-04 10:33:46 +08:00
tianshujie
d30de7b7a2 * Code for task #89153. 2023-03-29 13:23:39 +08:00
tianshujie
300cbe8f04 * Add empty option for execution Drop-down selection. 2023-03-29 11:32:48 +08:00
tianshujie
340228242e * Remove the document library of the parent stage. 2023-03-29 11:28:45 +08:00
Yagami
4c4daf6a2e * Fix bug #33084. 2023-03-20 14:06:52 +08:00
王怡栋
c1259d1e77 Merge branch 'sprint/feedback2356' into 'master'
Sprint/feedback2356

See merge request easycorp/zentaopms!7140
2023-03-20 02:25:54 +00:00
Yagami
4c88c29318 * Fix bug #33009. 2023-03-17 09:14:07 +08:00
caoyanyi
d5ef16c75a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-16 14:32:19 +08:00
caoyanyi
d435783cae * Modify font color. 2023-03-16 14:09:01 +08:00
liumengyi
068784e472 * Fix bug #32954. 2023-03-16 02:17:48 +00:00
liumengyi
6fc0fd1867 * Fix bug #32618. 2023-03-15 06:59:37 +00:00
liumengyi
0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00
xieqiyu
84e8ea04f5 * Code for bug#32835. 2023-03-13 02:50:03 +00:00
tianshujie
b924688fe8 * Fix bug #32711. 2023-03-09 10:20:20 +08:00
chaideqing
2c65356ae6 * Refactor code. 2023-03-08 10:29:57 +08:00
孙广明
59c05f91c7 Merge branch 'fixbug_liumengyi_32633' into 'master'
* Fix bug 32603 32632 32633.

See merge request easycorp/zentaopms!7142
2023-03-08 01:24:54 +00:00
liumengyi
47c874ae0c * Fix bug #32633. 2023-03-06 00:41:04 +00:00
Yagami
f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
chaideqing
ba7ff2154e * Refactor code. 2023-03-03 15:06:35 +08:00
Yagami
46661419f6 * Code for stage path. 2023-03-03 09:59:15 +08:00
Yagami
1ce1a24f1d * Fix execution-stage list bug. 2023-03-02 17:40:47 +08:00
liumengyi
285dcf409b * Fix bug #32513. 2023-03-02 07:56:48 +00:00
chaideqing
81e76a0e1e * Fix feedback2356 edit function. 2023-03-02 15:55:01 +08:00
liumengyi
ee007fe1f6 * Fix bug #32513. 2023-03-02 07:35:35 +00:00
chaideqing
df651dd614 * Fix feedback 2356. 2023-03-02 13:02:04 +08:00
王怡栋
8aceed5e5a Merge branch 'sprint/hufangzhou_formatcode' into 'master'
* Format the code and remove type restriction when batch change execution's status.

See merge request easycorp/zentaopms!7112
2023-03-01 10:15:45 +00:00
liumengyi
aa7540d163 * Fix bug #32558. 2023-03-01 08:47:10 +00:00
liumengyi
9567ecadfb * Fix bug of check date. 2023-03-01 08:11:25 +00:00
孙广明
65884c2dd9 Merge branch 'fixbug_liumengyi_32423' into 'master'
* Fix bug  32423 32540 32157.

See merge request easycorp/zentaopms!7110
2023-03-01 07:49:18 +00:00
hufangzhou
e89d668fc5 * Format the code and remove type restriction when batch change execution's status. 2023-03-01 07:44:23 +00:00
Yagami
9fe8ffa4af Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-03-01 14:48:22 +08:00
Yagami
97c421c5b4 * Fix bug #32374. 2023-03-01 14:48:12 +08:00
liumengyi
2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
孙广明
cef80a4330 Merge branch 'sprint/hufangzhou_fixbug_32533' into 'master'
* Fix bug #32533.

See merge request easycorp/zentaopms!7107
2023-03-01 06:34:02 +00:00
孙广明
dc4027286e Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32513.

See merge request easycorp/zentaopms!7106
2023-03-01 06:33:24 +00:00
hufangzhou
c262a060bd * Fix bug #32533. 2023-03-01 05:32:58 +00:00
liumengyi
951e4a09e1 * Fix bug #32513. 2023-03-01 05:06:42 +00:00
hufangzhou
e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +00:00
zhujinyong
e0bb071d99 * Fix bug #32339. 2023-03-01 08:52:19 +08:00
王怡栋
4f6e7cbe34 Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug

See merge request easycorp/zentaopms!7096
2023-03-01 00:32:32 +00:00
王怡栋
97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00
tianshujie
797c0befa2 * Code for fix bug #32505. 2023-02-28 17:03:09 +08:00
Yagami
7ca8fbffb4 * Fix code error. 2023-02-28 16:22:59 +08:00
孙广明
54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
xieqiyu
23518e36fd * Code for bug#32489. 2023-02-28 14:33:43 +08:00
Yagami
abc8bf2788 * Fix bug #32450. 2023-02-28 14:16:29 +08:00
liumengyi
cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
liumengyi
0f7851c03a * Fix bug #32464. 2023-02-28 02:59:43 +00:00
liumengyi
415c19a5d4 * Optimize code. 2023-02-28 01:47:28 +00:00