From 98ab1b1356a41d2fff3fd35c1461e8d543fca104 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 17:25:57 +0800
Subject: [PATCH] =?UTF-8?q?11/15=20=E7=94=B3=E8=B4=AD=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/product/drug/drugInfoManageSp.vue   |   8 +-
 .../purApplyDrug/purApplyDrug.vue             |   8 +-
 .../purApplyDrug/pureApplyAuditDrug.vue       |   8 +-
 .../purApplyDrug/pureApplyMySearchDrug.vue    |   8 +-
 .../purApplyDrug/pureApplySearchDetails.vue   | 217 +++++++++++++-----
 .../purApplyDrug/pureApplySearchDrug.vue      |  99 +-------
 6 files changed, 185 insertions(+), 163 deletions(-)

diff --git a/src/views/basic/product/drug/drugInfoManageSp.vue b/src/views/basic/product/drug/drugInfoManageSp.vue
index 80422631..38ff0087 100644
--- a/src/views/basic/product/drug/drugInfoManageSp.vue
+++ b/src/views/basic/product/drug/drugInfoManageSp.vue
@@ -1,9 +1,10 @@
 <template>
   <div>
     <el-card>
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="120px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" label-width="120px">
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList">
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
                           :label="item.columnDesc+`:`" :key="item.id">
               <el-input
@@ -71,6 +72,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
         <!--        <el-row>-->
@@ -159,7 +161,7 @@
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
           <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入药品</el-button>
@@ -364,7 +366,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         lockStatus: null,
         unionCode: null,
diff --git a/src/views/pharmaceuticals/purApplyDrug/purApplyDrug.vue b/src/views/pharmaceuticals/purApplyDrug/purApplyDrug.vue
index 34fe75b1..435df3d9 100644
--- a/src/views/pharmaceuticals/purApplyDrug/purApplyDrug.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/purApplyDrug.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="申购单号:">-->
@@ -83,6 +83,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -144,13 +145,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
           <el-button type="primary" icon="el-icon-plus" @click="newDistributionForm()" :loading="loading">新增单据
