Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

主题整合周计划及明细

Browse Source
This commit is contained in:
paidaxing444 2020-08-26 13:52:35 +08:00
parent 5d804c69f8
commit a9e3c5209b
9 changed files with 655 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/api/benyi/themeweekplan.js
View File

@ -43,6 +43,14 @@ export function delWeekplan(id) {
})
}
// 提交主题整合学期计划
export function checkWeekplan(id) {
return request({
url: '/benyi/themeweekplan/check/' + id,
method: 'post'
})
}
// 导出主题整合周计划（根据月计划明细）
export function exportWeekplan(query) {
return request({

15
ruoyi-ui/src/router/index.js
View File

@ -247,6 +247,21 @@ export const constantRoutes = [{
}
}]
},
{
path: '/benyi_course/themeweekplan',
component: Layout,
hidden: true,
children: [{
path: 'data/:id',
component: () =>
import('@/views/benyi/themeweekplan/data'),
name: 'Themeweekplan1',
meta: {
title: '主题整合周计划(明细)',
icon: ''
}
}]
},
{
path: '/benyi_course/math',
component: Layout,

548
ruoyi-ui/src/views/benyi/themeweekplan/data.vue
View File

@ -0,0 +1,548 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="周计划" prop="wpid">
<el-select v-model="queryParams.wpid" size="small">
<el-option
v-for="item in themeWeekPlanOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="选择日期" prop="daytime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="queryParams.daytime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
></el-date-picker>
</el-form-item>
<el-form-item label="星期" prop="zhou">
<el-input-number
v-model="queryParams.zhou"
placeholder="星期"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="活动" prop="activityid">
<el-input
v-model="queryParams.activityid"
placeholder="请输入活动"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分组性质" prop="fzxz">
<el-select v-model="queryParams.fzxz" size="small">
<el-option
v-for="item in fzxzOptions"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
/>
</el-select>
</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:themeweekplan:add']"
v-show="isShow"
>新增</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:themeweekplan:edit']"
v-show="isShow"
>修改</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:themeweekplan:remove']"
v-show="isShow"
>删除</el-button>
</el-col>
</el-row>
<el-table
v-loading="loading"
:data="weekplanitemList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="所属周计划" align="center" prop="wpid" :formatter="themeweekPlanFormat" />
<el-table-column label="日期" align="center" prop="daytime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.daytime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="星期" align="center" prop="zhou" />
<el-table-column
label="活动"
align="center"
prop="activityid"
:formatter="themeactivityFormat"
/>
<el-table-column label="分组性质" align="center" prop="fzxz" :formatter="fzxzFormat" />
<el-table-column label="家长支持" align="center" prop="jzzc" />
<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:themeweekplan:edit']"
v-show="isShow"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['benyi:themeweekplan:remove']"
v-show="isShow"
>删除</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" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="周计划" prop="wpid">
<el-select v-model="form.wpid" size="small" :disabled="true">
<el-option
v-for="item in themeWeekPlanOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="日期" prop="daytime">
<el-date-picker
clearable
size="small"
style="width: 200px"
v-model="form.daytime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
:disabled="disabled"
></el-date-picker>
</el-form-item>
<el-form-item label="星期" prop="zhou">
<el-input-number v-model="form.zhou" placeholder="请输入星期" :disabled="disabled" />
</el-form-item>
<el-form-item label="活动" prop="activityid">
<el-checkbox-group
v-model="themeactivityList"
:max="max"
@change="getThemeActivityIdValue"
>
<el-checkbox
v-for="(item,i) in themeactivityOptions"
:label="item.id"
:key="i"
>{{item.name}}</el-checkbox>
</el-checkbox-group>
<el-input v-model="form.activityid" v-if="false" />
</el-form-item>
<el-form-item label="分组性质" prop="fzxz">
<el-select v-model="form.fzxz" size="small">
<el-option
v-for="item in fzxzOptions"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="家长支持" prop="jzzc">
<el-input v-model="form.jzzc" type="textarea" placeholder="请输入家长支持" />
</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 {
listWeekplanitem,
getWeekplanitem,
delWeekplanitem,
addWeekplanitem,
updateWeekplanitem,
exportWeekplanitem,
} from "@/api/benyi/themeweekplanitem";
import { listWeekplan, getWeekplan } from "@/api/benyi/themeweekplan";
import { listActivityByThemeId } from "@/api/benyi/activity";
import { listMonthplan } from "@/api/benyi/thememonthplan";
import { listMonthplanitem } from "@/api/benyi/thememonthplanitem";
export default {
name: "Weekplanitem",
data() {
return {
isShow: true,
max: 2,
disabled: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 总条数
total: 0,
// 主题整合周计划明细表格数据
weekplanitemList: [],
//主题整合周计划列表
themeWeekPlanOptions: [],
//id默认值
defaultThemeWeekType: "",
//分组性质
fzxzOptions: [],
//选中的chebox值
themeactivityList: [],
//主题活动
themeactivityOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
daytime: undefined,
zhou: undefined,
activityid: undefined,
fzxz: undefined,
jzzc: undefined,
createuserid: undefined,
updateuserid: undefined,
wpid: undefined,
},
// 查询参数
queryParams_MonPlan: {
xnxq: undefined,
month: undefined,
status: "2",
},
queryParams_MonPlanItem: {
mpid: undefined,
zc: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
daytime: [{ required: true, message: "日期不能为空", trigger: "blur" }],
zhou: [{ required: true, message: "星期不能为空", trigger: "blur" }],
fzxz: [
{ required: true, message: "分组性质不能为空", trigger: "blur" },
],
activityid: [
{ required: true, message: "活动不能为空", trigger: "blur" },
],
},
};
},
created() {
const themeweekplanid = this.$route.params && this.$route.params.id;
this.getThemeWeekPlan(themeweekplanid);
this.getThemeWeekPlanList();
this.getDicts("sys_dm_fzxz").then((response) => {
this.fzxzOptions = response.data;
});
},
methods: {
// 主题--字典状态字典翻译
themeactivityFormat(row, column) {
if (row.activityid != null) {
var ilength = row.activityid.split(";").length - 1;
var names = "";
for (var i = 1; i < ilength; i++) {
names =
names +
this.selectMoeDictLabel(
this.themeactivityOptions,
row.activityid.split(";")[i]
) +
"；";
}
//this.selectDictLabel(this.scopeOptions, row.xnxq);
return names;
}
return "";
},
//获取选中的checkbox
getThemeActivityIdValue() {
//console.log(this.themeList);
var text = ";";
this.themeactivityList.forEach(function (value, key, arr) {
//console.log(value); // 结果依次为1，2，3
text = text + value + ";";
//console.log(text);
});
this.form.activityid = text;
},
//主题活动
getThemeActivityList(themeid) {
listActivityByThemeId(themeid).then((response) => {
//console.log(response.rows);
this.themeactivityOptions = response.rows;
});
},
// 分组性质类型--字典状态字典翻译
fzxzFormat(row, column) {
return this.selectDictLabel(this.fzxzOptions, row.fzxz);
},
// 字典翻译
themeweekPlanFormat(row, column) {
// return this.selectDictLabel(this.classOptions, row.classid);
var actions = [];
var datas = this.themeWeekPlanOptions;
Object.keys(datas).map((key) => {
if (datas[key].id == "" + row.wpid) {
actions.push(datas[key].name);
return false;
}
});
return actions.join("");
},
//计划详情
getThemeWeekPlan(themeweekplanid) {
getWeekplan(themeweekplanid).then((response) => {
this.queryParams.wpid = response.data.id;
this.defaultThemeweekType = response.data.id;
console.log(
"月份：" + response.data.month + " " + "周次:" + response.data.zc
);
//查找活动id
this.queryParams_MonPlan.month = response.data.month;
this.queryParams_MonPlan.xnxq = response.data.xnxq;
listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
//console.log(resMonPlan.rows);
this.queryParams_MonPlanItem.mpid = resMonPlan.rows[0].id;
this.queryParams_MonPlanItem.zc = response.data.zc;
listMonthplanitem(this.queryParams_MonPlanItem).then(
(resMonPlanItem) => {
console.log(resMonPlanItem.rows);
var activityids = resMonPlanItem.rows[0].activityid.split(";");
var array = [];
//console.log(arr);
activityids.forEach(function (value, key, arr) {
//console.log(value); // 结果依次为1，2，3
if (value != "") {
array.push(parseInt(value));
}
});
this.getThemeActivityList(array);
}
);
});
if (response.data.status == "0") {
this.isShow = true;
} else {
this.isShow = false;
}
this.getList();
});
},
getThemeWeekPlanList() {
listWeekplan().then((response) => {
this.themeWeekPlanOptions = response.rows;
});
},
/** 查询主题整合周计划明细列表 */
getList() {
this.loading = true;
listWeekplanitem(this.queryParams).then((response) => {
this.weekplanitemList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
daytime: undefined,
zhou: undefined,
activityid: undefined,
fzxz: undefined,
jzzc: undefined,
createuserid: undefined,
createTime: undefined,
updateuserid: undefined,
updateTime: undefined,
wpid: undefined,
};
this.resetForm("form");
this.themeactivityList = [];
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.wpid = this.defaultThemeweekType;
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 = "添加主题整合周计划明细";
this.form.wpid = this.queryParams.wpid;
this.disabled = false;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getWeekplanitem(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改主题整合周计划明细";
this.disabled = true;
var activityid = response.data.activityid.split(";");
var array = [];
//console.log(arr);
activityid.forEach(function (value, key, arr) {
//console.log(value); // 结果依次为1，2，3
if (value != "") {
array.push(parseInt(value));
}
});
this.themeactivityList = array;
});
},
/** 提交按钮 */
submitForm: function () {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != undefined) {
updateWeekplanitem(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
this.open = false;
this.getList();
}
});
} else {
addWeekplanitem(this.form).then((response) => {
if (response.code === 200) {
this.msgSuccess("新增成功");
this.open = false;
this.getList();
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
'是否确认删除主题整合周计划明细编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return delWeekplanitem(ids);
})
.then(() => {
this.getList();
this.msgSuccess("删除成功");
})
.catch(function () {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有主题整合周计划明细数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return exportWeekplanitem(queryParams);
})
.then((response) => {
this.download(response.msg);
})
.catch(function () {});
},
},
};
</script>

