From b69959f530c5c51daa19333879ddbf91675e830f Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: Thu, 12 Mar 2026 15:45:07 +0800
Subject: [PATCH] 修改
---
src/views/license/licenseInfo/index.vue | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/views/license/licenseInfo/index.vue b/src/views/license/licenseInfo/index.vue
index 35b6339..b1dabeb 100644
--- a/src/views/license/licenseInfo/index.vue
+++ b/src/views/license/licenseInfo/index.vue
@@ -139,7 +139,7 @@
v-if="isSupervision==='null'?false:true">删除</el-button>
<br><el-button type="text" v-print="printObj1" @click="giveData(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印正本（新）</el-button>
- <el-button type="text" v-print="printObj1" @click="giveDetail(scope.row)"
+ <el-button type="text" v-print="printObj2" @click="giveDetail(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印副本（新）</el-button>
<el-button type="text" v-print="printObj3" @click="giveData(scope.row)"
v-if="isSupervision==='null' && scope.row.reviewstatus === 2?true:false">打印正本（旧）</el-button>
@@ -210,7 +210,7 @@
</el-col>
<el-col :span="11" style="font-size: 27px">
<span
- v-if="type === 2">{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
+ v-if="type === 2">{{province === "东台市"? "东台市":province}}{{city}}{{district}}{{address}}</span>
<span v-if="type === 3 || type === 4">{{mainpersonname}}</span>
</el-col>
<el-col :span="3" style="font-size: 27px;font-weight: bold">
@@ -232,9 +232,9 @@
</el-col>
<el-col :span="11" style="font-size: 27px">
<span
- v-if="type === 2">{{storageprovince === "新疆维吾尔自治区"? "新疆":storageprovince}}{{storagecity}}{{storagedistrict}}{{storageaddress}}</span>
+ v-if="type === 2">{{storageprovince === "东台市"? "东台市":storageprovince}}{{storagecity}}{{storagedistrict}}{{storageaddress}}</span>
<span
- v-if="type === 3 || type === 4">{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
+ v-if="type === 3 || type === 4">{{province === "东台市"? "东台市":province}}{{city}}{{district}}{{address}}</span>
</el-col>
<el-col :span="3" style="font-size: 27px;font-weight: bold">
<span v-if="type === 2">库房面积</span>
@@ -347,7 +347,7 @@
</el-col>
<el-col :span="18">
<span
- v-if="type === 2">{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
+ v-if="type === 2">{{province === "东台市"? "东台市":province}}{{city}}{{district}}{{address}}</span>
<span v-if="type === 3">{{mainpersonname}}</span>
</el-col>
</el-row>
@@ -359,9 +359,9 @@
</el-col>
<el-col :span="18">
<span
- v-if="type === 2">{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{storagedistrict}}{{storageaddress}}</span>
+ v-if="type === 2">{{province === "东台市"? "东台市":province}}{{city}}{{storagedistrict}}{{storageaddress}}</span>
<span
- v-if="type === 3">{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
+ v-if="type === 3">{{province === "东台市"? "东台市":province}}{{city}}{{district}}{{address}}</span>
</el-col>
</el-row>
<el-row style="height: 60px;margin-top: 4px">
@@ -416,11 +416,11 @@
<el-row style="margin-top: 92px;padding-left: 120px">
<el-col :span="4" style="font-weight: bold;">
<span v-if="type === 2">主要负责人</span>
- <span v-if="type === 3">许可类型</span>
+ <span v-if="type === 3 || type === 4">许可类型</span>
</el-col>
<el-col :span="8">
<span v-if="type === 2">{{mainpersonname}}</span>
- <span v-if="type === 3">{{licensetype}}</span>
+ <span v-if="type === 3 || type === 4">{{licensetype}}</span>
</el-col>
</el-row>
<el-row style="margin-top: 48px;margin-left: 120px;">
@@ -508,7 +508,7 @@
</el-row>
<el-row style="height:80px;margin-left:470px;">
<el-col :span="13" style="font-size: 22px;height: 90px;padding-right: 200px;">
- <span>{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
+ <span>{{province === "东台市"? "东台市":province}}{{city}}{{district}}{{address}}</span>
</el-col>
<!--<el-col :span="8" style="font-size: 27px">
<span>{{area}}㎡</span>
@@ -532,7 +532,7 @@
<span>（{{reservebox}}箱）</span>
</el-col>
<el-col :span="8" style="font-size: 22px;padding-left: 50px;height: 80px">
- <span>{{storageprovince === "新疆维吾尔自治区"? "新疆":storageprovince}}{{storagecity}}{{storagedistrict}}{{storageaddress}}</span><br>
+ <span>{{storageprovince === "东台市"? "东台市":storageprovince}}{{storagecity}}{{storagedistrict}}{{storageaddress}}</span><br>
<span>库区面积{{area}}㎡</span>；
<span>库房面积{{storagearea}}㎡</span>
</el-col>
@@ -621,7 +621,7 @@
</el-row>
<el-row style="margin-top: 50px;margin-left: 75px;height: 35px">
<el-col :span="8">
- <span>{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
+ <span>{{province === "东台市"? "东台市":province}}{{city}}{{district}}{{address}}</span>
</el-col>
</el-row>
<el-row style="margin-top: 22px;margin-left: 75px">
@@ -631,7 +631,7 @@
</el-row>
<el-row style="margin-top: 15px;margin-left: 75px;height: 35px">
<el-col :span="8">
- <span>{{storageprovince === "新疆维吾尔自治区"? "新疆":storageprovince}}{{storagecity}}{{storagedistrict}}{{storageaddress}}</span><br>
+ <span>{{storageprovince === "东台市"? "东台市":storageprovince}}{{storagecity}}{{storagedistrict}}{{storageaddress}}</span><br>
<span>库区面积{{area}}㎡</span>；
<span>库房面积{{storagearea}}㎡</span>
</el-col>
@@ -927,16 +927,20 @@
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) {
this.area = val.dealingarea
this.powder = val.reservekg
- if (val.licensetype === 2) {
- this.licensetype = '临时零售'
- } else {
+ if (val.licensetype === 1) {
this.licensetype = '长期零售'
+ } else{
+ this.licensetype = '短期零售'
}
if (val.dealingtype === 2 || val.dealingtype === 4) {
this.dealingtype = '专店'
@@ -981,7 +985,6 @@
},
//打印正本
giveData(val) {
- console.log(val)
this.code = val.code
this.name = val.name
this.mainpersonname = val.mainpersonname
@@ -990,18 +993,24 @@
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
- if (val.licensetype === 2) {
- this.licensetype = '临时'
- } else if(val.licensetype === 3){
- this.licensetype = '长期'
- }else{
- this.licensetype = '短期'
+ if (val.licensetype === 1) {
+ this.licensetype = '长期零售'
+ } else{
+ this.licensetype = '短期零售'
}
if (val.dealingtype === 2 || val.dealingtype === 4) {
this.dealingtype = '专店'
--
Gitblit v1.9.2