From d641c38044a445fbac5875e4ffd821f9f8e23ece Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Fri, 2 Aug 2024 09:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=96=87=E4=BB=B6=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=8A=96=E5=8A=A8=E3=80=81=E6=95=B0=E6=8D=AE=E4=BA=91?=
 =?UTF-8?q?=E5=9B=BE=E7=9A=84=E4=BC=81=E4=B8=9A=E6=83=85=E5=86=B5=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=B8=85=E7=A9=BA=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                    |  2 +-
 .../components/headquarterEnterprise.vue        | 14 +++++++++-----
 .../dataCloudMap/components/serviceIndustry.vue | 17 +++++++++++++----
 .../declareAddContent/ismybuild/index.vue       |  9 +++++++++
 .../enterpriseDirectory/index.vue               |  2 +-
 .../records/components/index.vue                | 10 ++++++++--
 6 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 6bb626c..82c8025 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408012042",
+  "version": "1.0.202408020854",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/views/dataCloudMap/components/headquarterEnterprise.vue b/src/views/dataCloudMap/components/headquarterEnterprise.vue
index 2971c48..fdc10bc 100644
--- a/src/views/dataCloudMap/components/headquarterEnterprise.vue
+++ b/src/views/dataCloudMap/components/headquarterEnterprise.vue
@@ -165,13 +165,17 @@ export default {
       this.pagination = { ...this.pagination,...this.formInline };
       this.getList();
     },
-    // 大类数量点击
+    // 企业详情
     enterpriseInfo(row){
       getUserId({getCreditCode : row.tyshxydm}).then(res=>{
-        this.$router.push({
-          name: 'enterpriselibraryInfo',
-          query: { userId: res.data.id, creditCode: row.tyshxydm }
-        })
+        if(res.data?.id) {
+          this.$router.push({
+            name: 'enterpriselibraryInfo',
+            query: { userId: res.data.id, creditCode: row.tyshxydm }
+          })
+        } else {
+          this.$message.error("该企业未在企业库");
+        }
       })
     },
     // tab切换
diff --git a/src/views/dataCloudMap/components/serviceIndustry.vue b/src/views/dataCloudMap/components/serviceIndustry.vue
index e13f08c..f59f84d 100644
--- a/src/views/dataCloudMap/components/serviceIndustry.vue
+++ b/src/views/dataCloudMap/components/serviceIndustry.vue
@@ -100,6 +100,11 @@ export default {
     },
     infoClose(){
       this.infoVisible = false;
+      this.formInline = {
+        qymc:"",
+        tyshxydm:"",
+        servicesType: null,
+      }
     },
     getList(){
       this.loading = true;
@@ -140,10 +145,14 @@ export default {
     // 企业详情
     enterpriseInfo(row){
       getUserId({getCreditCode : row.tyshxydm}).then(res=>{
-        this.$router.push({
-          name: 'enterpriselibraryInfo',
-          query: { userId: res.data.id, creditCode: row.tyshxydm }
-        })
+        if(res.data?.id) {
+          this.$router.push({
+            name: 'enterpriselibraryInfo',
+            query: { userId: res.data.id, creditCode: row.tyshxydm }
+          })
+        } else {
+          this.$message.error("该企业未在企业库");
+        }
       })
     },
     // 修改table背景色
diff --git a/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue b/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue
index 45624f6..ab25f0d 100644
--- a/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue
+++ b/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue
@@ -388,6 +388,15 @@ export default {
 </script>
 
 <style lang='scss'>
+::v-deep .el-form {
+  .el-form-item__content {
+    .el-upload-list {
+      .el-upload-list__item{
+        transition: none !important;
+      } 
+    }
+  }
+}
 .editor-tabs {
   background: #121315;
 
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index 474ef9c..e7b5b7d 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -64,7 +64,7 @@
       </el-table-column>
       <!-- <el-table-column prop="enterpriseDirectory" label="企业名录分类" :show-overflow-tooltip="true" min-width="190"></el-table-column> -->
       <el-table-column prop="templateName" label="模版名称" min-width="180" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="状态" min-width="50" >
+      <el-table-column label="状态" min-width="100" >
         <template slot-scope="scope">
           <span :class="scope.row.status == 2 ? 'tab-green' : scope.row.status == 1 ? 'tab-red' : scope.row.status == 0 ? 'tab-blue' : scope.row.status == 3 ? 'tab-green' : ''">{{ scope.row.status == 2 ? '有效' : scope.row.status == 1 ? '过期' : scope.row.status == 0 ? '未开始' : scope.row.status == 3 ? '长期有效' : '' }}</span>
         </template>
diff --git a/src/views/onlineDeclaration/records/components/index.vue b/src/views/onlineDeclaration/records/components/index.vue
index 8f73066..e21ca3b 100644
--- a/src/views/onlineDeclaration/records/components/index.vue
+++ b/src/views/onlineDeclaration/records/components/index.vue
@@ -124,7 +124,13 @@ export default {
   width: 100%;
   text-align: center;
 }
-:v-deep .el-upload-list__item{
-  transition: none !important;
+::v-deep .el-form {
+  .el-form-item__content {
+    .el-upload-list {
+      .el-upload-list__item{
+        transition: none !important;
+      } 
+    }
+  }
 }
 </style>