diff --git a/src/views/supplier/drugMaintain/InvProducts.vue b/src/views/supplier/drugMaintain/InvProducts.vue
index 70e987b..efc2f10 100644
--- a/src/views/supplier/drugMaintain/InvProducts.vue
+++ b/src/views/supplier/drugMaintain/InvProducts.vue
@@ -1,148 +1,10 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
-       <!-- <el-row>
-          <el-col :span="18">
-            <el-form-item label="扫码查询:">
-              <el-input v-model="filterQuery.udiCode"
-                        style="width: 97%"
-                        placeholder="请扫描或输入UDI码"
-                        clearable="true"
-                        @keyup.enter.native="keyup_submit($event)"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="DI/物资编码:">
-              <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="物资名称:">
-              <el-input v-model="filterQuery.cpmctymc" placeholder="请输入物资名称"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="规格型号:">
-              <el-input v-model="filterQuery.ggxh" placeholder="请输入规格型号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="批次号:">
-              <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="注册/备案号:">
-              <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="请输入注册/备案号"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="请输入生产企业"
-                        style="width: 90%"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-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-col :span="6">
-            <el-form-item label="所属货位:">
-              <el-select
-                v-model="filterQuery.invSpaceCode"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择所属货位"
-                :remote-method="getSpaceList"
-                size="mini"
-                :loading="corpLoading"
-                style="width: 90%"
-              >
-                <el-option
-                  v-for="item in spaceList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
-
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="过滤方式:">
-              <el-select
-                v-model="filterQuery.filterNoInv"
-                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="6">
-            <el-form-item label="供应商名称:">
-              <el-select
-                v-model="filterQuery.supId"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请选择供应商名称"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="corpLoading"
-                @change="corpChange"
-                style="width: 90%"
-                @clear="getcorp"
-              >
-                <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-                >
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-        </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]"
@@ -208,12 +70,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"
@@ -419,7 +282,7 @@ export default {
   name: "InvProducts",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         nameCode: null,
         cpmctymc: null,
@@ -435,6 +298,7 @@ export default {
         limit: 10,
         udiCode: null,
         filterNoInv: '1',
+        keyWords:""
       },
       list: [],
      total: 0,
@@ -491,6 +355,7 @@ export default {
         productsType: 2,
         page: 1,
         limit: 10,
+        keyWords:""
       };
       this.getList();
       this.findMethod(this);