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

周教学计划优化 打印优化

Browse Source
This commit is contained in:
zhanglipeng
2021-09-01 11:25:15 +08:00
parent 0d74d2d6b0
commit de3b3746f4
6 changed files with 72 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-ui/src/views/benyi/checkinstatisticsschool/index.vue
View File

@ -43,8 +43,8 @@
<div ref="printMe" class="print-me"> <div ref="printMe" class="print-me">
<h2 style="text-align: center">{{ this.deptName }}班级儿童考勤表</h2> <h2 style="text-align: center">{{ this.deptName }}班级儿童考勤表</h2>
<h4 style="text-align: left"> <h4 style="text-align: right">
考勤月份：{{ this.month }} ---- 班级总数：{{ this.classcount }} ---- 考勤月份：{{ this.month }} ------ 班级总数：{{ this.classcount }} ------
幼儿总数：{{ this.chilidcount }} 幼儿总数：{{ this.chilidcount }}
</h4> </h4>
<el-table <el-table
@ -97,7 +97,7 @@ export default {
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 总条数 // 总条数
total: 0, //total: 0,
//javascript //javascript
// 表头数据 // 表头数据
tableHead: [ tableHead: [
@ -361,7 +361,7 @@ export default {
: parseFloat((res.day31 * 100).toFixed(2)) + "%", : parseFloat((res.day31 * 100).toFixed(2)) + "%",
}); });
}); });
this.total = response.total; //this.total = response.total;
this.loading = false; this.loading = false;
}); });
}, },

14
ruoyi-ui/src/views/benyi/planweek/table.vue
View File

