Commit Graph
21958 Commits
Author SHA1 Message Date
qiyu-xie ba205e23af * Finish task#36081. 2021-02-19 09:39:28 +08:00
hufangzhou 796d89c8e9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-19 09:37:30 +08:00
hufangzhou f821dad6d2 * Finish task #36002. 2021-02-19 09:11:36 +08:00
Yagami 2d3e8e42b3 * Remove product change program condition. 2021-02-19 09:10:29 +08:00
leiyong 40f64463b1 * Fix bug. 2021-02-18 14:03:05 +08:00
hufangzhou def14e0080 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-18 13:37:47 +08:00
hufangzhou 1205201de1 * Fix bug #10977. 2021-02-18 13:37:44 +08:00
leiyong eddeec47cf * Fix bug. 2021-02-18 13:22:22 +08:00
hufangzhou 154276a3f6 * Adjust the style. 2021-02-18 09:59:44 +08:00
hufangzhou bf3874c53e * Adjust the submit button style. 2021-02-18 09:30:16 +08:00
hufangzhou fa4c4c31c1 * Fix a bug. 2021-02-18 09:12:39 +08:00
holan20180123 94bacf0238 * Adjust the style. 2021-02-10 16:16:45 +08:00
hufangzhou fe39709e78 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-10 14:51:40 +08:00
hufangzhou 9b123a8c56 * Fix a bug. 2021-02-10 14:51:38 +08:00
sgm0422 0f43ebdd34 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-10 10:56:26 +08:00
sgm0422 aaabaabf4e * Fix bug. 2021-02-10 10:56:20 +08:00
leiyong 6470a77a4e * Fix bug#10974. 2021-02-10 10:07:47 +08:00
holan20180123 c90fdfc528 * Remove duplicate code. 2021-02-09 14:36:52 +08:00
holan20180123 04d48a701d * Remove duplicate code. 2021-02-09 14:20:03 +08:00
hufangzhou e10844807b Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-09 09:29:55 +08:00
hufangzhou d013ea7a3f * Fix bug #10971. 2021-02-09 09:29:51 +08:00
holan20180123 440d8f440e * Delete duplicate code. 2021-02-08 17:09:11 +08:00
holan20180123 166f48a297 * Delete duplicate code. 2021-02-08 17:01:10 +08:00
leiyong 5b69333ed1 * Fix bug. 2021-02-08 15:20:54 +08:00
holan20180123 67dd183b10 * Fix bug #10966. 2021-02-08 14:21:15 +08:00
hufangzhou 49148806ac * Adjust the date control style. 2021-02-08 14:05:13 +08:00
holan20180123 a76ae26523 * Fix bug #10966. 2021-02-08 10:53:11 +08:00
leiyong 4bc4aac3be * Fix bug. 2021-02-07 17:33:08 +08:00
leiyong 86605772b0 * Fix bug. 2021-02-07 17:19:36 +08:00
hufangzhou 80269b0d7f Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-07 16:54:26 +08:00
hufangzhou e961221f9d * Fix a bug. 2021-02-07 16:54:24 +08:00
qiyu-xie 73cc080ca2 * Modify the file name when export requirement. 2021-02-07 16:38:41 +08:00
leiyong 600adeffa3 * Delete ->navGroup->report. 2021-02-07 15:55:42 +08:00
tianshujie98 7f988a7678 * Fix bug. 2021-02-07 15:06:26 +08:00
hufangzhou 161091b205 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-07 14:40:56 +08:00
hufangzhou 7b7e6ca1e2 * Fix bug #10962. 2021-02-07 14:40:53 +08:00
holan20180123 e20edbd507 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-07 14:08:55 +08:00
holan20180123 4d3549d213 * Fix bug #10961. 2021-02-07 14:08:38 +08:00
hufangzhou 7f91a9bfff Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-07 13:59:18 +08:00
hufangzhou 84737561fd * Fix bug #10947. 2021-02-07 13:59:14 +08:00
leiyong bc2cca510c * Fix bug#10949. 2021-02-05 17:13:08 +08:00
holan20180123 abec7b041b * Fix bug #10950. 2021-02-05 16:57:01 +08:00
qiyu-xie b81164efe0 * Navigation error after click zeroCase. 2021-02-05 15:54:00 +08:00
leiyong 4ce72a430b * Fix bug. 2021-02-05 15:36:11 +08:00
leiyong 21dd44fc92 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-05 15:35:55 +08:00
holan20180123 ba3337c6a0 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-05 14:15:37 +08:00
holan20180123 8c50f17c84 * Fix bug #10950. 2021-02-05 14:15:10 +08:00
leiyong 21d9cd791d * Fix bug. 2021-02-05 13:10:40 +08:00
hufangzhou cf31720440 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-05 11:48:04 +08:00
hufangzhou 0a0babaf9b * Adjust the code. 2021-02-05 11:48:01 +08:00