From acd2f6ae604121a4821b0a7084f0f4bd80279cc5 Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Fri, 8 May 2020 10:05:22 +0800 Subject: [PATCH] =?UTF-8?q?20200508-zlp-1=20=E4=B8=80=E6=97=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/benyi/dayflowmanger.js | 53 +++ .../src/views/benyi/dayflowlook/index.vue | 437 ++++++++++++++++++ .../src/views/benyi/dayflowmanger/index.vue | 348 ++++++++++++++ .../src/views/benyi_course/dayflow/index.vue | 3 + 4 files changed, 841 insertions(+) create mode 100644 ruoyi-ui/src/api/benyi/dayflowmanger.js create mode 100644 ruoyi-ui/src/views/benyi/dayflowlook/index.vue create mode 100644 ruoyi-ui/src/views/benyi/dayflowmanger/index.vue create mode 100644 ruoyi-ui/src/views/benyi_course/dayflow/index.vue diff --git a/ruoyi-ui/src/api/benyi/dayflowmanger.js b/ruoyi-ui/src/api/benyi/dayflowmanger.js new file mode 100644 index 000000000..4a5356c9e --- /dev/null +++ b/ruoyi-ui/src/api/benyi/dayflowmanger.js @@ -0,0 +1,53 @@ +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 + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/dayflowlook/index.vue b/ruoyi-ui/src/views/benyi/dayflowlook/index.vue new file mode 100644 index 000000000..a5cc5ee03 --- /dev/null +++ b/ruoyi-ui/src/views/benyi/dayflowlook/index.vue @@ -0,0 +1,437 @@ +<template> + <div class="app-container"> + <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> + <el-form-item label="活动类型" prop="type"> + <el-select v-model="queryParams.type" placeholder="请选择活动类型" clearable size="small"> + <el-option + v-for="dict in schoolcalendartypeOptions" + :key="dict.dictValue" + :label="dict.dictLabel" + :value="dict.dictValue" + /> + </el-select> + </el-form-item> + <el-form-item label="适用范围" prop="scope"> + <el-select v-model="queryParams.scope" placeholder="请选择适用范围" clearable size="small"> + <el-option + v-for="dict in scopeOptions" + :key="dict.dictValue" + :label="dict.dictLabel" + :value="dict.dictValue" + /> + </el-select> + </el-form-item> + <el-form-item label="学年学期" prop="xnxq"> + <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期" clearable size="small"> + <el-option + v-for="dict in xnxqOptions" + :key="dict.dictValue" + :label="dict.dictLabel" + :value="dict.dictValue" + /> + </el-select> + </el-form-item> + <el-form-item label="活动时间" prop="activitytime"> + <el-date-picker + v-model="dateRange" + size="small" + style="width: 240px" + value-format="yyyy-MM-dd" + type="daterange" + range-separator="-" + start-placeholder="开始日期" + end-placeholder="结束日期" + ></el-date-picker> + </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:schoolcalendar: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:schoolcalendar: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:schoolcalendar: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:schoolcalendar:export']" + >导出</el-button> + </el-col> + </el-row> + + <el-table + v-loading="loading" + :data="schoolcalendarList" + @selection-change="handleSelectionChange" + > + <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" /> + <el-table-column label="编号" align="center" prop="id" /> + <el-table-column label="名称" align="center" prop="name" /> + <el-table-column + label="活动类型" + align="center" + :formatter="schoolcalendartypeFormat" + prop="type" + /> + <el-table-column label="适用范围" align="center" :formatter="scopeFormat" prop="scope" /> + <el-table-column label="学年学期" align="center" :formatter="xnxqFormat" prop="xnxq" /> + <el-table-column label="活动时间" align="center" prop="activitytime" width="180" /> + <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:schoolcalendar:edit']" + :disabled="!checkSelectable(scope.row)" + >修改</el-button> + <el-button + size="mini" + type="text" + icon="el-icon-delete" + @click="handleDelete(scope.row)" + v-hasPermi="['benyi:schoolcalendar:remove']" + :disabled="!checkSelectable(scope.row)" + >删除</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="500px"> + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> + <el-form-item label="名称" prop="name"> + <el-input v-model="form.name" type="textarea" placeholder="请输入内容" /> + </el-form-item> + <el-form-item label="活动类型" prop="type"> + <el-select v-model="form.type" placeholder="请选择活动类型" clearable size="small"> + <el-option + v-for="dict in schoolcalendartypeOptions" + :key="dict.dictValue" + :label="dict.dictLabel" + :value="dict.dictValue" + /> + </el-select> + </el-form-item> + <el-form-item label="适用范围" prop="scope"> + <el-select v-model="form.scope" multiple placeholder="请选择适用范围" clearable size="small"> + <el-option + v-for="dict in scopeOptions" + :key="dict.dictValue" + :label="dict.dictLabel" + :value="dict.dictValue" + /> + </el-select> + </el-form-item> + <el-form-item label="活动时间" prop="activitytime"> + <el-date-picker + clearable + size="small" + style="width: 200px" + v-model="form.activitytime" + type="date" + value-format="yyyy-MM-dd" + placeholder="选择活动时间" + ></el-date-picker> + </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 { + listSchoolcalendar, + getSchoolcalendar, + delSchoolcalendar, + addSchoolcalendar, + updateSchoolcalendar, + exportSchoolcalendar +} from "@/api/benyi/schoolcalendar"; + +export default { + name: "Schoolcalendar", + data() { + return { + // 遮罩层 + loading: true, + // 选中数组 + ids: [], + // 非单个禁用 + single: true, + // 非多个禁用 + multiple: true, + // 总条数 + total: 0, + // 园历管理表格数据 + schoolcalendarList: [], + // 弹出层标题 + title: "", + // 日期范围 + dateRange: [], + // 是否显示弹出层 + open: false, + //园历类型 + schoolcalendartypeOptions: [], + //园历适用范围 + scopeOptions: [], + //学年学期 + xnxqOptions: [], + //声明方法 + selectable: Function, + // 查询参数 + queryParams: { + pageNum: 1, + pageSize: 10, + name: undefined, + type: undefined, + scope: undefined, + xnxq: undefined, + deptid: undefined, + activitytime: undefined, + createuserid: undefined, + createtime: undefined + }, + // 表单参数 + form: {}, + // 表单校验 + rules: { + name: [{ required: true, message: "名称不能为空", trigger: "blur" }], + type: [ + { required: true, message: "活动类型不能为空", trigger: "blur" } + ], + scope: [ + { required: true, message: "活动范围不能为空", trigger: "blur" } + ], + activitytime: [ + { required: true, message: "活动时间不能为空", trigger: "blur" } + ] + } + }; + }, + created() { + this.getList(); + this.getDicts("sys_schoolcalendartype").then(response => { + this.schoolcalendartypeOptions = response.data; + }); + this.getDicts("sys_yebjlx").then(response => { + this.scopeOptions = response.data; + }); + this.getDicts("sys_xnxq").then(response => { + this.xnxqOptions = response.data; + }); + }, + methods: { + // 学校园历类型--字典状态字典翻译 + schoolcalendartypeFormat(row, column) { + return this.selectDictLabel(this.schoolcalendartypeOptions, row.type); + }, + //控制按钮可用 + checkSelectable(row) { + var date = new Date(); + //console.log(date.toLocaleDateString()); + return this.CompareDate(row.activitytime,date.toLocaleDateString()); + }, + //比较日期大小 + CompareDate(d1, d2) { + return new Date(d1.replace(/-/g, "/")) > new Date(d2.replace(/-/g, "/")); + }, + // 适用范围类型--字典状态字典翻译 + scopeFormat(row, column) { + //alert(row.scope.split(';').length); + var ilength = row.scope.split(";").length; + var names = ""; + for (var i = 0; i < ilength; i++) { + names = + names + + this.selectDictLabel(this.scopeOptions, row.scope.split(";")[i]) + + ";"; + } + //this.selectDictLabel(this.scopeOptions, row.xnxq); + return names; + }, + // 学年学期类型--字典状态字典翻译 + xnxqFormat(row, column) { + return this.selectDictLabel(this.xnxqOptions, row.xnxq); + }, + /** 查询园历管理列表 */ + getList() { + this.loading = true; + listSchoolcalendar( + this.addDateRange(this.queryParams, this.dateRange) + ).then(response => { + this.schoolcalendarList = response.rows; + this.total = response.total; + this.loading = false; + }); + }, + // 取消按钮 + cancel() { + this.open = false; + this.reset(); + }, + // 表单重置 + reset() { + this.form = { + id: undefined, + name: undefined, + type: undefined, + scope: undefined, + activitytime: undefined + }; + this.resetForm("form"); + }, + /** 搜索按钮操作 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getList(); + }, + /** 重置按钮操作 */ + resetQuery() { + this.dateRange = []; + 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; + getSchoolcalendar(id).then(response => { + this.form = response.data; + this.scopeOptions = response.scopes; + this.form.scope = response.scopeIds; + this.open = true; + this.title = "修改园历管理"; + }); + }, + /** 提交按钮 */ + submitForm: function() { + this.$refs["form"].validate(valid => { + if (valid) { + var arrscope = this.form.scope; + this.form.scope = arrscope.join(";"); + if (this.form.id != undefined) { + updateSchoolcalendar(this.form).then(response => { + if (response.code === 200) { + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); + } else { + this.msgError(response.msg); + } + }); + } else { + addSchoolcalendar(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 delSchoolcalendar(ids); + }) + .then(() => { + this.getList(); + this.msgSuccess("删除成功"); + }) + .catch(function() {}); + }, + /** 导出按钮操作 */ + handleExport() { + const queryParams = this.queryParams; + this.$confirm("是否确认导出所有园历管理数据项?", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(function() { + return exportSchoolcalendar(queryParams); + }) + .then(response => { + this.download(response.msg); + }) + .catch(function() {}); + } + } +}; +</script> \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/dayflowmanger/index.vue b/ruoyi-ui/src/views/benyi/dayflowmanger/index.vue new file mode 100644 index 000000000..c7f59a0bc --- /dev/null +++ b/ruoyi-ui/src/views/benyi/dayflowmanger/index.vue @@ -0,0 +1,348 @@ +<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> \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi_course/dayflow/index.vue b/ruoyi-ui/src/views/benyi_course/dayflow/index.vue new file mode 100644 index 000000000..853e2ee3b --- /dev/null +++ b/ruoyi-ui/src/views/benyi_course/dayflow/index.vue @@ -0,0 +1,3 @@ +<template > + <router-view /> +</template> \ No newline at end of file