From 1cf4ed5237b2ed61504cdd2f7c567a86d82fb6fd Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 29 十二月 2023 16:09:58 +0800
Subject: [PATCH] 添加状态
---
src/views/license/licenseInfo/components/licenseDelayForm.vue | 12 ++++++
src/views/license/licenseInfo/components/licenseModForm.vue | 34 ++++++++++++++--
src/views/layout/components/Sidebar/index.vue | 3 -
src/views/license/licenseInfo/components/licenseInfoForm.vue | 36 +++++++++++++++--
src/styles/sidebar.scss | 5 ++
5 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 1e43cce..a87545a 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -30,9 +30,14 @@
.scrollbar-wrapper {
overflow-x: hidden !important;
+ overflow-y: scroll;
+ height: calc(100vh - 80px);
.el-scrollbar__view {
height: 100%;
+ overflow-y: auto;
+ &::-webkit-scrollbar { width: 0; height: 0; color: transparent }
+ &::scrollbar { width: 0; height: 0; color: transparent }
}
}
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 1890b89..77d9e7f 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,6 +1,5 @@
<template>
- <el-scrollbar
- wrap-class="scrollbar-wrapper">
+ <el-scrollbar wrap-class="scrollbar-wrapper">
<el-menu
:collapse="isCollapse"
:default-active="$route.path"
diff --git a/src/views/license/licenseInfo/components/licenseDelayForm.vue b/src/views/license/licenseInfo/components/licenseDelayForm.vue
index af0af69..8212082 100644
--- a/src/views/license/licenseInfo/components/licenseDelayForm.vue
+++ b/src/views/license/licenseInfo/components/licenseDelayForm.vue
@@ -574,6 +574,12 @@
<el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
</el-checkbox-group>
</el-col>
+ <el-col :span="8">
+ <el-checkbox :disabled="true" v-model="checked7">升空类</el-checkbox>
+ <el-checkbox-group :disabled="true" v-model="checkMore7" style="display:inline-block;" >
+ <el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
+ </el-checkbox-group>
+ </el-col>
</el-row>
</el-form-item>
</el-col>
@@ -728,12 +734,14 @@
checked4:false,
checked5:false,
checked6:false,
+ checked7:false,
checkMore1:[],
checkMore2:[],
checkMore3:[],
checkMore4:[],
checkMore5:[],
checkMore6:[],
+ checkMore7:[],
checkList1:['C级','D级'],
checkList2:['C级','D级'],
checkMoreList:['C级','D级'],
@@ -853,12 +861,14 @@
this.checked4 = dealingrange[3].checked4
this.checked5 = dealingrange[4].checked5
this.checked6 = dealingrange[5].checked6
+ this.checked7 = dealingrange[6].checked7
this.checkMore1=dealingrange[0].checkMore1
this.checkMore2=dealingrange[1].checkMore2
this.checkMore3=dealingrange[2].checkMore3
this.checkMore4=dealingrange[3].checkMore4
this.checkMore5=dealingrange[4].checkMore5
this.checkMore6=dealingrange[5].checkMore6
+ this.checkMore7=dealingrange[6].checkMore7
}else if(roleType === '烟花爆竹零售经营（长期）' || roleType === '烟花爆竹零售经营（短期）' || (roleType === 'null'&& this.dataForm.type ===3)){
this.type = 3
if(this.dataForm.dealingrange.length > 10){
@@ -871,12 +881,14 @@
this.checked4 = dealingrange[3].checked4
this.checked5 = dealingrange[4].checked5
this.checked6 = dealingrange[5].checked6
+ this.checked7 = dealingrange[6].checked7
this.checkMore1=dealingrange[0].checkMore1
this.checkMore2=dealingrange[1].checkMore2
this.checkMore3=dealingrange[2].checkMore3
this.checkMore4=dealingrange[3].checkMore4
this.checkMore5=dealingrange[4].checkMore5
this.checkMore6=dealingrange[5].checkMore6
+ this.checkMore7=dealingrange[6].checkMore7
}
},
async submit(value){
diff --git a/src/views/license/licenseInfo/components/licenseInfoForm.vue b/src/views/license/licenseInfo/components/licenseInfoForm.vue
index fbacdc3..1977932 100644
--- a/src/views/license/licenseInfo/components/licenseInfoForm.vue
+++ b/src/views/license/licenseInfo/components/licenseInfoForm.vue
@@ -575,6 +575,12 @@
<el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
</el-checkbox-group>
</el-col>
+ <el-col :span="8">
+ <el-checkbox v-model="checked7" @change="justifySingle(7)">升空类</el-checkbox>
+ <el-checkbox-group v-model="checkMore7" style="display:inline-block;" @change="justify(7)">
+ <el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
+ </el-checkbox-group>
+ </el-col>
</el-row>
</el-form-item>
</el-col>
@@ -726,12 +732,14 @@
checked4:false,
checked5:false,
checked6:false,
+ checked7:false,
checkMore1:[],
checkMore2:[],
checkMore3:[],
checkMore4:[],
checkMore5:[],
checkMore6:[],
+ checkMore7:[],
checkList1:['C级','D级'],
checkList2:['C级','D级'],
checkMoreList:['C级','D级'],
@@ -874,12 +882,14 @@
this.checked4 = false
this.checked5 = false
this.checked6 = false
+ this.checked7 = false
this.checkMore1=[]
this.checkMore2=[]
this.checkMore3=[]
this.checkMore4=[]
this.checkMore5=[]
this.checkMore6=[]
+ this.checkMore7=[]
this.id=null
this.area=null
this.firststoragenum=null
@@ -914,12 +924,14 @@
this.checked4 = dealingrange[3].checked4
this.checked5 = dealingrange[4].checked5
this.checked6 = dealingrange[5].checked6
+ this.checked7 = dealingrange[6].checked7
this.checkMore1=dealingrange[0].checkMore1
this.checkMore2=dealingrange[1].checkMore2
this.checkMore3=dealingrange[2].checkMore3
this.checkMore4=dealingrange[3].checkMore4
this.checkMore5=dealingrange[4].checkMore5
this.checkMore6=dealingrange[5].checkMore6
+ this.checkMore7=dealingrange[6].checkMore7
}else if(roleType === '烟花爆竹零售经营（长期）' || roleType === '烟花爆竹零售经营（短期）' || (roleType === 'null'&& this.dataForm.type ===3)){
this.type = 3
if(value.dealingrange.length > 10){
@@ -934,12 +946,14 @@
this.checked4 = dealingrange[3].checked4
this.checked5 = dealingrange[4].checked5
this.checked6 = dealingrange[5].checked6
+ this.checked7 = dealingrange[6].checked7
this.checkMore1=dealingrange[0].checkMore1
this.checkMore2=dealingrange[1].checkMore2
this.checkMore3=dealingrange[2].checkMore3
this.checkMore4=dealingrange[3].checkMore4
this.checkMore5=dealingrange[4].checkMore5
this.checkMore6=dealingrange[5].checkMore6
+ this.checkMore7=dealingrange[6].checkMore7
}
}
},
@@ -951,13 +965,13 @@
this.dataForm.licenseStorage.push(storageOne)
this.dataForm.licenseStorage.push(storageTwo)
this.dataForm.licenseStorage.push(storageThree)
- this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},])
+ this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},{checked7:this.checked7,checkMore7:this.checkMore7}])
this.dataForm.licenseStorage = JSON.stringify(this.dataForm.licenseStorage)
}else if(this.dataForm.type === 2){
this.dataForm.licenseStorage = JSON.stringify([{id:this.id,area:this.area,storagenum:this.storagenum,storagearea:this.storagearea,powder:this.powder,firststoragenum:this.firststoragenum,firststoragearea:this.firststoragearea,firstpowder:this.firstpowder,thirdstoragenum:this.thirdstoragenum,thirdstoragearea:this.thirdstoragearea,thirdpowder:this.thirdpowder,type:3}])
- this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},])
+ this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},{checked7:this.checked7,checkMore7:this.checkMore7}])
}else{
- this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},])
+ this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},{checked7:this.checked7,checkMore7:this.checkMore7}])
this.dataForm.licenseStorage = JSON.stringify([])
}
let fullAddress = (this.dataForm.province ==='新疆维吾尔自治区'? '新疆': this.dataForm.province)
@@ -1076,11 +1090,17 @@
}else{
this.checked5 = false
}
- }else{
+ }else if(value === 6){
if(this.checkMore6.length !== 0){
this.checked6 = true
}else{
this.checked6 = false
+ }
+ }else{
+ if(this.checkMore7.length !== 0){
+ this.checked7 = true
+ }else{
+ this.checked7 = false
}
}
},
@@ -1116,12 +1136,18 @@
}else{
this.checkMore5 = []
}
- }else{
+ }else if(value === 6){
if(this.checked6 === true){
this.checkMore6 = ['C级','D级']
}else{
this.checkMore6 = []
}
+ }else{
+ if(this.checked7 === true){
+ this.checkMore7 = ['C级','D级']
+ }else{
+ this.checkMore7 = []
+ }
}
},
diff --git a/src/views/license/licenseInfo/components/licenseModForm.vue b/src/views/license/licenseInfo/components/licenseModForm.vue
index a1c3147..492b323 100644
--- a/src/views/license/licenseInfo/components/licenseModForm.vue
+++ b/src/views/license/licenseInfo/components/licenseModForm.vue
@@ -572,6 +572,12 @@
<el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
</el-checkbox-group>
</el-col>
+ <el-col :span="8">
+ <el-checkbox v-model="checked7" @change="justifySingle(7)">升空类</el-checkbox>
+ <el-checkbox-group v-model="checkMore7" style="display:inline-block;" @change="justify(7)">
+ <el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
+ </el-checkbox-group>
+ </el-col>
</el-row>
</el-form-item>
</el-col>
@@ -731,12 +737,14 @@
checked4:false,
checked5:false,
checked6:false,
+ checked7:false,
checkMore1:[],
checkMore2:[],
checkMore3:[],
checkMore4:[],
checkMore5:[],
checkMore6:[],
+ checkMore7:[],
checkList1:['C级','D级'],
checkList2:['C级','D级'],
checkMoreList:['C级','D级'],
@@ -858,12 +866,14 @@
this.checked4 = dealingrange[3].checked4
this.checked5 = dealingrange[4].checked5
this.checked6 = dealingrange[5].checked6
+ this.checked7 = dealingrange[6].checked7
this.checkMore1=dealingrange[0].checkMore1
this.checkMore2=dealingrange[1].checkMore2
this.checkMore3=dealingrange[2].checkMore3
this.checkMore4=dealingrange[3].checkMore4
this.checkMore5=dealingrange[4].checkMore5
this.checkMore6=dealingrange[5].checkMore6
+ this.checkMore7=dealingrange[6].checkMore7
}else if(roleType === '烟花爆竹零售经营（长期）' || roleType === '烟花爆竹零售经营（短期）' || (roleType === 'null'&& this.dataForm.type ===3)){
this.type = 3
if(this.dataForm.dealingrange.length > 10){
@@ -876,12 +886,14 @@
this.checked4 = dealingrange[3].checked4
this.checked5 = dealingrange[4].checked5
this.checked6 = dealingrange[5].checked6
+ this.checked7 = dealingrange[6].checked7
this.checkMore1=dealingrange[0].checkMore1
this.checkMore2=dealingrange[1].checkMore2
this.checkMore3=dealingrange[2].checkMore3
this.checkMore4=dealingrange[3].checkMore4
this.checkMore5=dealingrange[4].checkMore5
this.checkMore6=dealingrange[5].checkMore6
+ this.checkMore7=dealingrange[6].checkMore7
}
},
async submit(value){
@@ -892,13 +904,13 @@
this.dataForm.licenseStorage.push(storageOne)
this.dataForm.licenseStorage.push(storageTwo)
this.dataForm.licenseStorage.push(storageThree)
- this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},])
+ this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},{checked7:this.checked7,checkMore7:this.checkMore7}])
this.dataForm.licenseStorage = JSON.stringify(this.dataForm.licenseStorage)
}else if(this.dataForm.type === 2){
this.dataForm.licenseStorage = JSON.stringify([{id:this.id,area:this.area,storagenum:this.storagenum,storagearea:this.storagearea,powder:this.powder,firststoragenum:this.firststoragenum,firststoragearea:this.firststoragearea,firstpowder:this.firstpowder,thirdstoragenum:this.thirdstoragenum,thirdstoragearea:this.thirdstoragearea,thirdpowder:this.thirdpowder,type:3}])
- this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},])
+ this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},{checked7:this.checked7,checkMore7:this.checkMore7}])
}else{
- this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},])
+ this.dataForm.dealingrange = JSON.stringify([{checked1:this.checked1,checkMore1:this.checkMore1},{checked2:this.checked2,checkMore2:this.checkMore2},{checked3:this.checked3,checkMore3:this.checkMore3},{checked4:this.checked4,checkMore4:this.checkMore4},{checked5:this.checked5,checkMore5:this.checkMore5},{checked6:this.checked6,checkMore6:this.checkMore6},{checked7:this.checked7,checkMore7:this.checkMore7}])
this.dataForm.licenseStorage = JSON.stringify([])
}
let fullAddress = (this.dataForm.province ==='新疆维吾尔自治区'? '新疆': this.dataForm.province)
@@ -968,11 +980,17 @@
}else{
this.checked5 = false
}
- }else{
+ }else if(value === 6){
if(this.checkMore6.length !== 0){
this.checked6 = true
}else{
this.checked6 = false
+ }
+ }else{
+ if(this.checkMore7.length !== 0){
+ this.checked7 = true
+ }else{
+ this.checked7 = false
}
}
},
@@ -1008,12 +1026,18 @@
}else{
this.checkMore5 = []
}
- }else{
+ }else if(value === 6){
if(this.checked6 === true){
this.checkMore6 = ['C级','D级']
}else{
this.checkMore6 = []
}
+ }else{
+ if(this.checked7 === true){
+ this.checkMore7 = ['C级','D级']
+ }else{
+ this.checkMore7 = []
+ }
}
},
--
Gitblit v1.9.2