主题整合周计划审批
This commit is contained in:
zhanglipeng
parent
9def2f5508
commit
a59e0ed925
@ -489,6 +489,22 @@ export const constantRoutes = [
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: "/benyi/themeweekplan",
|
||||
component: Layout,
|
||||
hidden: true,
|
||||
children: [
|
||||
{
|
||||
path: "approval/:id",
|
||||
component: () => import("@/views/benyi/themeweekplanapproval/approval"),
|
||||
name: "ThemeweekplanApproval",
|
||||
meta: {
|
||||
title: "主题整合月计划审批",
|
||||
icon: ""
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: "/benyi_course/learndevelopmentteacherprint",
|
||||
component: Layout,
|
||||
|
||||
@ -94,7 +94,7 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
@ -212,6 +212,9 @@ export default {
|
||||
this.themeFormat(response.data.themes);
|
||||
|
||||
this.form = response.data;
|
||||
if (response.data.status == "1") {
|
||||
this.form.status = null;
|
||||
}
|
||||
|
||||
this.getList();
|
||||
});
|
||||
|
||||
@ -186,6 +186,10 @@ export default {
|
||||
this.spyj = response.data.shyj;
|
||||
this.remark = response.data.remark;
|
||||
this.form = response.data;
|
||||
if (response.data.status == "1") {
|
||||
this.form.status = null;
|
||||
}
|
||||
|
||||
});
|
||||
this.getThemeTermItemPlan();
|
||||
},
|
||||
|
||||
440
ruoyi-ui/src/views/benyi/themeweekplanapproval/approval.vue
Normal file
440
ruoyi-ui/src/views/benyi/themeweekplanapproval/approval.vue
Normal file
@ -0,0 +1,440 @@
|
||||
<template>
|
||||
<div class="table-container" ref="printMe">
|
||||
<h2 class="title">{{ title }}</h2>
|
||||
<div class="table">
|
||||
<div class="print no-print">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
size="mini"
|
||||
icon="el-icon-printer"
|
||||
@click="prints"
|
||||
></el-button>
|
||||
</div>
|
||||
<table>
|
||||
<tr class="align-center">
|
||||
<!-- <td v-for="h in headerData" :key="h.title">
|
||||
<b class="table-title">{{h.title}}</b>
|
||||
{{h.name}}
|
||||
</td>-->
|
||||
<td style="width: 15%">
|
||||
<b class="table-title">班级：</b>
|
||||
{{ classname }}
|
||||
</td>
|
||||
<td style="width: 15%">
|
||||
<b class="table-title">制表人：</b>
|
||||
{{ tbr }}
|
||||
</td>
|
||||
<td style="width: 35%">
|
||||
<b class="table-title">月主题：</b>
|
||||
{{ monththeme }}
|
||||
</td>
|
||||
<td style="width: 15%">
|
||||
<b class="table-title">月份：</b>
|
||||
{{ month }}
|
||||
</td>
|
||||
<td style="width: 20%">
|
||||
<b class="table-title">周次：</b>
|
||||
第{{ zc }}周
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="align-center table-bg">
|
||||
<td v-for="h in bodyData.title" :key="h.prop">
|
||||
<b>{{ h.label }}</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-for="item in bodyData.weekplanitemList" :key="item.daytime">
|
||||
<td
|
||||
v-if="item.theme"
|
||||
:rowspan="bodyData.weekplanitemList.length"
|
||||
class="align-center"
|
||||
>
|
||||
<span>{{ item.theme }}</span>
|
||||
</td>
|
||||
<td class="align-center">{{ item.daytime }} / 星期{{ item.zhou }}</td>
|
||||
<td v-if="item.activityid != undefined">
|
||||
<!-- {{ themeactivityFormat(item.activityid) }} -->
|
||||
<router-link
|
||||
style="margin: 5px; color: blue; text-decoration: underline"
|
||||
v-for="(index, item) in item.activityid.split(';')"
|
||||
:key="item"
|
||||
:to="url + index"
|
||||
>{{ themeactivityFormat(index) }}</router-link
|
||||
>
|
||||
</td>
|
||||
<td class="align-center">
|
||||
{{ fzxzFormat(item.fzxz) }}
|
||||
</td>
|
||||
<td>{{ item.jzzc }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="align-center">备注</td>
|
||||
<td colspan="4">{{ bz }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="align-center">主管审批</td>
|
||||
<td colspan="4">{{ spyj }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- <p
|
||||
class="warning"
|
||||
>注：此周计划表不需要发给家长，只需上报教学主管。制定班级一周教学与活动计划表，请使用班级管理模块中“教学与游戏活动周计划表”，以上报教学主管和作为周计划通知发给家长。</p>-->
|
||||
</div>
|
||||
<div class="no-print" style="padding-top: 20px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="审批意见" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio label="0">退回</el-radio>
|
||||
<el-radio label="2">通过</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="审批建议" prop="shyj">
|
||||
<el-input
|
||||
v-model="form.shyj"
|
||||
type="textarea"
|
||||
placeholder="请输入审核建议"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
listWeekplanitem,
|
||||
getWeekplanitem,
|
||||
} from "@/api/benyi/themeweekplanitem";
|
||||
|
||||
import {
|
||||
listWeekplan,
|
||||
getWeekplan,
|
||||
updateWeekplan,
|
||||
} from "@/api/benyi/themeweekplan";
|
||||
import { listActivityById } from "@/api/benyi/activity";
|
||||
import { listMonthplan } from "@/api/benyi/thememonthplan";
|
||||
import { listMonthplanitem } from "@/api/benyi/thememonthplanitem";
|
||||
import { listThemeByIds, listThemeByActivityIds } from "@/api/benyi/theme";
|
||||
|
||||
export default {
|
||||
name: "ThemeweekplanApproval",
|
||||
data() {
|
||||
return {
|
||||
//url
|
||||
url: "/benyi_course/tremplan/themestudy/",
|
||||
tableData: [],
|
||||
title: "",
|
||||
zc: "",
|
||||
month: "",
|
||||
classname: "",
|
||||
tbr: "",
|
||||
monththeme: "",
|
||||
bz: "",
|
||||
spyj: "",
|
||||
//根据活动id获取的theme名称
|
||||
themenamebyactivityids: "",
|
||||
//分组性质
|
||||
fzxzOptions: [],
|
||||
//主题活动
|
||||
themeactivityOptions: [],
|
||||
bodyData: {
|
||||
title: [
|
||||
{
|
||||
label: "分主题",
|
||||
prop: "theme",
|
||||
},
|
||||
{
|
||||
label: "日期 / 星期",
|
||||
prop: "day",
|
||||
},
|
||||
{
|
||||
label: "活动名称",
|
||||
prop: "name",
|
||||
},
|
||||
{
|
||||
label: "分组性质",
|
||||
prop: "term",
|
||||
},
|
||||
{
|
||||
label: "家长支持",
|
||||
prop: "help",
|
||||
},
|
||||
],
|
||||
weekplanitemList: [
|
||||
{
|
||||
theme: "春天的颜色",
|
||||
},
|
||||
// {
|
||||
// day: "周二",
|
||||
// name: "活动",
|
||||
// term: "同质",
|
||||
// },
|
||||
// {
|
||||
// day: "周三",
|
||||
// name: "活动",
|
||||
// term: "同质",
|
||||
// },
|
||||
// {
|
||||
// day: "周四",
|
||||
// name: "活动",
|
||||
// term: "同质",
|
||||
// },
|
||||
// {
|
||||
// day: "周五",
|
||||
// name: "活动",
|
||||
// term: "同质",
|
||||
// },
|
||||
],
|
||||
},
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
wpid: undefined,
|
||||
},
|
||||
// 查询参数
|
||||
queryParams_MonPlan: {
|
||||
xnxq: undefined,
|
||||
month: undefined,
|
||||
classid: undefined,
|
||||
status: "2",
|
||||
},
|
||||
queryParams_MonPlanItem: {
|
||||
mpid: undefined,
|
||||
zc: undefined,
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
status: [
|
||||
{ required: true, message: "审批意见不能为空", trigger: "blur" },
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
created() {
|
||||
const themeweekplanid = this.$route.params && this.$route.params.id;
|
||||
this.getThemeWeekPlan(themeweekplanid);
|
||||
this.getDicts("sys_dm_fzxz").then((response) => {
|
||||
this.fzxzOptions = response.data;
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
//主题翻译
|
||||
async themeFormat(themeids) {
|
||||
var themename = "";
|
||||
var ids = themeids.split(";");
|
||||
var array = [];
|
||||
//console.log(ids);
|
||||
ids.forEach(function (value, key, arr) {
|
||||
//console.log(value); // 结果依次为1，2，3
|
||||
if (value != "") {
|
||||
array.push(parseInt(value));
|
||||
}
|
||||
});
|
||||
|
||||
if (array.length > 0) {
|
||||
await listThemeByIds(array).then((response) => {
|
||||
response.rows.forEach(function (value1, key1, arr1) {
|
||||
themename = themename + value1.name + ";";
|
||||
});
|
||||
});
|
||||
//(themename);
|
||||
this.monththeme = themename;
|
||||
}
|
||||
},
|
||||
// 主题--字典状态字典翻译
|
||||
themeactivityFormat(activityid) {
|
||||
if (activityid != null && activityid != "") {
|
||||
var name = this.selectMoeDictLabel(
|
||||
this.themeactivityOptions,
|
||||
activityid
|
||||
);
|
||||
return name;
|
||||
}
|
||||
return "";
|
||||
},
|
||||
// 分组性质类型--字典状态字典翻译
|
||||
fzxzFormat(fzxz) {
|
||||
return this.selectDictLabel(this.fzxzOptions, fzxz);
|
||||
},
|
||||
//主题活动
|
||||
getThemeActivityList(themeid) {
|
||||
listActivityById(themeid).then((response) => {
|
||||
// console.log(response.rows);
|
||||
this.themeactivityOptions = response.rows;
|
||||
});
|
||||
},
|
||||
//获取周教学计划详情
|
||||
getThemeWeekPlan(themeweekplanid) {
|
||||
getWeekplan(themeweekplanid).then((response) => {
|
||||
//console.log(response.data.classid);
|
||||
this.queryParams.wpid = response.data.id;
|
||||
this.title = response.data.name;
|
||||
this.zc = response.data.zc;
|
||||
this.month = response.data.month;
|
||||
this.classname = response.classname;
|
||||
this.tbr = response.createusername;
|
||||
this.bz = response.data.remark;
|
||||
this.spyj = response.data.shyj;
|
||||
|
||||
this.form = response.data;
|
||||
//console.log(response.data.status);
|
||||
if (response.data.status == "1") {
|
||||
this.form.status = null;
|
||||
}
|
||||
|
||||
//查找活动id
|
||||
this.queryParams_MonPlan.month = response.data.month;
|
||||
this.queryParams_MonPlan.xnxq = response.data.xnxq;
|
||||
this.queryParams_MonPlan.classid = response.data.classid;
|
||||
listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
|
||||
//console.log(resMonPlan.rows);
|
||||
//获取的月主题
|
||||
var monththemeids = resMonPlan.rows[0].themes;
|
||||
|
||||
this.themeFormat(monththemeids);
|
||||
|
||||
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);
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
this.getList();
|
||||
});
|
||||
},
|
||||
/** 查询主题整合周计划明细列表 */
|
||||
async getList() {
|
||||
//console.log(this.queryParams.wpid);
|
||||
await listWeekplanitem(this.queryParams).then((response) => {
|
||||
this.bodyData.weekplanitemList = response.rows;
|
||||
|
||||
//获取所有的活动id
|
||||
var activityIds = "";
|
||||
response.rows.forEach(function (value, key, arr) {
|
||||
if (value.activityid != null) {
|
||||
activityIds = activityIds + value.activityid + ";";
|
||||
}
|
||||
});
|
||||
var array = [];
|
||||
activityIds.split(";").forEach(function (value, key, arr) {
|
||||
if (value != "") {
|
||||
array.push(parseInt(value));
|
||||
}
|
||||
});
|
||||
//获取所有的活动id截止
|
||||
this.getThemeByActivityIds(array);
|
||||
});
|
||||
},
|
||||
//根据活动id获取theme列表
|
||||
async getThemeByActivityIds(array) {
|
||||
if (array.length > 0) {
|
||||
var themename = "";
|
||||
await listThemeByActivityIds(array).then((response) => {
|
||||
response.rows.forEach(function (value, key, arr) {
|
||||
themename = themename + value.name + ";";
|
||||
});
|
||||
});
|
||||
//console.log(themename);
|
||||
this.themenamebyactivityids = themename;
|
||||
}
|
||||
|
||||
this.bodyData.weekplanitemList[0].theme =
|
||||
this.themenamebyactivityids == ""
|
||||
? "未设置"
|
||||
: this.themenamebyactivityids;
|
||||
},
|
||||
prints() {
|
||||
//console.log(this.$refs.printMe);
|
||||
this.$print(this.$refs.printMe);
|
||||
},
|
||||
submitForm: function () {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.form.id != undefined) {
|
||||
updateWeekplan(this.form).then((response) => {
|
||||
if (response.code === 200) {
|
||||
this.msgSuccess("审批成功");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.table-container {
|
||||
padding: 30px 10%;
|
||||
.title {
|
||||
margin: 0;
|
||||
font-size: 18px;
|
||||
text-align: center;
|
||||
padding: 15px 0;
|
||||
}
|
||||
.align-center {
|
||||
text-align: center;
|
||||
}
|
||||
.table {
|
||||
font-size: 14px;
|
||||
.print {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
p {
|
||||
margin: 0;
|
||||
}
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table td {
|
||||
border: #ccc solid 1px;
|
||||
line-height: 24px;
|
||||
padding: 8px 5px;
|
||||
}
|
||||
.table-title {
|
||||
font-size: 16px;
|
||||
}
|
||||
.table-bg {
|
||||
background: #f8f8f8;
|
||||
}
|
||||
}
|
||||
.warning {
|
||||
padding-top: 20px;
|
||||
font-size: 12px;
|
||||
color: #666;
|
||||
}
|
||||
}
|
||||
@media print {
|
||||
.table-container {
|
||||
padding: 30px 0;
|
||||
}
|
||||
.print {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
/*去除页眉页脚*/
|
||||
@page {
|
||||
size: auto; /* auto is the initial value */
|
||||
margin: 3mm; /* this affects the margin in the printer settings */
|
||||
}
|
||||
</style>
|
||||
@ -191,7 +191,7 @@
|
||||
/>
|
||||
|
||||
<!-- 添加或修改主题整合周计划（根据月计划明细）对话框 -->
|
||||
<el-dialog
|
||||
<!-- <el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
class="v-dialog"
|
||||
@ -258,7 +258,7 @@
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-dialog> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -407,32 +407,38 @@ export default {
|
||||
this.multiple = !selection.length;
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
// handleUpdate(row) {
|
||||
// this.reset();
|
||||
// const id = row.id || this.ids;
|
||||
// getWeekplan(id).then((response) => {
|
||||
// this.form = response.data;
|
||||
// this.open = true;
|
||||
// this.title = "审批主题整合周计划";
|
||||
// this.disable = true;
|
||||
// });
|
||||
// },
|
||||
handleUpdate(row) {
|
||||
this.reset();
|
||||
const id = row.id || this.ids;
|
||||
getWeekplan(id).then((response) => {
|
||||
this.form = response.data;
|
||||
this.open = true;
|
||||
this.title = "审批主题整合周计划";
|
||||
this.disable = true;
|
||||
this.$router.push({
|
||||
path: "/benyi/themeweekplan/approval/" + id,
|
||||
});
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm: function () {
|
||||
this.$refs["form"].validate((valid) => {
|
||||
if (valid) {
|
||||
if (this.form.id != undefined) {
|
||||
updateWeekplan(this.form).then((response) => {
|
||||
if (response.code === 200) {
|
||||
this.msgSuccess("审批成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
// submitForm: function () {
|
||||
// this.$refs["form"].validate((valid) => {
|
||||
// if (valid) {
|
||||
// if (this.form.id != undefined) {
|
||||
// updateWeekplan(this.form).then((response) => {
|
||||
// if (response.code === 200) {
|
||||
// this.msgSuccess("审批成功");
|
||||
// this.open = false;
|
||||
// this.getList();
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// },
|
||||
/** 预览按钮操作 */
|
||||
handleView(row) {
|
||||
const id = row.id;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user