From c1f94f3013f994875242af7c01ecbc983d6d9887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Wed, 29 Mar 2023 17:28:21 +0800
Subject: [PATCH] 3/29

---
 src/views/main/CommondbVessellist/index.vue   | 37 +++++++++++++------
 src/views/main/PrinttemplateRight/addForm.vue |  5 ++-
 src/views/main/PrinttemplateRight/index.vue   | 18 ++++++++-
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/views/main/CommondbVessellist/index.vue b/src/views/main/CommondbVessellist/index.vue
index cd9ae93..0b9edb0 100644
--- a/src/views/main/CommondbVessellist/index.vue
+++ b/src/views/main/CommondbVessellist/index.vue
@@ -10,7 +10,21 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="关键字：">
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="模块">
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
+                      <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <!-- <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
                   <a-form-item
                     :label="item.title"
                     v-if="
@@ -23,15 +37,16 @@
                     "
                   >
                     <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
-                      <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
-                        {{ item.name }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <!-- <a-form-item :label="item.title" v-if="item.title == '船名'">
+                  </a-form-item> -->
+
+                <!-- <a-form-item :label="item.title" v-if="item.title == '模块'">
+                  <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
+                    <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
+                      {{ item.name }}
+                    </a-select-option>
+                  </a-select>
+                </a-form-item> -->
+                <!-- <a-form-item :label="item.title" v-if="item.title == '船名'">
                     <a-select
                       allow-clear
                       show-search
@@ -48,7 +63,7 @@
                       </a-select-option>
                     </a-select>
                   </a-form-item> -->
-                </a-col>
+                <!-- </a-col> -->
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
diff --git a/src/views/main/PrinttemplateRight/addForm.vue b/src/views/main/PrinttemplateRight/addForm.vue
index ee590bf..ae0f2f9 100644
--- a/src/views/main/PrinttemplateRight/addForm.vue
+++ b/src/views/main/PrinttemplateRight/addForm.vue
@@ -18,7 +18,7 @@
                 show-search
                 :default-active-first-option="false"
                 :show-arrow="false"
-                :filter-option="false"
+                :filter-option="filterOption"
                 :not-found-content="null"
                 v-decorator="['userIdList', { rules: [{ required: true, message: '请选择用户！' }] }]"
               >
@@ -104,6 +104,9 @@ export default {
     })
   },
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     handleSearch(value) {
       console.log(value)
       let Rdata = []
diff --git a/src/views/main/PrinttemplateRight/index.vue b/src/views/main/PrinttemplateRight/index.vue
index a4c87b0..22f6eef 100644
--- a/src/views/main/PrinttemplateRight/index.vue
+++ b/src/views/main/PrinttemplateRight/index.vue
@@ -13,7 +13,20 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="用户：">
-                    <a-select placeholder="请选择用户" v-model="queryParam.userId">
+                    <!-- <a-select placeholder="请选择用户" v-model="queryParam.userId">
+                      <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select> -->
+                    <a-select
+                      show-search
+                      placeholder="请选择用户"
+                      v-model="queryParam.userId"
+                      :default-active-first-option="false"
+                      :show-arrow="false"
+                      :filter-option="filterOption"
+                      :not-found-content="null"
+                    >
                       <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
                         {{ item.name }}
                       </a-select-option>
@@ -171,6 +184,9 @@ export default {
     this.init()
   },
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     RMain(data) {
       let Text = ''
       if (data.type == 'FastReport') {