From 5efbe70ddf13564d0cb78197ef04246c62bd8671 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 12 Aug 2022 13:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classificationMaintenanceModel.vue        |  1 +
 .../components/countryCardView.vue            | 11 ++-
 .../components/displayInformationModel.vue    | 89 ++++++++++++++++---
 .../components/problemKnowledgeBaseList.vue   | 24 +++--
 4 files changed, 103 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
index 15a8814fc..6d6415529 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceModel.vue
@@ -115,6 +115,7 @@
       },
       handleCancel() {
         this.visible = false
+        this.$emit('classificationMaintenanceModelForm')
       },
       onChange(page, pageSize) {
         this.pageNo = page
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
index 93adee56b..4c91a6b97 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
@@ -6,7 +6,7 @@
            <span style="line-height: 66px;display: inline-block;float: left">
              <a-icon type="arrow-left" style="margin-right: 6px;"/>
            </span>
-          {{$t('See')}}
+          {{header_text}}
         </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
@@ -107,6 +107,7 @@
         queryCountryList: [],
         countryCardViewList: [],
         applyMarkets: '',
+        header_text: '',
         url: {
           list: '/problemKnowledgeBase/countryCardTempEO/list',
           deleteOne: ''
@@ -151,6 +152,9 @@
             this.displayList.forEach(val => {
               val.showOrNot = true
             })
+            this.$nextTick(() => {
+              this.$refs.displayInformationModelRef.dataListOne = JSON.parse(JSON.stringify(this.displayList))
+            })
             this.consolidateData()
             this.loading = false
           } else {
@@ -230,6 +234,11 @@
               this.clientWidth = 340 * (this.queryCountryList.length + 1) + 'px'
               this.isTrue = true
             })
+            let content = []
+            this.queryCountryList.forEach(val => {
+              content.push(val.applyMarket_dictText)
+            })
+            this.header_text = content.join('-')
             callback && callback()
             if (!callback) {
               this.consolidateData()
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue
index 724dc4f46..709a02c38 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue
@@ -9,6 +9,27 @@
       @close="handleCancel"
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :md="12" :sm="8" style="line-height: 48px">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('LabelName')">
+                  <span>{{$t('LabelName')}}</span>
+                </div>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('LabelName')"
+                         v-model="queryParam.labelName"></a-input>
+              </div>
+            </a-col>
+            <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+               <a-col :md="6" :sm="24">
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+               </a-col>
+         </span>
+          </a-row>
+        </a-form>
+      </div>
       <div style="margin-bottom: 60px">
         <a-table
           v-if="this.visible"
@@ -42,9 +63,11 @@
           list: '/problemKnowledgeBase/countryCardTempEO/list',
           deleteOne: ''
         },
+        queryParam: {},
         visible: false,
         selectedRowKeys: [],
         dataList: [],
+        dataListOne: [],
         loading: false,
         confirmLoading: false,
         columns: [
@@ -67,10 +90,24 @@
     mounted() {
     },
     methods: {
+      searchQuery() {
+        if (this.queryParam.labelName) {
+          this.dataList = this.dataList.filter(res => {
+            return res.lableName.includes(this.queryParam.labelName)
+          })
+          this.dataList = [...this.dataList]
+        }
+      },
+      searchReset() {
+        this.queryParam = {}
+        this.dataList = JSON.parse(JSON.stringify(this.dataListOne))
+        this.dataList = [...this.dataList]
+      },
       getData(data) {
         this.visible = true
         this.$nextTick(() => {
-          this.dataList = data
+          this.queryParam = {}
+          this.dataList = JSON.parse(JSON.stringify(data))
           this.dataList = [...this.dataList]
         })
       },
@@ -78,11 +115,16 @@
         this.visible = false
       },
       handleSubmit() {
-        this.$emit('displayInformationModelForm', this.dataList)
+        this.$emit('displayInformationModelForm', this.dataListOne)
         this.visible = false
       },
       onCheckAllChange(index) {
         this.dataList[index].showOrNot = !this.dataList[index].showOrNot
+        this.dataListOne.forEach(res => {
+          if (res.id == this.dataList[index].id) {
+            res.showOrNot = !res.showOrNot
+          }
+        })
       }
     }
   }
@@ -107,18 +149,41 @@
     border-radius: 0 0 2px 2px;
   }
 
-  .box-title {
-    width: 100%;
-    text-align: right;
-    margin-bottom: 20px;
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
   }
 
-  .operator-text {
-    cursor: pointer;
-    margin-right: 13px;
-    font-size: 14px;
-    font-weight: 400;
-    color: #040B29;
+  .title-text {
+    width: 20%;
+    min-width: 110px;
+    color: #000F16;
     display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    margin-top: 3px;
+    text-align: right;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .box-input {
+    display: inline-block;
+    width: 70%;
+    height: 38px;
+    margin-top: 2px;
+  }
+
+  .box-button {
+    height: 38px;
+    /*margin-top: 2px;*/
+  }
+
+  .text-operation {
+    margin-right: 8px;
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 89f8433f7..0c8e92dd4 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -1,15 +1,17 @@
 <template>
   <div class="box">
     <div class="search-detail-wrap">
-      <div class="box-title-text">
-        <div class="title-text" :title="$t('searchContent')">
-          <span>{{$t('searchContent')}}</span>
+      <a-form layout="inline" @keyup.enter.native="onSearch">
+        <div class="box-title-text">
+          <div class="title-text" :title="$t('searchContent')">
+            <span>{{$t('searchContent')}}</span>
+          </div>
+          <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
+                   v-model="searchStr"></a-input>
+          <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
+          <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
         </div>
-        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('searchContent')"
-                 v-model="searchStr"></a-input>
-        <a-button class="box-button" type="primary" @click="onSearch">{{$t('query')}}</a-button>
-        <a-button class="box-button" style="margin-left: 8px" @click="ResetSearch">{{$t('reset')}}</a-button>
-      </div>
+      </a-form>
     </div>
     <div class="box-content">
       <div class="box-content-left">
@@ -75,7 +77,8 @@
       />
     </div>
     <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
-    <classificationMaintenanceModel ref="classificationMaintenanceModelRef"/>
+    <classificationMaintenanceModel @classificationMaintenanceModelForm="classificationMaintenanceModelForm"
+                                    ref="classificationMaintenanceModelRef"/>
   </div>
 </template>
 
@@ -120,6 +123,9 @@
           }
         })
       },
+      classificationMaintenanceModelForm(){
+         this.replacePage()
+      },
       onSearch() {
         this.pageNo = 1
         this.getList()