Commit Graph
125 Commits
Author SHA1 Message Date
wangyidong cc64eafe95 * Adjust code for upgrade module. 2021-03-05 13:05:19 +08:00
holan20180123 9fc4ff6e32 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-03 11:09:54 +08:00
holan20180123 b5a16df369 * Code for task #36028. 2021-03-03 11:09:34 +08:00
tianshujie98 8601b6e336 * Finish task #36373. 2021-03-03 11:02:05 +08:00
holan20180123 bc0c65f776 * Code for task #36028. 2021-03-03 10:46:15 +08:00
Yagami aab57d7d25 * Finish task #36314. 2021-03-02 13:07:55 +08:00
Yagami 294058ddcd * Finish task #36358 and rename mode. 2021-03-02 10:13:51 +08:00
qiyu-xie acf7d5f65a * Fix bug. 2021-02-26 09:59:28 +08:00
qiyu-xie 27d4ac77fe * Optimize code. 2021-02-26 09:18:26 +08:00
holan20180123 1324bec03b * Fix task #36047. 2021-02-26 08:54:25 +08:00
qiyu-xie 0cae24f3ef * When merged product lines, default selected first products. 2021-02-25 09:52:23 +08:00
qiyu-xie f534192438 * Process program when merging product lines. 2021-02-24 17:04:26 +08:00
qiyu-xie 0f23c8706d * Fix the program name when selected product already has program. 2021-02-24 15:04:24 +08:00
holan20180123 f2606bb1e0 * Code for task #36041. 2021-02-24 11:32:01 +08:00
Yagami 4319d006b8 * Fix bug. 2021-02-23 16:28:05 +08:00
qiyu-xie 6547d09a91 * Finish task#36046. 2021-02-23 10:31:24 +08:00
wangyidong 535fb750b3 * code for change after15mode to mode. 2021-02-23 09:12:48 +08:00
hufangzhou 183ee6bbc8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-22 14:03:20 +08:00
hufangzhou 3ade008ce6 * Finish task#36071. 2021-02-22 13:59:12 +08:00
wangyidong 6787d19ac7 * finish task #36010. 2021-02-22 13:04:18 +08:00
Yagami b668ce1970 * Finish task #36028,#36068,#36072. 2021-02-22 11:05:30 +08:00
wangyidong 98cea3e643 * finish task #35998. 2021-02-22 10:55:54 +08:00
qiyu-xie 48075c526d * When merge data by product, add an arrow in the page. 2021-02-22 09:27:26 +08:00
qiyu-xie ff8bb44ada * Fix bug. 2021-02-22 09:04:00 +08:00
qiyu-xie 83c4669281 * Finish task#36086. 2021-02-20 17:00:25 +08:00
Yagami 75136c6365 * Remove unused code. 2021-02-20 14:12:29 +08:00
qiyu-xie eba69aa8b7 * Finish task#36030.36047. 2021-02-20 13:26:51 +08:00
hufangzhou 62e481747d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 11:11:57 +08:00
hufangzhou 81f261dd64 * Finish task #36088. 2021-02-20 11:11:43 +08:00
holan20180123 6c7d50e989 * Finish task #36085. 2021-02-20 10:55:24 +08:00
holan20180123 05a30dd9aa * Finish task #36029,#36084. 2021-02-20 10:45:43 +08:00
Yagami aeee54b1f3 * Add upgrade repo logic. 2021-01-08 13:31:05 +08:00
hufangzhou d6455e7f41 * Fix bug#3726. 2020-12-04 14:21:33 +08:00
leiyong 4f4f6cbf9d * Adjust upgrade module. 2020-11-20 14:38:28 +08:00
leiyong 22a0fb1922 * Adjust the upgrade module mergeprogram.js file. 2020-11-19 17:50:18 +08:00
leiyong 55976aeb26 * Query the program and project logic when upgrading. 2020-11-19 17:32:08 +08:00
Yagami 7eaf1d34e1 * Adjust code. 2020-11-19 08:53:47 +08:00
leiyong 811e7a9de8 * Fix bug. 2020-11-17 15:28:12 +08:00
leiyong ef4db941b7 * Finish task#8301. 2020-11-17 14:03:10 +08:00
Yagami 13c924c5f5 * Merge code. 2020-11-13 11:38:22 +08:00
Yagami efeea142bc * Add video. 2020-11-03 13:33:30 +08:00
Yagami 478d51813f * Add sql. 2020-11-02 16:17:57 +08:00
Yagami 755513d9cd * Fix details. 2020-10-30 13:43:05 +08:00
Catouse 6c4885cd24 * task #8164, improve UI of upgrade/mergeprogram view. 2020-10-30 11:08:18 +08:00
Yagami d1f2919365 * Fix details. 2020-10-30 10:30:38 +08:00
Yagami 77e3053176 * Fix details. 2020-10-29 16:59:21 +08:00
Yagami b4ea03a2fd * Fix details. 2020-10-29 14:04:46 +08:00
Yagami 0f3348ad2a * Finish task #8164. 2020-10-27 14:46:03 +08:00
Yagami 27986da851 * Code for task #8164. 2020-10-26 16:36:32 +08:00
Yagami 5082e5a913 * Add upgrade view. 2020-10-26 16:36:32 +08:00