Commit Graph

529 Commits

Author SHA1 Message Date
aoli.qu 903e75936f Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into HEAD 2021-09-02 11:02:03 +08:00
qinjie c69726e30d 组织机构选择组件修改 2021-09-01 14:49:07 +08:00
qinjie 24d3811344 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-01 14:44:39 +08:00
qinjie e06874281e 组织结构树选中组件默认选中第一个节点 2021-09-01 14:44:31 +08:00
Yuanjianghong ee48577889 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-01 11:12:42 +08:00
Yuanjianghong ac89753655 修改 2021-09-01 11:12:32 +08:00
aoli.qu 63416eb973 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into HEAD 2021-09-01 11:12:18 +08:00
qinjie 2ade51f1c2 表格搜索组件新增组织机构树 2021-09-01 11:11:39 +08:00
qinjie 107eca865d 组织机构树选择组件调整 2021-09-01 10:31:10 +08:00
aoli.qu a665afac52 动态路由 2021-09-01 10:28:24 +08:00
qinjie ff40c9afa0 components 新增orgTree export 2021-09-01 10:13:58 +08:00
qinjie 07f3713fe5 ceshi 2021-09-01 09:00:52 +08:00
qinjie 385a56f457 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-09-01 08:58:39 +08:00
qinjie 493a39d96c 组织机构选择组件调整 2021-09-01 08:58:06 +08:00
Yuanjianghong 39ebbb6f7f 添加页面 2021-08-31 17:17:18 +08:00
Yuanjianghong d4062016cf 新增页面 2021-08-31 11:15:40 +08:00
aoli.qu 917bdee613 路由调整 2021-08-31 11:08:04 +08:00
aoli.qu ac57a0cb85 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
# Conflicts:
#	src/core/lazy_use.js
2021-08-31 10:07:56 +08:00
aoli.qu 3ae9351c71 解决冲突 2021-08-31 10:02:42 +08:00
aoli.qu 7339321e5f 用户管理、菜单管理、角色管理功能页面开发 2021-08-31 09:26:31 +08:00
qinjie cb2d422f19 路由模式改为hash 2021-08-30 17:42:30 +08:00
qinjie 0212dfe7b3 打包资源配置 2021-08-30 16:48:09 +08:00
qinjie ee079657fe 添加打包资源路径配置 2021-08-30 16:38:11 +08:00
qinjie 59048cc4cb 新增 webpack 版本 2021-08-30 16:12:07 +08:00
Yuanjianghong 43260db924 新增种类 2021-08-30 09:22:20 +08:00
Yuanjianghong c0056a2764 修改 2021-08-28 17:43:09 +08:00
Yuanjianghong 46ca4f3b72 暂存修改穿梭框 2021-08-28 14:54:27 +08:00
qinjie dd58d093f3 组织机构树选择组件使用说明 2021-08-28 10:57:09 +08:00
qinjie 64631ef5d0 引入并注册Empty,组织结构树选择组件新增起始节点 2021-08-28 10:42:15 +08:00
qinjie 8ed75d939c 人员档案管理 2021-08-28 09:09:04 +08:00
qinjie cded48a4e6 新增组织机构数选择组件 2021-08-28 08:37:30 +08:00
qinjie 7c2c95b74f 新增组织机构选择组件样式 2021-08-27 18:02:02 +08:00
qinjie ee19890838 修改系统颜色方案,新增档案管理路由 2021-08-27 18:01:25 +08:00
Yuanjianghong ece529ec06 穿梭框测试提交 2021-08-27 17:52:21 +08:00
Yuanjianghong 86d80a3b1a 新增部门选择视图 2021-08-26 16:30:04 +08:00
Yuanjianghong b55cbf263e Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-25 18:13:22 +08:00
Yuanjianghong 39d96927b2 项目管理新增页面保存 2021-08-25 18:13:09 +08:00
覃杰 37a10f81cd !38 新增页面
Merge pull request !38 from hbzgyjh/auto-5488917-develop-1629881599558
2021-08-25 08:54:01 +00:00
Yuanjianghong 0303c91ca3 新增页面 2021-08-25 16:52:11 +08:00
覃杰 542ee12546 !37 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !37 from 啊啊啊啊杰/auto-8700219-develop-1629877726567
2021-08-25 07:51:09 +00:00
18571350067 303fb795ed Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop 2021-08-25 15:48:36 +08:00
覃杰 c4460facbd !36 封装搜索表单
Merge pull request !36 from QuAoLi/auto-5159892-develop-1629876522888
2021-08-25 07:48:06 +00:00
覃杰 7f2a1aa800 !35 1111
Merge pull request !35 from 啊啊啊啊杰/auto-8700219-develop-1629797892887
2021-08-25 07:46:45 +00:00
18571350067 ece8691b16 课程管理 2021-08-25 15:45:24 +08:00
18571350067 3386f62590 课程列表 2021-08-25 15:34:46 +08:00
aoli.qu 3c3e7065c6 封装搜索表单 2021-08-25 15:28:24 +08:00
18571350067 031e016105 1111 2021-08-24 17:37:44 +08:00
QuAoLi 87d2cb7e89 !34 文件中心功能开发
Merge pull request !34 from QuAoLi/auto-5159892-develop-1629792442044
2021-08-24 08:08:16 +00:00
QuAoLi 4e955953e9 文件中心功能开发 2021-08-24 16:07:08 +08:00
QuAoLi 300ff20db3 !33 Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
Merge pull request !33 from QuAoLi/auto-5159892-develop-1629788990634
2021-08-24 07:11:25 +00:00