diff --git a/src/views/system/kindergartenCheckReport/index.vue b/src/views/system/kindergartenCheckReport/index.vue index c504a87..962c3e7 100644 --- a/src/views/system/kindergartenCheckReport/index.vue +++ b/src/views/system/kindergartenCheckReport/index.vue @@ -145,7 +145,7 @@ size="mini" type="text" icon="el-icon-download" - v-if="scope.row.checkStatus == 1" + v-show="scope.row.checkStatus == 1" @click="handleExport(scope.row)" v-hasPermi="['system:kindergartenCheckReport:download']" >下载下载 { - console.log(response); - code = response.code; if (response.data.existFlag) { this.title = "修改幼儿园检测报告审批状态"; this.pdfurl = baseurl + response.data.downloadAddress; @@ -631,7 +627,7 @@ export default { this.form.id = res.data.id; // this.pdfurl = window.URL.createObjectURL(res); // window.open(this.pdfurl); - console.log(this.form) + this.info(); this.open = true; }); } @@ -640,30 +636,28 @@ export default { }, /** 提交按钮 */ submitForm() { - console.log(this.form); - if (this.form.id != null) { - var obj = { - id: this.form.id, - checkStatus: this.form.checkStatus, + var obj = { + id: this.form.id, + checkStatus: this.form.checkStatus, + }; + updateKindergartenCheckReport(obj).then((response) => { + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.queryParams = { + pageNum: 1, + pageSize: 10, + kindergartenId: null, + batchCode: null, }; - updateKindergartenCheckReport(obj).then((response) => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.queryParams = { - pageNum: 1, - pageSize: 10, - kindergartenId: null, - batchCode: null, - }; - this.info(); - }); - } + this.info(); + }); }, //预览 lookhand(item) { report(item.kindergartenId, item.batchCode).then((res) => { // this.pdfurl = window.URL.createObjectURL(res); this.pdfurl = baseurl + res.data.downloadAddress; + this.info(); this.openiframe = true; console.log(this.pdfurl); // window.open(this.pdfurl); diff --git a/src/views/system/personalCheckReport/index.vue b/src/views/system/personalCheckReport/index.vue index 307c345..ba749d9 100644 --- a/src/views/system/personalCheckReport/index.vue +++ b/src/views/system/personalCheckReport/index.vue @@ -132,7 +132,7 @@ type="text" icon="el-icon-download" @click="handleExport(scope.row)" - v-if="scope.row.checkStatus == 1" + v-show="scope.row.checkStatus == 1" v-hasPermi="['system:personalCheckReport:download']" >下载 @@ -141,7 +141,7 @@ size="mini" type="text" icon="el-icon-download" - v-else + v-show="scope.row.checkStatus == 0" @click="handleExport(scope.row)" v-hasPermi="['system:personalCheckReport:download']" >下载 { - if (valid) { - if (this.form.id != null) { - var obj = { - id: this.form.id, - checkStatus: this.form.checkStatus, - }; - updatePersonalCheckReport(obj).then((response) => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.queryParams = { - pageNum: 1, - pageSize: 10, - studentId: null, - batchCode: null, - }; - this.getList(); - }); - } - } + var obj = { + id: this.form.id, + checkStatus: this.form.checkStatus, + }; + updatePersonalCheckReport(obj).then((response) => { + this.$modal.msgSuccess("修改成功"); + this.queryParams = { + pageNum: 1, + pageSize: 10, + studentId: null, + batchCode: null, + }; + this.getList(); + this.open = false; }); }, //预览 @@ -959,6 +954,7 @@ export default { checkReportreport(item.studentId, item.batchCode).then((res) => { // this.pdfurl = window.URL.createObjectURL(res); this.pdfurl = baseurl + res.data.downloadAddress; + this.getList(); this.openiframe = true; // window.open(this.pdfurl); }); @@ -975,11 +971,6 @@ export default { ); } }, - itemlists(studentId, batchCode) { - console.log(studentId, batchCode); - this.queryParams.studentId = studentId; - this.queryParams.batchCode = batchCode; - }, //班级 classresetQuery() {