From 4982061e27b3b149709808541c64834e15cbdc31 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 30 十二月 2024 11:16:50 +0800
Subject: [PATCH] 修改
---
src/views/license/licenseInfo/index.vue | 22
src/views/usermng/product.vue | 10
src/views/license/licenseInfo/components/licenseInfoForm.vue | 1029 +++++++++++++++++++++++++++++++--------------------------
3 files changed, 582 insertions(+), 479 deletions(-)
diff --git a/src/views/license/licenseInfo/components/licenseInfoForm.vue b/src/views/license/licenseInfo/components/licenseInfoForm.vue
index 1977932..89bf377 100644
--- a/src/views/license/licenseInfo/components/licenseInfoForm.vue
+++ b/src/views/license/licenseInfo/components/licenseInfoForm.vue
@@ -7,12 +7,13 @@
width="60%"
>
- <el-form ref="dataForm" :model="dataForm" :rules="ruleForm" label-position="right" label-width="150px" element-loading-text="保存中...">
+ <el-form ref="dataForm" :model="dataForm" :rules="ruleForm" label-position="right" label-width="150px"
+ element-loading-text="保存中...">
<el-row>
<el-col :span="23">
<el-row>
<el-col :span="15">
- <el-form-item label="企业名称:" >
+ <el-form-item label="企业名称:">
<el-input v-model.trim="dataForm.name" class="carrierLicense_select" :disabled="true">
</el-input>
</el-form-item>
@@ -21,7 +22,7 @@
<img src="../../../../assets/enterprise.png" class="enterpriseBasicInformation_image" @click="showEnterprise"></img>
</el-col>-->
<el-col :span="8">
- <el-form-item label="统一社会信用代码:" >
+ <el-form-item label="统一社会信用代码:">
<el-input v-model.trim="dataForm.code" class="carrierLicense_select">
</el-input>
</el-form-item>
@@ -29,19 +30,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="主要负责人姓名:" >
+ <el-form-item label="主要负责人姓名:">
<el-input v-model.trim="dataForm.mainpersonname" class="carrierLicense_select">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="主要负责人身份证号:" >
+ <el-form-item label="主要负责人身份证号:">
<el-input v-model.trim="dataForm.mainpersonidcardnum" class="carrierLicense_select">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="主要负责人联系电话:" >
+ <el-form-item label="主要负责人联系电话:">
<el-input v-model.trim="dataForm.mainpersontel" class="carrierLicense_select">
</el-input>
</el-form-item>
@@ -49,19 +50,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="安全负责人姓名:" >
+ <el-form-item label="安全负责人姓名:">
<el-input v-model.trim="dataForm.safetypersonname" class="carrierLicense_select">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="安全负责人身份证号:" >
+ <el-form-item label="安全负责人身份证号:">
<el-input v-model.trim="dataForm.safetypersonidcardnum" class="carrierLicense_select">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="安全负责人联系电话:" >
+ <el-form-item label="安全负责人联系电话:">
<el-input v-model.trim="dataForm.safetypersontel" class="carrierLicense_select">
</el-input>
</el-form-item>
@@ -69,8 +70,8 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="许可类型:" >
- <el-select v-model="dataForm.licensetype" clearable filterable >
+ <el-form-item label="许可类型:">
+ <el-select v-model="dataForm.licensetype" clearable filterable>
<el-option
v-for="item in licensetypeList"
:key="item.id"
@@ -82,8 +83,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="经营方式:" >
- <el-select v-model="dataForm.dealingtype" clearable filterable @change="changeDealing()">
+ <el-form-item label="经营方式:">
+ <el-select v-model="dataForm.dealingtype" clearable filterable
+ @change="changeDealing()">
<el-option
v-for="item in dealingtypeList"
:key="item.id"
@@ -95,36 +97,37 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="核定储量（箱）:" >
- <el-input-number :controls="false" v-model="dataForm.reservebox">
+ <el-form-item label="核定储量（箱）:">
+ <el-input-number :controls="false" v-model="dataForm.reservebox">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="核定储量（千克）:" >
- <el-input-number :controls="false" v-model="dataForm.reservekg">
+ <el-form-item label="核定储量（千克）:">
+ <el-input-number :controls="false" v-model="dataForm.reservekg">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="经营面积（全部）:" >
- <el-input-number :controls="false" v-model="dataForm.dealingarea">
+ <el-form-item label="经营面积（全部）:">
+ <el-input-number :controls="false" v-model="dataForm.dealingarea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="经营面积（物品）:" v-if="showSaveArea">
- <el-input-number :controls="false" v-model="dataForm.savearea">
+ <el-form-item label="经营面积（物品）:" v-if="showSaveArea">
+ <el-input-number :controls="false" v-model="dataForm.savearea">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="注册地址省:" >
- <el-select v-model="dataForm.province" clearable filterable @change="changeArea('province')" placeholder="省">
+ <el-form-item label="注册地址省:">
+ <el-select v-model="dataForm.province" clearable filterable
+ @change="changeArea('province')" placeholder="省">
<el-option
v-for="item in provinceList"
:key="item.id"
@@ -136,8 +139,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="市" >
- <el-select v-model="dataForm.city" prop="city" clearable filterable @change="changeArea('city')" placeholder="市">
+ <el-form-item label="市">
+ <el-select v-model="dataForm.city" prop="city" clearable filterable
+ @change="changeArea('city')" placeholder="市">
<el-option
v-for="item in cityList"
:key="item.id"
@@ -149,8 +153,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="区" >
- <el-select v-model="dataForm.district" clearable filterable @change="changeArea('district')" placeholder="区">
+ <el-form-item label="区">
+ <el-select v-model="dataForm.district" clearable filterable
+ @change="changeArea('district')" placeholder="区">
<el-option
v-for="item in districtList"
:key="item.id"
@@ -164,8 +169,9 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="注册详细地址:" >
- <el-input v-model.trim="dataForm.address" class="carrierLicense_select" placeholder="详细地址（无需填写省市区信息）">
+ <el-form-item label="注册详细地址:">
+ <el-input v-model.trim="dataForm.address" class="carrierLicense_select"
+ placeholder="详细地址（无需填写省市区信息）">
</el-input>
</el-form-item>
</el-col>
@@ -178,8 +184,9 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="仓储地址省:" >
- <el-select v-model="dataForm.storageprovince" clearable filterable @change="changeStorageArea('province')" placeholder="省">
+ <el-form-item label="仓储地址省:">
+ <el-select v-model="dataForm.storageprovince" clearable filterable
+ @change="changeStorageArea('province')" placeholder="省">
<el-option
v-for="item in provinceList"
:key="item.id"
@@ -191,8 +198,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="市" >
- <el-select v-model="dataForm.storagecity" prop="city" clearable filterable @change="changeStorageArea('city')" placeholder="市">
+ <el-form-item label="市">
+ <el-select v-model="dataForm.storagecity" prop="city" clearable filterable
+ @change="changeStorageArea('city')" placeholder="市">
<el-option
v-for="item in cityList"
:key="item.id"
@@ -204,8 +212,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="区" >
- <el-select v-model="dataForm.storagedistrict" clearable filterable @change="changeStorageArea('district')" placeholder="区">
+ <el-form-item label="区">
+ <el-select v-model="dataForm.storagedistrict" clearable filterable
+ @change="changeStorageArea('district')" placeholder="区">
<el-option
v-for="item in districtList"
:key="item.id"
@@ -219,8 +228,9 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="仓储详细地址:" >
- <el-input v-model.trim="dataForm.storageaddress" class="carrierLicense_select" placeholder="详细地址（无需填写省市区信息）">
+ <el-form-item label="仓储详细地址:">
+ <el-input v-model.trim="dataForm.storageaddress" class="carrierLicense_select"
+ placeholder="详细地址（无需填写省市区信息）">
</el-input>
</el-form-item>
</el-col>
@@ -232,8 +242,9 @@
<!-- </el-col>-->
</el-row>
<el-row>
- <el-form-item label="经济类型:" prop="economictype" >
- <el-select v-model.trim="dataForm.economictype" placeholder="" clearable class="enterpriseBasicInformation_input">
+ <el-form-item label="经济类型:" prop="economictype">
+ <el-select v-model.trim="dataForm.economictype" placeholder="" clearable
+ class="enterpriseBasicInformation_input">
<el-option
v-for="item in economicTypeList"
:key="item.id"
@@ -252,66 +263,66 @@
<el-divider></el-divider>
<el-row>
<el-col :span="6">
- <el-form-item label="库区面积:" >
- <el-input-number :controls="false" style="width: auto" v-model.trim="area" >
+ <el-form-item label="库区面积:">
+ <el-input-number :controls="false" style="width: auto" v-model.trim="area">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房数量:" >
- <el-input v-model.trim="storagenum" :disabled="true">
+ <el-form-item label="库房数量:">
+ <el-input v-model.trim="storagenum" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房面积:" >
- <el-input v-model.trim="storagearea" :disabled="true">
+ <el-form-item label="库房面积:">
+ <el-input v-model.trim="storagearea" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="核定药量:" >
- <el-input v-model.trim="powder" :disabled="true">
+ <el-form-item label="核定药量:">
+ <el-input v-model.trim="powder" :disabled="true">
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.1级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="firststoragenum" >
+ <el-form-item label="1.1级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="firststoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 库房面积:" >
- <el-input-number :controls="false" v-model.trim="firststoragearea">
+ <el-form-item label="1.1级 库房面积:">
+ <el-input-number :controls="false" v-model.trim="firststoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 核定药量:" >
- <el-input-number :controls="false" v-model.trim="firstpowder">
+ <el-form-item label="1.1级 核定药量:">
+ <el-input-number :controls="false" v-model.trim="firstpowder">
</el-input-number>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.3级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="thirdstoragenum" >
+ <el-form-item label="1.3级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="thirdstoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 库房面积:" >
- <el-input-number :controls="false" v-model.trim="thirdstoragearea">
+ <el-form-item label="1.3级 库房面积:">
+ <el-input-number :controls="false" v-model.trim="thirdstoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 核定药量:" >
- <el-input-number :controls="false" v-model.trim="thirdpowder">
+ <el-form-item label="1.3级 核定药量:">
+ <el-input-number :controls="false" v-model.trim="thirdpowder">
</el-input-number>
</el-form-item>
</el-col>
@@ -325,25 +336,25 @@
<el-divider></el-divider>
<el-row>
<el-col :span="6">
- <el-form-item label="库区面积:" >
- <el-input-number :controls="false" style="width: auto" v-model.trim="storage1.area" >
+ <el-form-item label="库区面积:">
+ <el-input-number :controls="false" style="width: auto" v-model.trim="storage1.area">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房数量:" >
+ <el-form-item label="库房数量:">
<el-input v-model.trim="storagenum1" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房面积:" >
+ <el-form-item label="库房面积:">
<el-input v-model.trim="storagearea1" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="核定药量:" >
+ <el-form-item label="核定药量:">
<el-input v-model.trim="powder1" :disabled="true">
</el-input>
</el-form-item>
@@ -351,19 +362,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.1级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="storage1.firststoragenum" >
+ <el-form-item label="1.1级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="storage1.firststoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 库房面积:" >
+ <el-form-item label="1.1级 库房面积:">
<el-input-number :controls="false" v-model.trim="storage1.firststoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 核定药量:" >
+ <el-form-item label="1.1级 核定药量:">
<el-input-number :controls="false" v-model.trim="storage1.firstpowder">
</el-input-number>
</el-form-item>
@@ -371,19 +382,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.3级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="storage1.thirdstoragenum" >
+ <el-form-item label="1.3级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="storage1.thirdstoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 库房面积:" >
+ <el-form-item label="1.3级 库房面积:">
<el-input-number :controls="false" v-model.trim="storage1.thirdstoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 核定药量:" >
+ <el-form-item label="1.3级 核定药量:">
<el-input-number :controls="false" v-model.trim="storage1.thirdpowder">
</el-input-number>
</el-form-item>
@@ -396,25 +407,25 @@
<el-divider></el-divider>
<el-row>
<el-col :span="6">
- <el-form-item label="库区面积:" >
- <el-input-number :controls="false" style="width: auto" v-model.trim="storage2.area" >
+ <el-form-item label="库区面积:">
+ <el-input-number :controls="false" style="width: auto" v-model.trim="storage2.area">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房数量:" >
+ <el-form-item label="库房数量:">
<el-input v-model.trim="storagenum2" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房面积:" >
+ <el-form-item label="库房面积:">
<el-input v-model.trim="storagearea2" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="核定药量:" >
+ <el-form-item label="核定药量:">
<el-input v-model.trim="powder2" :disabled="true">
</el-input>
</el-form-item>
@@ -422,19 +433,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.1级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="storage2.firststoragenum" >
+ <el-form-item label="1.1级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="storage2.firststoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 库房面积:" >
+ <el-form-item label="1.1级 库房面积:">
<el-input-number :controls="false" v-model.trim="storage2.firststoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 核定药量:" >
+ <el-form-item label="1.1级 核定药量:">
<el-input-number :controls="false" v-model.trim="storage2.firstpowder">
</el-input-number>
</el-form-item>
@@ -442,19 +453,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.3级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="storage2.thirdstoragenum" >
+ <el-form-item label="1.3级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="storage2.thirdstoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 库房面积:" >
+ <el-form-item label="1.3级 库房面积:">
<el-input-number :controls="false" v-model.trim="storage2.thirdtoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 核定药量:" >
+ <el-form-item label="1.3级 核定药量:">
<el-input-number :controls="false" v-model.trim="storage2.thirdpowder">
</el-input-number>
</el-form-item>
@@ -467,25 +478,25 @@
<el-divider></el-divider>
<el-row>
<el-col :span="6">
- <el-form-item label="库区面积:" >
- <el-input-number :controls="false" style="width: auto" v-model.trim="storage3.area" >
+ <el-form-item label="库区面积:">
+ <el-input-number :controls="false" style="width: auto" v-model.trim="storage3.area">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房数量:" >
+ <el-form-item label="库房数量:">
<el-input v-model.trim="storagenum3" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="库房面积:" >
+ <el-form-item label="库房面积:">
<el-input v-model.trim="storagearea3" :disabled="true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="核定药量:" >
+ <el-form-item label="核定药量:">
<el-input v-model.trim="powder3" :disabled="true">
</el-input>
</el-form-item>
@@ -493,19 +504,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.1级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="storage3.firststoragenum" >
+ <el-form-item label="1.1级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="storage3.firststoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 库房面积:" >
+ <el-form-item label="1.1级 库房面积:">
<el-input-number :controls="false" v-model.trim="storage3.firststoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.1级 核定药量:" >
+ <el-form-item label="1.1级 核定药量:">
<el-input-number :controls="false" v-model.trim="storage3.firstpowder">
</el-input-number>
</el-form-item>
@@ -513,19 +524,19 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="1.3级 库房数量:" >
- <el-input-number :controls="false" v-model.trim="storage3.thirdstoragenum" >
+ <el-form-item label="1.3级 库房数量:">
+ <el-input-number :controls="false" v-model.trim="storage3.thirdstoragenum">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 库房面积:" >
+ <el-form-item label="1.3级 库房面积:">
<el-input-number :controls="false" v-model.trim="storage3.thirdtoragearea">
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="1.3级 核定药量:" >
+ <el-form-item label="1.3级 核定药量:">
<el-input-number :controls="false" v-model.trim="storage3.thirdpowder">
</el-input-number>
</el-form-item>
@@ -535,50 +546,72 @@
<el-row>
<el-col :span="24">
- <el-form-item label="许可范围:" >
+ <el-form-item label="许可范围:">
<el-row>
<el-col :span="8">
<el-checkbox v-model="checked1" @change="justifySingle(1)">爆竹类</el-checkbox>
- <el-checkbox-group v-model="checkMore1" style="display:inline-block;" @change="justify(1)">
- <el-checkbox v-for="item in checkList1" :label="item" :key="item">{{item}}</el-checkbox>
+ <el-checkbox-group v-model="checkMore1" style="display:inline-block;"
+ @change="justify(1)">
+ <el-checkbox v-for="item in checkList1" :label="item" :key="item">
+ {{ item }}
+ </el-checkbox>
</el-checkbox-group>
</el-col>
<el-col :span="8">
<el-checkbox v-model="checked2" @change="justifySingle(2)">喷花类</el-checkbox>
- <el-checkbox-group v-model="checkMore2" style="display:inline-block;" @change="justify(2)">
- <el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
+ <el-checkbox-group v-model="checkMore2" style="display:inline-block;"
+ @change="justify(2)">
+ <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="checked3" @change="justifySingle(3)">旋转类</el-checkbox>
- <el-checkbox-group v-model="checkMore3" style="display:inline-block;" @change="justify(3)">
- <el-checkbox v-for="item in checkMoreList" :label="item" :key="item">{{item}}</el-checkbox>
+ <el-checkbox-group v-model="checkMore3" style="display:inline-block;"
+ @change="justify(3)">
+ <el-checkbox v-for="item in checkMoreList" :label="item" :key="item">
+ {{ item }}
+ </el-checkbox>
</el-checkbox-group>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-checkbox v-model="checked4" @change="justifySingle(4)">吐珠类</el-checkbox>
- <el-checkbox-group v-model="checkMore4" style="display:inline-block;" @change="justify(4)">
- <el-checkbox v-for="item in checkList1" :label="item" :key="item">{{item}}</el-checkbox>
+ <el-checkbox-group v-model="checkMore4" style="display:inline-block;"
+ @change="justify(4)">
+ <el-checkbox v-for="item in checkList1" :label="item" :key="item">
+ {{ item }}
+ </el-checkbox>
</el-checkbox-group>
</el-col>
<el-col :span="8">
<el-checkbox v-model="checked5" @change="justifySingle(5)">玩具类</el-checkbox>
- <el-checkbox-group v-model="checkMore5" style="display:inline-block;" @change="justify(5)">
- <el-checkbox v-for="item in checkMoreList" :label="item" :key="item">{{item}}</el-checkbox>
+ <el-checkbox-group v-model="checkMore5" style="display:inline-block;"
+ @change="justify(5)">
+ <el-checkbox v-for="item in checkMoreList" :label="item" :key="item">
+ {{ item }}
+ </el-checkbox>
</el-checkbox-group>
</el-col>
<el-col :span="8">
- <el-checkbox v-model="checked6" @change="justifySingle(6)">组合烟花类</el-checkbox>
- <el-checkbox-group v-model="checkMore6" style="display:inline-block;" @change="justify(6)">
- <el-checkbox v-for="item in checkList2" :label="item" :key="item">{{item}}</el-checkbox>
+ <el-checkbox v-model="checked6" @change="justifySingle(6)">组合烟花类
+ </el-checkbox>
+ <el-checkbox-group v-model="checkMore6" style="display:inline-block;"
+ @change="justify(6)">
+ <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 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>
@@ -587,8 +620,9 @@
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="备注:" >
- <el-input type="textarea" :rows="3" v-model.trim="dataForm.remark" class="carrierLicense_select">
+ <el-form-item label="备注:">
+ <el-input type="textarea" :rows="3" v-model.trim="dataForm.remark"
+ class="carrierLicense_select">
</el-input>
</el-form-item>
</el-col>
@@ -601,13 +635,14 @@
<el-divider></el-divider>
<el-row>
<el-col :span="8">
- <el-form-item label="发证机关:" >
- <el-input v-model.trim="dataForm.issuingunit" :disabled="isSupervision === 'null' ? false :true">
+ <el-form-item label="发证机关:">
+ <el-input v-model.trim="dataForm.issuingunit"
+ :disabled="isSupervision === 'null' ? false :true">
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="发证日期:" prop="issuingdate" >
+ <el-form-item label="发证日期:" prop="issuingdate">
<el-date-picker
:disabled="isSupervision === 'null' ? false :true"
value-format="yyyy-MM-dd"
@@ -619,7 +654,7 @@
</el-row>
<el-row>
<span :span="16">
- <el-form-item label="有效期:" >
+ <el-form-item label="有效期:">
<el-date-picker
:disabled="isSupervision === 'null' ? false :true"
value-format="yyyy-MM-dd"
@@ -641,239 +676,233 @@
</el-row>
</el-form>
- <div align="right" style="margin-top:30px;" v-if="title==='审核' ? false : true">
+ <div align="right" style="margin-top:30px;" v-if="title==='审核' ? false : true">
<el-button @click="licenseInfoVisible = false">取消</el-button>
<el-button type="primary" @click="submit('')">确认</el-button>
</div>
- <div align="right" style="margin-top:30px;" v-if="title==='审核' ?true : false">
+ <div align="right" style="margin-top:30px;" v-if="title==='审核' ?true : false">
<el-button @click="submit('拒绝')">拒绝</el-button>
<el-button type="primary" @click="submit('同意')">同意</el-button>
</div>
-<!-- <select-enterprise ref="selectEnterprise" @getinfo="giveEnterprise"></select-enterprise>-->
+ <!-- <select-enterprise ref="selectEnterprise" @getinfo="giveEnterprise"></select-enterprise>-->
</el-dialog>
</template>
<script>
import selectEnterprise from "./selectEnterprise";
-import {addLicenseInfo,updateLicenseInfo} from "../../../../api/license";
+import {addLicenseInfo, updateLicenseInfo} from "../../../../api/license";
import {getCityListData, getProvinceListData} from "../../../../api/area";
import Cookies from "js-cookie";
-import { dictionaryAllItems } from '../../../../api/dictionary'
+import {dictionaryAllItems} from '../../../../api/dictionary'
import {parseError} from "../../../../utils/messageDialog";
export default {
name: "licenseInfoForm",
- data(){
- return{
- title:'',
- licenseInfoVisible:false,
- ruleForm:{
-
- },
- type:null,
- isSupervision:'',
- roleType:'',
- showSaveArea:false,
- salecompanyname:[],
- economicTypeList:[],
- licensetypeList:[
- {id:1,name:'长期'},
- {id:2,name:'临时'}
+ data() {
+ return {
+ title: '',
+ licenseInfoVisible: false,
+ ruleForm: {},
+ type: null,
+ isSupervision: '',
+ roleType: '',
+ showSaveArea: false,
+ salecompanyname: [],
+ economicTypeList: [],
+ licensetypeList: [
+ {id: 1, name: '长期'},
+ {id: 2, name: '临时'}
],
- dealingtypeList:[
- {id:1,name:'专柜'},
- {id:2,name:'专店'}
+ dealingtypeList: [
+ {id: 1, name: '专柜'},
+ {id: 2, name: '专店'}
],
- validTime:['',''],
- dataForm:{
- id:'',
- type:null,
- name:'',
- mainpersonname:'',
- mainpersonidcardnum:'',
- mainpersontel:'',
- safetypersonname:'',
- safetypersonidcardnum:'',
- safetypersontel:'',
- dealingrange:[],
- licensetype:'',
- dealingtype:'',
- reservebox:'',
- reservekg:'',
- dealingarea:'',
- savearea:'',
- province:'',
- city:'',
- district:'',
- address:'',
- storageprovince:'',
- storagecity:'',
- storagedistrict:'',
- storageaddress:'',
- issuingunit:'',
- issuingdate:'',
- effectdate:'',
- noeffectdate:'',
- economictype:'',
- licenseStorage:[
-
- ],
- remark:'',
+ validTime: ['', ''],
+ dataForm: {
+ id: '',
+ type: null,
+ name: '',
+ mainpersonname: '',
+ mainpersonidcardnum: '',
+ mainpersontel: '',
+ safetypersonname: '',
+ safetypersonidcardnum: '',
+ safetypersontel: '',
+ dealingrange: [],
+ licensetype: '',
+ dealingtype: '',
+ reservebox: '',
+ reservekg: '',
+ dealingarea: '',
+ savearea: '',
+ province: '',
+ city: '',
+ district: '',
+ address: '',
+ storageprovince: '',
+ storagecity: '',
+ storagedistrict: '',
+ storageaddress: '',
+ issuingunit: '',
+ issuingdate: '',
+ effectdate: '',
+ noeffectdate: '',
+ economictype: '',
+ licenseStorage: [],
+ remark: '',
},
- areaListQuery:{
-
+ areaListQuery: {},
+ provinceList: [],
+ cityList: [],
+ districtList: [],
+ checked1: false,
+ checked2: false,
+ checked3: false,
+ checked4: false,
+ checked5: false,
+ checked6: false,
+ checked7: false,
+ checkMore1: [],
+ checkMore2: [],
+ checkMore3: [],
+ checkMore4: [],
+ checkMore5: [],
+ checkMore6: [],
+ checkMore7: [],
+ checkList1: ['C级', 'D级'],
+ checkList2: ['C级', 'D级'],
+ checkMoreList: ['C级', 'D级'],
+ storage1: {
+ id: null,
+ area: null,
+ firststoragenum: null,
+ thirdstoragenum: null,
+ firststoragearea: null,
+ thirdstoragearea: null,
+ firstpowder: null,
+ thirdpowder: null,
},
- provinceList:[],
- cityList:[],
- districtList:[],
- checked1:false,
- checked2:false,
- checked3:false,
- checked4:false,
- checked5:false,
- checked6:false,
- checked7:false,
- checkMore1:[],
- checkMore2:[],
- checkMore3:[],
- checkMore4:[],
- checkMore5:[],
- checkMore6:[],
- checkMore7:[],
- checkList1:['C级','D级'],
- checkList2:['C级','D级'],
- checkMoreList:['C级','D级'],
- storage1:{
- id:null,
- area:null,
- firststoragenum:null,
- thirdstoragenum:null,
- firststoragearea:null,
- thirdstoragearea:null,
- firstpowder:null,
- thirdpowder:null,
+ storage2: {
+ id: null,
+ area: null,
+ firststoragenum: null,
+ thirdstoragenum: null,
+ firststoragearea: null,
+ thirdstoragearea: null,
+ firstpowder: null,
+ thirdpowder: null,
},
- storage2:{
- id:null,
- area:null,
- firststoragenum:null,
- thirdstoragenum:null,
- firststoragearea:null,
- thirdstoragearea:null,
- firstpowder:null,
- thirdpowder:null,
+ storage3: {
+ id: null,
+ area: null,
+ firststoragenum: null,
+ thirdstoragenum: null,
+ firststoragearea: null,
+ thirdstoragearea: null,
+ firstpowder: null,
+ thirdpowder: null,
},
- storage3:{
- id:null,
- area:null,
- firststoragenum:null,
- thirdstoragenum:null,
- firststoragearea:null,
- thirdstoragearea:null,
- firstpowder:null,
- thirdpowder:null,
- },
- id:null,
- area:null,
- firststoragenum:null,
- thirdstoragenum:null,
- firststoragearea:null,
- thirdstoragearea:null,
- firstpowder:null,
- thirdpowder:null,
+ id: null,
+ area: null,
+ firststoragenum: null,
+ thirdstoragenum: null,
+ firststoragearea: null,
+ thirdstoragearea: null,
+ firstpowder: null,
+ thirdpowder: null,
}
},
- components:{
+ components: {
selectEnterprise
},
- computed:{
- storagenum:function (){
+ computed: {
+ storagenum: function () {
return Number(this.firststoragenum) + Number(this.thirdstoragenum)
},
- storagearea:function(){
+ storagearea: function () {
return Number(this.firststoragearea) + Number(this.thirdstoragearea)
},
- powder:function (){
+ powder: function () {
return Number(this.firstpowder) + Number(this.thirdpowder)
},
- storagenum1:function (){
+ storagenum1: function () {
return Number(this.storage1.firststoragenum) + Number(this.storage1.thirdstoragenum)
},
- storagearea1:function(){
+ storagearea1: function () {
console.log(this.storage1);
return Number(this.storage1.firststoragearea) + Number(this.storage1.thirdstoragearea)
},
- powder1:function (){
+ powder1: function () {
console.log(this.storage1);
return Number(this.storage1.firstpowder) + Number(this.storage1.thirdpowder)
},
- storagenum2:function (){
+ storagenum2: function () {
return Number(this.storage2.firststoragenum) + Number(this.storage2.thirdstoragenum)
},
- storagearea2:function(){
+ storagearea2: function () {
return Number(this.storage2.firststoragearea) + Number(this.storage2.thirdstoragearea)
},
- powder2:function (){
+ powder2: function () {
return Number(this.storage2.firstpowder) + Number(this.storage2.thirdpowder)
},
- storagenum3:function (){
+ storagenum3: function () {
return Number(this.storage3.firststoragenum) + Number(this.storage3.thirdstoragenum)
},
- storagearea3:function(){
+ storagearea3: function () {
return Number(this.storage3.firststoragearea) + Number(this.storage3.thirdstoragearea)
},
- powder3:function (){
+ powder3: function () {
return Number(this.storage3.firstpowder) + Number(this.storage3.thirdpowder)
}
},
- created(){
- this.getProvince();
- this.getEconomicTypeList()
+ created() {
+ this.getProvince();
+ this.getEconomicTypeList()
},
- methods:{
- showLicenseForm(title,value,isSupervision,roleType){
+ methods: {
+ showLicenseForm(title, value, isSupervision, roleType) {
this.isSupervision = isSupervision
this.roleType = roleType
this.licenseInfoVisible = true
this.title = title
- if(title === '新增'){
+ if (title === '新增') {
this.dataForm = {
- id:'',
- type:null,
- name:Cookies.get("company"),
- mainpersonname:'',
- mainpersonidcardnum:'',
- mainpersontel:'',
- safetypersonname:'',
- safetypersonidcardnum:'',
- safetypersontel:'',
- dealingrange:[],
- licensetype:'',
- dealingtype:'',
- reservebox:'',
- reservekg:'',
- dealingarea:'',
- savearea:'',
- province:'',
- city:'',
- district:'',
- address:'',
- storageprovince:'',
- storagecity:'',
- storagedistrict:'',
- storageaddress:'',
- issuingunit:'',
- issuingdate:'',
- effectdate:'',
- noeffectdate:'',
- licenseStorage:[],
- remark:'',
+ id: '',
+ type: null,
+ name: Cookies.get("company"),
+ mainpersonname: '',
+ mainpersonidcardnum: '',
+ mainpersontel: '',
+ safetypersonname: '',
+ safetypersonidcardnum: '',
+ safetypersontel: '',
+ dealingrange: [],
+ licensetype: '',
+ dealingtype: '',
+ reservebox: '',
+ reservekg: '',
+ dealingarea: '',
+ savearea: '',
+ province: '',
+ city: '',
+ district: '',
+ address: '',
+ storageprovince: '',
+ storagecity: '',
+ storagedistrict: '',
+ storageaddress: '',
+ issuingunit: '',
+ issuingdate: '',
+ effectdate: '',
+ noeffectdate: '',
+ licenseStorage: [],
+ remark: '',
}
- if(roleType === '烟花爆竹生产'){
+ if (roleType === '烟花爆竹生产') {
this.dataForm.type = 1
- }else if(roleType === '烟花爆竹批发经营'){
+ } else if (roleType === '烟花爆竹批发经营') {
this.dataForm.type = 2
- }else{
+ } else {
this.dataForm.type = 3
}
this.checked1 = false
@@ -883,41 +912,41 @@
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
- this.thirdstoragenum=null
- this.firststoragearea=null
- this.thirdstoragearea=null
- this.firstpowder=null
- this.thirdpowder=null
- }else{
+ this.checkMore1 = []
+ this.checkMore2 = []
+ this.checkMore3 = []
+ this.checkMore4 = []
+ this.checkMore5 = []
+ this.checkMore6 = []
+ this.checkMore7 = []
+ this.id = null
+ this.area = null
+ this.firststoragenum = null
+ this.thirdstoragenum = null
+ this.firststoragearea = null
+ this.thirdstoragearea = null
+ this.firstpowder = null
+ this.thirdpowder = null
+ } else {
this.dataForm = value
- if(roleType === '烟花爆竹批发经营' || (this.dataForm.type === 2 && roleType === 'null')){
+ if (roleType === '烟花爆竹批发经营' || (this.dataForm.type === 2 && roleType === 'null')) {
this.type = 2
- if(value.licenseStorage.length > 10){
+ if (value.licenseStorage.length > 10) {
value.licenseStorage = JSON.parse(value.licenseStorage)
- value.dealingrange =JSON.parse(value.dealingrange)
- }else{
+ value.dealingrange = JSON.parse(value.dealingrange)
+ } else {
}
let licenseStorage = this.dataForm.licenseStorage
let dealingrange = this.dataForm.dealingrange
this.id = licenseStorage[0].id
this.area = licenseStorage[0].area
- this.firststoragenum=licenseStorage[0].firststoragenum
- this.thirdstoragenum=licenseStorage[0].thirdstoragenum
- this.firststoragearea=licenseStorage[0].firststoragearea
- this.thirdstoragearea=licenseStorage[0].thirdstoragearea
- this.firstpowder=licenseStorage[0].firstpowder
- this.thirdpowder=licenseStorage[0].thirdpowder
+ this.firststoragenum = licenseStorage[0].firststoragenum
+ this.thirdstoragenum = licenseStorage[0].thirdstoragenum
+ this.firststoragearea = licenseStorage[0].firststoragearea
+ this.thirdstoragearea = licenseStorage[0].thirdstoragearea
+ this.firstpowder = licenseStorage[0].firstpowder
+ this.thirdpowder = licenseStorage[0].thirdpowder
this.checked1 = dealingrange[0].checked1
this.checked2 = dealingrange[1].checked2
this.checked3 = dealingrange[2].checked3
@@ -925,18 +954,18 @@
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.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){
- value.dealingrange =JSON.parse(value.dealingrange)
- }else{
+ if (value.dealingrange.length > 10) {
+ value.dealingrange = JSON.parse(value.dealingrange)
+ } else {
}
let dealingrange = this.dataForm.dealingrange
@@ -947,110 +976,171 @@
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
+ 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){
- if(this.dataForm.type === 1){
- let storageOne = Object.assign(this.storage1,{storagenum1:this.storagenum1,storagearea1:this.storagearea1,powder1:this.powder1})
- let storageTwo = Object.assign(this.storage1,{storagenum2:this.storagenum2,storagearea2:this.storagearea2,powder2:this.powder2})
- let storageThree = Object.assign(this.storage1,{storagenum3:this.storagenum3,storagearea3:this.storagearea3,powder3:this.powder3})
+ async submit(value) {
+ if (this.dataForm.type === 1) {
+ let storageOne = Object.assign(this.storage1, {
+ storagenum1: this.storagenum1,
+ storagearea1: this.storagearea1,
+ powder1: this.powder1
+ })
+ let storageTwo = Object.assign(this.storage1, {
+ storagenum2: this.storagenum2,
+ storagearea2: this.storagearea2,
+ powder2: this.powder2
+ })
+ let storageThree = Object.assign(this.storage1, {
+ storagenum3: this.storagenum3,
+ storagearea3: this.storagearea3,
+ powder3: this.powder3
+ })
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},{checked7:this.checked7,checkMore7:this.checkMore7}])
+ 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},{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},{checked7:this.checked7,checkMore7:this.checkMore7}])
+ } 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}, {
+ 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}, {
+ checked7: this.checked7,
+ checkMore7: this.checkMore7
+ }])
this.dataForm.licenseStorage = JSON.stringify([])
}
- let fullAddress = (this.dataForm.province ==='新疆维吾尔自治区'? '新疆': this.dataForm.province)
+ let fullAddress = (this.dataForm.province === '新疆维吾尔自治区' ? '新疆' : this.dataForm.province)
+ this.dataForm.city + this.dataForm.district + this.dataForm.address;
- let fullStorageAddress = (this.dataForm.storageprovince ==='新疆维吾尔自治区'? '新疆': this.dataForm.storageprovince)
+ let fullStorageAddress = (this.dataForm.storageprovince === '新疆维吾尔自治区' ? '新疆' : this.dataForm.storageprovince)
+ this.dataForm.storagecity + this.dataForm.storagedistrict + this.dataForm.storageaddress;
- if (this.getByteLen(fullAddress) > 390 || this.getByteLen(fullStorageAddress) > 390){
+ if (this.getByteLen(fullAddress) > 390 || this.getByteLen(fullStorageAddress) > 390) {
parseError({error: '注册地址或仓储地址的省市区详细地址总和不能超过200个字，请删减', vm: this})
} else {
- if(this.title === "新增"){
+ if (this.title === "新增") {
let res = await addLicenseInfo(this.dataForm)
- if(res.data.code === '200'){
+ if (res.data.code === '200') {
this.licenseInfoVisible = false
this.$emit('getinfo')
this.$notify({
- title:'成功',
- duration:2000,
- message:'新增成功',
- type:'success'
+ title: '成功',
+ duration: 2000,
+ message: '新增成功',
+ type: 'success'
})
- }else{
+ } else {
this.$message({
- type:'warning',
- message:res.data.message
+ type: 'warning',
+ message: res.data.message
})
}
- }else if(this.title === '修改'){
+ } else if (this.title === '修改') {
let res = await updateLicenseInfo(this.dataForm)
- if(res.data.code === '200'){
+ if (res.data.code === '200') {
this.licenseInfoVisible = false
this.$emit('getinfo')
this.$notify({
- title:'成功',
- duration:2000,
- message:'修改成功',
- type:'success'
+ title: '成功',
+ duration: 2000,
+ message: '修改成功',
+ type: 'success'
})
- }else{
+ } else {
this.$message({
- type:'warning',
- message:res.data.message
+ type: 'warning',
+ message: res.data.message
})
}
- }else{
- if(value === '同意'){
+ } else {
+ if (value === '同意') {
this.dataForm.reviewstatus = 2
let res = await updateLicenseInfo(this.dataForm)
- if(res.data.code === '200'){
+ if (res.data.code === '200') {
this.licenseInfoVisible = false
this.$emit('getinfo')
this.$notify({
- title:'成功',
- duration:2000,
- message:'修改成功',
- type:'success'
+ title: '成功',
+ duration: 2000,
+ message: '修改成功',
+ type: 'success'
})
- }else{
+ } else {
this.$message({
- type:'warning',
- message:res.data.message
+ type: 'warning',
+ message: res.data.message
})
}
- }else{
+ } else {
this.dataForm.reviewstatus = 3
let res = await updateLicenseInfo(this.dataForm)
- if(res.data.code === '200'){
+ if (res.data.code === '200') {
this.licenseInfoVisible = false
this.$emit('getinfo')
this.$notify({
- title:'成功',
- duration:2000,
- message:'修改成功',
- type:'success'
+ title: '成功',
+ duration: 2000,
+ message: '修改成功',
+ type: 'success'
})
- }else{
+ } else {
this.$message({
- type:'warning',
- message:res.data.message
+ type: 'warning',
+ message: res.data.message
})
}
}
@@ -1059,93 +1149,93 @@
},
- justify(value){
- if(value === 1){
- if(this.checkMore1.length !== 0){
+ justify(value) {
+ if (value === 1) {
+ if (this.checkMore1.length !== 0) {
this.checked1 = true
- }else{
+ } else {
this.checked1 = false
}
- }else if(value===2){
- if(this.checkMore2.length !== 0){
+ } else if (value === 2) {
+ if (this.checkMore2.length !== 0) {
this.checked2 = true
- }else{
- this.checked2= false
+ } else {
+ this.checked2 = false
}
- }else if(value ===3){
- if(this.checkMore3.length !== 0){
+ } else if (value === 3) {
+ if (this.checkMore3.length !== 0) {
this.checked3 = true
- }else{
+ } else {
this.checked3 = false
}
- }else if(value === 4){
- if(this.checkMore4.length !== 0){
+ } else if (value === 4) {
+ if (this.checkMore4.length !== 0) {
this.checked4 = true
- }else{
+ } else {
this.checked4 = false
}
- }else if(value === 5){
- if(this.checkMore5.length !== 0){
+ } else if (value === 5) {
+ if (this.checkMore5.length !== 0) {
this.checked5 = true
- }else{
+ } else {
this.checked5 = false
}
- }else if(value === 6){
- if(this.checkMore6.length !== 0){
+ } else if (value === 6) {
+ if (this.checkMore6.length !== 0) {
this.checked6 = true
- }else{
+ } else {
this.checked6 = false
}
- }else{
- if(this.checkMore7.length !== 0){
+ } else {
+ if (this.checkMore7.length !== 0) {
this.checked7 = true
- }else{
+ } else {
this.checked7 = false
}
}
},
- justifySingle(value){
- if(value === 1){
- if(this.checked1 === true){
- this.checkMore1 = ['C级','D级']
- }else{
+ justifySingle(value) {
+ if (value === 1) {
+ if (this.checked1 === true) {
+ this.checkMore1 = ['C级', 'D级']
+ } else {
this.checkMore1 = []
}
- }else if(value ===2){
- if(this.checked2 === true){
- this.checkMore2 = ['C级','D级']
- }else{
+ } else if (value === 2) {
+ if (this.checked2 === true) {
+ this.checkMore2 = ['C级', 'D级']
+ } else {
this.checkMore2 = []
}
- }else if(value=== 3){
- if(this.checked3 === true){
- this.checkMore3 = ['C级','D级']
- }else{
+ } else if (value === 3) {
+ if (this.checked3 === true) {
+ this.checkMore3 = ['C级', 'D级']
+ } else {
this.checkMore3 = []
}
- }else if(value === 4){
- if(this.checked4 === true){
- this.checkMore4 = ['C级','D级']
- }else{
+ } else if (value === 4) {
+ if (this.checked4 === true) {
+ this.checkMore4 = ['C级', 'D级']
+ } else {
this.checkMore4 = []
}
- }else if(value ===5){
- if(this.checked5 === true){
- this.checkMore5 = ['C级','D级']
- }else{
+ } else if (value === 5) {
+ if (this.checked5 === true) {
+ this.checkMore5 = ['C级', 'D级']
+ } else {
this.checkMore5 = []
}
- }else if(value === 6){
- if(this.checked6 === true){
- this.checkMore6 = ['C级','D级']
- }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{
+ } else {
+ if (this.checked7 === true) {
+ this.checkMore7 = ['C级', 'D级']
+ } else {
this.checkMore7 = []
}
}
@@ -1171,14 +1261,14 @@
},//获取国民经济类型列表
- async getProvince(){
+ async getProvince() {
let res = await getProvinceListData()
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.provinceList = res.data.result.provinceList
}
},
- async changeArea(value){
- if(value === 'province'){
+ async changeArea(value) {
+ if (value === 'province') {
this.dataForm.city = ''
this.dataForm.district = ''
this.areaListQuery = {
@@ -1187,10 +1277,10 @@
parentname: this.dataForm.province,
}
let res = await getCityListData(this.areaListQuery)
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.cityList = res.data.result
}
- }else if(value === 'city'){
+ } else if (value === 'city') {
this.dataForm.district = ''
this.areaListQuery = {
type: 3,
@@ -1198,23 +1288,23 @@
parentname: this.dataForm.city,
}
let res = await getCityListData(this.areaListQuery)
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.districtList = res.data.result
}
- }else if(value === 'district'){
+ } else if (value === 'district') {
this.areaListQuery = {
type: 4,
parenttype: 3,
parentname: this.dataForm.district,
}
let res = await getCityListData(this.areaListQuery)
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.streetList = res.data.result
}
}
},
- async changeStorageArea(value){
- if(value === 'province'){
+ async changeStorageArea(value) {
+ if (value === 'province') {
this.dataForm.storagecity = ''
this.dataForm.storagedistrict = ''
this.areaListQuery = {
@@ -1223,10 +1313,10 @@
parentname: this.dataForm.storageprovince,
}
let res = await getCityListData(this.areaListQuery)
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.cityList = res.data.result
}
- }else if(value === 'city'){
+ } else if (value === 'city') {
this.dataForm.storagedistrict = ''
this.areaListQuery = {
type: 3,
@@ -1234,41 +1324,41 @@
parentname: this.dataForm.storagecity,
}
let res = await getCityListData(this.areaListQuery)
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.districtList = res.data.result
}
- }else if(value === 'district'){
+ } else if (value === 'district') {
this.areaListQuery = {
type: 4,
parenttype: 3,
parentname: this.dataForm.storagedistrict,
}
let res = await getCityListData(this.areaListQuery)
- if(res.data.code === "200"){
+ if (res.data.code === "200") {
this.streetList = res.data.result
}
}
},
- changeDealing(){
- if(this.dataForm.dealingtype === 1){
+ changeDealing() {
+ if (this.dataForm.dealingtype === 1) {
this.showSaveArea = true
- }else{
+ } else {
this.showSaveArea = false
}
},
- giveData(){
- if(this.validTime ===null){
+ giveData() {
+ if (this.validTime === null) {
this.dataForm.effectdate = ""
this.dataForm.noeffectdate = ""
- }else{
+ } else {
this.dataForm.effectdate = this.validTime[0]
this.dataForm.noeffectdate = this.validTime[1]
}
},
- showEnterprise(){
+ showEnterprise() {
this.$refs.selectEnterprise.showEnterPrise(this.safetySuperVisionList)
},
- giveEnterprise(val){
+ giveEnterprise(val) {
this.dataForm.name = val
},
getByteLen(val) {
@@ -1277,8 +1367,7 @@
let a = val.charAt(i);
if (a.match(/[^\x00-\xff]/ig) != null) {
len += 2;
- }
- else {
+ } else {
len += 1;
}
}
@@ -1289,18 +1378,20 @@
</script>
<style scoped>
-.enterpriseBasicInformation_title{
+.enterpriseBasicInformation_title {
font-weight: bolder;
font-size: large;
text-align: center;
margin-top: 10px;
}
-.enterpriseBasicInformation_image{
- width:70%;
- height:70%;
- margin-left:10px;
+
+.enterpriseBasicInformation_image {
+ width: 70%;
+ height: 70%;
+ margin-left: 10px;
}
-.el-input-number{
+
+.el-input-number {
width: 100%;
}
</style>
diff --git a/src/views/license/licenseInfo/index.vue b/src/views/license/licenseInfo/index.vue
index ca8024b..c69fbb2 100644
--- a/src/views/license/licenseInfo/index.vue
+++ b/src/views/license/licenseInfo/index.vue
@@ -927,7 +927,11 @@
this.district = val.district
this.address = val.address
if (val.type === 2) {
- this.area = JSON.parse(val.licenseStorage)[0].area
+ if(JSON.parse(val.licenseStorage)[0] && JSON.parse(val.licenseStorage)[0].area){
+ this.area = JSON.parse(val.licenseStorage)[0].area
+ }else{
+ this.area = 0
+ }
this.storagearea = JSON.parse(val.licenseStorage)[0].storagearea
this.powder = JSON.parse(val.licenseStorage)[0].powder
} else if (val.type === 3 || val.type === 4) {
@@ -981,7 +985,7 @@
},
//打印正本
giveData(val) {
- console.log(val)
+ console.log(JSON.parse(val.licenseStorage)[0],'>>>>')
this.code = val.code
this.name = val.name
this.mainpersonname = val.mainpersonname
@@ -990,9 +994,17 @@
this.district = val.district
this.address = val.address
if (val.type === 2) {
- this.area = JSON.parse(val.licenseStorage)[0].area
- this.storagearea = JSON.parse(val.licenseStorage)[0].storagearea
- this.powder = JSON.parse(val.licenseStorage)[0].powder
+ if(JSON.parse(val.licenseStorage)[0]){
+ this.area = JSON.parse(val.licenseStorage)[0].area
+ this.storagearea = JSON.parse(val.licenseStorage)[0].storagearea
+ this.powder = JSON.parse(val.licenseStorage)[0].powder
+ }else{
+ this.area = 0
+ this.storagearea = 0
+ this.powder = 0
+ }
+ // this.storagearea = JSON.parse(val.licenseStorage)[0].storagearea
+ // this.powder = JSON.parse(val.licenseStorage)[0].powder
} else if (val.type === 3 || val.type === 4) {
this.area = val.dealingarea
this.powder = val.reservekg
diff --git a/src/views/usermng/product.vue b/src/views/usermng/product.vue
index 6634af6..c200030 100644
--- a/src/views/usermng/product.vue
+++ b/src/views/usermng/product.vue
@@ -104,7 +104,7 @@
<span>{{ scope.row.specification }}</span>
</template>
</el-table-column>
- <el-table-column label="箱含药量" prop="explosiveContent" align="center" sortable="custom">
+ <el-table-column label="单个产品含药量" prop="explosiveContent" align="center" sortable="custom">
<template slot-scope="scope">
<span>{{ scope.row.explosiveContent }}</span>
</template>
@@ -124,7 +124,7 @@
<span>{{ scope.row.level }}</span>
</template>
</el-table-column>
- <el-table-column label="单个产品含量" prop="boxNumber" align="center" sortable="custom">
+ <el-table-column label="箱含量" prop="boxNumber" align="center" sortable="custom">
<template slot-scope="scope">
<span>{{ scope.row.boxNumber }}</span>
</template>
@@ -215,13 +215,13 @@
<br>
<span v-show="dialogStatus !== 'create'" style="font-size: 12px;color: red">(如单挂鞭炮2000发，则填2000)</span>
</el-form-item>
- <el-form-item :label="dialogStatus === 'createNew' ? '最小单位含药量:':'含药量:'" prop="explosiveContent">
+ <el-form-item :label="dialogStatus === 'createNew' ? '最小单位含药量:':'单个产品含药量:'" prop="explosiveContent">
<el-input-number v-model.number="dataForm.explosiveContent" :controls="false" :disabled="dialogStatus==='editor'"/>
<span> g</span>
<br>
- <span v-show="dialogStatus !== 'create'" style="font-size: 12px;color: red">(箱含药量 = 最小单位含药量×规格×箱含量，如单发鞭炮含药量为0.5g，则填写0.5)</span>
+ <span v-show="dialogStatus !== 'create'" style="font-size: 12px;color: red">(单个产品含药量 = 最小单位含药量×规格，如 最小单位含药量为0.5g，规格为100，则单个产品含药量为0.5*100=50g)</span>
</el-form-item>
- <el-form-item label="单个产品含量:" prop="boxNumber">
+ <el-form-item label="箱含量:" prop="boxNumber">
<el-input-number v-model.number="dataForm.boxNumber" :controls="false" :disabled="dialogStatus==='editor'"/>
</el-form-item>
<el-form-item label="包装方式:" prop="packing">
--
Gitblit v1.9.2