From 105f57205b2f60654d3b722086756bc2d102bc60 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Wed, 22 Nov 2023 16:45:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E6=89=80=E6=9C=89=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E7=9A=84=E8=A1=8C=E4=B8=9A=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OutSourced/index.vue              |  4 ++--
 .../commonly/ignore/components/companyList.vue   |  2 +-
 .../corpmajornum/components/companyList.vue      |  2 +-
 src/views/map/bubble/index.vue                   |  2 +-
 src/views/risk/four/components/corpInfo.vue      | 16 ++++++++--------
 .../notificationcard/components/corpInfo.vue     | 16 ++++++++--------
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index 3f4723c..8f48b69 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -51,10 +51,10 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
+      <el-table-column prop="INDUSTRYALL" label="所属行业" show-overflow-tooltip >
         <template slot-scope="{row}">
           <span v-if="row.CORPINFO_ID !='1'">
-            {{ row.INDUSTRY_NAME }}
+            {{ row.INDUSTRYALL }}
           </span>
           <span v-else>
             交通运输、仓储和邮政业
diff --git a/src/views/hidden/commonly/ignore/components/companyList.vue b/src/views/hidden/commonly/ignore/components/companyList.vue
index 1eafd20..a26a525 100644
--- a/src/views/hidden/commonly/ignore/components/companyList.vue
+++ b/src/views/hidden/commonly/ignore/components/companyList.vue
@@ -58,7 +58,7 @@
     >
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="CORP_NAME" label="分公司名称"/>
-      <el-table-column prop="NAME" label="所属行业"/>
+      <el-table-column prop="INDUSTRYALL" label="所属行业"/>
       <el-table-column label="属地">
         <template slot-scope="{row}">
           {{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}
diff --git a/src/views/hidden/major/corpmajornum/components/companyList.vue b/src/views/hidden/major/corpmajornum/components/companyList.vue
index 4d9a943..db49736 100644
--- a/src/views/hidden/major/corpmajornum/components/companyList.vue
+++ b/src/views/hidden/major/corpmajornum/components/companyList.vue
@@ -55,7 +55,7 @@
     >
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="CORP_NAME" label="分公司名称"/>
-      <el-table-column prop="NAME" label="分公司行业类型"/>
+      <el-table-column prop="INDUSTRYALL" label="分公司行业类型"/>
       <el-table-column label="属地">
         <template slot-scope="{row}">
           {{ row.CITY_NAME }} {{ row.COUNTRY_NAME ? ('-- ' + row.COUNTRY_NAME) : '' }}
diff --git a/src/views/map/bubble/index.vue b/src/views/map/bubble/index.vue
index 5f7f75a..1a0429b 100644
--- a/src/views/map/bubble/index.vue
+++ b/src/views/map/bubble/index.vue
@@ -35,7 +35,7 @@
           <div class="data-li">
             <div class="data-label textColor">所属行业：</div>
             <div class="data-value">
-              <span class="label-num textColor line-3">{{ pd.INDUSTRY_NAME }}</span>
+              <span class="label-num textColor line-3">{{ pd.INDUSTRY_ALL }}</span>
             </div>
           </div>
           <div class="data-li">
diff --git a/src/views/risk/four/components/corpInfo.vue b/src/views/risk/four/components/corpInfo.vue
index baa86fd..640326b 100644
--- a/src/views/risk/four/components/corpInfo.vue
+++ b/src/views/risk/four/components/corpInfo.vue
@@ -7,13 +7,13 @@
             <el-input v-model="KEYWORDS" placeholder="企业名称"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="所属行业">
-            <el-select v-model="CORP_OF_TYPE" style="width: 100%;">
-              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <!--        <el-col :span="4">-->
+        <!--          <el-form-item label="所属行业">-->
+        <!--            <el-select v-model="CORP_OF_TYPE" style="width: 100%;">-->
+        <!--              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
         <!--        <el-col :span="4">-->
         <!--          <el-form-item label="属地">-->
         <!--            <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
@@ -55,7 +55,7 @@
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="企业名称" />
-      <el-table-column prop="TYPE_NAME" label="所属行业" />
+      <el-table-column prop="INDUSTRYALL" label="所属行业" />
       <el-table-column label="属地" >
         <template slot-scope="{row}">
           {{ row.CITY_NAME }} {{ row.COUNTRY_NAME?('-- '+ row.COUNTRY_NAME ):'' }} {{ row.VILLAGE_NAME?(' -- '+row.VILLAGE_NAME):'' }}
diff --git a/src/views/risk/notificationcard/components/corpInfo.vue b/src/views/risk/notificationcard/components/corpInfo.vue
index 287ddbe..a01e532 100644
--- a/src/views/risk/notificationcard/components/corpInfo.vue
+++ b/src/views/risk/notificationcard/components/corpInfo.vue
@@ -7,13 +7,13 @@
             <el-input v-model="KEYWORDS" placeholder="企业名称"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="所属行业">
-            <el-select v-model="CORP_OF_TYPE" style="width: 100%;">
-              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <!--        <el-col :span="4">-->
+        <!--          <el-form-item label="所属行业">-->
+        <!--            <el-select v-model="CORP_OF_TYPE" style="width: 100%;">-->
+        <!--              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID" />-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
         <!--        <el-col :span="4">-->
         <!--          <el-form-item label="属地">-->
         <!--            <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
@@ -55,7 +55,7 @@
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="企业名称" />
-      <el-table-column prop="TYPE_NAME" label="所属行业" />
+      <el-table-column prop="INDUSTRYALL" label="所属行业" />
       <el-table-column prop="gaoCount" label="告知卡数" />
       <el-table-column label="属地" >
         <template slot-scope="{row}">