Commit Graph
56441 Commits
Author SHA1 Message Date
liuchenglong 2fe32edde4 * Resolve confilict. 2023-05-06 01:55:07 +00:00
liuchenglong 1214dc05b7 * Resolve confilict. 2023-05-06 01:51:00 +00:00
shenshulong 64cc586bd4 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 01:47:52 +00:00
shenshulong a09b477950 * Adjusted programplan ajaxCustom function. 2023-05-06 01:47:30 +00:00
dingguodong e0a5cde05f Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 09:44:50 +08:00
dingguodong 1334804d34 * Replace $this->productID with $productID for better readable code. 2023-05-06 09:43:30 +08:00
xushenjie 3e8187d89f Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 01:42:53 +00:00
xushenjie 6d5f87ae7c * Adjust the unit test script for todoModel::create(). 2023-05-06 01:42:31 +00:00
liuchenglong 158152c119 * Split program plan edit function. 2023-05-06 01:41:38 +00:00
dingguodong 6023df6846 * Prepare refactor programplanModel::create(). 2023-05-06 09:41:16 +08:00
lanzongjun b43f8da312 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 09:35:41 +08:00
lanzongjun 5f1054447c * Adjusted todo model resolve conflict. 2023-05-06 09:35:35 +08:00
lanzongjun 505c3e03dc * Adjusted todo model. 2023-05-06 09:33:04 +08:00
chentao 466814ab60 * product: move common function into model. 2023-05-06 09:32:44 +08:00
Wangyuting 9d91c3e0cd * Optimize block code. 2023-05-06 09:20:21 +08:00
xushenjie 4bb5172af4 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 01:19:04 +00:00
xushenjie eb0f96c4e0 * Adjust the method notes of todo module file. 2023-05-06 01:18:41 +00:00
liuhong 5cb75109a8 * Adjust code for activate control function. 2023-05-06 09:18:32 +08:00
xushenjie f3c38c1de6 * Optimize the code for the todo zen file. 2023-05-06 01:02:38 +00:00
dingguodong 76113325d8 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 08:49:48 +08:00
dingguodong 678d65f104 * Correct code refer to sonar. 2023-05-06 08:49:17 +08:00
xushenjie c5e33f00cd * Adjust the split of the logic associated with todoController::create(). 2023-05-06 00:47:03 +00:00
dingguodong bd9e112cd6 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 08:44:37 +08:00
dingguodong c46c48f0e6 * Prepare refactor programplanModel::create. 2023-05-06 08:37:15 +08:00
liuhong 50f528ad7a * Submit control layer activate function. 2023-05-05 20:17:56 +08:00
liuhong 228bd13b2c * Submit manageProduct function. 2023-05-05 19:56:59 +08:00
liuruogu e33c9b2f0e * Finish task #92563. 2023-05-05 19:24:52 +08:00
liuruogu e19b9e6857 * Do task #92556. 2023-05-05 19:24:52 +08:00
jukui 102ee17412 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-05 19:19:49 +08:00
jukui d00b2a0394 * Modify getSiblings function and test case for programplan model. 2023-05-05 19:19:03 +08:00
zhaoke e8a7b62865 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-05 19:15:32 +08:00
zhaoke b70e6c54b8 * Adjust poolID name. 2023-05-05 19:15:25 +08:00
lanzongjun 6618688f3e Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-05 19:14:52 +08:00
lanzongjun 36e723769d * Adjusted gantt data func. 2023-05-05 19:14:48 +08:00
jukui c1be1a1e9b * Modify getList function param type for todo model. 2023-05-05 19:09:13 +08:00
Wangyuting 845e55974c * Finish projectstatisticblock css. 2023-05-05 18:57:07 +08:00
dingyongliang b0b1e45dbc * refactor tabs wg. 2023-05-05 18:56:49 +08:00
sunhao 0521d95fb0 * zin: split form widget to form and formbase 2023-05-05 18:56:37 +08:00
wangyidong 02d6b1c2ec Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-05 18:44:54 +08:00
wangyidong aa4bc30df9 * add unit test. 2023-05-05 18:44:28 +08:00
xushenjie d39d3c45e5 * Optimize the code of todoTao. 2023-05-05 10:38:48 +00:00
xushenjie ada6ed9b87 * Reorder code of todoModel::createByCycle(). 2023-05-05 10:35:21 +00:00
lanzongjun 514b9d716f Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-05 18:33:23 +08:00
lanzongjun 5974474665 * Adjusted function param. 2023-05-05 18:33:19 +08:00
Lufei abe9641cbe - Remove a function for form. 2023-05-05 18:31:58 +08:00
xushenjie 2a24f37441 * Adjust the unit test script for todoModel::cretaeBycycle(). 2023-05-05 10:16:18 +00:00
wangyidong fecbd0bef1 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-05 18:07:11 +08:00
xushenjie 1bb838784d Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-05 10:06:16 +00:00
xushenjie 555c1b469a * Optimize the code for todoModel::createByCycle(). 2023-05-05 10:06:13 +00:00
Wangyuting 6adce696c6 * Optimize block contorl code. 2023-05-05 18:06:02 +08:00