From de75f9547373be23d1463544b44c325ab7601cae Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 13 Jun 2022 17:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue |  3 ++-
 src/views/portal/case/Index.vue  | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index 0a39e7ac..73236c9f 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -25,7 +25,8 @@
             </div> -->
             <!-- <div class="case-summary"><span>{{ caseDetail.summary }}</span></div> -->
             <div class="btn-div clearfix" >
-              <div style="color:#666" v-if="caseDetail.orgDomain" class="item">{{ orgDomainTranslate(caseDetail.orgDomain) }}</div>
+              <div style="color:#666" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
+              <div style="color:#666" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
               <div style="color:#666" v-if="caseDetail.majorType" class="item">{{ majorTypeTranslate(caseDetail.majorType) }}</div>
               <div v-if="caseDetail.keyword1" class="item">{{ caseDetail.keyword1 }}</div>
               <div v-if="caseDetail.keyword2" class="item">{{ caseDetail.keyword2 }}</div>
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 20336b0c..31c8b7e7 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -19,7 +19,7 @@
               <div class="searchbar" v-if="searchTags.length > 0">
               <div style="line-height: 30px;">
                 <span class="item-title">搜索条件</span>
-                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag }}</el-tag>
+                <el-tag closable v-for="(tag, tagIdx) in searchTags" :key="tagIdx" @close="tagsClose(tag,tagIdx)">{{ tag.value }}</el-tag>
               </div>
             </div>
               <el-row class="search-item">
@@ -91,6 +91,7 @@
                     </div>
                     <div class="keyword-text clearfix">
                       <div style="color:#666" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
+                      <div style="color:#666" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
                       <div style="color:#666" v-if="item.majorType">{{ majorTypeTranslate(item.majorType) }}</div>
                       <div v-if="item.keyword1">{{ item.keyword1 }}</div>
                       <div v-if="item.keyword2">{{ item.keyword2 }}</div>
@@ -584,15 +585,24 @@ export default {
           caseData[i] !== null &&
           caseData[i] !== undefined
         ) {
-          if (caseData[i] !== "0") {
-            this.searchTags.push(caseData[i]);
+          if (caseData[i] == "0") {
+            return;
+          }
+          if(i == 'majorType'){
+            this.searchTags.push({ type:'majorType',value:this.majorTypeTranslate(caseData[i])})
+          }
+          if(i == 'orgDomain'){
+            this.searchTags.push({type:'orgDomain',value:this.orgDomainTranslate(caseData[i])})
+          }
+          if(i == 'keyWord'){
+            this.searchTags.push({type:'keyWord',value:caseData[i]})
           }
         }
       }
     },
     tagsClose(tag, index) {
       for (let i in this.queryCondition) {
-        if (tag === this.queryCondition[i]) {
+        if (tag.type === i) {
           if (i == "majorType") {
             this.queryCondition.majorType = null;
           }