From 95dcb99f1ec095f2b1e97aa6cd5c22a8ba02dd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 29 Sep 2022 17:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/kindergartenCheckReport/index.vue | 460 +++++++++- .../system/personalCheckReport/index.vue | 836 +++++++++++++++++- 2 files changed, 1234 insertions(+), 62 deletions(-) diff --git a/src/views/system/kindergartenCheckReport/index.vue b/src/views/system/kindergartenCheckReport/index.vue index 28fca75..5bf6d68 100644 --- a/src/views/system/kindergartenCheckReport/index.vue +++ b/src/views/system/kindergartenCheckReport/index.vue @@ -8,10 +8,44 @@ v-show="showSearch" label-width="90px" > - + + {{ kindergartenName }} + {{ kindergartenName }} + + + + {{ batchName }} + {{ batchName }} + + - - + + > + + + 下载 + 下载 @@ -138,7 +189,7 @@ @@ -171,15 +222,207 @@
关闭
+ + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + @@ -192,12 +435,61 @@ import { } from "@/api/system/kindergartenCheckReport"; import kindergarten from "../../assembly/kindergarten.vue"; import baseurl from "@/api/baseurl.js"; +import { + listKindergartenInfo, + tKindergartenInfo, +} from "@/api/system/kindergartenInfo"; +import { getRoleInfo, testScoreBatch } from "@/api/system/quality"; export default { components: { kindergarten }, name: "KindergartenCheckReport", data() { return { + checkStatuslist: [ + { + value: 0, + name: "未审核", + }, + { + value: 1, + name: "已审核", + }, + ], + total1: 0, + total4: 0, + //遮罩层 + kindergartenshow: false, + batchCodeshow: false, + // 显示搜索条件 + showSearch: true, + //幼儿园查询参数 + kqueryParams: { + pageNum: 1, + pageSize: 10, + organizeId: null, + kindergartenName: null, + kindergartenAddress: null, + kindergartenType: null, + phone: null, + contacts: null, + }, + //幼儿园list + kindergartenList: [], + //幼儿园名字 + kindergartenName: "请选择幼儿园", + //幼儿园ID + kindergartenId: "", + //批次名称 + batchCode: "", + batchName: "请选择批次", + //批次list + testScorelist: [], + //批次编号 + testqueryParams: { + pageNum: 1, + pageSize: 10, + }, // 遮罩层 loading: true, openiframe: false, @@ -241,10 +533,11 @@ export default { }, created() { this.getList(); + this.info(); }, methods: { /** 查询幼儿园检测报告列表 */ - getList() { + info() { this.loading = true; listKindergartenCheckReport(this.queryParams).then((response) => { this.kindergartenCheckReportList = response.rows; @@ -252,6 +545,20 @@ export default { this.loading = false; }); }, + getList() { + this.loading = true; + tKindergartenInfo(this.kindergartenType).then((res) => { + this.type = res.data[0]; + this.type2 = res.data[1]; + }); + + //获取幼儿园list + listKindergartenInfo(this.kqueryParams).then((response) => { + this.kindergartenList = response.rows; + this.total1 = response.total; + // console.log(this.kindergartenList); + }); + }, // 取消按钮 cancel() { this.open = false; @@ -283,10 +590,29 @@ export default { handleQuery() { console.log(this.queryParams); this.queryParams.pageNum = 1; - this.getList(); + this.info(); }, /** 重置按钮操作 */ resetQuery() { + this.queryParams = { + pageNum: 1, + pageSize: 10, + kindergartenId: null, + batchCode: null, + reportCode: null, + reportName: null, + physicalSynthAnalysis: null, + downloadAddress: null, + motionLibraryId: null, + checkUserId: null, + checkTime: null, + checkStatus: null, + }; + this.kindergartenName = "请选择幼儿园"; + this.kindergartenId = ""; + //批次名称 + this.batchCode = ""; + this.batchName = "请选择批次"; this.resetForm("queryForm"); this.handleQuery(); }, @@ -294,9 +620,10 @@ export default { handleUpdate(row) { this.reset(); const id = row.id || this.ids; + this.form = row; existKindergartenCheckReport(row.kindergartenId, row.batchCode).then( (response) => { - console.log(response); + console.log(this.form); if (response.code == 200) { this.title = "修改幼儿园检测报告审批状态"; this.pdfurl = baseurl + response.data.downloadAddress; @@ -315,23 +642,20 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { - if (valid) { - if (this.form.id != null) { - updateKindergartenCheckReport(this.form).then((response) => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.queryParams = { - pageNum: 1, - pageSize: 10, - kindergartenId: null, - batchCode: null, - }; - this.getList(); - }); - } - } - }); + console.log(this.form); + if (this.form.id != null) { + updateKindergartenCheckReport(this.form).then((response) => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.queryParams = { + pageNum: 1, + pageSize: 10, + kindergartenId: null, + batchCode: null, + }; + this.info(); + }); + } }, //预览 lookhand(item) { @@ -360,6 +684,74 @@ export default { kinbatlist(kindergartenId, batchCode) { console.log(kindergartenId, batchCode); }, + + //幼儿园左侧点击 + kindergartenNameclick(row) { + this.kindergartenName = row.kindergartenName; + this.queryParams.kindergartenId = row.id; + this.kindergartenId = row.id; + this.kindergartenshow = false; + }, + + //点击批次左边 + batchCodeclick(row) { + this.batchCode = row.batchCode; + this.batchName = row.batchName; + this.queryParams.batchCode = row.batchCode; + this.batchCodeshow = false; + }, + //点击批次 + batchCodeshowclick() { + this.testScore(); + this.batchCodeshow = true; + }, + //批次 + testScore() { + testScoreBatch(this.testqueryParams).then((res) => { + this.testScorelist = res.rows; + this.total4 = res.total; + }); + }, + testresetQuery() { + this.testqueryParams = { + pageNum: 1, + pageSize: 10, + batchCode: "", + batchName: "", + }; + this.testScore(); + }, + //批次关闭 + batchCodecancel() { + this.batchCodeshow = false; + this.testresetQuery(); + }, + //幼儿园关闭 + kindergartencancel() { + this.kindergartenshow = false; + this.kinresetQuery(); + }, + kinhandleQuery() { + //获取幼儿园list + listKindergartenInfo(this.kqueryParams).then((response) => { + this.kindergartenList = response.rows; + this.total1 = response.total; + // console.log(this.kindergartenList); + }); + }, + kinresetQuery() { + this.kqueryParams = { + pageNum: 1, + pageSize: 10, + organizeId: null, + kindergartenName: null, + kindergartenAddress: null, + kindergartenType: null, + phone: null, + contacts: null, + }; + this.kinhandleQuery(); + }, }, }; diff --git a/src/views/system/personalCheckReport/index.vue b/src/views/system/personalCheckReport/index.vue index 718233d..f2a8fd6 100644 --- a/src/views/system/personalCheckReport/index.vue +++ b/src/views/system/personalCheckReport/index.vue @@ -8,10 +8,34 @@ v-show="showSearch" label-width="90px" > - + + {{ studentname }} + {{ studentname }} + + + {{ batchName }} + {{ batchName }} + - + > + + + 下载 + 下载 @@ -116,7 +157,437 @@ :limit.sync="queryParams.pageSize" @pagination="getList" /> + + + + + {{ kindergartenName }} + {{ kindergartenName }} + + + {{ className }} + + {{ className }} + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + +