diff --git a/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue b/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue
index 4232c40..7cccce0 100644
--- a/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoSupSecAuditOrder.vue
@@ -1,101 +1,10 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购部门:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="收货仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--                         @change="invChange"-->
-<!--              >-->
-<!--                <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-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单据类型:">-->
-<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-<!--                         style="width: 90%"-->
-<!--                         clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in busTypes"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.action">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="创建时间:">-->
-<!--              <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="结束日期"-->
-<!--                style="width: 90%"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="审核时间:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-date-picker&ndash;&gt;-->
-<!--          &lt;!&ndash;                :picker-options="pickerOptions"&ndash;&gt;-->
-<!--          &lt;!&ndash;                v-model="auditDateRange"&ndash;&gt;-->
-<!--          &lt;!&ndash;                type="daterange"&ndash;&gt;-->
-<!--          &lt;!&ndash;                format="yyyy 年 MM 月 dd 日"&ndash;&gt;-->
-<!--          &lt;!&ndash;                value-format="yyyy-MM-dd"&ndash;&gt;-->
-<!--          &lt;!&ndash;                range-separator="至"&ndash;&gt;-->
-<!--          &lt;!&ndash;                start-placeholder="开始日期"&ndash;&gt;-->
-<!--          &lt;!&ndash;                end-placeholder="结束日期"&ndash;&gt;-->
-<!--          &lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-date-picker>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-
-<!--        </el-row>-->
+      <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" >
+            <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]"
@@ -158,12 +67,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <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"
@@ -217,11 +127,6 @@
 <!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
 <!--        </el-table-column>-->
 <!--        &lt;!&ndash;        <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
-<!--        &lt;!&ndash;                reviceStatus[scope.row.status]&ndash;&gt;-->
-<!--        &lt;!&ndash;              }}&ndash;&gt;-->
-<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
 <!--        &lt;!&ndash;          </template>&ndash;&gt;-->
 <!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
 <!--        <el-table-column label="操作" width="200" fixed="right">-->
@@ -995,7 +900,7 @@ export default {
       imgListCold:[],
       imgViewerVisible: false,
       imgViewerVisibleCold:false,
-      showSearch: true,
+      showSearch: false,
       Upinvoice: false,
       currentManufacturer: {},
       filterQuery: {
diff --git a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
index 01a8d6f..325365d 100644
--- a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
+++ b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
@@ -1,67 +1,81 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="filterQuery"    label-width="120px" v-show="showSearch">
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="药品编码:">
-              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="药品编码"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="药品名称:">
-              <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="物资名称"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="制剂规格:">
-              <el-input v-model="filterQuery.prepnSpec" style="width: 90%" placeholder="制剂规格" clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="包装规格:">
-              <el-input v-model="filterQuery.bzgg" style="width: 90%" placeholder="包装规格" clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="医保编码:">
-              <el-input v-model="filterQuery.ybbm" style="width: 90%" placeholder="医保编码" clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="批准文号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="批准文号"
-                        clearable="true"></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="true"></el-input>
-            </el-form-item>
-          </el-col>
+      <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" >
+            <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"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :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' && 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 == '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-row>-->
-
-          <!--<el-col :span="6">-->
-          <!--  <el-form-item label="对照条件:" class="query-form-item">-->
-          <!--    <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>-->
-          <!--      <el-option label="全部" :value="0"></el-option>-->
-          <!--      <el-option label="对照完成" :value="1"></el-option>-->
-          <!--      <el-option label="未对照产品编码" :value="2"></el-option>-->
-          <!--      &lt;!&ndash;<el-option label="未对照" :value="3"></el-option>&ndash;&gt;-->
-          <!--      <el-option label="未对照其他产品编码" :value="4"></el-option>-->
-          <!--    </el-select>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
-        <!--</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="submitSearch">查询</el-button>
 
@@ -512,11 +526,6 @@
         </el-row>
 
 
-
-
-
-
-
         <!--<el-row :gutter="20" class="el-row" type="flex">-->
 
         <!--  <el-col :span="12" class="el-col">-->
@@ -777,6 +786,7 @@ import store from "@/store";
 import {isBlank} from "@/utils/strUtil";
 import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
 import {filterClassify} from "@/api/purchase/classifyCode"
+import { executeFuc, getHead } from '@/utils/customConfig'
 
 export default {
   name: "UdIInfoSelect",
@@ -796,8 +806,13 @@ export default {
   },
   data() {
     return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+
+
       ybHcflDetail: {},
-      showSearch: true,
+      showSearch: false,
       radioCheck: null,
       filterQuery: {
         customerId: null,
@@ -812,7 +827,8 @@ export default {
         productsType: 2,
         bzgg:"",
         prepnSpec:"",
-        filterNameCodes:[]
+        filterNameCodes:[],
+        keyWords:""
       },
 
 
@@ -905,6 +921,16 @@ 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;
+    },
+
     classifyChange(){
       this.classifySearch(this.repEditQuery.flbm)
       let item = this.classifyList.find(item => item.code == this.repEditQuery.flbm)
@@ -969,6 +995,7 @@ export default {
         productsType: 2,
         bzgg:"",
         prepnSpec:"",
+        keyWords:""
       };
       this.getList();
     },
@@ -1312,6 +1339,13 @@ export default {
   },
   components: {},
   created() {
+    getHead("basicCompanyProductsImport","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
     this.selectSysParam();
     this.findBasicProductSet();
     this.findHsflMethod(this.repEditQuery.basicPrductRemak8);
diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue
index 69e15db..b787b87 100644
--- a/src/views/system/customConfig/configQueryDetail.vue
+++ b/src/views/system/customConfig/configQueryDetail.vue
@@ -85,6 +85,16 @@
            </el-form-item>
          </el-col>
        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否常用查询" prop="isImport">
+              <el-select v-model="subData.isImport" placeholder="请选择是否常用查询" style="width: 80%">
+                <el-option label="是" :value="true"/>
+                <el-option label="否" :value="false"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="列类型" prop="columnType">
@@ -256,6 +266,10 @@
           columnType: [
             { required: true, message: "请选择类型", trigger: "blur" },
           ],
+          isImport: [
+            { required: true, message: "请选择是否常用", trigger: "blur" },
+          ],
+
         },
         isExpandAll: true,
         total: 0,