From c7e48d2706db70ed6c6b17c5f6ec5474aff2ce2c Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 8 May 2019 21:33:25 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/page/index.js | 91 +++++++++++----------- src/router/views/index.js | 104 +++++++++++++++++--------- src/views/work/process/leave/form.vue | 103 +++++++++++++++---------- 3 files changed, 176 insertions(+), 122 deletions(-) diff --git a/src/router/page/index.js b/src/router/page/index.js index 01dcc4d..1136402 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -1,80 +1,81 @@ import Layout from '@/page/index/' + export default [{ - path: '/login', - name: '登录页', - component: () => - import( /* webpackChunkName: "page" */ '@/page/login/index'), - meta: { - keepAlive: true, - isTab: false, - isAuth: false - } + path: '/login', + name: '登录页', + component: () => + import( /* webpackChunkName: "page" */ '@/page/login/index'), + meta: { + keepAlive: true, + isTab: false, + isAuth: false + } }, -{ + { path: '/lock', name: '锁屏页', component: () => - import( /* webpackChunkName: "page" */ '@/page/lock/index'), + import( /* webpackChunkName: "page" */ '@/page/lock/index'), meta: { - keepAlive: true, - isTab: false, - isAuth: false + keepAlive: true, + isTab: false, + isAuth: false } -}, -{ + }, + { path: '/404', component: () => - import( /* webpackChunkName: "page" */ '@/components/error-page/404'), + import( /* webpackChunkName: "page" */ '@/components/error-page/404'), name: '404', meta: { - keepAlive: true, - isTab: false, - isAuth: false + keepAlive: true, + isTab: false, + isAuth: false } -}, -{ + }, + { path: '/403', component: () => - import( /* webpackChunkName: "page" */ '@/components/error-page/403'), + import( /* webpackChunkName: "page" */ '@/components/error-page/403'), name: '403', meta: { - keepAlive: true, - isTab: false, - isAuth: false + keepAlive: true, + isTab: false, + isAuth: false } -}, -{ + }, + { path: '/500', component: () => - import( /* webpackChunkName: "page" */ '@/components/error-page/500'), + import( /* webpackChunkName: "page" */ '@/components/error-page/500'), name: '500', meta: { - keepAlive: true, - isTab: false, - isAuth: false + keepAlive: true, + isTab: false, + isAuth: false } -}, -{ + }, + { path: '/', name: '主页', redirect: '/wel' -}, -{ + }, + { path: '/myiframe', component: Layout, redirect: '/myiframe', children: [{ - path: ":routerPath", - name: 'iframe', - component: () => - import( /* webpackChunkName: "page" */ '@/components/iframe/main'), - props: true + path: ":routerPath", + name: 'iframe', + component: () => + import( /* webpackChunkName: "page" */ '@/components/iframe/main'), + props: true }] -}, -{ + }, + { path: '*', redirect: '/404' -} -] \ No newline at end of file + } +] diff --git a/src/router/views/index.js b/src/router/views/index.js index d1dee42..6d7326b 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1,41 +1,71 @@ import Layout from '@/page/index/' + export default [{ - path: '/wel', - component: Layout, - redirect: '/wel/index', - children: [{ - path: 'index', - name: '首页', - meta: { - i18n: 'dashboard' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/wel') - }] + path: '/wel', + component: Layout, + redirect: '/wel/index', + children: [{ + path: 'index', + name: '首页', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/wel') + }] }, { - path: '/test', - component: Layout, - redirect: '/test/index', - children: [{ - path: 'index', - name: '测试页', - meta: { - i18n: 'test' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/util/test') - }] + path: '/test', + component: Layout, + redirect: '/test/index', + children: [{ + path: 'index', + name: '测试页', + meta: { + i18n: 'test' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/util/test') + }] }, { - path: '/info', - component: Layout, - redirect: '/info/index', - children: [{ - path: 'index', - name: '个人信息', - meta: { - i18n: 'info' - }, - component: () => - import( /* webpackChunkName: "views" */ '@/views/user/info') - }] -}] \ No newline at end of file + path: '/info', + component: Layout, + redirect: '/info/index', + children: [{ + path: 'index', + name: '个人信息', + meta: { + i18n: 'info' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/user/info') + }] +}, { + path: '/work/process/leave', + component: Layout, + redirect: '/work/process/leave/form', + children: [{ + path: 'form', + name: '请假流程', + meta: { + i18n: 'work' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form') + }, { + path: 'handle', + name: '处理请假流程', + meta: { + i18n: 'work' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle') + }, { + path: 'detail', + name: '请假流程详情', + meta: { + i18n: 'work' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail') + }] +}] diff --git a/src/views/work/process/leave/form.vue b/src/views/work/process/leave/form.vue index ac1e65a..8c6607b 100644 --- a/src/views/work/process/leave/form.vue +++ b/src/views/work/process/leave/form.vue @@ -1,6 +1,6 @@ @@ -9,55 +9,78 @@ data() { return { form: { - imgUrl: [], + }, option: { - labelWidth: 120, - column: [ + group:[ { - label: '流程类型', - prop: 'flowCategory', - type: 'select', - dicUrl: `/api/blade-system/dict/dictionary?code=flow`, - props: { - label: "dictValue", - value: "dictKey" - }, - rules: [ + icon:'el-icon-info', + label: '请假基础信息', + prop: 'group1', + column: [ + { + label: '审批人员', + prop: 'taskUser', + type: 'select', + dicUrl: `/api/blade-user/user-list`, + props: { + label: "account", + value: "id" + }, + span:24, + rules: [ + { + required: true, + message: '请选择审批人员', + trigger: 'blur' + } + ] + }, + { + label: '开始时间', + prop: 'startTime', + type: 'datetime', + rules: [ + { + required: true, + message: '请选择开始时间', + trigger: 'blur' + } + ] + }, { - required: true, - message: '请选择流程类型', - trigger: 'blur' - } + label: '结束时间', + prop: 'endTime', + type: 'datetime', + rules: [ + { + required: true, + message: '请选择结束时间', + trigger: 'blur' + } + ] + }, + { + label: '请假理由', + prop: 'reason', + type: 'textarea', + span:24, + rules: [ + { + required: true, + message: '请输入请假理由', + trigger: 'blur' + } + ] + }, ] }, - { - label: '附件上传', - prop: 'imgUrl', - type: 'upload', - loadText: '附件上传中，请稍等', - span: 24, - propsHttp: { - res: 'data.0' - }, - tip: '请上传 bpmn20.xml 标准格式文件', - }, - ] + ], } } }, methods: { - uploadBefore(file, done, loading) { - console.log(file) - done() - this.$message.success('上传前的方法') - }, - uploadAfter(res, done, loading) { - console.log(res) - done() - this.$message.success('上传后的方法') - }, - submit() { + handleSubmit() { this.$message.success('当前数据' + JSON.stringify(this.form)) } }