bug修复

This commit is contained in:
zhanglipeng 2021-07-03 15:24:45 +08:00
parent 63c5659925
commit 045ebec056
4 changed files with 44 additions and 28 deletions

View File

@ -1,23 +1,29 @@
<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">
<td class="w140"> <td class="w140">
<b class="table-title">班级</b> <b class="table-title">班级</b>
{{classname}} {{ classname }}
</td> </td>
<td> <td>
<b class="table-title">学期</b> <b class="table-title">学期</b>
{{xnxqFormat(xnxq)}} {{ xnxqFormat(xnxq) }}
</td> </td>
<td class="w200"> <td class="w200">
<b class="table-title">幼儿姓名</b> <b class="table-title">幼儿姓名</b>
{{childFormat(childid)}} {{ childFormat(childid) }}
</td> </td>
</tr> </tr>
<tr> <tr>
@ -26,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{zpimgsremarks}}</td> <td colspan="2">{{ zpimgsremarks }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">生活照片</td> <td class="align-center">生活照片</td>
@ -34,7 +40,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{shimgsremarks}}</td> <td colspan="2">{{ shimgsremarks }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">有趣事件</td> <td class="align-center">有趣事件</td>
@ -42,7 +48,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{yqsjremarks}}</td> <td colspan="2">{{ yqsjremarks }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">教师评语</td> <td class="align-center">教师评语</td>
@ -50,7 +56,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{jspyremarks}}</td> <td colspan="2">{{ jspyremarks }}</td>
</tr> </tr>
</table> </table>
<!-- <p <!-- <p
@ -64,9 +70,6 @@
import { import {
listFamily, listFamily,
getFamily, getFamily,
delFamily,
addFamily,
updateFamily,
} from "@/api/benyi/learndevelopmentfamily"; } from "@/api/benyi/learndevelopmentfamily";
import { listChild } from "@/api/benyi/child"; import { listChild } from "@/api/benyi/child";
@ -83,7 +86,7 @@ export default {
title: "幼儿学习与发展档案(家长)", title: "幼儿学习与发展档案(家长)",
classname: "", classname: "",
childid: "", childid: "",
xnxq:"", xnxq: "",
zpimgs: "", zpimgs: "",
zpimgsremarks: "", zpimgsremarks: "",
shimgs: "", shimgs: "",
@ -114,13 +117,16 @@ export default {
open: false, open: false,
// //
queryParams: { queryParams: {
id: "",
}, },
// //
form: {}, form: {},
}; };
}, },
created() { created() {
const childId = this.$route.params && this.$route.params.id;
this.queryParams.id = childId;
this.getList(); this.getList();
this.getChildList(); this.getChildList();
this.getDicts("sys_xnxq").then((response) => { this.getDicts("sys_xnxq").then((response) => {

View File

@ -1,23 +1,29 @@
<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">
<td class="w140"> <td class="w140">
<b class="table-title">班级</b> <b class="table-title">班级</b>
{{classname}} {{ classname }}
</td> </td>
<td> <td>
<b class="table-title">学期</b> <b class="table-title">学期</b>
{{xnxqFormat(xnxq)}} {{ xnxqFormat(xnxq) }}
</td> </td>
<td class="w200"> <td class="w200">
<b class="table-title">幼儿姓名</b> <b class="table-title">幼儿姓名</b>
{{childFormat(childid)}} {{ childFormat(childid) }}
</td> </td>
</tr> </tr>
<tr> <tr>
@ -26,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{gcjlremarks}}</td> <td colspan="2">{{ gcjlremarks }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">问题与方案</td> <td class="align-center">问题与方案</td>
@ -34,7 +40,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{wtyfaremarks}}</td> <td colspan="2">{{ wtyfaremarks }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">评估结果</td> <td class="align-center">评估结果</td>
@ -42,7 +48,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{pgjgremarks}}</td> <td colspan="2">{{ pgjgremarks }}</td>
</tr> </tr>
<tr> <tr>
<td class="align-center">教育计划</td> <td class="align-center">教育计划</td>
@ -50,7 +56,7 @@
</tr> </tr>
<tr> <tr>
<td class="align-center">备注</td> <td class="align-center">备注</td>
<td colspan="2">{{jyjhremarks}}</td> <td colspan="2">{{ jyjhremarks }}</td>
</tr> </tr>
</table> </table>
<!-- <p <!-- <p
@ -64,9 +70,6 @@
import { import {
listTeacher, listTeacher,
getTeacher, getTeacher,
delTeacher,
addTeacher,
updateTeacher,
} from "@/api/benyi/learndevelopmentteacher"; } from "@/api/benyi/learndevelopmentteacher";
import { listChild } from "@/api/benyi/child"; import { listChild } from "@/api/benyi/child";
@ -83,7 +86,7 @@ export default {
title: "幼儿学习与发展档案(教师)", title: "幼儿学习与发展档案(教师)",
classname: "", classname: "",
childid: "", childid: "",
xnxq:"", xnxq: "",
gcjl: "", gcjl: "",
gcjlremarks: "", gcjlremarks: "",
wtyfa: "", wtyfa: "",
@ -114,9 +117,15 @@ export default {
open: false, open: false,
// //
form: {}, form: {},
queryParams: {
id: "",
},
}; };
}, },
created() { created() {
const childId = this.$route.params && this.$route.params.id;
this.queryParams.id = childId;
//console.log(childId);
this.getList(); this.getList();
this.getChildList(); this.getChildList();
this.getDicts("sys_xnxq").then((response) => { this.getDicts("sys_xnxq").then((response) => {
@ -152,7 +161,6 @@ export default {
this.childOptions = response.rows; this.childOptions = response.rows;
this.classname = response.rows[0].bjmc; this.classname = response.rows[0].bjmc;
// console.log(response.rows); // console.log(response.rows);
}); });
}, },
/** 查询儿童学习与发展档案(教师)列表 */ /** 查询儿童学习与发展档案(教师)列表 */

View File

@ -43,6 +43,7 @@
<if test="jspy != null and jspy != ''">and a.jspy = #{jspy}</if> <if test="jspy != null and jspy != ''">and a.jspy = #{jspy}</if>
<if test="jspyremarks != null and jspyremarks != ''">and a.jspyremarks = #{jspyremarks}</if> <if test="jspyremarks != null and jspyremarks != ''">and a.jspyremarks = #{jspyremarks}</if>
<if test="createuserid != null ">and a.createuserid = #{createuserid}</if> <if test="createuserid != null ">and a.createuserid = #{createuserid}</if>
<if test="id != null ">and a.id = #{id}</if>
</where> </where>
</select> </select>

View File

@ -43,6 +43,7 @@
<if test="jyjh != null and jyjh != ''">and a.jyjh = #{jyjh}</if> <if test="jyjh != null and jyjh != ''">and a.jyjh = #{jyjh}</if>
<if test="jyjhremarks != null and jyjhremarks != ''">and a.jyjhremarks = #{jyjhremarks}</if> <if test="jyjhremarks != null and jyjhremarks != ''">and a.jyjhremarks = #{jyjhremarks}</if>
<if test="createuserid != null ">and a.createuserid = #{createuserid}</if> <if test="createuserid != null ">and a.createuserid = #{createuserid}</if>
<if test="id != null ">and a.id = #{id}</if>
</where> </where>
</select> </select>