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 |   91 ++++++++++++++++++++++++++-------------------
 1 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/src/views/license/licenseInfo/index.vue b/src/views/license/licenseInfo/index.vue
index f05f42d..b1dabeb 100644
--- a/src/views/license/licenseInfo/index.vue
+++ b/src/views/license/licenseInfo/index.vue
@@ -186,18 +186,18 @@
                 <el-row style="height:75px;margin-left:140px;margin-top:30px;">
                     <el-col :span="3" style="font-size: 27px;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="11" style="font-size: 27px">
                         <span>{{name}}</span>
                     </el-col>
                     <el-col :span="3" style="font-size: 27px;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="5" style="font-size: 27px">
                         <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-col :span="2" style="font-size: 27px;">
                         <span></span>
@@ -206,20 +206,20 @@
                 <el-row style="height:75px;margin-left:140px;">
                     <el-col :span="3" style="font-size: 27px;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="11" style="font-size: 27px">
                         <span
-                            v-if="type === 2">{{province === "新疆维吾尔自治区"? "新疆":province}}{{city}}{{district}}{{address}}</span>
-                        <span v-if="type === 3">{{mainpersonname}}</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">
                         <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="5" style="font-size: 27px">
                         <span v-if="type === 2">{{area}}㎡</span>
-                        <span v-if="type === 3">{{dealingtype}}</span>
+                        <span v-if="type === 3 || type === 4">{{dealingtype}}</span>
                     </el-col>
                     <el-col :span="2" style="font-size: 27px;">
                         <span></span>
@@ -228,21 +228,21 @@
                 <el-row style="height:75px;margin-left:140px;">
                     <el-col :span="3" style="font-size: 27px;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="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">{{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>
-                        <span v-if="type === 3">经营面积</span>
+                        <span v-if="type === 3 || type === 4">经营面积</span>
                     </el-col>
                     <el-col :span="5" style="font-size: 27px">
                         <span v-if="type === 2">{{storagearea}}㎡</span>
-                        <span v-if="type === 3">{{area}}㎡</span>
+                        <span v-if="type === 3 || type === 4">{{area}}㎡</span>
                     </el-col>
                     <el-col :span="2" style="font-size: 27px;">
                         <span></span>
@@ -257,7 +257,7 @@
                     </el-col>
                     <el-col :span="3" style="font-size: 27px;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="5" style="font-size: 27px;">
                         <span>{{powder}}kg</span>
@@ -324,6 +324,9 @@
                 </el-row>
             </div>
         </div>
+
+
+
         <div v-show="false">
             <div id="printMe2">
                 <el-row>
@@ -344,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>
@@ -356,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">
@@ -413,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;">
@@ -505,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>
@@ -529,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>
@@ -618,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">
@@ -628,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>
@@ -924,18 +927,22 @@
                 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) {
+                } 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) {
+                    if (val.dealingtype === 2 || val.dealingtype === 4) {
                         this.dealingtype = '专店'
                     } else {
                         this.dealingtype = '专柜'
@@ -986,18 +993,26 @@
                 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
-                } else if (val.type === 3) {
+                    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 {
-                        this.licensetype = '长期'
+                    if (val.licensetype === 1) {
+                        this.licensetype = '长期零售'
+                    } else{
+                        this.licensetype = '短期零售'
                     }
-                    if (val.dealingtype === 2) {
+                    if (val.dealingtype === 2 || val.dealingtype === 4) {
                         this.dealingtype = '专店'
                     } else {
                         this.dealingtype = '专柜'

--
Gitblit v1.9.2