增加一日流程之任务

This commit is contained in:
sk1551 2020-05-18 14:42:30 +08:00
parent 36126ce877
commit 21e23dcd37
7 changed files with 743 additions and 1134 deletions

View File

@ -1,53 +0,0 @@
import request from '@/utils/request'
// 查询一日流程列表
export function listDetail(query) {
return request({
url: '/benyi/dayflowmanger/list',
method: 'get',
params: query
})
}
// 查询一日流程详细
export function getDetail(id) {
return request({
url: '/benyi/dayflowmanger/' + id,
method: 'get'
})
}
// 新增一日流程
export function addDetail(data) {
return request({
url: '/benyi/dayflowmanger',
method: 'post',
data: data
})
}
// 修改一日流程
export function updateDetail(data) {
return request({
url: '/benyi/dayflowmanger',
method: 'put',
data: data
})
}
// 删除一日流程
export function delDetail(id) {
return request({
url: '/benyi/dayflowmanger/' + id,
method: 'delete'
})
}
// 导出一日流程
export function exportDetail(query) {
return request({
url: '/benyi/dayflowmanger/export',
method: 'get',
params: query
})
}

View File

@ -1,61 +1,61 @@
import request from '@/utils/request' import request from '@/utils/request'
// 查询字典数据列表 // 查询字典数据列表
export function listData(query) { export function listData(query) {
return request({ return request({
url: '/system/dict/data/list', url: '/system/dict/data/list',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询字典数据详细 // 查询字典数据详细
export function getData(dictCode) { export function getData(dictCode) {
return request({ return request({
url: '/system/dict/data/' + dictCode, url: '/system/dict/data/' + dictCode,
method: 'get' method: 'get'
}) })
} }
// 根据字典类型查询字典数据信息 // 根据字典类型查询字典数据信息
export function getDicts(dictType) { export function getDicts(dictType) {
return request({ return request({
url: '/system/dict/data/dictType/' + dictType, url: '/system/dict/data/dictType/' + dictType,
method: 'get' method: 'get'
}) })
} }
// 新增字典数据 // 新增字典数据
export function addData(data) { export function addData(data) {
return request({ return request({
url: '/system/dict/data', url: '/system/dict/data',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改字典数据 // 修改字典数据
export function updateData(data) { export function updateData(data) {
return request({ return request({
url: '/system/dict/data', url: '/system/dict/data',
method: 'put', method: 'put',
data: data data: data
}) })
} }
// 删除字典数据 // 删除字典数据
export function delData(dictCode) { export function delData(dictCode) {
return request({ return request({
url: '/system/dict/data/' + dictCode, url: '/system/dict/data/' + dictCode,
method: 'delete' method: 'delete'
}) })
} }
// 导出字典数据 // 导出字典数据
export function exportData(query) { export function exportData(query) {
return request({ return request({
url: '/system/dict/data/export', url: '/system/dict/data/export',
method: 'get', method: 'get',
params: query params: query
}) })
} }

View File

@ -1,191 +1,192 @@
@import './variables.scss'; @import './variables.scss';
@import './mixin.scss'; @import './mixin.scss';
@import './transition.scss'; @import './transition.scss';
@import './element-ui.scss'; @import './element-ui.scss';
@import './sidebar.scss'; @import './sidebar.scss';
@import './btn.scss'; @import './btn.scss';
body {
body { height: 100%;
height: 100%; -moz-osx-font-smoothing: grayscale;
-moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased;
-webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility;
text-rendering: optimizeLegibility; font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; }
}
label {
label { font-weight: 700;
font-weight: 700; }
}
html {
html { height: 100%;
height: 100%; box-sizing: border-box;
box-sizing: border-box; }
}
#app {
#app { height: 100%;
height: 100%; }
}
*,
*, *:before,
*:before, *:after {
*:after { box-sizing: inherit;
box-sizing: inherit; }
}
.no-padding {
.no-padding { padding: 0px !important;
padding: 0px !important; }
}
.padding-content {
.padding-content { padding: 4px 0;
padding: 4px 0; }
}
a:focus,
a:focus, a:active {
a:active { outline: none;
outline: none; }
}
a,
a, a:focus,
a:focus, a:hover {
a:hover { cursor: pointer;
cursor: pointer; color: inherit;
color: inherit; text-decoration: none;
text-decoration: none; }
}
div:focus {
div:focus { outline: none;
outline: none; }
}
.fr {
.fr { float: right;
float: right; }
}
.fl {
.fl { float: left;
float: left; }
}
.pr-5 {
.pr-5 { padding-right: 5px;
padding-right: 5px; }
}
.pl-5 {
.pl-5 { padding-left: 5px;
padding-left: 5px; }
}
.block {
.block { display: block;
display: block; }
}
.pointer {
.pointer { cursor: pointer;
cursor: pointer; }
}
.inlineBlock {
.inlineBlock { display: block;
display: block; }
}
.clearfix {
.clearfix { &:after {
&:after { visibility: hidden;
visibility: hidden; display: block;
display: block; font-size: 0;
font-size: 0; content: " ";
content: " "; clear: both;
clear: both; height: 0;
height: 0; }
} }
}
aside {
aside { background: #eef1f6;
background: #eef1f6; padding: 8px 24px;
padding: 8px 24px; margin-bottom: 20px;
margin-bottom: 20px; border-radius: 2px;
border-radius: 2px; display: block;
display: block; line-height: 32px;
line-height: 32px; font-size: 16px;
font-size: 16px; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; color: #2c3e50;
color: #2c3e50; -webkit-font-smoothing: antialiased;
-webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale;
-moz-osx-font-smoothing: grayscale; a {
color: #337ab7;
a { cursor: pointer;
color: #337ab7; &:hover {
cursor: pointer; color: rgb(32, 160, 255);
}
&:hover { }
color: rgb(32, 160, 255); }
}
} //main-container全局样式
} .app-container {
padding: 20px;
//main-container全局样式 }
.app-container {
padding: 20px; .components-container {
} margin: 30px 50px;
position: relative;
.components-container { }
margin: 30px 50px;
position: relative; .pagination-container {
} margin-top: 30px;
}
.pagination-container {
margin-top: 30px; .text-center {
} text-align: center
}
.text-center {
text-align: center .sub-navbar {
} height: 50px;
line-height: 50px;
.sub-navbar { position: relative;
height: 50px; width: 100%;
line-height: 50px; text-align: right;
position: relative; padding-right: 20px;
width: 100%; transition: 600ms ease position;
text-align: right; background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
padding-right: 20px; .subtitle {
transition: 600ms ease position; font-size: 20px;
background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%); color: #fff;
}
.subtitle { &.draft {
font-size: 20px; background: #d0d0d0;
color: #fff; }
} &.deleted {
background: #d0d0d0;
&.draft { }
background: #d0d0d0; }
}
.link-type,
&.deleted { .link-type:focus {
background: #d0d0d0; color: #337ab7;
} cursor: pointer;
} &:hover {
color: rgb(32, 160, 255);
.link-type, }
.link-type:focus { }
color: #337ab7;
cursor: pointer; .link-dayflow,
.link-dayflow:focus {
&:hover { color: #337ab7;
color: rgb(32, 160, 255); cursor: pointer;
} &:hover {
} color: rgb(32, 160, 255);
}
.filter-container { }
padding-bottom: 10px;
.filter-container {
.filter-item { padding-bottom: 10px;
display: inline-block; .filter-item {
vertical-align: middle; display: inline-block;
margin-bottom: 10px; vertical-align: middle;
} margin-bottom: 10px;
} }
}
//refine vue-multiselect plugin
.multiselect { //refine vue-multiselect plugin
line-height: 16px; .multiselect {
} line-height: 16px;
}
.multiselect--active {
z-index: 1000 !important; .multiselect--active {
} z-index: 1000 !important;
}

View File

@ -1,127 +1,135 @@
import Vue from 'vue' import Vue from 'vue'
import Router from 'vue-router' import Router from 'vue-router'
Vue.use(Router) Vue.use(Router)
/* Layout */ /* Layout */
import Layout from '@/layout' import Layout from '@/layout'
/** /**
* Note: 路由配置项 * Note: 路由配置项
* *
* hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401login等页面或者如一些编辑页面/edit/1 * hidden: true // 当设置 true 的时候该路由不会再侧边栏出现 如401login等页面或者如一些编辑页面/edit/1
* alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时自动会变成嵌套的模式--如组件页面 * alwaysShow: true // 当你一个路由下面的 children 声明的路由大于1个时自动会变成嵌套的模式--如组件页面
* // 只有一个时,会将那个子路由当做根路由显示在侧边栏--如引导页面 * // 只有一个时,会将那个子路由当做根路由显示在侧边栏--如引导页面
* // 若你想不管路由下面的 children 声明的个数都显示你的根路由 * // 若你想不管路由下面的 children 声明的个数都显示你的根路由
* // 你可以设置 alwaysShow: true这样它就会忽略之前定义的规则一直显示根路由 * // 你可以设置 alwaysShow: true这样它就会忽略之前定义的规则一直显示根路由
* redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击 * redirect: noRedirect // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
* name:'router-name' // 设定路由的名字,一定要填写不然使用<keep-alive>时会出现各种问题 * name:'router-name' // 设定路由的名字,一定要填写不然使用<keep-alive>时会出现各种问题
* meta : { * meta : {
roles: ['admin','editor'] // 设置该路由进入的权限,支持多个权限叠加 roles: ['admin','editor'] // 设置该路由进入的权限,支持多个权限叠加
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字 title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
icon: 'svg-name' // 设置该路由的图标对应路径src/icons/svg icon: 'svg-name' // 设置该路由的图标对应路径src/icons/svg
breadcrumb: false // 如果设置为false则不会在breadcrumb面包屑中显示 breadcrumb: false // 如果设置为false则不会在breadcrumb面包屑中显示
} }
*/ */
// 公共路由 // 公共路由
export const constantRoutes = [ export const constantRoutes = [{
{ path: '/redirect',
path: '/redirect', component: Layout,
component: Layout, hidden: true,
hidden: true, children: [{
children: [ path: '/redirect/:path(.*)',
{ component: () =>
path: '/redirect/:path(.*)', import ('@/views/redirect')
component: () => import('@/views/redirect') }]
} },
] {
}, path: '/login',
{ component: () =>
path: '/login', import ('@/views/login'),
component: () => import('@/views/login'), hidden: true
hidden: true },
}, {
{ path: '/404',
path: '/404', component: () =>
component: () => import('@/views/error/404'), import ('@/views/error/404'),
hidden: true hidden: true
}, },
{ {
path: '/401', path: '/401',
component: () => import('@/views/error/401'), component: () =>
hidden: true import ('@/views/error/401'),
}, hidden: true
{ },
path: '', {
component: Layout, path: '',
redirect: 'index', component: Layout,
children: [ redirect: 'index',
{ children: [{
path: 'index', path: 'index',
component: () => import('@/views/index'), component: () =>
name: '首页', import ('@/views/index'),
meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true } name: '首页',
} meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
] }]
}, },
{ {
path: '/user', path: '/user',
component: Layout, component: Layout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: 'noredirect',
children: [ children: [{
{ path: 'profile',
path: 'profile', component: () =>
component: () => import('@/views/system/user/profile/index'), import ('@/views/system/user/profile/index'),
name: 'Profile', name: 'Profile',
meta: { title: '个人中心', icon: 'user' } meta: { title: '个人中心', icon: 'user' }
} }]
] },
}, {
{ path: '/dict',
path: '/dict', component: Layout,
component: Layout, hidden: true,
hidden: true, children: [{
children: [ path: 'type/data/:dictId(\\d+)',
{ component: () =>
path: 'type/data/:dictId(\\d+)', import ('@/views/system/dict/data'),
component: () => import('@/views/system/dict/data'), name: 'Data',
name: 'Data', meta: { title: '字典数据', icon: '' }
meta: { title: '字典数据', icon: '' } }]
} },
] {
}, path: '/dayflow',
{ component: Layout,
path: '/job', hidden: true,
component: Layout, children: [{
hidden: true, path: 'dayflowmanger/dayflowtask/:id(\\d+)',
children: [ component: () =>
{ import ('@/views/benyi/dayflow/task'),
path: 'log', name: 'Task',
component: () => import('@/views/monitor/job/log'), meta: { title: '一日流程任务', icon: '' }
name: 'JobLog', }]
meta: { title: '调度日志' } },
} {
] path: '/job',
}, component: Layout,
{ hidden: true,
path: '/gen', children: [{
component: Layout, path: 'log',
hidden: true, component: () =>
children: [ import ('@/views/monitor/job/log'),
{ name: 'JobLog',
path: 'edit', meta: { title: '调度日志' }
component: () => import('@/views/tool/gen/editTable'), }]
name: 'GenEdit', },
meta: { title: '修改生成配置' } {
} path: '/gen',
] component: Layout,
} hidden: true,
] children: [{
path: 'edit',
export default new Router({ component: () =>
mode: 'history', // 去掉url中的# import ('@/views/tool/gen/editTable'),
scrollBehavior: () => ({ y: 0 }), name: 'GenEdit',
routes: constantRoutes meta: { title: '修改生成配置' }
}) }]
}
]
export default new Router({
mode: 'history', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})

View File

@ -1,348 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="流程类型" prop="flowType">
<el-select v-model="queryParams.flowType" placeholder="请选择类型" clearable size="small">
<el-option
v-for="dict in dayflowtypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="流程名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['benyi:dayflowmanger:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['benyi:dayflowmanger:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['benyi:dayflowmanger:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['benyi:dayflowmanger:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="流程ID" align="center" prop="id" />
<el-table-column label="流程名称" align="center" prop="name" />
<el-table-column label="流程序号" align="center" prop="sortNumber" />
<el-table-column label="流程任务数量" align="center" prop="targetCount" />
<el-table-column label="类型" align="center" prop="flowType" :formatter="dayflowtypeFormat" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['benyi:dayflowmanger:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['benyi:dayflowmanger:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改一日流程对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1024px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="名称" prop="name">
<el-input v-model="form.name" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="流程序号" prop="sortNumber">
<el-input-number v-model="form.sortNumber" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="类型" prop="flowType">
<el-select v-model="form.flowType" placeholder="请选择类型">
<el-option
v-for="dict in dayflowtypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="导言" prop="content">
<el-input v-model="form.content" type="textarea" placeholder="请输入导言" />
</el-form-item>
<el-form-item label="目的" prop="note">
<Editor v-model="form.note" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listDetail,
getDetail,
delDetail,
addDetail,
updateDetail,
exportDetail
} from "@/api/benyi/dayflowmanger";
import Editor from "@/components/Editor";
export default {
name: "Detail",
components: {
Editor
},
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
total: 0,
//
detailList: [],
//
title: "",
//
open: false,
//
dayflowtypeOptions: [],
//
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
flowType: undefined,
createUser: undefined,
updateUser: undefined
},
//
form: {},
//
rules: {
name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
content: [{ required: true, message: "导言不能为空", trigger: "blur" }],
note: [{ required: true, message: "目的不能为空", trigger: "blur" }],
sortNumber: [
{ required: true, message: "流程序号不能为空", trigger: "blur" }
],
flowType: [
{ required: true, message: "流程类型不能为空", trigger: "blur" }
]
}
};
},
created() {
this.getList();
this.getDicts("sys_dayflow_type").then(response => {
this.dayflowtypeOptions = response.data;
});
},
methods: {
/** 查询一日流程列表 */
getList() {
this.loading = true;
listDetail(this.queryParams).then(response => {
this.detailList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// --
dayflowtypeFormat(row, column) {
return this.selectDictLabel(this.dayflowtypeOptions, row.flowType);
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
id: undefined,
sortNumber: 0,
targetCount: undefined,
name: undefined,
content: undefined,
note: undefined,
flowType: undefined,
createUser: undefined,
updateUser: undefined,
createTime: undefined,
updateTime: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加一日流程";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getDetail(id).then(response => {
this.form = response.data;
console.log(response.data);
this.open = true;
this.title = "修改一日流程";
});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != undefined) {
updateDetail(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
} else {
addDetail(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
} else {
this.msgError(response.msg);
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除一日流程编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}
)
.then(function() {
return delDetail(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有一日流程数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(function() {
return exportDetail(queryParams);
})
.then(response => {
this.download(response.msg);
})
.catch(function() {});
}
}
};
</script>

View File

@ -1,355 +1,355 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true"> <el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="字典名称" prop="dictType"> <el-form-item label="字典名称" prop="dictType">
<el-select v-model="queryParams.dictType" size="small"> <el-select v-model="queryParams.dictType" size="small">
<el-option <el-option
v-for="item in typeOptions" v-for="item in typeOptions"
:key="item.dictId" :key="item.dictId"
:label="item.dictName" :label="item.dictName"
:value="item.dictType" :value="item.dictType"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="字典标签" prop="dictLabel"> <el-form-item label="字典标签" prop="dictLabel">
<el-input <el-input
v-model="queryParams.dictLabel" v-model="queryParams.dictLabel"
placeholder="请输入字典标签" placeholder="请输入字典标签"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictValue"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:dict:add']" v-hasPermi="['system:dict:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
icon="el-icon-edit" icon="el-icon-edit"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:dict:export']" v-hasPermi="['system:dict:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编码" align="center" prop="dictCode" /> <el-table-column label="字典编码" align="center" prop="dictCode" />
<el-table-column label="字典标签" align="center" prop="dictLabel" /> <el-table-column label="字典标签" align="center" prop="dictLabel" />
<el-table-column label="字典键值" align="center" prop="dictValue" /> <el-table-column label="字典键值" align="center" prop="dictValue" />
<el-table-column label="字典排序" align="center" prop="dictSort" /> <el-table-column label="字典排序" align="center" prop="dictSort" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']" v-hasPermi="['system:dict:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']" v-hasPermi="['system:dict:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典类型"> <el-form-item label="字典类型">
<el-input v-model="form.dictType" :disabled="true" /> <el-input v-model="form.dictType" :disabled="true" />
</el-form-item> </el-form-item>
<el-form-item label="数据标签" prop="dictLabel"> <el-form-item label="数据标签" prop="dictLabel">
<el-input v-model="form.dictLabel" placeholder="请输入数据标签" /> <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
</el-form-item> </el-form-item>
<el-form-item label="数据键值" prop="dictValue"> <el-form-item label="数据键值" prop="dictValue">
<el-input v-model="form.dictValue" placeholder="请输入数据键值" /> <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
</el-form-item> </el-form-item>
<el-form-item label="显示排序" prop="dictSort"> <el-form-item label="显示排序" prop="dictSort">
<el-input-number v-model="form.dictSort" controls-position="right" :min="0" /> <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictValue" :label="dict.dictValue"
>{{dict.dictLabel}}</el-radio> >{{dict.dictLabel}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { listData, getData, delData, addData, updateData, exportData } from "@/api/system/dict/data"; import { listData, getData, delData, addData, updateData, exportData } from "@/api/system/dict/data";
import { listType, getType } from "@/api/system/dict/type"; import { listType, getType } from "@/api/system/dict/type";
export default { export default {
name: "Data", name: "Data",
data() { data() {
return { return {
// //
loading: true, loading: true,
// //
ids: [], ids: [],
// //
single: true, single: true,
// //
multiple: true, multiple: true,
// //
total: 0, total: 0,
// //
dataList: [], dataList: [],
// //
defaultDictType: "", defaultDictType: "",
// //
title: "", title: "",
// //
open: false, open: false,
// //
statusOptions: [], statusOptions: [],
// //
typeOptions: [], typeOptions: [],
// //
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
dictName: undefined, dictName: undefined,
dictType: undefined, dictType: undefined,
status: undefined status: undefined
}, },
// //
form: {}, form: {},
// //
rules: { rules: {
dictLabel: [ dictLabel: [
{ required: true, message: "数据标签不能为空", trigger: "blur" } { required: true, message: "数据标签不能为空", trigger: "blur" }
], ],
dictValue: [ dictValue: [
{ required: true, message: "数据键值不能为空", trigger: "blur" } { required: true, message: "数据键值不能为空", trigger: "blur" }
], ],
dictSort: [ dictSort: [
{ required: true, message: "数据顺序不能为空", trigger: "blur" } { required: true, message: "数据顺序不能为空", trigger: "blur" }
] ]
} }
}; };
}, },
created() { created() {
const dictId = this.$route.params && this.$route.params.dictId; const dictId = this.$route.params && this.$route.params.dictId;
this.getType(dictId); this.getType(dictId);
this.getTypeList(); this.getTypeList();
this.getDicts("sys_normal_disable").then(response => { this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data; this.statusOptions = response.data;
}); });
}, },
methods: { methods: {
/** 查询字典类型详细 */ /** 查询字典类型详细 */
getType(dictId) { getType(dictId) {
getType(dictId).then(response => { getType(dictId).then(response => {
this.queryParams.dictType = response.data.dictType; this.queryParams.dictType = response.data.dictType;
this.defaultDictType = response.data.dictType; this.defaultDictType = response.data.dictType;
this.getList(); this.getList();
}); });
}, },
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getTypeList() { getTypeList() {
listType().then(response => { listType().then(response => {
this.typeOptions = response.rows; this.typeOptions = response.rows;
}); });
}, },
/** 查询字典数据列表 */ /** 查询字典数据列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listData(this.queryParams).then(response => { listData(this.queryParams).then(response => {
this.dataList = response.rows; this.dataList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },
// //
statusFormat(row, column) { statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status); return this.selectDictLabel(this.statusOptions, row.status);
}, },
// //
cancel() { cancel() {
this.open = false; this.open = false;
this.reset(); this.reset();
}, },
// //
reset() { reset() {
this.form = { this.form = {
dictCode: undefined, dictCode: undefined,
dictLabel: undefined, dictLabel: undefined,
dictValue: undefined, dictValue: undefined,
dictSort: 0, dictSort: 0,
status: "0", status: "0",
remark: undefined remark: undefined
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.dictType = this.defaultDictType; this.queryParams.dictType = this.defaultDictType;
this.handleQuery(); this.handleQuery();
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加字典数据"; this.title = "添加字典数据";
this.form.dictType = this.queryParams.dictType; this.form.dictType = this.queryParams.dictType;
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.dictCode) this.ids = selection.map(item => item.dictCode)
this.single = selection.length!=1 this.single = selection.length!=1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const dictCode = row.dictCode || this.ids const dictCode = row.dictCode || this.ids
getData(dictCode).then(response => { getData(dictCode).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改字典数据"; this.title = "修改字典数据";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.dictCode != undefined) { if (this.form.dictCode != undefined) {
updateData(this.form).then(response => { updateData(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else { } else {
this.msgError(response.msg); this.msgError(response.msg);
} }
}); });
} else { } else {
addData(this.form).then(response => { addData(this.form).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
} else { } else {
this.msgError(response.msg); this.msgError(response.msg);
} }
}); });
} }
} }
}); });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const dictCodes = row.dictCode || this.ids; const dictCodes = row.dictCode || this.ids;
this.$confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?', "警告", { this.$confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return delData(dictCodes); return delData(dictCodes);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}).catch(function() {}); }).catch(function() {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
const queryParams = this.queryParams; const queryParams = this.queryParams;
this.$confirm('是否确认导出所有数据项?', "警告", { this.$confirm('是否确认导出所有数据项?', "警告", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }).then(function() {
return exportData(queryParams); return exportData(queryParams);
}).then(response => { }).then(response => {
this.download(response.msg); this.download(response.msg);
}).catch(function() {}); }).catch(function() {});
} }
} }
}; };
</script> </script>

View File

@ -30,7 +30,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
* @date 2020-05-07 * @date 2020-05-07
*/ */
@RestController @RestController
@RequestMapping("/benyi/dayflowmanger") @RequestMapping("/benyi/dayflow/dayflowmanger")
public class ByDayFlowDetailController extends BaseController public class ByDayFlowDetailController extends BaseController
{ {
@Autowired @Autowired
@ -45,6 +45,7 @@ public class ByDayFlowDetailController extends BaseController
{ {
startPage(); startPage();
List<ByDayFlowDetail> list = byDayFlowDetailService.selectByDayFlowDetailList(byDayFlowDetail); List<ByDayFlowDetail> list = byDayFlowDetailService.selectByDayFlowDetailList(byDayFlowDetail);
System.out.println("-------------------------------"+list);
return getDataTable(list); return getDataTable(list);
} }