Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/PanelOrderDeal.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>
@@ -286,7 +306,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         billNo: null,

src/views/collect/PanelOrderEndSearch.vue

@@ -88,6 +88,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>
@@ -305,7 +325,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         tagStatus: 3,

src/views/collect/PanelOrderUpload.vue

@@ -88,6 +88,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>
@@ -320,7 +340,7 @@ export default {
       convertDateFun: convertDate,
       //界面配置-------------end
 
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         busType: null,
         tagStatus: null,