From f330cf8c266964baff0817c11227dae2f2e5ac83 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期四, 24 十一月 2022 10:36:58 +0800
Subject: [PATCH] 修复测试问题
---
src/views/specialCheck/components/wholesaleForm.vue | 21 +++++++---
src/views/specialCheck/components/areaEnterprises.vue | 24 +++++++++---
src/views/selfCheck/components/supervisionDetails.vue | 5 +-
src/views/selfCheck/components/checkDetails.vue | 12 ++++-
src/views/specialCheck/components/feedbackDetails.vue | 6 +-
5 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/src/views/selfCheck/components/checkDetails.vue b/src/views/selfCheck/components/checkDetails.vue
index 9214023..215ac5b 100644
--- a/src/views/selfCheck/components/checkDetails.vue
+++ b/src/views/selfCheck/components/checkDetails.vue
@@ -170,11 +170,17 @@
font-weight: bolder;
}
.table-tit{
+ width: 100%;
display: flex;
align-items: center;
- margin-bottom: 10px;
- div:first-of-type{
- margin-right: 100px;
+ justify-content: space-between;
+ flex-flow: wrap;
+ background: #ecf5ff;
+ padding: 10px;
+ border-radius: 4px;
+
+ &>div{
+ width: 50%;
}
}
.corp-list{
diff --git a/src/views/selfCheck/components/supervisionDetails.vue b/src/views/selfCheck/components/supervisionDetails.vue
index 6afdea9..bd9355d 100644
--- a/src/views/selfCheck/components/supervisionDetails.vue
+++ b/src/views/selfCheck/components/supervisionDetails.vue
@@ -8,7 +8,7 @@
@close="resetForm()"
>
<div slot="title" class="dialog-title">
- 烟花爆竹批发企业自查情况信息报送表
+ 烟花爆竹{{enterpriseType==1?'批发':(enterpriseType==2?'零售':'')}}企业检查情况反馈表
</div>
<div class="table-tit">
<div>企业名称: <span class="m-color">{{corpInfo.enterpriseName}}</span></div>
@@ -123,7 +123,8 @@
dialogVisible:false,
dialogReport: false,
id: null,
- unitType: 1,
+ unitType: null,
+ enterpriseType: null,
corpInfo:{
enterpriseName: '',
enterpriseProvince: '',
diff --git a/src/views/specialCheck/components/areaEnterprises.vue b/src/views/specialCheck/components/areaEnterprises.vue
index 663379c..b82b47b 100644
--- a/src/views/specialCheck/components/areaEnterprises.vue
+++ b/src/views/specialCheck/components/areaEnterprises.vue
@@ -32,7 +32,7 @@
<el-table-column label="检查时间" prop="checkTime" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button type="text" @click="toCheck(scope.row.id)">查看</el-button>
+ <el-button type="text" @click="toCheck(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
@@ -41,6 +41,7 @@
<el-button type="primary" @click="dialogVisible = false">确认</el-button>
</span>
<check-details ref="report"></check-details>
+ <supervision-details ref="detail"></supervision-details>
</el-dialog>
</template>
@@ -48,10 +49,12 @@
import {computePageCount} from "@/utils";
import { getSpotCheckRecord } from "@/api/specialCheck";
import checkDetails from "../../selfCheck/components/checkDetails"
+ import supervisionDetails from "../../selfCheck/components/supervisionDetails";
export default {
name: "areaEnterprises",
components: {
+ supervisionDetails,
checkDetails
},
data(){
@@ -68,12 +71,21 @@
watch: {
},
methods:{
- toCheck(id){
+ toCheck(row){
const t = this
- t.$refs.report.id = id
- t.$refs.report.enterpriseType = t.enterpriseType
- t.$refs.report.getEnterpriseInfo()
- t.$refs.report.dialogVisible = true
+ console.log(row.checkUnitType,'type')
+ if(row.checkUnitType == 4){
+ t.$refs.report.id = row.id
+ t.$refs.report.enterpriseType = t.enterpriseType
+ t.$refs.report.getEnterpriseInfo()
+ t.$refs.report.dialogVisible = true
+ }else{
+ t.$refs.detail.id = row.id
+ t.$refs.detail.unitType = row.checkUnitType
+ t.$refs.detail.enterpriseType = t.enterpriseType
+ t.$refs.detail.getEnterpriseInfo()
+ t.$refs.detail.dialogVisible = true
+ }
}
},
}
diff --git a/src/views/specialCheck/components/feedbackDetails.vue b/src/views/specialCheck/components/feedbackDetails.vue
index 9b86dbb..99a627e 100644
--- a/src/views/specialCheck/components/feedbackDetails.vue
+++ b/src/views/specialCheck/components/feedbackDetails.vue
@@ -123,7 +123,7 @@
<div v-if="provinceCheckStatus == 1" class="record-list">
<div class="record-item">
<table class="record-table">
- <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹批发企业检查情况反馈表</tr>
+ <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
<tr>
<td class="m-color w-50">被检查企业名称</td>
<td class="m-color w-50">所属省市县</td>
@@ -205,7 +205,7 @@
<div v-if="cityCheckStatus == 1" class="record-list">
<div class="record-item">
<table class="record-table">
- <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹批发企业检查情况反馈表</tr>
+ <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
<tr>
<td class="m-color w-50">被检查企业名称</td>
<td class="m-color w-50">所属省市县</td>
@@ -287,7 +287,7 @@
<div v-if="areaCheckStatus == 1" class="record-list">
<div class="record-item">
<table class="record-table">
- <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹批发企业检查情况反馈表</tr>
+ <tr class="m-color b-font" style="background: #409EFF;color: #fff;text-align: center">烟花爆竹{{enterpriseType==1?'批发':'零售'}}企业检查情况反馈表</tr>
<tr>
<td class="m-color w-50">被检查企业名称</td>
<td class="m-color w-50">所属省市县</td>
diff --git a/src/views/specialCheck/components/wholesaleForm.vue b/src/views/specialCheck/components/wholesaleForm.vue
index c80a323..643ec2f 100644
--- a/src/views/specialCheck/components/wholesaleForm.vue
+++ b/src/views/specialCheck/components/wholesaleForm.vue
@@ -8,10 +8,10 @@
</div>
<div class="control-bar">
<div v-show="enterpriseType == 1">
- 批发企业共计<span class="point-data" @click="getEnterpriseCompleteInfoList">{{enterpriseCount}}</span>家，其中：已自查<span class="point-data" @click="toSelfEnterprise(1)">{{ selfCheckEnterpriseCount }}</span>家，未自查<span @click="toSelfEnterprise(0)" class="undone point-data">{{ noSelfCheckEnterpriseCount }}</span>家；本级已经抽查<span class="point-data" @click="toLevelEnterprise(1)">{{ thislevelAlreadyCheckCount }}</span>家，未检查<span @click="toLevelEnterprise(0)" class="undone point-data">{{ thislevelNoCheckCount }}</span>家，完成率<span>{{ thislevelCompletionRate + '%' }}</span>。
+ 批发企业共计<span class="point-data" @click="resetSearch()">{{enterpriseCount}}</span>家，其中：已自查<span class="point-data" @click="toSelfEnterprise(1)">{{ selfCheckEnterpriseCount }}</span>家，未自查<span @click="toSelfEnterprise(0)" class="undone point-data">{{ noSelfCheckEnterpriseCount }}</span>家；本级已经抽查<span class="point-data" @click="toLevelEnterprise(1)">{{ thislevelAlreadyCheckCount }}</span>家，未检查<span @click="toLevelEnterprise(0)" class="undone point-data">{{ thislevelNoCheckCount }}</span>家，完成率<span>{{ thislevelCompletionRate + '%' }}</span>。
</div>
<div v-show="enterpriseType == 2">
- 零售企业共计<span class="point-data" @click="getEnterpriseCompleteInfoList">{{enterpriseCount}}</span>家，其中：已自查<span class="point-data" @click="toSelfEnterprise(1)">{{ selfCheckEnterpriseCount }}</span>家，未自查<span @click="toSelfEnterprise(0)" class="undone point-data">{{ noSelfCheckEnterpriseCount }}</span>家；本级已经抽查<span class="point-data" @click="toLevelEnterprise(1)">{{ thislevelAlreadyCheckCount }}</span>家，未检查<span @click="toLevelEnterprise(0)" class="undone point-data">{{ thislevelNoCheckCount }}</span>家，完成率<span>{{ thislevelCompletionRate + '%' }}</span>。
+ 零售企业共计<span class="point-data" @click="resetSearch()">{{enterpriseCount}}</span>家，其中：已自查<span class="point-data" @click="toSelfEnterprise(1)">{{ selfCheckEnterpriseCount }}</span>家，未自查<span @click="toSelfEnterprise(0)" class="undone point-data">{{ noSelfCheckEnterpriseCount }}</span>家；本级已经抽查<span class="point-data" @click="toLevelEnterprise(1)">{{ thislevelAlreadyCheckCount }}</span>家，未检查<span @click="toLevelEnterprise(0)" class="undone point-data">{{ thislevelNoCheckCount }}</span>家，完成率<span>{{ thislevelCompletionRate + '%' }}</span>。
</div>
<el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="showFilter = !showFilter">{{showFilter?'关闭查询':'自定义查询'}}</el-button>
</div>
@@ -229,6 +229,8 @@
},
locationChange(value) {
const t = this
+ t.selfcheckStatus = null
+ t.thislevelCheckStatus = null
t.search.province = value[0]
t.search.city = value[1] ? value[1] : ''
t.search.area = value[2] ? value[2] : ''
@@ -236,7 +238,10 @@
},
changeRadio(){
- this.getEnterpriseCompleteInfoList()
+ const t = this
+ t.selfcheckStatus = null
+ t.thislevelCheckStatus = null
+ t.getEnterpriseCompleteInfoList()
},
searchData(){
@@ -244,17 +249,19 @@
},
resetSearch(){
- this.search = {
+ const t = this
+ t.selfcheckStatus = null
+ t.thislevelCheckStatus = null
+ t.search = {
name: '',
province: '',
city: '',
area: '',
isRisky: null
}
- this.selectedOptions = []
- this.getEnterpriseCompleteInfoList()
+ t.selectedOptions = []
+ t.getEnterpriseCompleteInfoList()
},
-
toSelfEnterprise(value){
const t = this
t.thislevelCheckStatus = null
--
Gitblit v1.9.2