From 03f0e2a3220106ec2a9dd8f53d3ef5ab824c3ae7 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 10 一月 2025 09:47:02 +0800
Subject: [PATCH] 添加OCR

---
 src/views/license/licenseInfo/index.vue |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/license/licenseInfo/index.vue b/src/views/license/licenseInfo/index.vue
index 37ebacd..c69fbb2 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>
@@ -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;">
@@ -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,16 +994,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 === 1) {
-                        this.licensetype = '长期'
+                        this.licensetype = '长期零售'
                     } else{
-                        this.licensetype = '短期'
+                        this.licensetype = '短期零售'
                     }
                     if (val.dealingtype === 2 || val.dealingtype === 4) {
                         this.dealingtype = '专店'

--
Gitblit v1.9.2