@@ -428,7 +430,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       pId: null,
       filterQuery: {
         billAction: null,
diff --git a/src/views/pharmaceuticals/purApplyDrug/pureApplyAuditDrug.vue b/src/views/pharmaceuticals/purApplyDrug/pureApplyAuditDrug.vue
index 45dae525..266b3aed 100644
--- a/src/views/pharmaceuticals/purApplyDrug/pureApplyAuditDrug.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/pureApplyAuditDrug.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="申购单号">-->
@@ -84,6 +84,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -145,13 +146,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -423,7 +425,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
diff --git a/src/views/pharmaceuticals/purApplyDrug/pureApplyMySearchDrug.vue b/src/views/pharmaceuticals/purApplyDrug/pureApplyMySearchDrug.vue
index 72eb8a9f..d9c20ef8 100644
--- a/src/views/pharmaceuticals/purApplyDrug/pureApplyMySearchDrug.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/pureApplyMySearchDrug.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" label-width="100px">
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="申购单号">-->
@@ -97,6 +97,7 @@
 <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -170,13 +171,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -487,7 +489,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",
diff --git a/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue b/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue
index 82cc504d..06780ac7 100644
--- a/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDetails.vue
@@ -1,72 +1,153 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="filterQuery" class="query-form" label-width="100px" v-if="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="申购单号:">
-              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
-            </el-form-item>
-          </el-col>
+      <!--<el-form :model="filterQuery" class="query-form" label-width="100px" v-if="showSearch">-->
+      <!--  <el-row>-->
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="申购单号:">-->
+      <!--        <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
 
-          <el-col :span="6">
-            <el-form-item label="药品编码:">
-              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/药品编码"
-                        clearable></el-input>
-            </el-form-item>
-          </el-col>
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="药品编码:">-->
+      <!--        <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="请输入DI/药品编码"-->
+      <!--                  clearable></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
 
-          <el-col :span="6">
-            <el-form-item label="药品名称:">
-              <el-input v-model="filterQuery.productName" style="width: 90%" placeholder="请输入药品名称"
-                        clearable></el-input>
-            </el-form-item>
-          </el-col>
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="药品名称:">-->
+      <!--        <el-input v-model="filterQuery.productName" style="width: 90%" placeholder="请输入药品名称"-->
+      <!--                  clearable></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
 
-          <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input v-model="filterQuery.spec" style="width: 90%" placeholder="请输入规格型号" clearable></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="规格型号:">-->
+      <!--        <el-input v-model="filterQuery.spec" style="width: 90%" placeholder="请输入规格型号" clearable></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+      <!--  </el-row>-->
 
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="批准文号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入批准文号"
-                        clearable></el-input>
-            </el-form-item>
-          </el-col>
+      <!--  <el-row>-->
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="批准文号:">-->
+      <!--        <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入批准文号"-->
+      <!--                  clearable></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
 
-          <el-col :span="6">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
-                        clearable></el-input>
-            </el-form-item>
-          </el-col>
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="生产企业:">-->
+      <!--        <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"-->
+      <!--                  clearable></el-input>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
 
-          <el-col :span="6">
-            <el-form-item label="创建时间:">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                style="width: 90%"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+      <!--    <el-col :span="6">-->
+      <!--      <el-form-item label="创建时间:">-->
+      <!--        <el-date-picker-->
+      <!--          :picker-options="pickerOptions"-->
+      <!--          v-model="actDateRange"-->
+      <!--          type="daterange"-->
+      <!--          format="yyyy 年 MM 月 dd 日"-->
+      <!--          style="width: 90%"-->
+      <!--          value-format="yyyy-MM-dd"-->
+      <!--          range-separator="至"-->
+      <!--          start-placeholder="开始日期"-->
+      <!--          end-placeholder="结束日期"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <!--    </el-col>-->
+      <!--  </el-row>-->
+      <!--</el-form>-->
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" label-width="100px" >
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :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>
+              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-select v-model="filterQuery[item.columnName]"
+                           :placeholder="item.columnDesc"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <el-option
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-select
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actAuditDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actAuditDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="filterQuery[item.columnName]"
+                  :style="`width:${item.width+'px'}`"
+                  value-format="yyyy-MM-dd"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  type="date"
+                  :placeholder="item.columnDesc"
+                ></el-date-picker>
+              </el-form-item>
+            </div>
+          </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -100,12 +181,17 @@
 </template>
 <script>
 import {getDetailList} from "@/api/pharmaceuticals/purApplyDrug";
+import { executeFuc, getHead } from '@/utils/customConfig'
 
 export default {
   data() {
     return {
+      //页面配置
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
       pageType:null,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billNo: null,
         productId: null,
@@ -191,6 +277,15 @@ export default {
   },
 
   methods: {
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
     onReset() {
       this.filterQuery = {
         billNo: null,
@@ -203,7 +298,8 @@ export default {
         endDate: null,
         page: 1,
         limit: 10,
-        pageType: this.$route.query.pageType
+        pageType: this.$route.query.pageType,
+        productType: 2,
       };
       this.actDateRange = [];
       this.getList();
@@ -259,6 +355,13 @@ export default {
   mounted() {
   },
   created() {
+    getHead("pureApplySearchDetails-mx","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
     this.getList();
     this.pageType = this.$route.query.pageType;
   },
diff --git a/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDrug.vue b/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDrug.vue
index e0ae42df..c550ffbe 100644
--- a/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDrug.vue
+++ b/src/views/pharmaceuticals/purApplyDrug/pureApplySearchDrug.vue
@@ -1,100 +1,10 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" label-width="100px" >
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购部门:">-->
-<!--              <el-select v-model="filterQuery.deptCode" clearable @change="getInvList" placeholder="请选择申购部门"-->
-<!--                         style="width: 90%">-->
-<!--                <el-option-->
-<!--                  v-for="item in deptList"-->
-<!--                  :key="item.code"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code"-->
-<!--                >-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="申购仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" style="width: 90%" clearable placeholder="请选择所属仓库">-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="到货仓库">-->
-<!--              <el-select v-model="filterQuery.targetInvCode" @change="getList" style="width: 90%" clearable-->
-<!--                         placeholder="请选择到货仓库">-->
-<!--                <el-option-->
-<!--                  v-for="item in targetInvList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="紧急程度:" prop="emergency">-->
-<!--              <el-select v-model="filterQuery.emergency" placeholder="请选择紧急程度" style="width: 90%" clearable>-->
-<!--                <el-option label="正常" :value=1></el-option>-->
-<!--                <el-option label="较急" :value=2></el-option>-->
-<!--                <el-option label="特急" :value=3></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="创建时间:">-->
-<!--              <el-date-picker-->
-<!--                :picker-options="pickerOptions"-->
-<!--                v-model="actDateRange"-->
-<!--                type="daterange"-->
-<!--                format="yyyy 年 MM 月 dd 日"-->
-<!--                style="width: 90%"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                range-separator="至"-->
-<!--                start-placeholder="开始日期"-->
-<!--                end-placeholder="结束日期"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="审核时间:">-->
-<!--              <el-date-picker-->
-<!--                :picker-options="pickerAuditOptions"-->
-<!--                v-model="actAuditDateRange"-->
-<!--                type="daterange"-->
-<!--                format="yyyy 年 MM 月 dd 日"-->
-<!--                style="width: 90%"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                range-separator="至"-->
-<!--                start-placeholder="开始日期"-->
-<!--                end-placeholder="结束日期"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" label-width="100px" >
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList" >
+            <div v-if="showSearch || item.isImport">
             <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
@@ -168,13 +78,14 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
 
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">高级查询</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmitFind">查询</el-button>
         </el-button-group>
@@ -469,7 +380,7 @@ export default {
     return {
       pageType:null,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         billAction: null,
         billNo: "",