From 6de39d0cc846f2e827a6536ce1e4493de14f7b33 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期一, 28 十一月 2022 15:41:44 +0800 Subject: [PATCH] 修改 --- src/views/specialCheck/components/sumSheet.vue | 9 +++++++-- src/views/selfCheck/supervision.vue | 1 - src/views/specialCheck/components/checkEnterprises.vue | 10 +++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/views/selfCheck/supervision.vue b/src/views/selfCheck/supervision.vue index 4a6c682..c65d109 100644 --- a/src/views/selfCheck/supervision.vue +++ b/src/views/selfCheck/supervision.vue @@ -106,7 +106,6 @@ t.$refs.details.id = row.id t.$refs.details.checkUnitType = row.checkUnitType t.$refs.details.getEnterpriseInfo() - console.log(t.$refs.details.unitType) }, async getSpotCheckList(){ diff --git a/src/views/specialCheck/components/checkEnterprises.vue b/src/views/specialCheck/components/checkEnterprises.vue index 6dacddc..ef98f15 100644 --- a/src/views/specialCheck/components/checkEnterprises.vue +++ b/src/views/specialCheck/components/checkEnterprises.vue @@ -50,24 +50,27 @@ <span slot="footer" class="dialog-footer"> <el-button type="primary" @click="dialogVisible = false">确认</el-button> </span> - <check-details ref="report"></check-details> +<!-- <check-details ref="report"></check-details>--> + <supervision-details ref="report"></supervision-details> </el-dialog> </template> <script> import {computePageCount} from "@/utils"; import { getSpotCheckRecord } from "@/api/specialCheck"; - import checkDetails from "../../selfCheck/components/checkDetails" + // import checkDetails from "../../selfCheck/components/checkDetails" + import supervisionDetails from "../../selfCheck/components/supervisionDetails" export default { name: "checkEnterprises", components: { - checkDetails + supervisionDetails }, data(){ return{ taskId: null, enterpriseType: null, + checkUnitType: null, enterpriseCity: '', enterpriseArea: '', listLoading: false, @@ -116,6 +119,7 @@ const t = this t.$refs.report.id = id t.$refs.report.enterpriseType = t.enterpriseType + t.$refs.report.checkUnitType = t.checkUnitType t.$refs.report.getEnterpriseInfo() t.$refs.report.dialogVisible = true } diff --git a/src/views/specialCheck/components/sumSheet.vue b/src/views/specialCheck/components/sumSheet.vue index 15e14a7..6fbd4d2 100644 --- a/src/views/specialCheck/components/sumSheet.vue +++ b/src/views/specialCheck/components/sumSheet.vue @@ -147,7 +147,7 @@ <td :rowspan="sheetStatus==1?2:1">{{ item.completedRectifyHiddendangerSum }}</td> <td :rowspan="sheetStatus==1?2:1">{{ item.completedRectifyMajorHiddendangerNum }}</td> <td :rowspan="sheetStatus==1?2:1">{{ item.hiddendangerRectifyRate==null?'--':(item.hiddendangerRectifyRate + '%') }}</td> - <td>{{ sheetStatus==1?'设立区级':'县级' }}</td> + <td>{{ sheetStatus==1?'设区市级':'县级' }}</td> <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.spotCheckEnterpriseNum !== undefined)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.spotCheckEnterpriseNum !== undefined)" class="point-item" @click="checkEnterprise(item.enterpriseCity,item.enterpriseArea)"> {{sheetStatus==1?item.citySpotCheckinfo.spotCheckEnterpriseNum:item.areaSpotCheckinfo.spotCheckEnterpriseNum}} </td> @@ -377,8 +377,14 @@ t.$refs.enterprises.enterpriseArea = area if(t.sheetStatus == 1){ t.$refs.enterprises.enterpriseCity = city + if(area == 'all'){ + t.$refs.enterprises.checkUnitType = 3 + }else{ + t.$refs.enterprises.checkUnitType = 2 + } }else{ t.$refs.enterprises.enterpriseCity = null + t.$refs.enterprises.checkUnitType = 3 } t.$refs.enterprises.dialogVisible = true t.$refs.enterprises.getEnterprises() @@ -390,7 +396,6 @@ t.enterpriseCity = city t.sheetStatus = 2 t.getDataStatistics() - console.log(t.sheetStatus,t.institutionalData[0].citySpotCheckinfo.spotCheckEnterpriseNum,'666666666666666666') }else{ t.sheetStatus = 3 t.$refs.areaSheet.taskId = t.taskId -- Gitblit v1.9.2