54
ruoyi-ui/src/views/benyi/themeweekplan/index.vue
View File

@ -86,21 +86,18 @@
v-hasPermi="['benyi:themeweekplan: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:themeweekplan:export']"
>导出</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="weekplanList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="selection" width="55" align="center" :selectable="isShow" />
<!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="计划名称" align="center" prop="name" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/benyi_course/themeweekplan/data/' + scope.row.id" class="link-type">
<span>{{ scope.row.name }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="班级名称" align="center" prop="classid" :formatter="classFormat" />
<el-table-column label="所属月份" align="center" prop="month" width="180">
<template slot-scope="scope">
@ -119,6 +116,7 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['benyi:themeweekplan:edit']"
v-show="isShow(scope.row)"
>修改</el-button>
<el-button
size="mini"
@ -126,7 +124,16 @@
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['benyi:themeweekplan:remove']"
v-show="isShow(scope.row)"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-check"
@click="handleCheck(scope.row)"
v-hasPermi="['benyi:themeweekplan:edit']"
v-show="isShow(scope.row)"
>提交</el-button>
</template>
</el-table-column>
</el-table>
@ -187,6 +194,7 @@ import {
addWeekplan,
updateWeekplan,
exportWeekplan,
checkWeekplan,
} from "@/api/benyi/themeweekplan";
import { listClass } from "@/api/system/class";
@ -256,6 +264,13 @@ export default {
});
},
methods: {
isShow(row) {
if (row.status == "0") {
return true;
} else {
return false;
}
},
//班级列表
getClassList() {
listClass(null).then((response) => {
@ -392,6 +407,23 @@ export default {
})
.catch(function () {});
},
/** 提交按钮操作 */
handleCheck(row) {
const id = row.id;
this.$confirm("是否确认提交主题整合周计划?提交后数据将不能维护", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(function () {
return checkWeekplan(id);
})
.then(() => {
this.getList();
this.msgSuccess("提交成功");
})
.catch(function () {});
},
},
};
</script>

9
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeMonthplanController.java
View File

@ -60,7 +60,14 @@ public class ByThemeMonthplanController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ByThemeMonthplan byThemeMonthplan) {
startPage();
List<ByThemeMonthplan> list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
byThemeMonthplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
String classId = schoolCommon.getClassId();
List<ByThemeMonthplan> list = null;
//首先判断当前账户是否为幼儿园账号
if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
byThemeMonthplan.setClassid(classId);
}
list = byThemeMonthplanService.selectByThemeMonthplanList(byThemeMonthplan);
return getDataTable(list);
}

