From c140bdeadd1f0e6be00284b1d7582a9f4620d400 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Sat, 14 Sep 2024 14:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ruoyi.scss                  |  6 +++++
 .../CollectOrderAllotCardComponents.vue       | 22 ++++++++++++++++++-
 src/views/collect/CollectOrderNew.vue         | 22 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 7c2d0d60..2f0c24ba 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -327,6 +327,12 @@
   margin-top: 15px
 }
 
+.right-search{
+  position: relative;
+  float: left;
+  margin-top: 15px
+}
+
 
 .dialog-one {
   width: 45%;
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index e4f37610..c6a8624e 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -90,6 +90,26 @@
           </template>
         </el-row>
       </el-form>
+      <div class="right-search" v-if="!showSearch">
+        <!-- 关键字搜索 按需配置 -->
+        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+          <el-row style=" display:flex;  flex-wrap: wrap; ">
+            <template v-for="(item, index) in queryList">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+                            class="query-form-item"
+                            :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-row>
+        </el-form>
+      </div>
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@@ -454,7 +474,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         billNo: null,
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index 6fc2041b..7f939f6b 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -80,6 +80,26 @@
           </template>
         </el-row>
       </el-form>
+      <div class="right-search" v-if="!showSearch">
+        <!-- 关键字搜索 按需配置 -->
+        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+          <el-row style=" display:flex;  flex-wrap: wrap; ">
+            <template v-for="(item, index) in queryList">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+                            class="query-form-item"
+                            :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </template>
+          </el-row>
+        </el-form>
+      </div>
       <div class="top-right-btn">
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@@ -447,7 +467,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         tagStatus: this.tagStatus,    //
         tagStatusList: this.tagStatusList,    //