From 5a28e6e5194ddd3727fb5411c785bef0f29152bb Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期五, 25 十一月 2022 16:15:07 +0800
Subject: [PATCH] 新增有效期限
---
src/views/specialCheck/components/wholesaleForm.vue | 14 ++-
src/views/specialCheck/components/areaEnterprises.vue | 2
src/views/specialCheck/index.vue | 14 ++-
src/views/selfCheck/components/supervisionDetails.vue | 25 ++++-
src/views/specialCheck/components/sendWork.vue | 22 ++++
config/prod.env.js | 7 +
src/views/specialCheck/components/sumSheet.vue | 75 ++++++++++++------
src/views/selfCheck/supervision.vue | 5
src/views/login/components/login-form.vue | 4
src/views/specialCheck/components/feedbackDetails.vue | 15 ++-
10 files changed, 122 insertions(+), 61 deletions(-)
diff --git a/config/prod.env.js b/config/prod.env.js
index 657782c..ee760f5 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -11,8 +11,11 @@
// BASE_API: '"http://220.171.99.118:3100"',
// IMG_API: '"http://220.171.99.118:3100/upload/"',
// BASE_API: '"http://192.168.0.179:8100"'
- BASE_API: '"http://39.104.85.193:4105"',
- IMG_API: '"http://39.104.85.193:4105/upload/"',
+ // BASE_API: '"http://39.104.85.193:4105"',
+ // IMG_API: '"http://39.104.85.193:4105/upload/"',
+
+ BASE_API: '"http://192.168.0.52:8100"',
+ IMG_API: '"http://192.168.0.52:8100/upload/"',
// BASE_API: '"http://220.171.99.118:4101/api"',
// IMG_API: '"http://220.171.99.118:4101/api/upload/"',
diff --git a/src/views/login/components/login-form.vue b/src/views/login/components/login-form.vue
index a6fe502..cff96d7 100644
--- a/src/views/login/components/login-form.vue
+++ b/src/views/login/components/login-form.vue
@@ -15,7 +15,7 @@
name="username"
type="text"
auto-complete="on"
- style="padding-top: 3px;padding-bottom: 3px"
+ style="padding-top: 1px;padding-bottom: 3px"
/>
</el-form-item>
</el-col>
@@ -36,7 +36,7 @@
name="password"
auto-complete="on"
@keyup.enter.native="handleSubmit"
- style="padding-top: 3px;padding-bottom: 3px"
+ style="padding-top: 1px;padding-bottom: 3px"
/>
</el-form-item>
</el-col>
diff --git a/src/views/selfCheck/components/supervisionDetails.vue b/src/views/selfCheck/components/supervisionDetails.vue
index a05d2f0..7fca71a 100644
--- a/src/views/selfCheck/components/supervisionDetails.vue
+++ b/src/views/selfCheck/components/supervisionDetails.vue
@@ -5,6 +5,7 @@
:close-on-click-modal="false"
width="75%"
center
+ @open="getCheckUnitType()"
@close="resetForm()"
>
<div slot="title" class="dialog-title">
@@ -42,9 +43,9 @@
<td class="w-10">{{item.rectifyPrice}}</td>
<td class="w-10">{{item.chargePerson}}</td>
<td class="w-20 overText">
- <span v-if="item.rectifyStatus == 0">
+ <span v-if="!item.rectifyStatus">
未整改
- <el-button type="text" @click="toRectify(item)">去整改</el-button>
+ <span v-if="unitType == -1" style="cursor: pointer;color: #409EFF" @click="toRectify(item)">去整改</span>
</span>
<span v-else>
{{item.completeRectifyTime + '整改完成'}}
@@ -134,7 +135,7 @@
<script>
import {computePageCount} from "@/utils";
import { getSpotCheckRecorder, updateSpotCheckRectifyInfo } from "@/api/selfCheck";
-
+ import { getCheckUnitType } from "@/api/specialCheck"
export default {
name: "supervisionDetails",
data(){
@@ -142,6 +143,7 @@
dialogVisible:false,
dialogReport: false,
id: null,
+ checkUnitType: null,
unitType: null,
enterpriseType: null,
corpInfo:{
@@ -174,15 +176,26 @@
}
},
created() {
- const t = this
- // t.getEnterpriseInfo()
+
+ },
+ mounted() {
+
},
watch: {
},
methods:{
+ async getCheckUnitType(){
+ const t = this
+ let res = await getCheckUnitType()
+ if(res.data.code === "200"){
+ t.unitType = res.data.result.checkUnitType
+ }else{
+ t.unitType = -1
+ }
+ },
async getEnterpriseInfo(){
const t = this
- const data = {id: t.id,unitType:t.unitType}
+ const data = {id: t.id,unitType:t.checkUnitType}
let res = await getSpotCheckRecorder(data)
if(res.data.code === "200"){
t.corpInfo = res.data.result
diff --git a/src/views/selfCheck/supervision.vue b/src/views/selfCheck/supervision.vue
index e338805..4a6c682 100644
--- a/src/views/selfCheck/supervision.vue
+++ b/src/views/selfCheck/supervision.vue
@@ -29,7 +29,7 @@
<span>{{ scope.row.rectifyStatus == 0?'存在未整改':'已完成' }}</span>
</template>
</el-table-column>
- <el-table-column label="详情" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="详情" align="center" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="toDetail(scope.row)">查看详情</el-button>
</template>
@@ -104,8 +104,9 @@
const t = this
t.$refs.details.dialogVisible = true
t.$refs.details.id = row.id
- t.$refs.details.unitType = row.checkUnitType
+ 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/areaEnterprises.vue b/src/views/specialCheck/components/areaEnterprises.vue
index b82b47b..0cdaabc 100644
--- a/src/views/specialCheck/components/areaEnterprises.vue
+++ b/src/views/specialCheck/components/areaEnterprises.vue
@@ -81,7 +81,7 @@
t.$refs.report.dialogVisible = true
}else{
t.$refs.detail.id = row.id
- t.$refs.detail.unitType = row.checkUnitType
+ t.$refs.detail.checkUnitType = 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 c856b07..0960aca 100644
--- a/src/views/specialCheck/components/feedbackDetails.vue
+++ b/src/views/specialCheck/components/feedbackDetails.vue
@@ -21,7 +21,7 @@
<div>检查层级: <span class="m-color">{{ corpInfo.checkUnitType == 1 ? '省级':(corpInfo.checkUnitType == 2 ? '市级' : '区县级') }}</span></div>
<div>检查单位: <span class="m-color">{{ corpInfo.checkUnit }}</span></div>
</div>
- <div style="width: 100%" v-if="(unitType==1 && provinceCheckStatus==0)||(unitType==2 && cityCheckStatus==0)||(unitType==3 && areaCheckStatus==0)">
+ <div style="width: 100%" v-if="(unitType==1 && !provinceCheckStatus)||(unitType==2 && !cityCheckStatus)||(unitType==3 && !areaCheckStatus)">
<el-form :model="feedbackForm" :rules="rules" ref="feedbackForm" class="demo-ruleForm">
<el-row :gutter="40" type="flex" align="middle" style="margin: 20px 0">
<el-col :span="8">
@@ -64,7 +64,7 @@
<el-button type="text" @click="deleteItem(index)">删除</el-button>
</td>
</tr>
- <tr style="text-align: center"><el-button icon="el-icon-plus" type="primary" plain round @click="addItem()">添加行</el-button></tr>
+ <tr style="text-align: center"><el-button icon="el-icon-plus" style="height: 32px;padding: 0 30px;margin-top: 6px" type="primary" plain round @click="addItem()">添加行</el-button></tr>
<tr class="m-color b-font" style="text-align: center">执法处罚情况</tr>
<tr>
<td class="m-color w-25 mid">罚款金额（万元）</td>
@@ -192,7 +192,7 @@
</td>
</tr>
<tr style="text-align: center" v-if="unitType == 1">
- <el-button type="primary" icon="el-icon-edit" plain @click="editRecord(1)">修改</el-button>
+ <el-button style="height: 32px;padding: 0 30px;margin-top: 6px" type="primary" icon="el-icon-edit" plain @click="editRecord(1)">修改</el-button>
</tr>
</table>
</div>
@@ -417,7 +417,7 @@
<el-button type="text" @click="deleteEditItem(index)">删除</el-button>
</td>
</tr>
- <tr style="text-align: center"><el-button type="primary" plain icon="el-icon-plus" @click="addEditItem()">添加行</el-button></tr>
+ <tr style="text-align: center"><el-button style="height: 32px;padding: 0 30px;margin-top: 6px" type="primary" plain icon="el-icon-plus" @click="addEditItem()">添加行</el-button></tr>
</table>
</div>
<el-row :gutter="80" v-if="editForm.hiddendangerStatus==1">
@@ -559,9 +559,9 @@
let res = await getSpotCheckReportInfo({id: t.id})
if(res.data.code === "200"){
if(res.data.result == null){
- t.provinceCheckStatus = 0
- t.cityCheckStatus = 0
- t.areaCheckStatus = 0
+ t.provinceCheckStatus = null
+ t.cityCheckStatus = null
+ t.areaCheckStatus = null
t.checkData.provinceCheckTime = ''
t.checkData.cityCheckTime = ''
t.checkData.areaCheckTime = ''
@@ -652,6 +652,7 @@
detainLicenseStatus: null
},
t.dialogVisible = false
+ t.getSpotCheckReportInfo()
} else {
console.log('error submit!!');
return false;
diff --git a/src/views/specialCheck/components/sendWork.vue b/src/views/specialCheck/components/sendWork.vue
index 547e8af..66f1716 100644
--- a/src/views/specialCheck/components/sendWork.vue
+++ b/src/views/specialCheck/components/sendWork.vue
@@ -10,7 +10,7 @@
>
<el-form :model="workForm" :rules="rules" ref="workForm" label-width="80px">
<el-form-item label="专项检查任务名称：" label-width="180px" prop="taskName">
- <el-input type="textarea" v-model="workForm.taskName"></el-input>
+ <el-input v-model="workForm.taskName"></el-input>
</el-form-item>
<div class="form-part">
<h3>省级检查指标</h3>
@@ -220,10 +220,13 @@
const t = this
t.$refs[formName].validate((valid) => {
if (valid) {
- this.$confirm('此操作将把任务下发给所有单位, 是否继续?', '提示', {
+ this.$confirm('确认将任务下发到所有单位，一经下发不可修改撤回，请谨慎核对！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
- type: 'warning'
+ type: 'warning',
+ center: true,
+ cancelButtonClass: 'canBtn',
+ confirmButtonClass: 'sendBtn'
}).then(async () => {
const loading = this.$loading({
lock: true,
@@ -264,6 +267,7 @@
</script>
<style lang="scss" scoped>
+
.input-with-select .el-select {
width: 120px;
}
@@ -297,3 +301,15 @@
}
}
</style>
+<style>
+.canBtn{
+ width: 30%;
+ font-size: 16px;
+}
+.sendBtn{
+ width: 30%;
+ font-size: 16px;
+ background-color: #ff5555 !important;
+ border-color: rgba(0,0,0,0);
+}
+</style>
diff --git a/src/views/specialCheck/components/sumSheet.vue b/src/views/specialCheck/components/sumSheet.vue
index c8bb865..043a63c 100644
--- a/src/views/specialCheck/components/sumSheet.vue
+++ b/src/views/specialCheck/components/sumSheet.vue
@@ -126,8 +126,8 @@
<td>{{thisLevelStatistic.thisLevelSpotCheckinfo.amerceEnterpriseNum}}</td>
<td>{{thisLevelStatistic.thisLevelSpotCheckinfo.amerceMoneySum}}</td>
</tr>
- <template v-for="(item,index) in institutionalData">
- <tr>
+ <template v-if="institutionalData && institutionalData.length>0" v-for="(item,index) in institutionalData">
+ <tr v-if="item.citySpotCheckinfo || item.areaSpotCheckinfo">
<td :rowspan="sheetStatus==1?2:1">{{ index + 1}}</td>
<td :rowspan="sheetStatus==1?2:1" class="point-item" @click="toDig(item.enterpriseCity,item.enterpriseArea)">
{{sheetStatus==1?item.enterpriseCity:item.enterpriseArea }}
@@ -148,30 +148,54 @@
<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 class="point-item" @click="checkEnterprise(item.enterpriseCity,item.enterpriseArea)">{{sheetStatus==1?item.citySpotCheckinfo.spotCheckEnterpriseNum:item.areaSpotCheckinfo.spotCheckEnterpriseNum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckinfo.spotCheckRateRequire + '%':item.areaSpotCheckinfo.spotCheckRateRequire + '%'}}</td>
- <td v-if="sheetStatus==1" :class="item.citySpotCheckinfo.spotCheckCompleteRate<item.citySpotCheckinfo.spotCheckRateRequire?'warning':''">
- {{item.citySpotCheckinfo.spotCheckCompleteRate + '%'}}
+ <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.spotCheckEnterpriseNum)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.spotCheckEnterpriseNum)" class="point-item" @click="checkEnterprise(item.enterpriseCity,item.enterpriseArea)">
+ {{sheetStatus==1?item.citySpotCheckinfo.spotCheckEnterpriseNum:item.areaSpotCheckinfo.spotCheckEnterpriseNum}}
+ </td>
+ <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.spotCheckRateRequire)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.spotCheckRateRequire)">
+ {{sheetStatus==1?item.citySpotCheckinfo.spotCheckRateRequire + '%':item.areaSpotCheckinfo.spotCheckRateRequire + '%'}}
+ </td>
+ <td v-if="sheetStatus==1 && item.citySpotCheckinfo && item.citySpotCheckinfo.spotCheckCompleteRate" :class="item.citySpotCheckinfo.spotCheckCompleteRate<item.citySpotCheckinfo.spotCheckRateRequire?'warning':''">
+ {{item.citySpotCheckinfo.spotCheckCompleteRate==null?'--':item.citySpotCheckinfo.spotCheckCompleteRate + '%'}}
</td>
<td v-else :class="item.areaSpotCheckinfo.spotCheckCompleteRate<item.areaSpotCheckinfo.spotCheckRateRequire?'warning':''">
- {{item.areaSpotCheckinfo.spotCheckCompleteRate + '%'}}
+ {{item.areaSpotCheckinfo.spotCheckCompleteRate==null?'--':item.areaSpotCheckinfo.spotCheckCompleteRate + '%'}}
</td>
- <td>{{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerSum:item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerSum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum:item.areaSpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum:item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckCompletedRectifyMajorHiddendangerNum:item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyMajorHiddendangerNum}}</td>
- <td>
- {{sheetStatus==1?(item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate==null?'--':item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate + '%'):(item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate==null?'--':item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate + '%')}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckinfo.revokeLicenseEnterpriseSum:item.areaSpotCheckinfo.revokeLicenseEnterpriseSum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckinfo.detainLicenseSum:item.areaSpotCheckinfo.detainLicenseSum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckinfo.amerceEnterpriseNum:item.areaSpotCheckinfo.amerceEnterpriseNum}}</td>
- <td>{{sheetStatus==1?item.citySpotCheckinfo.amerceMoneySum:item.areaSpotCheckinfo.amerceMoneySum}}</td>
+ <td v-if="(item.citySpotCheckHiddendangerinfo && item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerSum)|| (item.areaSpotCheckHiddendangerinfo && item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerSum)">
+ {{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerSum:item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerSum}}
+ </td>
+ <td v-if="(item.citySpotCheckHiddendangerinfo && item.citySpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum)|| (item.areaSpotCheckHiddendangerinfo && item.areaSpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum)">
+ {{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum:item.areaSpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum}}
+ </td>
+ <td v-if="(item.citySpotCheckHiddendangerinfo && item.citySpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum)|| (item.areaSpotCheckHiddendangerinfo && item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum)">
+ {{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum:item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum}}
+ </td>
+ <td v-if="(item.citySpotCheckHiddendangerinfo && item.citySpotCheckHiddendangerinfo.spotCheckCompletedRectifyMajorHiddendangerNum)|| (item.areaSpotCheckHiddendangerinfo && item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyMajorHiddendangerNum)">
+ {{sheetStatus==1?item.citySpotCheckHiddendangerinfo.spotCheckCompletedRectifyMajorHiddendangerNum:item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyMajorHiddendangerNum}}
+ </td>
+ <td v-if="sheetStatus==1 && item.citySpotCheckHiddendangerinfo && item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate">
+ {{item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate == null ? '--' : item.citySpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate + '%' }}
+ </td>
+ <td v-else>
+ {{item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate==null?'--':item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerRectifyRate + '%'}}
+ </td>
+ <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.revokeLicenseEnterpriseSum)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.revokeLicenseEnterpriseSum)">
+ {{sheetStatus==1?item.citySpotCheckinfo.revokeLicenseEnterpriseSum:item.areaSpotCheckinfo.revokeLicenseEnterpriseSum}}
+ </td>
+ <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.detainLicenseSum)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.detainLicenseSum)">
+ {{sheetStatus==1?item.citySpotCheckinfo.detainLicenseSum:item.areaSpotCheckinfo.detainLicenseSum}}
+ </td>
+ <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.amerceEnterpriseNum)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.amerceEnterpriseNum)">
+ {{sheetStatus==1?item.citySpotCheckinfo.amerceEnterpriseNum:item.areaSpotCheckinfo.amerceEnterpriseNum}}
+ </td>
+ <td v-if="(item.citySpotCheckinfo && item.citySpotCheckinfo.amerceMoneySum)|| (item.areaSpotCheckinfo && item.areaSpotCheckinfo.amerceMoneySum)">
+ {{sheetStatus==1?item.citySpotCheckinfo.amerceMoneySum:item.areaSpotCheckinfo.amerceMoneySum}}
+ </td>
</tr>
<tr v-if="sheetStatus==1">
<td>县级</td>
<td class="point-item" @click="checkEnterprise(item.enterpriseCity,'all')">{{item.areaSpotCheckinfo.spotCheckEnterpriseNum}}</td>
- <td>{{item.areaSpotCheckinfo.spotCheckRateRequire + '%'}}</td>
- <td :class="item.areaSpotCheckinfo.spotCheckCompleteRate<item.areaSpotCheckinfo.spotCheckRateRequire?'warning':''">{{item.areaSpotCheckinfo.spotCheckCompleteRate + '%'}}</td>
+ <td>{{item.areaSpotCheckinfo.spotCheckRateRequire==null?'--':item.areaSpotCheckinfo.spotCheckRateRequire + '%'}}</td>
+ <td :class="item.areaSpotCheckinfo.spotCheckCompleteRate<item.areaSpotCheckinfo.spotCheckRateRequire?'warning':''">{{item.areaSpotCheckinfo.spotCheckCompleteRate==null?'--':item.areaSpotCheckinfo.spotCheckCompleteRate + '%'}}</td>
<td>{{item.areaSpotCheckHiddendangerinfo.spotCheckHiddendangerSum}}</td>
<td>{{item.areaSpotCheckHiddendangerinfo.spotCheckMajorHiddendangerNum}}</td>
<td>{{item.areaSpotCheckHiddendangerinfo.spotCheckCompletedRectifyHiddendangerSum}}</td>
@@ -256,7 +280,7 @@
created() {
const t = this
t.getCheckUnitType()
- if(t.taskId){t.getDataStatistics()}
+ // if(t.taskId){t.getDataStatistics()}
},
computed: {
...mapGetters([
@@ -338,7 +362,6 @@
},
switchSheet() {
const t = this
- console.log(t.sheetStatus,'status')
if(t.sheetStatus == 1 || t.sheetStatus == 2){
t.getDataStatistics()
}else{
@@ -367,6 +390,7 @@
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
@@ -433,7 +457,7 @@
border-left: none;
font-weight: bolder;
text-align: center;
- color: #409EFF;
+ color: #034EA2;
&:first-of-type{
border-top: 1px solid #ccc;
@@ -456,11 +480,8 @@
}
.point-item{
cursor: pointer;
-
- &:hover{
- text-decoration: underline;
- color: #409EFF;
- }
+ text-decoration: underline;
+ color: #409EFF;
}
.warning{
color: red;
diff --git a/src/views/specialCheck/components/wholesaleForm.vue b/src/views/specialCheck/components/wholesaleForm.vue
index 1d1295f..a51c187 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="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>。
+ 批发企业共计<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 class="undone">{{ thislevelCompletionRateRequire }}{{thislevelCompletionRateRequireUnit ==1?'家':'%'}}</span>，完成率<span>{{ thislevelCompletionRate == null?'--':thislevelCompletionRate + '%' }}</span>。
</div>
<div v-show="enterpriseType == 2">
- 零售企业共计<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>。
+ 零售企业共计<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 class="undone">{{ thislevelCompletionRateRequire }}{{thislevelCompletionRateRequireUnit ==1?'家':'%'}}</span>，完成率<span>{{ thislevelCompletionRate == null?'--':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>
@@ -71,7 +71,7 @@
<span>{{ scope.row.selfcheckStatus == 1 ? '已填报' : '未填报' }}</span>
</template>
</el-table-column>
- <el-table-column label="详情" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="自查详情" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button type="text" @click="viewDetails(scope.row)">查看</el-button>
</template>
@@ -81,9 +81,9 @@
<span>{{ scope.row.thislevelCheckStatus == 1 ? '已反馈' : '未反馈' }}</span>
</template>
</el-table-column>
- <el-table-column fixed="right" :label="unitType==1?'执法抽查':'执法检查'" align="center" class-name="small-padding fixed-width">
+ <el-table-column v-if="unitType!=0" fixed="right" :label="unitType==1?'执法抽查':'执法检查'" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button type="text" @click="toFeedback(scope.row)">情况反馈</el-button>
+ <el-button type="text" @click="toFeedback(scope.row)">情况反馈</el-button>
</template>
</el-table-column>
</el-table>
@@ -149,6 +149,8 @@
selfCheckEnterpriseCount: null,
noSelfCheckEnterpriseCount: null,
thislevelAlreadyCheckCount: null,
+ thislevelCompletionRateRequire: null,
+ thislevelCompletionRateRequireUnit: null,
thislevelNoCheckCount: null,
thislevelCompletionRate: null,
checkData: []
@@ -206,6 +208,8 @@
t.noSelfCheckEnterpriseCount = res.data.result.noSelfCheckEnterpriseCount
t.thislevelAlreadyCheckCount = res.data.result.thislevelAlreadyCheckCount
t.thislevelNoCheckCount = res.data.result.thislevelNoCheckCount
+ t.thislevelCompletionRateRequire = res.data.result.thislevelCompletionRateRequire
+ t.thislevelCompletionRateRequireUnit = res.data.result.thislevelCompletionRateRequireUnit
t.thislevelCompletionRate = res.data.result.thislevelCompletionRate
t.checkData = res.data.result.iPage.records
t.recordTotal = res.data.result.iPage.total
diff --git a/src/views/specialCheck/index.vue b/src/views/specialCheck/index.vue
index d1fedc7..a108f2d 100644
--- a/src/views/specialCheck/index.vue
+++ b/src/views/specialCheck/index.vue
@@ -18,7 +18,7 @@
</template>
<el-menu-item :index="i + '-' + 1">安全检查反馈情况（批发）</el-menu-item>
<el-menu-item :index="i + '-' + 2">安全检查反馈情况（零售）</el-menu-item>
- <el-menu-item :index="i + '-' + 3" v-if="unitType==1||unitType==2">安全检查情况汇总</el-menu-item>
+ <el-menu-item :index="i + '-' + 3" v-if="unitType==0||unitType==1||unitType==2">安全检查情况汇总</el-menu-item>
</el-submenu>
</el-menu>
<div v-else style="background:#eee;color: #333;font-size: 16px;padding: 20px 10px">
@@ -29,7 +29,7 @@
<wholesale-form v-show="curTab == 1 || curTab == 2" ref="wholesale"></wholesale-form>
<sum-sheet v-show="curTab == 3" ref="sumSheet"></sum-sheet>
</div>
- <div v-else class="table-area" style="text-align:center;margin-top: 200px">暂无任务信息</div>
+ <div v-else class="table-area" style="text-align:center;">暂无任务信息</div>
<send-work ref="send"></send-work>
</div>
</template>
@@ -78,17 +78,16 @@
methods: {
async getCheckUnitType(){
const t = this
- t.listLoading = true
let res = await getCheckUnitType()
if(res.data.code === "200"){
t.unitType = res.data.result.checkUnitType
+ console.log(t.unitType,'type666')
}else{
t.$message({
type:'warning',
message:res.data.message
})
}
- t.listLoading = false
},
async getSpecialCheckTask(){
@@ -121,10 +120,13 @@
t.$refs.sumSheet.taskName = keyPath[0].split('-')[1]
t.$refs.sumSheet.enterpriseCity = ''
t.$refs.sumSheet.enterpriseArea = ''
- t.$refs.sumSheet.sheetStatus = t.unitType
+ if(t.unitType == 0){
+ t.$refs.sumSheet.sheetStatus=1
+ }else{
+ t.$refs.sumSheet.sheetStatus = t.unitType
+ }
t.$refs.sumSheet.activeTab = 1
t.$refs.sumSheet.getDataStatistics()
- console.log(t.$refs.sumSheet.sheetStatus,t.$refs.sumSheet.institutionalData,'55555555555555555')
}
t.curTab = Number(key.split('-')[1])
},
--
Gitblit v1.9.2