@ -11,19 +11,19 @@
<b class="table-title">{{h.title}}</b> <b class="table-title">{{h.title}}</b>
{{h.name}} {{h.name}}
</td>--> </td>-->
<td class="w140"> <td style="width:20%">
<b class="table-title">班级：</b> <b class="table-title">班级：</b>
{{classname}} {{classname}}
</td> </td>
<td> <td style="width:20%">
<b class="table-title">月份：</b> <b class="table-title">月份：</b>
{{month}} {{month}}
</td> </td>
<td> <td style="width:20%">
<b class="table-title">周次：</b> <b class="table-title">周次：</b>
第{{zc}}周 第{{zc}}周
</td> </td>
<td colspan="3"> <td colspan="3" style="width:40%">
<b class="table-title">月主题：</b> <b class="table-title">月主题：</b>
{{monththeme}} {{monththeme}}
</td> </td>
@ -283,12 +283,6 @@ export default {
<style lang="scss"> <style lang="scss">
.table-container { .table-container {
padding: 30px 10%; padding: 30px 10%;
.w140 {
width: 140px;
}
.w200 {
width: 200px;
}
.title { .title {
margin: 0; margin: 0;
font-size: 18px; font-size: 18px;

12
ruoyi-ui/src/views/benyi/thememonthplan/table.vue
View File

@ -17,19 +17,19 @@
<b class="table-title">{{h.title}}</b> <b class="table-title">{{h.title}}</b>
{{h.name}} {{h.name}}
</td>--> </td>-->
<td> <td style="width: 20%">
<b class="table-title">班级：</b> <b class="table-title">班级：</b>
{{ classname }} {{ classname }}
</td> </td>
<td> <td style="width: 15%">
<b class="table-title">月份：</b> <b class="table-title">月份：</b>
{{ month }} {{ month }}
</td> </td>
<td colspan="2"> <td colspan="2" style="width: 45%">
<b class="table-title">月主题：</b> <b class="table-title">月主题：</b>
{{ monththeme }} {{ monththeme }}
</td> </td>
<td> <td style="width: 20%">
<b class="table-title">制表人：</b> <b class="table-title">制表人：</b>
{{ tbr }} {{ tbr }}
</td> </td>
@ -48,9 +48,7 @@
<span>{{ monththeme }}</span> <span>{{ monththeme }}</span>
</td> </td>
<td class="align-center">{{ item.zc }}</td> <td class="align-center">{{ item.zc }}</td>
<td class="align-center"> <td class="align-center">{{ item.starttime }}至{{ item.endtime }}</td>
{{ item.starttime }}---{{ item.endtime }}
</td>
<td class="align-center"> <td class="align-center">
{{ themeactivityFormat(item.activityid) }} {{ themeactivityFormat(item.activityid) }}
</td> </td>

46
ruoyi-ui/src/views/benyi/themetermplan/table.vue
View File

@ -17,15 +17,15 @@
<b class="table-title">{{h.title}}</b> <b class="table-title">{{h.title}}</b>
{{h.name}} {{h.name}}
</td>--> </td>-->
<td class="w140"> <td style="width: 20%">
<b class="table-title">班级：</b> <b class="table-title">班级：</b>
{{ classname }} {{ classname }}
</td> </td>
<td> <td style="width: 60%">
<b class="table-title">学期：</b> <b class="table-title">学期：</b>
{{ xnxqFormat(xnxq) }} {{ xnxqFormat(xnxq) }}
</td> </td>
<td class="w200"> <td style="width: 20%">
<b class="table-title">制定人：</b> <b class="table-title">制定人：</b>
{{ tbr }} {{ tbr }}
</td> </td>
@ -39,7 +39,15 @@
<td class="align-center"> <td class="align-center">
<span>{{ item.month }}</span> <span>{{ item.month }}</span>
</td> </td>
<td class="align-center" v-html="themeFormat(item.themeconent)"></td> <td class="align-center">
<router-link
style="margin:10px"
v-for="(index, item) in item.themeconent.split(';')"
:key="item"
:to="url + (Number(index) + Number(99999))"
>{{ themeFormat(index) }}</router-link
>
</td>
<td>{{ item.remark }}</td> <td>{{ item.remark }}</td>
</tr> </tr>
<tr> <tr>
@ -70,6 +78,8 @@ export default {
name: "TermTable", name: "TermTable",
data() { data() {
return { return {
//url
url: "/benyi_course/tremplan/themestudy/",
//学年学期 //学年学期
xnxqOptions: [], xnxqOptions: [],
//主题 //主题
@ -118,23 +128,11 @@ export default {
return this.selectDictLabel(this.xnxqOptions, xnxq); return this.selectDictLabel(this.xnxqOptions, xnxq);
}, },
// 主题--字典状态字典翻译 // 主题--字典状态字典翻译
themeFormat(themeids) { themeFormat(themeid) {
if (themeids != "" && themeids != null) { if (themeid != "" && themeid != null) {
var ilength = themeids.split(";").length - 1; //console.log(themeid);
var names = ""; var name = this.selectMoeDictLabel(this.themeOptions, themeid);
for (var i = 1; i < ilength; i++) { return name;
var themeId = themeids.split(";")[i];
names =
names +
"<a target='_bank' href='/benyi_course/tremplan/themestudy/" +
(Number(99999) + Number(themeId)) +
"'>" +
this.selectMoeDictLabel(this.themeOptions, themeId) +
"</a>" +
" ";
}
//this.selectDictLabel(this.scopeOptions, row.xnxq);
return names;
} }
return ""; return "";
}, },
@ -176,12 +174,6 @@ export default {
<style lang="scss"> <style lang="scss">
.table-container { .table-container {
padding: 30px 10%; padding: 30px 10%;
.w140 {
width: 140px;
}
.w200 {
width: 200px;
}
.title { .title {
margin: 0; margin: 0;
font-size: 18px; font-size: 18px;

68
ruoyi-ui/src/views/benyi/themeweekplan/table.vue
View File

@ -1,9 +1,15 @@
<template> <template>
<div class="table-container" ref="printMe"> <div class="table-container" ref="printMe">
<h2 class="title">{{title}}</h2> <h2 class="title">{{ title }}</h2>
<div class="table"> <div class="table">
<div class="print no-print"> <div class="print no-print">
<el-button type="primary" plain size="mini" icon="el-icon-printer" @click="prints"></el-button> <el-button
type="primary"
plain
size="mini"
icon="el-icon-printer"
@click="prints"
></el-button>
</div> </div>
<table> <table>
<tr class="align-center"> <tr class="align-center">
@ -11,48 +17,52 @@
<b class="table-title">{{h.title}}</b> <b class="table-title">{{h.title}}</b>
{{h.name}} {{h.name}}
</td>--> </td>-->
<td> <td style="width: 15%">
<b class="table-title">班级：</b> <b class="table-title">班级：</b>
{{classname}} {{ classname }}
</td> </td>
<td> <td style="width: 15%">
<b class="table-title">月份：</b>
{{month}}
</td>
<td>
<b class="table-title">周次：</b>
第{{zc}}周
</td>
<td>
<b class="table-title">月主题：</b>
{{monththeme}}
</td>
<td>
<b class="table-title">制表人：</b> <b class="table-title">制表人：</b>
{{tbr}} {{ 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> </td>
</tr> </tr>
<tr class="align-center table-bg"> <tr class="align-center table-bg">
<td v-for="h in bodyData.title" :key="h.prop"> <td v-for="h in bodyData.title" :key="h.prop">
<b>{{h.label}}</b> <b>{{ h.label }}</b>
</td> </td>
</tr> </tr>
<tr v-for="item in bodyData.weekplanitemList" :key="item.daytime"> <tr v-for="item in bodyData.weekplanitemList" :key="item.daytime">
<td v-if="item.theme" :rowspan="bodyData.weekplanitemList.length" class="align-center"> <td
<span>{{item.theme}}</span> v-if="item.theme"
:rowspan="bodyData.weekplanitemList.length"
class="align-center"
>
<span>{{ item.theme }}</span>
</td> </td>
<td class="align-center">{{item.daytime}} / 星期{{item.zhou}}</td> <td class="align-center">{{ item.daytime }} / 星期{{ item.zhou }}</td>
<td>{{themeactivityFormat(item.activityid)}}</td> <td>{{ themeactivityFormat(item.activityid) }}</td>
<td class="align-center">{{fzxzFormat(item.fzxz)}}</td> <td class="align-center">{{ fzxzFormat(item.fzxz) }}</td>
<td>{{item.jzzc}}</td> <td>{{ item.jzzc }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="4">{{bz}}</td> <td colspan="4">{{ bz }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">主管审批</td> <td class="align-center">主管审批</td>
<td colspan="4">{{spyj}}</td> <td colspan="4">{{ spyj }}</td>
</tr> </tr>
</table> </table>
<!-- <p <!-- <p
@ -150,7 +160,7 @@ export default {
queryParams_MonPlan: { queryParams_MonPlan: {
xnxq: undefined, xnxq: undefined,
month: undefined, month: undefined,
classid:undefined, classid: undefined,
status: "2", status: "2",
}, },
queryParams_MonPlanItem: { queryParams_MonPlanItem: {
@ -236,7 +246,7 @@ export default {
//查找活动id //查找活动id
this.queryParams_MonPlan.month = response.data.month; this.queryParams_MonPlan.month = response.data.month;
this.queryParams_MonPlan.xnxq = response.data.xnxq; this.queryParams_MonPlan.xnxq = response.data.xnxq;
this.queryParams_MonPlan.classid=response.data.classid; this.queryParams_MonPlan.classid = response.data.classid;
listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => { listMonthplan(this.queryParams_MonPlan).then((resMonPlan) => {
//console.log(resMonPlan.rows); //console.log(resMonPlan.rows);
//获取的月主题 //获取的月主题

2
ruoyi-ui/src/views/system/user/index.vue
View File

@ -252,7 +252,7 @@
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" class="v-dialog u-dialog"> <el-dialog :title="title" :visible.sync="open" class="v-dialog u-dialog">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row :gutter="10"> <el-row :gutter="16">
<el-col :xs="24" :sm="24" :md="12"> <el-col :xs="24" :sm="24" :md="12">
<el-form-item label="用户姓名" prop="nickName"> <el-form-item label="用户姓名" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入用户姓名" /> <el-input v-model="form.nickName" placeholder="请输入用户姓名" />