Commit Graph
61 Commits
Author SHA1 Message Date
liumengyi 6815069457 * Modify width. 2023-06-25 13:57:09 +08:00
liumengyi 01e0d8217b * Set the width of the modal box to a CSS class. 2023-06-25 11:28:06 +08:00
liumengyi e29880edca * Optimize code. 2023-06-21 19:00:51 +08:00
liumengyi c6a9013ae7 * Refactor holiday::edit. 2023-06-21 18:44:12 +08:00
liumengyi 02ab7d5e5e * Optimize code. 2023-06-21 17:31:07 +08:00
liumengyi dc1880ab80 * Refactor holiday::import. 2023-06-21 17:28:02 +08:00
liumengyi cc8ad3f3c9 * Refactor holiday::create. 2023-06-21 16:36:00 +08:00
liumengyi fc14347876 * Change to modal. 2023-06-16 14:04:10 +08:00
liumengyi b340051b71 * Optimize code for holiday::browse. 2023-06-16 10:45:20 +08:00
liumengyi e0c770491a * Change to modal box. 2023-06-16 10:20:41 +08:00
liumengyi 90a51004b6 * Refactor holiday::browse. 2023-06-14 16:45:21 +08:00
zhouxin 77a2da90d9 * Batch modify quote for unit test. 2023-05-25 13:43:27 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
wangyidong 2e596f3907 * add title for show all desc. 2023-03-01 18:34:09 +08:00
caoyanyi d6fe7e5e79 * Fix bug #32453. 2023-02-28 13:27:47 +08:00
tianshujie c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
tianshujie 573b2ef793 * Modify the holiday list style. 2023-02-28 10:36:01 +08:00
wangyidong 11507ffff2 * fix bug #32277. 2023-02-27 16:16:04 +08:00
guofeilong 0d4a09fb42 * Code for style refactors in holiday. 2023-02-17 09:33:54 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
caoyanyi 53a597e301 * Hide holiday import style. 2023-02-14 15:26:59 +08:00
wangyidong 6b0a919b6f * code for task #83737. 2023-02-13 15:23:46 +08:00
caoyanyi ea3f16c869 * Optimize page style. 2023-02-08 15:00:54 +08:00
caoyanyi 3c2e056d46 * Adjust code. 2023-02-08 14:45:22 +08:00
caoyanyi adfc82feef * Optimize holiday import style. 2023-02-08 13:10:07 +08:00
caoyanyi 03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +08:00
Lufei 79540ab480 * Use string instead of varchar. 2022-12-08 14:23:23 +08:00
tianshujie e31283d2f9 * Modified Obtain the configuration information about the workweek. 2022-11-17 15:47:12 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
zhouxudong 6884f83b21 * Finish task #61110. 2022-07-20 01:31:31 +00:00
zhouxudong fd9c465df7 * Finish task #61110. 2022-07-19 02:21:10 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 192198a02f Merge branch 'test_sunjun' into 'master'
test_sunjun

See merge request easycorp/zentaopms!3262
2022-05-07 02:03:09 +00:00
sunjun 3ceae4320f test_sunjun 2022-05-07 01:41:38 +00:00
zhouxin d1ebd38016 * Add tsetcase for holiday. 2022-05-06 09:19:37 +00:00
tanghucheng 7442260c49 * Fix bug . 2022-04-28 16:47:11 +08:00
tanghucheng 9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08:00
liumengyi cc3c90291d * Finish task #47483. 2022-01-10 17:32:31 +08:00
孙广明 612c6e0728 * Add weekly and holiday. 2021-11-08 09:07:16 +08:00
Yagami 67832082d6 * Move holiday to max. 2021-02-24 16:29:02 +08:00
leiyong fa8ac71eee * Add version. 2021-01-29 17:10:24 +08:00
leiyong 4458e57c9d * Adjust code. 2020-12-21 10:39:49 +08:00
leiyong bff36567c9 * Adjust code. 2020-12-18 13:35:10 +08:00
Yagami 81302ef084 * Finish task #8597. 2020-12-10 15:05:33 +08:00
leiyong bb485680aa * Adjust the budget module code. 2020-12-09 08:27:19 +08:00
hufangzhou 8b291bc6da * Fix bug#3736. 2020-12-08 11:34:35 +08:00
leiyong d2ddce5e7c * Adjust the holiday module. 2020-12-08 11:08:32 +08:00