9
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeTermplanController.java
View File

@ -55,7 +55,14 @@ public class ByThemeTermplanController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ByThemeTermplan byThemeTermplan) {
startPage();
List<ByThemeTermplan> list = byThemeTermplanService.selectByThemeTermplanList(byThemeTermplan);
byThemeTermplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
String classId = schoolCommon.getClassId();
List<ByThemeTermplan> list = null;
//首先判断当前账户是否为幼儿园账号
if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
byThemeTermplan.setClassid(classId);
}
list = byThemeTermplanService.selectByThemeTermplanList(byThemeTermplan);
return getDataTable(list);
}

24
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByThemeWeekplanController.java
View File

@ -62,7 +62,16 @@ public class ByThemeWeekplanController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(ByThemeWeekplan byThemeWeekplan) {
startPage();
List<ByThemeWeekplan> list = byThemeWeekplanService.selectByThemeWeekplanList(byThemeWeekplan);
byThemeWeekplan.setSchoolid(SecurityUtils.getLoginUser().getUser().getDept().getDeptId());
String classId = schoolCommon.getClassId();
List<ByThemeWeekplan> list = null;
//首先判断当前账户是否为幼儿园账号
if (schoolCommon.isSchool() && !schoolCommon.isStringEmpty(classId)) {
byThemeWeekplan.setClassid(classId);
}
list = byThemeWeekplanService.selectByThemeWeekplanList(byThemeWeekplan);
return getDataTable(list);
}
@ -189,4 +198,17 @@ public class ByThemeWeekplanController extends BaseController {
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(byThemeWeekplanService.deleteByThemeWeekplanByIds(ids));
}
/**
* 提交主题整合学期计划
*/
@PreAuthorize("@ss.hasPermi('benyi:themeweekplan:edit')")
@Log(title = "主题整合周计划", businessType = BusinessType.UPDATE)
@PostMapping("/check/{id}")
public AjaxResult check(@PathVariable String id) {
ByThemeWeekplan byThemeWeekplan = new ByThemeWeekplan();
byThemeWeekplan.setId(id);
byThemeWeekplan.setStatus("1");
return toAjax(byThemeWeekplanService.updateByThemeWeekplan(byThemeWeekplan));
}
}

1
ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml
View File

@ -40,6 +40,7 @@
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
</where>
order by month desc
</select>
<select id="selectByThemeWeekplanById" parameterType="String" resultMap="ByThemeWeekplanResult">

1
ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanitemMapper.xml
View File

@ -35,6 +35,7 @@
<if test="updateuserid != null ">and updateuserid = #{updateuserid}</if>
<if test="wpid != null and wpid != ''">and wpid = #{wpid}</if>
</where>
order by zhou
</select>
<select id="selectByThemeWeekplanitemById" parameterType="Long" resultMap="ByThemeWeekplanitemResult">