xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2023-04-19 11:32:19 +08:00
parent 81fa474fcc
commit 580ba4e8d5
2 changed files with 147 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
src/views/system/kindergartenCheckReport/index.vue
View File

@ -21,14 +21,12 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
" "
>{{ kindergartenName }}</el-button >{{ kindergartenName }}</el-button>
>
<el-button <el-button
@click="kindergartenshow = true" @click="kindergartenshow = true"
style="width: 230px; text-align: left; height: 32px" style="width: 230px; text-align: left; height: 32px"
v-else v-else
>{{ kindergartenName }}</el-button >{{ kindergartenName }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item label="所属批次" prop="categoryName"> <el-form-item label="所属批次" prop="categoryName">
@ -36,14 +34,12 @@
@click="batchCodeshowclick" @click="batchCodeshowclick"
style="width: 230px; text-align: left; height: 32px; color: #c0c4cc" style="width: 230px; text-align: left; height: 32px; color: #c0c4cc"
v-if="batchName == '请选择批次'" v-if="batchName == '请选择批次'"
>{{ batchName }}</el-button >{{ batchName }}</el-button>
>
<el-button <el-button
@click="batchCodeshowclick" @click="batchCodeshowclick"
style="width: 230px; text-align: left; height: 32px" style="width: 230px; text-align: left; height: 32px"
v-else v-else
>{{ batchName }}</el-button >{{ batchName }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item label="报告名称" prop="reportName"> <el-form-item label="报告名称" prop="reportName">
@ -65,40 +61,23 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="审核状态" prop="checkStatus"> <el-form-item label="审核状态" prop="checkStatus">
<el-select <el-select v-model="queryParams.checkStatus" placeholder="请选择审核状态" style="width: 230px">
v-model="queryParams.checkStatus"
placeholder="请选择审核状态"
style="width: 230px"
>
<el-option <el-option
v-for="item in checkStatuslist" v-for="item in checkStatuslist"
:key="item.value" :key="item.value"
:label="item.name" :label="item.name"
:value="item.value" :value="item.value"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="kindergartenCheckReportList"> <el-table v-loading="loading" :data="kindergartenCheckReportList">
<el-table-column <el-table-column label="幼儿园名称" align="center" prop="kindergartenName" />
label="幼儿园名称"
align="center"
prop="kindergartenName"
/>
<el-table-column label="批次名称" align="center" prop="batchName" /> <el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="报告名称" align="center" prop="reportName" /> <el-table-column label="报告名称" align="center" prop="reportName" />
<el-table-column label="报告编号" align="center" prop="reportCode" /> <el-table-column label="报告编号" align="center" prop="reportCode" />
@ -109,21 +88,12 @@
{{ scope.row.checkStatus == 1 ? "已审核" : "" }} {{ scope.row.checkStatus == 1 ? "已审核" : "" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="审核时间" align="center" prop="checkTime" width="180">
label="审核时间"
align="center"
prop="checkTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -131,16 +101,14 @@
icon="el-icon-search" icon="el-icon-search"
v-hasPermi="['system:kindergartenCheckReport:preview']" v-hasPermi="['system:kindergartenCheckReport:preview']"
@click="lookhand(scope.row)" @click="lookhand(scope.row)"
>预览</el-button >预览</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:kindergartenCheckReport:edit']" v-hasPermi="['system:kindergartenCheckReport:edit']"
>审核</el-button >审核</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -148,8 +116,7 @@
v-show="scope.row.checkStatus == 1" v-show="scope.row.checkStatus == 1"
@click="handleExport(scope.row)" @click="handleExport(scope.row)"
v-hasPermi="['system:kindergartenCheckReport:download']" v-hasPermi="['system:kindergartenCheckReport:download']"
>下载</el-button >下载</el-button>
>
<el-button <el-button
disabled disabled
size="mini" size="mini"
@ -158,8 +125,7 @@
v-show="scope.row.checkStatus == 0" v-show="scope.row.checkStatus == 0"
@click="handleExport(scope.row)" @click="handleExport(scope.row)"
v-hasPermi="['system:kindergartenCheckReport:download']" v-hasPermi="['system:kindergartenCheckReport:download']"
>下载</el-button >下载</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -173,12 +139,7 @@
/> />
<!-- 修改幼儿园检测报告对话框 --> <!-- 修改幼儿园检测报告对话框 -->
<el-dialog <el-dialog :title="title" :visible.sync="open" width="1350px" append-to-body>
:title="title"
:visible.sync="open"
width="1350px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="审核状态" prop="checkStatus"> <el-form-item label="审核状态" prop="checkStatus">
<el-radio-group v-model="form.checkStatus"> <el-radio-group v-model="form.checkStatus">
@ -187,11 +148,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<div style="height: 550px; overflow: auto"> <div style="height: 550px; overflow: auto">
<kindergartenEcharts <kindergartenEcharts v-if="open" :itemlists="itemlist" class="personal"></kindergartenEcharts>
v-if="open"
:itemlists="itemlist"
class="personal"
></kindergartenEcharts>
</div> </div>
<!-- <el-form-item label="幼儿园名称" prop="kindergartenName"> <!-- <el-form-item label="幼儿园名称" prop="kindergartenName">
<el-input v-model="form.kindergartenName" /> <el-input v-model="form.kindergartenName" />
@ -204,7 +161,7 @@
</el-form-item> </el-form-item>
<el-form-item label="报告名称" prop="reportName"> <el-form-item label="报告名称" prop="reportName">
<el-input v-model="form.reportName" placeholder="请输入报告名称" /> <el-input v-model="form.reportName" placeholder="请输入报告名称" />
</el-form-item> --> </el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -214,11 +171,7 @@
<el-dialog :visible.sync="openiframe" width="1350px" append-to-body> <el-dialog :visible.sync="openiframe" width="1350px" append-to-body>
<div style="height: 680px; overflow: auto"> <div style="height: 680px; overflow: auto">
<kindergartenEcharts <kindergartenEcharts :itemlists="itemlist" class="personal" v-if="openiframe"></kindergartenEcharts>
:itemlists="itemlist"
class="personal"
v-if="openiframe"
></kindergartenEcharts>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="openiframe = false">关闭</el-button> <el-button type="primary" @click="openiframe = false">关闭</el-button>
@ -243,30 +196,14 @@
label-width="90px" label-width="90px"
> >
<el-form-item label="批次编号" prop="batchCode"> <el-form-item label="批次编号" prop="batchCode">
<el-input <el-input v-model="testqueryParams.batchCode" placeholder="请输入批次编号" clearable />
v-model="testqueryParams.batchCode"
placeholder="请输入批次编号"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item label="批次名称" prop="batchCode"> <el-form-item label="批次名称" prop="batchCode">
<el-input <el-input v-model="testqueryParams.batchName" placeholder="请输入批次名称" clearable />
v-model="testqueryParams.batchName"
placeholder="请输入批次名称"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="testScore">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="testresetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="testScore"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="testresetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -293,18 +230,8 @@
></el-button> ></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="batchCode" label="批次编号" width="230" align="center" />
property="batchCode" <el-table-column property="batchName" label="批次名称" width="230" align="center" />
label="批次编号"
width="230"
align="center"
/>
<el-table-column
property="batchName"
label="批次名称"
width="230"
align="center"
/>
</el-table> </el-table>
<pagination <pagination
v-show="total4 > 0" v-show="total4 > 0"
@ -323,13 +250,7 @@
append-to-body append-to-body
:before-close="kindergartencancel" :before-close="kindergartencancel"
> >
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="110px"
>
<el-form-item label="幼儿园名称" prop="kindergartenName"> <el-form-item label="幼儿园名称" prop="kindergartenName">
<el-input <el-input
style="width: 200px" style="width: 200px"
@ -339,16 +260,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="kinhandleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="kinhandleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick"> <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
@ -371,41 +284,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="kindergartenName" label="幼儿园名字" width="150" align="center"></el-table-column>
property="kindergartenName" <el-table-column property="kindergartenAddress" label="幼儿园地址" width="150" align="center"></el-table-column>
label="幼儿园名字" <el-table-column label="幼儿园所在组织" align="center" prop="organizeName" width="150"></el-table-column>
width="150" <el-table-column property="contacts" label="联系人" width="150" align="center"></el-table-column>
align="center" <el-table-column property="phone" label="联系电话" width="150" align="center"></el-table-column>
>
</el-table-column>
<el-table-column
property="kindergartenAddress"
label="幼儿园地址"
width="150"
align="center"
>
</el-table-column>
<el-table-column
label="幼儿园所在组织"
align="center"
prop="organizeName"
width="150"
>
</el-table-column>
<el-table-column
property="contacts"
label="联系人"
width="150"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="150"
align="center"
>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total1 > 0" v-show="total1 > 0"
@ -421,7 +304,7 @@
<script> <script>
import { import {
listKindergartenCheckReport, listKindergartenCheckReport,
uploadKindergartenCheckReport, uploadKindergartenCheckReport
} from "@/api/system/kindergartenCheckReport"; } from "@/api/system/kindergartenCheckReport";
import kindergarten from "../../assembly/kindergarten.vue"; import kindergarten from "../../assembly/kindergarten.vue";
import { listKindergartenInfo } from "@/api/system/kindergartenInfo"; import { listKindergartenInfo } from "@/api/system/kindergartenInfo";
@ -438,17 +321,17 @@ export default {
itemlist: { itemlist: {
kindergartenId: "", kindergartenId: "",
batchCode: "", batchCode: "",
number: 1, number: 1
}, },
checkStatuslist: [ checkStatuslist: [
{ {
value: 0, value: 0,
name: "未审核", name: "未审核"
}, },
{ {
value: 1, value: 1,
name: "已审核", name: "已审核"
}, }
], ],
total1: 0, total1: 0,
total4: 0, total4: 0,
@ -466,7 +349,7 @@ export default {
kindergartenAddress: null, kindergartenAddress: null,
kindergartenType: null, kindergartenType: null,
phone: null, phone: null,
contacts: null, contacts: null
}, },
//幼儿园list //幼儿园list
kindergartenList: [], kindergartenList: [],
@ -482,7 +365,7 @@ export default {
//批次编号 //批次编号
testqueryParams: { testqueryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
@ -516,13 +399,13 @@ export default {
motionLibraryId: null, motionLibraryId: null,
checkUserId: null, checkUserId: null,
checkTime: null, checkTime: null,
checkStatus: null, checkStatus: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: {}, rules: {},
pdfurl: null, pdfurl: null
}; };
}, },
created() { created() {
@ -533,7 +416,7 @@ export default {
/** 查询幼儿园检测报告列表 */ /** 查询幼儿园检测报告列表 */
info() { info() {
this.loading = true; this.loading = true;
listKindergartenCheckReport(this.queryParams).then((response) => { listKindergartenCheckReport(this.queryParams).then(response => {
this.kindergartenCheckReportList = response.rows; this.kindergartenCheckReportList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -541,7 +424,7 @@ export default {
}, },
getList() { getList() {
//获取幼儿园list //获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => { listKindergartenInfo(this.kqueryParams).then(response => {
this.kindergartenList = response.rows; this.kindergartenList = response.rows;
this.total1 = response.total; this.total1 = response.total;
}); });
@ -569,7 +452,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -593,7 +476,7 @@ export default {
motionLibraryId: null, motionLibraryId: null,
checkUserId: null, checkUserId: null,
checkTime: null, checkTime: null,
checkStatus: null, checkStatus: null
}; };
this.kindergartenName = "请选择幼儿园"; this.kindergartenName = "请选择幼儿园";
this.kindergartenId = ""; this.kindergartenId = "";
@ -611,6 +494,9 @@ export default {
this.loading = true; this.loading = true;
setTimeout(() => { setTimeout(() => {
this.form = JSON.parse(JSON.stringify(item)); this.form = JSON.parse(JSON.stringify(item));
if (this.form.checkStatus == "" || !this.form.checkStatus) {
this.form.checkStatus = 0;
}
this.title = "修改幼儿园检测报告审批状态"; this.title = "修改幼儿园检测报告审批状态";
this.open = true; this.open = true;
this.loading = false; this.loading = false;
@ -638,7 +524,7 @@ export default {
logging: false, //日志开关，便于查看html2canvas的内部执行流程 logging: false, //日志开关，便于查看html2canvas的内部执行流程
width: width, //dom 原始宽度 width: width, //dom 原始宽度
height: height, height: height,
useCORS: true, // 【重要】开启跨域配置 useCORS: true // 【重要】开启跨域配置
}; };
html2canvas(shareContent, opts).then(() => { html2canvas(shareContent, opts).then(() => {
var contentWidth = canvas.width; var contentWidth = canvas.width;
@ -673,11 +559,11 @@ export default {
formData.append("kindergartenName", this.form.kindergartenName); formData.append("kindergartenName", this.form.kindergartenName);
formData.append("batchCode", this.form.batchCode); formData.append("batchCode", this.form.batchCode);
formData.append("checkStatus", this.form.checkStatus); formData.append("checkStatus", this.form.checkStatus);
uploadKindergartenCheckReport(formData).then((res) => { uploadKindergartenCheckReport(formData).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: "审核完成", message: "审核完成",
type: "success", type: "success"
}); });
this.info(); this.info();
} }
@ -731,7 +617,7 @@ export default {
}, },
//批次 //批次
testScore() { testScore() {
testScoreBatch(this.testqueryParams).then((res) => { testScoreBatch(this.testqueryParams).then(res => {
this.testScorelist = res.rows; this.testScorelist = res.rows;
this.total4 = res.total; this.total4 = res.total;
}); });
@ -741,7 +627,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
batchCode: "", batchCode: "",
batchName: "", batchName: ""
}; };
this.testScore(); this.testScore();
}, },
@ -757,7 +643,7 @@ export default {
}, },
kinhandleQuery() { kinhandleQuery() {
//获取幼儿园list //获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => { listKindergartenInfo(this.kqueryParams).then(response => {
this.kindergartenList = response.rows; this.kindergartenList = response.rows;
this.total1 = response.total; this.total1 = response.total;
}); });
@ -771,7 +657,7 @@ export default {
kindergartenAddress: null, kindergartenAddress: null,
kindergartenType: null, kindergartenType: null,
phone: null, phone: null,
contacts: null, contacts: null
}; };
this.kinhandleQuery(); this.kinhandleQuery();
}, },
@ -786,10 +672,10 @@ export default {
u8arr[n] = bstr.charCodeAt(n); u8arr[n] = bstr.charCodeAt(n);
} }
return new Blob([u8arr], { return new Blob([u8arr], {
type: mime, type: mime
}); });
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

381
src/views/system/personalCheckReport/index.vue
View File

@ -13,28 +13,24 @@
@click="studentshowclick" @click="studentshowclick"
v-if="studentname == '请选择学生'" v-if="studentname == '请选择学生'"
style="width: 230px; text-align: left; height: 32px; color: #c0c4cc" style="width: 230px; text-align: left; height: 32px; color: #c0c4cc"
>{{ studentname }}</el-button >{{ studentname }}</el-button>
>
<el-button <el-button
@click="studentshowclick" @click="studentshowclick"
style="width: 230px; text-align: left; height: 32px" style="width: 230px; text-align: left; height: 32px"
v-else v-else
>{{ studentname }}</el-button >{{ studentname }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item label="所属批次" prop="categoryName"> <el-form-item label="所属批次" prop="categoryName">
<el-button <el-button
@click="batchCodeshowclick" @click="batchCodeshowclick"
style="width: 230px; text-align: left; height: 32px; color: #c0c4cc" style="width: 230px; text-align: left; height: 32px; color: #c0c4cc"
v-if="batchName == '请选择批次'" v-if="batchName == '请选择批次'"
>{{ batchName }}</el-button >{{ batchName }}</el-button>
>
<el-button <el-button
@click="batchCodeshowclick" @click="batchCodeshowclick"
style="width: 230px; text-align: left; height: 32px" style="width: 230px; text-align: left; height: 32px"
v-else v-else
>{{ batchName }}</el-button >{{ batchName }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item label="报告名称" prop="reportName"> <el-form-item label="报告名称" prop="reportName">
@ -56,31 +52,18 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="审核状态" prop="checkUserId"> <el-form-item label="审核状态" prop="checkUserId">
<el-select <el-select v-model="queryParams.checkStatus" placeholder="请选择审核状态" style="width: 230px">
v-model="queryParams.checkStatus"
placeholder="请选择审核状态"
style="width: 230px"
>
<el-option <el-option
v-for="item in checkStatuslist" v-for="item in checkStatuslist"
:key="item.value" :key="item.value"
:label="item.name" :label="item.name"
:value="item.value" :value="item.value"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
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-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="personalCheckReportList"> <el-table v-loading="loading" :data="personalCheckReportList">
@ -89,12 +72,7 @@
<el-table-column label="报告名称" align="center" prop="reportName" /> <el-table-column label="报告名称" align="center" prop="reportName" />
<el-table-column label="报告编号" align="center" prop="reportCode" /> <el-table-column label="报告编号" align="center" prop="reportCode" />
<el-table-column label="审核人" align="center" prop="checkUserName" /> <el-table-column label="审核人" align="center" prop="checkUserName" />
<el-table-column <el-table-column label="审核时间" align="center" prop="checkTime" width="180">
label="审核时间"
align="center"
prop="checkTime"
width="180"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span> <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
</template> </template>
@ -103,13 +81,9 @@
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.checkStatus == 0 ? "未审核" : "" }} {{ scope.row.checkStatus == 0 ? "未审核" : "" }}
{{ scope.row.checkStatus == 1 ? "已审核" : "" }} {{ scope.row.checkStatus == 1 ? "已审核" : "" }}
</template></el-table-column </template>
> </el-table-column>
<el-table-column <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -117,16 +91,14 @@
icon="el-icon-search" icon="el-icon-search"
@click="lookhand(scope.row)" @click="lookhand(scope.row)"
v-hasPermi="['system:checkReport:report']" v-hasPermi="['system:checkReport:report']"
>预览</el-button >预览</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:personalCheckReport:edit']" v-hasPermi="['system:personalCheckReport:edit']"
>审核</el-button >审核</el-button>
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -134,8 +106,7 @@
@click="handleExport(scope.row)" @click="handleExport(scope.row)"
v-show="scope.row.checkStatus == 1" v-show="scope.row.checkStatus == 1"
v-hasPermi="['system:personalCheckReport:download']" v-hasPermi="['system:personalCheckReport:download']"
>下载</el-button >下载</el-button>
>
<el-button <el-button
disabled disabled
size="mini" size="mini"
@ -144,8 +115,7 @@
v-show="scope.row.checkStatus == 0" v-show="scope.row.checkStatus == 0"
@click="handleExport(scope.row)" @click="handleExport(scope.row)"
v-hasPermi="['system:personalCheckReport:download']" v-hasPermi="['system:personalCheckReport:download']"
>下载</el-button >下载</el-button>
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -164,13 +134,7 @@
append-to-body append-to-body
:before-close="studentcancel" :before-close="studentcancel"
> >
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="所属幼儿园" prop="categoryName"> <el-form-item label="所属幼儿园" prop="categoryName">
<el-button <el-button
@click="kindergartenshow = true" @click="kindergartenshow = true"
@ -184,8 +148,7 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
" "
>{{ kindergartenName }}</el-button >{{ kindergartenName }}</el-button>
>
<el-button <el-button
@click="kindergartenshow = true" @click="kindergartenshow = true"
style=" style="
@ -197,8 +160,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
" "
v-else v-else
>{{ kindergartenName }}</el-button >{{ kindergartenName }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item label="所属班级" prop="categoryName" label-width="80px"> <el-form-item label="所属班级" prop="categoryName" label-width="80px">
@ -206,15 +168,13 @@
@click="classshowclick" @click="classshowclick"
style="width: 200px; text-align: left; height: 32px; color: #c0c4cc" style="width: 200px; text-align: left; height: 32px; color: #c0c4cc"
v-if="className == '请选择班级'" v-if="className == '请选择班级'"
>{{ className }}</el-button >{{ className }}</el-button>
>
<el-button <el-button
@click="classshowclick" @click="classshowclick"
style="width: 200px; text-align: left; height: 32px" style="width: 200px; text-align: left; height: 32px"
v-else v-else
>{{ className }}</el-button >{{ className }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item label="学生姓名" prop="studentName" label-width="80px"> <el-form-item label="学生姓名" prop="studentName" label-width="80px">
@ -226,19 +186,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="studenthandleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="studentresetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="studenthandleQuery"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
@click="studentresetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
@ -264,34 +213,12 @@
></el-button> ></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="className" label="班级名称" width="190" align="center" />
property="className" <el-table-column property="studentName" label="学生姓名" width="190" align="center" />
label="班级名称" <el-table-column property="studentName" label="性别" width="190" align="center">
width="190" <template slot-scope="scope">{{ scope.row.studentSex == "MALE" ? "男" : "女" }}</template>
align="center"
/>
<el-table-column
property="studentName"
label="学生姓名"
width="190"
align="center"
/>
<el-table-column
property="studentName"
label="性别"
width="190"
align="center"
>
<template slot-scope="scope">
{{ scope.row.studentSex == "MALE" ? "男" : "女" }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="homeAddress" label="住址" width="190" align="center" />
property="homeAddress"
label="住址"
width="190"
align="center"
/>
</el-table> </el-table>
<pagination <pagination
v-show="total3 > 0" v-show="total3 > 0"
@ -309,13 +236,7 @@
append-to-body append-to-body
:before-close="kindergartencancel" :before-close="kindergartencancel"
> >
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="110px"
>
<el-form-item label="幼儿园名称" prop="kindergartenName"> <el-form-item label="幼儿园名称" prop="kindergartenName">
<el-input <el-input
style="width: 200px" style="width: 200px"
@ -325,16 +246,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="kinhandleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="kinhandleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick"> <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
@ -357,41 +270,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="kindergartenName" label="幼儿园名字" width="150" align="center"></el-table-column>
property="kindergartenName" <el-table-column property="kindergartenAddress" label="幼儿园地址" width="150" align="center"></el-table-column>
label="幼儿园名字" <el-table-column label="幼儿园所在组织" align="center" prop="organizeName" width="150"></el-table-column>
width="150" <el-table-column property="contacts" label="联系人" width="150" align="center"></el-table-column>
align="center" <el-table-column property="phone" label="联系电话" width="150" align="center"></el-table-column>
>
</el-table-column>
<el-table-column
property="kindergartenAddress"
label="幼儿园地址"
width="150"
align="center"
>
</el-table-column>
<el-table-column
label="幼儿园所在组织"
align="center"
prop="organizeName"
width="150"
>
</el-table-column>
<el-table-column
property="contacts"
label="联系人"
width="150"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="150"
align="center"
>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total1 > 0" v-show="total1 > 0"
@ -409,32 +292,14 @@
append-to-body append-to-body
:before-close="classcancel" :before-close="classcancel"
> >
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="110px"
>
<el-form-item label="班级名称" prop="className"> <el-form-item label="班级名称" prop="className">
<el-input <el-input style="width: 200px" v-model="classqueryParams.className" placeholder="请输入班级名称"></el-input>
style="width: 200px"
v-model="classqueryParams.className"
placeholder="请输入班级名称"
></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="classhandleQuery">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="classresetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="classhandleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="classresetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
@ -460,25 +325,9 @@
></el-button> ></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="kindergartenName" label="幼儿园名称" width="190" align="center" />
property="kindergartenName" <el-table-column property="className" label="班级名称" width="180" align="center"></el-table-column>
label="幼儿园名称" <el-table-column property="classType" label="班级类型" width="160" align="center">
width="190"
align="center"
/>
<el-table-column
property="className"
label="班级名称"
width="180"
align="center"
>
</el-table-column>
<el-table-column
property="classType"
label="班级类型"
width="160"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.classType == dictValue1 ? "大班" : "" }} {{ scope.row.classType == dictValue1 ? "大班" : "" }}
{{ scope.row.classType == dictValue2 ? "中班" : "" }} {{ scope.row.classType == dictValue2 ? "中班" : "" }}
@ -487,20 +336,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="classTeacher" label="班主任姓名" width="180" align="center"></el-table-column>
property="classTeacher" <el-table-column property="phone" label="联系电话" width="190" align="center"></el-table-column>
label="班主任姓名"
width="180"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="190"
align="center"
>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total2 > 0" v-show="total2 > 0"
@ -528,30 +365,14 @@
label-width="90px" label-width="90px"
> >
<el-form-item label="批次编号" prop="batchCode"> <el-form-item label="批次编号" prop="batchCode">
<el-input <el-input v-model="testqueryParams.batchCode" placeholder="请输入批次编号" clearable />
v-model="testqueryParams.batchCode"
placeholder="请输入批次编号"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item label="批次名称" prop="batchCode"> <el-form-item label="批次名称" prop="batchCode">
<el-input <el-input v-model="testqueryParams.batchName" placeholder="请输入批次名称" clearable />
v-model="testqueryParams.batchName"
placeholder="请输入批次名称"
clearable
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="testScore">搜索</el-button>
type="primary" <el-button icon="el-icon-refresh" size="mini" @click="testresetQuery">重置</el-button>
icon="el-icon-search"
size="mini"
@click="testScore"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="testresetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -578,18 +399,8 @@
></el-button> ></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="batchCode" label="批次编号" width="230" align="center" />
property="batchCode" <el-table-column property="batchName" label="批次名称" width="230" align="center" />
label="批次编号"
width="230"
align="center"
/>
<el-table-column
property="batchName"
label="批次名称"
width="230"
align="center"
/>
</el-table> </el-table>
<pagination <pagination
v-show="total4 > 0" v-show="total4 > 0"
@ -600,12 +411,7 @@
/> />
</el-dialog> </el-dialog>
<!-- 修改个人体质检测报告对话框 --> <!-- 修改个人体质检测报告对话框 -->
<el-dialog <el-dialog :title="title" :visible.sync="open" width="1050px" append-to-body>
:title="title"
:visible.sync="open"
width="1050px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="审核状态" prop="checkStatus"> <el-form-item label="审核状态" prop="checkStatus">
<el-radio-group v-model="form.checkStatus"> <el-radio-group v-model="form.checkStatus">
@ -615,11 +421,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 550px; overflow: auto"> <div style="height: 550px; overflow: auto">
<personalecharts <personalecharts v-if="open" :itemlists="itemlist" class="personal"></personalecharts>
v-if="open"
:itemlists="itemlist"
class="personal"
></personalecharts>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -627,18 +429,9 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- //预览 --> <!-- //预览 -->
<el-dialog <el-dialog width="1300px" style="height: 95%" append-to-body :visible.sync="openiframe">
width="1300px"
style="height: 95%"
append-to-body
:visible.sync="openiframe"
>
<div style="height: 700px; overflow: auto"> <div style="height: 700px; overflow: auto">
<personalecharts <personalecharts v-if="openiframe" :itemlists="itemlist" class="personal"></personalecharts>
v-if="openiframe"
:itemlists="itemlist"
class="personal"
></personalecharts>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="openiframe = false">关闭</el-button> <el-button type="primary" @click="openiframe = false">关闭</el-button>
@ -650,14 +443,14 @@
<script> <script>
import { import {
listKindergartenInfo, listKindergartenInfo,
tKindergartenInfo, tKindergartenInfo
} from "@/api/system/kindergartenInfo"; } from "@/api/system/kindergartenInfo";
import { listStudentInfo } from "@/api/system/studentInfo"; import { listStudentInfo } from "@/api/system/studentInfo";
import { listClassinfo } from "@/api/system/classinfo"; import { listClassinfo } from "@/api/system/classinfo";
import { testScoreBatch } from "@/api/system/quality"; import { testScoreBatch } from "@/api/system/quality";
import { import {
listPersonalCheckReport, listPersonalCheckReport,
uploadPersonalCheckReport, uploadPersonalCheckReport
} from "@/api/system/personalCheckReport"; } from "@/api/system/personalCheckReport";
import personalecharts from "../personalecharts/index.vue"; import personalecharts from "../personalecharts/index.vue";
import html2canvas from "html2canvas"; import html2canvas from "html2canvas";
@ -699,7 +492,7 @@ export default {
cardNumber: null, cardNumber: null,
onceName: null, onceName: null,
homeAddress: null, homeAddress: null,
kindergartenId: null, kindergartenId: null
}, },
//班级查询 //班级查询
classqueryParams: { classqueryParams: {
@ -707,7 +500,7 @@ export default {
pageSize: 10, pageSize: 10,
kindergartenId: "", kindergartenId: "",
className: null, className: null,
classType: null, classType: null
}, },
//幼儿园查询参数 //幼儿园查询参数
kqueryParams: { kqueryParams: {
@ -718,7 +511,7 @@ export default {
kindergartenAddress: null, kindergartenAddress: null,
kindergartenType: null, kindergartenType: null,
phone: null, phone: null,
contacts: null, contacts: null
}, },
//幼儿园list //幼儿园list
kindergartenList: [], kindergartenList: [],
@ -748,7 +541,7 @@ export default {
//批次编号 //批次编号
testqueryParams: { testqueryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10
}, },
// 遮罩层 // 遮罩层
loading: true, loading: true,
@ -785,7 +578,7 @@ export default {
motionLibraryId: null, motionLibraryId: null,
checkUserId: null, checkUserId: null,
checkTime: null, checkTime: null,
checkStatus: null, checkStatus: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -795,20 +588,20 @@ export default {
checkStatuslist: [ checkStatuslist: [
{ {
value: 0, value: 0,
name: "未审核", name: "未审核"
}, },
{ {
value: 1, value: 1,
name: "已审核", name: "已审核"
}, }
], ],
itemlist: { itemlist: {
pageNum: 1, pageNum: 1,
pageSize: 999, pageSize: 999,
studentId: "", studentId: "",
batchCode: "", batchCode: "",
number: 1, number: 1
}, }
}; };
}, },
created() { created() {
@ -831,7 +624,7 @@ export default {
/** 查询个人体质检测报告列表 */ /** 查询个人体质检测报告列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listPersonalCheckReport(this.queryParams).then((response) => { listPersonalCheckReport(this.queryParams).then(response => {
this.personalCheckReportList = response.rows; this.personalCheckReportList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -863,7 +656,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -880,7 +673,9 @@ export default {
this.loading = true; this.loading = true;
setTimeout(() => { setTimeout(() => {
this.form = JSON.parse(JSON.stringify(row)); this.form = JSON.parse(JSON.stringify(row));
// this.form = row; if (this.form.checkStatus == "" || !this.form.checkStatus) {
this.form.checkStatus = 0;
}
this.title = "审核个人体质检测报告"; this.title = "审核个人体质检测报告";
this.open = true; this.open = true;
this.loading = false; this.loading = false;
@ -911,7 +706,7 @@ export default {
motionLibraryId: null, motionLibraryId: null,
checkUserId: null, checkUserId: null,
checkTime: null, checkTime: null,
checkStatus: null, checkStatus: null
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
@ -927,7 +722,7 @@ export default {
u8arr[n] = bstr.charCodeAt(n); u8arr[n] = bstr.charCodeAt(n);
} }
return new Blob([u8arr], { return new Blob([u8arr], {
type: mime, type: mime
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */
@ -952,7 +747,7 @@ export default {
logging: false, //日志开关，便于查看html2canvas的内部执行流程 logging: false, //日志开关，便于查看html2canvas的内部执行流程
width: width, //dom 原始宽度 width: width, //dom 原始宽度
height: height, height: height,
useCORS: true, // 【重要】开启跨域配置 useCORS: true // 【重要】开启跨域配置
}; };
html2canvas(shareContent, opts).then(() => { html2canvas(shareContent, opts).then(() => {
var contentWidth = canvas.width; var contentWidth = canvas.width;
@ -986,11 +781,11 @@ export default {
formData.append("studentName", this.form.studentName); formData.append("studentName", this.form.studentName);
formData.append("batchCode", this.form.batchCode); formData.append("batchCode", this.form.batchCode);
formData.append("checkStatus", this.form.checkStatus); formData.append("checkStatus", this.form.checkStatus);
uploadPersonalCheckReport(formData).then((res) => { uploadPersonalCheckReport(formData).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: "审核完成", message: "审核完成",
type: "success", type: "success"
}); });
this.getList(); this.getList();
} }
@ -1030,12 +825,12 @@ export default {
kindergartenAddress: null, kindergartenAddress: null,
kindergartenType: null, kindergartenType: null,
phone: null, phone: null,
contacts: null, contacts: null
}; };
this.kinhandleQuery(); this.kinhandleQuery();
}, },
kinhandleQuery() { kinhandleQuery() {
listKindergartenInfo(this.kqueryParams).then((response) => { listKindergartenInfo(this.kqueryParams).then(response => {
this.kindergartenList = response.rows; this.kindergartenList = response.rows;
this.total1 = response.total; this.total1 = response.total;
}); });
@ -1060,7 +855,7 @@ export default {
cardNumber: null, cardNumber: null,
onceName: null, onceName: null,
homeAddress: null, homeAddress: null,
kindergartenId: null, kindergartenId: null
}; };
this.studentlist(); this.studentlist();
}, },
@ -1082,7 +877,7 @@ export default {
}, },
//批次 //批次
testScore() { testScore() {
testScoreBatch(this.testqueryParams).then((res) => { testScoreBatch(this.testqueryParams).then(res => {
this.testScorelist = res.rows; this.testScorelist = res.rows;
this.total4 = res.total; this.total4 = res.total;
}); });
@ -1092,7 +887,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
batchCode: "", batchCode: "",
batchName: "", batchName: ""
}; };
this.testScore(); this.testScore();
}, },
@ -1115,7 +910,7 @@ export default {
}, },
//获取学生 //获取学生
studentlist() { studentlist() {
listStudentInfo(this.studentqueryParams).then((res) => { listStudentInfo(this.studentqueryParams).then(res => {
this.studentInfoList = res.rows; this.studentInfoList = res.rows;
this.total3 = res.total; this.total3 = res.total;
}); });
@ -1171,7 +966,7 @@ export default {
}, },
//班级类型 //班级类型
class() { class() {
tKindergartenInfo(this.ClassType).then((res) => { tKindergartenInfo(this.ClassType).then(res => {
this.dictValue1 = res.data[0].dictValue; this.dictValue1 = res.data[0].dictValue;
this.dictValue2 = res.data[1].dictValue; this.dictValue2 = res.data[1].dictValue;
this.dictValue3 = res.data[2].dictValue; this.dictValue3 = res.data[2].dictValue;
@ -1180,7 +975,7 @@ export default {
}, },
//班级list //班级list
classinfo() { classinfo() {
listClassinfo(this.classqueryParams).then((response) => { listClassinfo(this.classqueryParams).then(response => {
this.classinfoList = response.rows; this.classinfoList = response.rows;
this.total2 = response.total; this.total2 = response.total;
}); });
@ -1188,7 +983,7 @@ export default {
listKindergartenInfoetList() { listKindergartenInfoetList() {
//获取幼儿园list //获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => { listKindergartenInfo(this.kqueryParams).then(response => {
this.kindergartenList = response.rows; this.kindergartenList = response.rows;
this.total1 = response.total; this.total1 = response.total;
}); });
@ -1196,8 +991,8 @@ export default {
//批次关闭 //批次关闭
batchCodecancel() { batchCodecancel() {
this.batchCodeshow = false; this.batchCodeshow = false;
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>