Commit Graph

800 Commits

Author SHA1 Message Date
王怡栋
bb8cf72b8b * Merge for fixed code after tag in this release. 2021-08-17 17:27:42 +08:00
wangyidong
392f0b1525 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-04 14:19:37 +08:00
wangyidong
fd8d02c7df * add new version and upgrade. 2021-08-04 14:18:09 +08:00
leiyong
3f1e7b39d6 * Limit budget value size. 2021-08-04 14:03:50 +08:00
qiyu-xie
dcb627fced * Fix issue#361. 2021-08-03 13:52:44 +08:00
holan20180123
7f87b7742c * Fix issue #371. 2021-08-03 13:32:31 +08:00
tianshujie98
8f32a5fe01 * Finish task #40802. 2021-08-03 11:32:44 +08:00
tianshujie98
d83bb8b852 * Finish task #40843. 2021-08-03 10:55:39 +08:00
qiyu-xie
c16b0d4ffa * Finish task#40841. 2021-08-03 10:32:15 +08:00
tianshujie98
e56c5bafdc * Finish task #40837. 2021-08-03 10:21:34 +08:00
tianshujie98
4ef9020331 * Finish task #40838. 2021-08-03 10:14:12 +08:00
tianshujie98
9e99084add * Finish task #40839. 2021-08-03 09:20:50 +08:00
tianshujie98
9f04b9540d * Finish task #40840. 2021-08-03 09:16:24 +08:00
holan20180123
559c1679b5 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-03 08:28:23 +08:00
holan20180123
6424ffd442 * Adjust review code. 2021-08-03 08:27:48 +08:00
tianshujie98
c319f176c0 * Code modified when submitting code review. 2021-08-03 08:15:12 +08:00
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
qiyu-xie
8856ad6cc4 * Modify create project and program button style. 2021-08-02 14:31:30 +08:00
tianshujie98
6cf5b67feb * Add format judgment to the exchange rate. 2021-08-02 09:01:11 +08:00
qiyu-xie
eaffdc7a50 * Fix bug#13816. 2021-08-01 14:40:54 +08:00
Hao Sun
4bfa8f6cad * improve UI. 2021-07-30 14:38:39 +08:00
Hao Sun
8de42e5bca * add space between icon and text. 2021-07-30 14:38:39 +08:00
tianshujie98
e67b31f6a9 * Fix bug #13927. 2021-07-30 10:26:35 +08:00
tianshujie98
3c1c8ac6c4 * Adjust the column width of the product list under the program. 2021-07-29 09:05:05 +08:00
wangyidong
8d37af5669 * code for task #40451. 2021-07-28 17:49:03 +08:00
tianshujie98
263cc1d3c4 * Adjust page. 2021-07-28 08:18:21 +08:00
qiyu-xie
60e9643246 * Finish task#40513. Adjust program progress display style. 2021-07-26 09:59:12 +08:00
tianshujie98
8b6c3073d4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-26 09:27:36 +08:00
tianshujie98
c18b85dbda * Finish task #40518,#40519. 2021-07-26 09:27:12 +08:00
qiyu-xie
fcbf7ea63a * Fix a bug: empty program progress has error. 2021-07-23 15:16:26 +08:00
qiyu-xie
e7c113f935 * Finish task#40513. 2021-07-23 14:11:58 +08:00
Hao Sun
c6225f8b5d * ensure visible progress pie inited after toggle nest states @xieqiyu. 2021-07-23 10:55:24 +08:00
qiyu-xie
a846d966b5 * Add progress at program list. 2021-07-23 09:07:49 +08:00
qiyu-xie
a10a069fd6 * Finish task#40514. 2021-07-22 16:00:23 +08:00
qiyu-xie
5a25b835ff * Finish task#40512. 2021-07-22 14:40:05 +08:00
qiyu-xie
39dd1339ba * Finish task#40512. 2021-07-22 14:32:13 +08:00
qiyu-xie
94d2a7e781 * Adjust code. 2021-07-22 14:14:34 +08:00
qiyu-xie
101a8a16b5 * Finish task#40489. 2021-07-22 14:02:39 +08:00
qiyu-xie
599e51660b * Finish task#40489. 2021-07-22 13:39:59 +08:00
zenggang
cf9275cbae * Finisth task #40426 2021-07-22 13:27:43 +08:00
qiyu-xie
7de636609c * Finish task#40512. 2021-07-22 10:28:48 +08:00
qiyu-xie
94ba06cf2a * Finish task#40511. 2021-07-22 10:23:28 +08:00
holan20180123
9f289eaef2 * Adjust annotation. 2021-07-19 15:42:39 +08:00
holan20180123
9a0addce6b * Adjust style of program browse. 2021-07-19 14:28:29 +08:00
holan20180123
2de42041ea * Adjust edit product. 2021-07-19 09:53:53 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
Yagami
f401a0ac06 * Code for task #40118. 2021-07-14 15:55:03 +08:00
wangyidong
d45bb9c4f2 * finish task #38726. 2021-06-17 14:57:30 +08:00
wangyidong
5e371ace2d * add new version and upgrade. 2021-06-12 15:46:12 +08:00
wangyidong
4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00