From 86e4f56f909eb761874da7ad3db5be8b49d5856a Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 11 Mar 2022 10:07:10 +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

---
 .../src/components/currencySearch/index.vue   | 27 ++++++++++----
 jero-web/src/components/search/index.vue      |  9 ++---
 .../components/DocumentLibrary.vue            | 35 +++++++++++--------
 3 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/jero-web/src/components/currencySearch/index.vue b/jero-web/src/components/currencySearch/index.vue
index ae8d8d132..3703e26e6 100644
--- a/jero-web/src/components/currencySearch/index.vue
+++ b/jero-web/src/components/currencySearch/index.vue
@@ -3,7 +3,21 @@
     <a-row :gutter="24">
       <a-col :md="12" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
         <template>
-          <div class="box-title-text" v-if="item.field_show_type == '1'">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
@@ -17,7 +31,7 @@
             <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
                             v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
           </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
@@ -42,7 +56,7 @@
                            @change="dateChange(item.db_field_name)"
                            v-model="queryParam[item.db_field_name]"/>
           </div>
-          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
@@ -53,7 +67,8 @@
           </div>
         </template>
       </a-col>
-      <span style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px" class="table-page-search-submitButtons">
+      <span style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px"
+            class="table-page-search-submitButtons">
                   <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>
       </span>
@@ -89,11 +104,11 @@
     },
     methods: {
       searchQuery() {
-        this.$emit('searchQuery', this.queryParam)
+        this.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
       },
       searchReset() {
         this.queryParam = {}
-        this.$emit('searchReset', this.queryParam)
+        this.$emit('searchReset', JSON.parse(JSON.stringify(this.queryParam)))
       },
       getSeach() {
         let params = {
diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue
index 153fbf701..7b6facf89 100644
--- a/jero-web/src/components/search/index.vue
+++ b/jero-web/src/components/search/index.vue
@@ -16,7 +16,7 @@
               :placeholder="$t('PleaseSelect')+item.db_field_txt"
             />
           </div>
-          <div class="box-title-text" v-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
           item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
@@ -24,7 +24,7 @@
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
                      v-model="queryParam[item.db_field_name]"></a-input>
           </div>
-          <div class="box-title-text" v-if="item.field_show_type == '2'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
@@ -81,14 +81,15 @@
               :placeholder="$t('PleaseSelect')+item.db_field_txt"
             />
           </div>
-          <div class="box-title-text" v-if="item.field_show_type == '1'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
             <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
                      v-model="queryParam[item.db_field_name]"></a-input>
           </div>
-          <div class="box-title-text" v-if="item.field_show_type == '2'">
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
             <div class="title-text" :title="item.db_field_txt">
               <span>{{item.db_field_txt}}</span>
             </div>
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 8a1aba421..f17be695a 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -3,15 +3,18 @@
     <div class="search-text-wrap">
       <div class="text-left">
         <div class="text-left-wrap">
-          <div class="text-left-select" v-for="item in searchOption" :key="item.id">
-            <span class="text-sel">{{item.value}}</span>
-            <a-select class="text-select" :default-value="item.option[0].value" style="width: 120px"
-                      @change="handleChange">
-              <a-select-option v-for="opt in item.option" :value="opt.value">
-                {{opt.value}}
-              </a-select-option>
-            </a-select>
+          <div v-for="item in searchOption" :key="item.id">
+            <div class="text-left-select">
+              <span class="text-sel">{{item.value}}</span>
+              <a-select class="text-select" :default-value="item.option[0].value" style="width: 120px"
+                        @change="handleChange">
+                <a-select-option v-for="opt in item.option" :value="opt.value">
+                  {{opt.value}}
+                </a-select-option>
+              </a-select>
+            </div>
           </div>
+
           <div class="text-left-select">
             <span class="text-sel">发布日期</span>
             <a-date-picker class="text-select" @change="onChange"/>
@@ -39,7 +42,6 @@
             v-if="isTrue"
             ref="table"
             size="middle"
-            bordered
             :scroll="{x: true}"
             rowKey="id"
             :data-source="tableData"
@@ -53,7 +55,7 @@
                  <a @click="subscribe(record)" class="text-operation">
                     {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
                  </a>
-                 <a> {{$t('Push')}}</a>
+                 <a @click="handleCompare(record)" class="text-operation"> {{$t('Push')}}</a>
              </span>
             <!-- 字符串超长截取省略号显示-->
             <!--            <span slot="templateContent" slot-scope="text">-->
@@ -106,9 +108,10 @@
   import eventBUs from '../../../../common/event'
   import { getAction, postAction } from '@/api/manage'
   import libraryPush from '@/components/libraryPush/index'
+
   export default {
     name: 'DocumentLibrary',
-    components:{
+    components: {
       libraryPush
     },
     data() {
@@ -220,9 +223,11 @@
             ]
           }
         ],
-        tableData: [],
-        url:{
-          pullMessage: 'document/bussDocumentLibraryEO/pullMessage',//推送
+        tableData: [
+          {}
+        ],
+        url: {
+          pullMessage: 'document/bussDocumentLibraryEO/pullMessage'//推送
         },
         columns: [
           {
@@ -415,7 +420,7 @@
       },
       //推送
       handleCompare(val) {
-       let item = JSON.parse(JSON.stringify(val))
+        let item = JSON.parse(JSON.stringify(val))
         this.$nextTick(() => {
           this.$refs.libraryPushRef.visible = true
           this.$refs.libraryPushRef.tableKey = item.id.split(',')