From ece529ec0626a3f65870b7a64e20159555e0d480 Mon Sep 17 00:00:00 2001 From: Yuanjianghong Date: Fri, 27 Aug 2021 17:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 2 +- src/core/lazy_use.js | 6 +- src/views/project/ProjectList.vue | 50 +++++---- src/views/project/ProjectUnitSelect.vue | 132 ++++++++++++++++++------ 4 files changed, 138 insertions(+), 52 deletions(-) diff --git a/src/config/router.config.js b/src/config/router.config.js index 5681c28..da4b3a5 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -88,7 +88,7 @@ export const asyncRouterMap = [ path: '/project/add', name: 'ProjectForm', component: () => import('@/views/project/ProjectForm'), - meta: { title: '新增项目', keepAlive: true, permission: ['form'] } + meta: { title: '新增项目', keepAlive: true, permission: ['form'], show: false} }, { path: '/project/unitSelect', diff --git a/src/core/lazy_use.js b/src/core/lazy_use.js index 709faa4..2cbaf09 100644 --- a/src/core/lazy_use.js +++ b/src/core/lazy_use.js @@ -45,7 +45,9 @@ import { Descriptions, message, notification, - space + space, + Transfer, + Tree } from 'ant-design-vue' import Viser from 'viser-vue' @@ -99,6 +101,8 @@ Vue.use(Result) Vue.use(Statistic) Vue.use(Descriptions) Vue.use(space) +Vue.use(Tree) +Vue.use(Transfer) Vue.prototype.$confirm = Modal.confirm Vue.prototype.$message = message diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue index af4e099..5c2a7f4 100644 --- a/src/views/project/ProjectList.vue +++ b/src/views/project/ProjectList.vue @@ -9,12 +9,22 @@ 全部 运行中 已结束 - 未发布 + 未发布 开始时间: - + 结束时间: - + 培训方式: 全部 @@ -36,7 +46,7 @@ { return record.startDate + ' - ' + record.endDate }, }, - { title: '人数', dataIndex: 'personNum', customRender: (text) => text + '人' }, - { title: '项目类型', dataIndex: 'projectType' }, + { title: '人数', key: 'personNum', dataIndex: 'personNum', customRender: (text) => text + '人' }, + { title: '项目类型', dataIndex: 'projectType', key: 'projectType' }, { title: '项目状态', dataIndex: 'status', + key: 'status', customRender: (text, record, index) => { //项目状态 1-未发布 2-未开始 3-进行中 4-已完成 5-已中止 if (text == 1) { @@ -115,15 +127,15 @@ export default { } }, }, - { title: '创建人员', dataIndex: 'createBy' }, - { title: '创建时间', dataIndex: 'createDate' }, - { - title: '操作', - key: 'operation', - width: 200, - align: 'center', - scopedSlots: { customRender: 'action' }, - }, + { title: '创建人员', key: 'createBy', dataIndex: 'createBy' }, + { title: '创建时间', key: 'createDate', dataIndex: 'createDate' }, + // { + // title: '操作', + // width: 200, + // key: 'status', + // align: 'center', + // scopedSlots: { customRender: 'action' }, + // }, ], // 加载数据方法 必须为 Promise 对象 @@ -145,7 +157,7 @@ export default { handledCreate() { return this.$router.push( // {name: 'ProjectForm'} - {path: 'project/project/add',} + { path: 'project/project/add' } ) // router.push() }, diff --git a/src/views/project/ProjectUnitSelect.vue b/src/views/project/ProjectUnitSelect.vue index 0b04684..e694179 100644 --- a/src/views/project/ProjectUnitSelect.vue +++ b/src/views/project/ProjectUnitSelect.vue @@ -1,38 +1,108 @@ - + + \ No newline at end of file +.tree-transfer .ant-transfer-list:first-child { + width: 50%; + flex: none; + height: 100%; +} +