Commit Graph

102 Commits

Author SHA1 Message Date
caoqianming d30aac24af vue index 2020-08-14 09:56:42 +08:00
shilixia 8f08df1eb5 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-08-13 16:00:09 +08:00
shilixia d5bc101d0a xialashengqing 2020-08-13 15:59:59 +08:00
caoqianming 49c03ea4e7 cccform 2020-08-13 15:58:12 +08:00
shilixia 0a5d76fd09 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-08-10 14:27:15 +08:00
shilixia e288171467 xialaneirong 2020-08-10 14:26:45 +08:00
caoqianming 9c8ce37b46 application update 2020-08-10 14:16:27 +08:00
caoqianming 3f1a347346 dict update 2020-08-07 10:42:01 +08:00
shilixia 858049d38e 组织修改 2020-08-04 16:08:17 +08:00
shilixia b278a94ea5 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-29 14:51:30 +08:00
shilixia 9b0eed21a0 tijiaopeixun 2020-07-29 14:51:19 +08:00
caoqianming c2af958fd2 xx 2020-07-28 11:48:40 +08:00
shilixia cb88dd3953 pullxinneirong 2020-07-24 10:38:51 +08:00
shilixia 43e8d798e9 Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-24 09:08:01 +08:00
shilixia 93c48b3c6b renyuanpeixun 2020-07-24 09:07:44 +08:00
caoqianming 9844ec1fad employee search part1 2020-07-17 11:37:46 +08:00
shilixia 322e3ee0da Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-16 17:43:20 +08:00
shilixia 76b442e5db xuanzzeqi 2020-07-16 17:42:53 +08:00
caoqianming 64cd8cce4d employee ability education qualification complete 2020-07-16 12:03:07 +08:00
shilixia bd1255c47b peixun 2020-07-14 09:25:59 +08:00
shilixia de204dffca Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-10 16:53:04 +08:00
shilixia 25a8c140e0 pull人员内容 2020-07-10 16:52:48 +08:00
caoqianming 705f6bc6b9 employee 2020-07-10 16:50:19 +08:00
shilixia 63cc990a36 zhuzhixinxi 2020-07-10 08:56:04 +08:00
caoqianming c8c216e0ef employee 2020-07-10 08:54:35 +08:00
shilixia 400fbf6a56 pull 2020-07-08 16:00:08 +08:00
shilixia b6034728fd Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-07-06 10:20:02 +08:00
caoqianming d87a7f20c6 rbacfilterset 2020-07-06 10:14:20 +08:00
shilixia 1a9849c783 xiugai 2020-07-03 09:34:18 +08:00
shilixia b62e786237 pull guize 2020-07-03 09:31:56 +08:00
caoqianming 8cfa767c56 permission_data加入性能优化 2020-07-02 12:17:28 +08:00
caoqianming b1449ea7ad implementrule part1 2020-06-27 21:58:08 +08:00
shilixia 58c5aba98e Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas 2020-06-24 14:38:04 +08:00
caoqianming d262c8c13b implement 2020-06-24 14:35:16 +08:00
shilixia 074fb1e561 sdd 2020-06-24 14:24:03 +08:00
caoqianming 8bf3cb52c6 filelist 2020-06-16 18:21:52 +08:00
caoqianming 70e4fc1645 standard 2020-06-16 18:11:04 +08:00
caoqianming 2a317a1806 cert 2020-06-16 16:50:34 +08:00
caoqianming e30d372b10 commona model 2020-06-15 09:36:51 +08:00
caoqianming 35647fc622 dict add 2020-06-10 17:59:20 +08:00
caoqianming 66208baf14 some correct 2020-06-09 16:10:35 +08:00
caoqianming d00e4f20f8 启动脚本 2020-05-29 18:12:43 +08:00
caoqianming 48900fec5e xx 2020-05-28 20:24:41 +08:00
caoqianming e85bfe3f08 fileView 2020-05-27 18:28:10 +08:00
caoqianming d9b700dfe0 perms data 2020-05-26 20:30:17 +08:00
caoqianming ecdf44a64d dict enable 2020-05-19 18:26:47 +08:00
caoqianming 1200dda3a9 user conflict 2020-05-18 08:46:05 +08:00
caoqianming 4123fe657b vue perm and some bugs 2020-05-18 08:43:22 +08:00
caoqianming 3e2cf300dd docs 2020-05-12 10:34:53 +08:00
caoqianming 627b718d51 dict complete 2020-05-12 10:17:07 +08:00
caoqianming e266347d47 dict 2020-05-11 18:41:05 +08:00
caoqianming fdf19dfadc first commit 2020-05-11 10:20:32 +08:00