diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index e42e35df..ae3bce46 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -1,87 +1,108 @@
 <template>
   <div>
     <el-card>
-      <el-form :model="filterQuery" v-show="showSearch" label-width="auto">
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="药品编码:" class="query-form-item">
-              <el-input v-model="filterQuery.nameCode"
-                        placeholder="请输入药品编码"
-                        clearable
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="药品通用名:" class="query-form-item">
-              <el-input
-                clearable
-                v-model="filterQuery.cpmctymc"
-                placeholder="请输入药品通用名"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="医保编码:" class="query-form-item">
-              <el-input
-                clearable
-                v-model="filterQuery.ybbm"
-                placeholder="请输入医保编码"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="批准文号:" class="query-form-item">
-              <el-input
-                clearable
-                v-model="filterQuery.zczbhhzbapzbh"
-                placeholder="请输入批准文号"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8">-->
-          <!--            <el-form-item label="医疗器械注册人:" class="query-form-item">-->
-          <!--              <el-input-->
-          <!--                clearable-->
-          <!--                v-model="filterQuery.ylqxzcrbarmc"-->
-          <!--                placeholder="请输入医疗器械注册人"-->
-          <!--              ></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="8">
-            <el-form-item label="生产企业:" class="query-form-item">
-              <el-input
-                clearable
-                v-model="filterQuery.manufactory"
-                placeholder="请输入生产企业"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <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>
-                <!--<el-option label="未对照" :value="3"></el-option>-->
-                <el-option label="未对照其他产品编码" :value="4"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <!--<el-col :span="8">-->
-          <!--  <el-form-item label="是否禁用:" class="query-form-item">-->
-          <!--    <el-select v-model="filterQuery.isDisable" clearable>-->
-          <!--      <el-option label="是" :value=true></el-option>-->
-          <!--      <el-option label="否" :value=false></el-option>-->
-          <!--    </el-select>-->
-          <!--  </el-form-item>-->
-          <!--</el-col>-->
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" 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' && item.columnName !='queryName' && 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 == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
+                :label="item.columnDesc+`:`" :key="item.id">
+                <el-autocomplete
+                  class="inline-input"
+                  style="width: 90%"
+                  v-model="queryName"
+                  :fetch-suggestions="queryProductName"
+                  placeholder="请输入内容"
+                  clearable
+                  @select="handleSelect"
+                  @clear="clearQueryProduct"
+                ></el-autocomplete>
+              </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"
+                           @change="executeFuc($event,'5',item.checkRules)"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <el-option
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                  <span style="float: left">{{ item.name }}</span>
+                  <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </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
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :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"
+                  />
+                  <span style="float: left">{{ item.name }}</span>
+                  <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.code
+                    }}</span>
+                </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-divider/>
       </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" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>-->
@@ -194,6 +215,7 @@
 
     </el-card>
 
+
   </div>
 </template>
 
@@ -216,13 +238,30 @@ import {
 import drugAdd from '@/views/basic/product/drug/drugAdd'
 import chooseDrug from '@/views/basic/product/drug/chooseDrug'
 import chooseHouseDrug from '@/views/basic/product/drug/chooseHouseDrug'
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   components: {drugAdd, chooseDrug, chooseHouseDrug},
   name: 'drugMaintain',
   data() {
     return {
-      showSearch: true,
+      //界面配置
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      executeFuc(row, type, clickFuc, value) {
+        return executeFuc(this, row, type, clickFuc, value);
+      },
+      executeEval(row, expression, defaultRet) {
+        if (expression) {
+          return eval(expression);
+        }
+        return defaultRet;
+      },
+
+      showSearch: false,
       filterBadInv: true,
       query: {},
       list: [],
@@ -231,7 +270,8 @@ export default {
         productsType: 2,
         page: 1,
         limit: 20,
-        addType: 1
+        addType: 1,
+        keyWords:""
       },
       addDrugVisible: false,
       chooseDrugVisible: false,
@@ -284,7 +324,8 @@ export default {
         productsType: 2,
         page: 1,
         limit: 20,
-        addType: 1
+        addType: 1,
+        keyWords:""
       };
       this.getList();
     },
@@ -389,6 +430,13 @@ export default {
     ,
   },
   created() {
+    getHead("drugMaintain-ypzdwh", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
     this.getList()
   }
 }