From 6d393081ffd84343c22fcf2db8de4b37bf40b645 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 14:31:21 +0800
Subject: [PATCH] =?UTF-8?q?11/15=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugMaintain.vue | 284 +++++++++++++-----
 src/views/inout/InvoiceRegByFp.vue            |   6 +-
 src/views/inout/InvoiceRegByOrder.vue         |   6 +-
 src/views/inout/IoCreateOrder.vue             |   8 +-
 .../distribution/IoCreateOrder.vue            |   6 +-
 .../pharmaceuticals/inout/InvoiceRegByFp.vue  |   8 +-
 .../inout/InvoiceRegByOrder.vue               |   8 +-
 .../drugProducts/supProductsAddDi.vue         |  59 ----
 .../system/customConfig/configQueryDetail.vue |   9 +
 9 files changed, 241 insertions(+), 153 deletions(-)

diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index 5ae4faf..35a47b7 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -1,87 +1,187 @@
 <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-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>-->
+      <!--    &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+      <!--    &lt;!&ndash;            <el-form-item label="医疗器械注册人:" class="query-form-item">&ndash;&gt;-->
+      <!--    &lt;!&ndash;              <el-input&ndash;&gt;-->
+      <!--    &lt;!&ndash;                clearable&ndash;&gt;-->
+      <!--    &lt;!&ndash;                v-model="filterQuery.ylqxzcrbarmc"&ndash;&gt;-->
+      <!--    &lt;!&ndash;                placeholder="请输入医疗器械注册人"&ndash;&gt;-->
+      <!--    &lt;!&ndash;              ></el-input>&ndash;&gt;-->
+      <!--    &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+      <!--    &lt;!&ndash;          </el-col>&ndash;&gt;-->
+      <!--    <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>-->
+      <!--          &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-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>-->
+      <!--    &lt;!&ndash;<el-col :span="8">&ndash;&gt;-->
+      <!--    &lt;!&ndash;  <el-form-item label="是否禁用:" class="query-form-item">&ndash;&gt;-->
+      <!--    &lt;!&ndash;    <el-select v-model="filterQuery.isDisable" clearable>&ndash;&gt;-->
+      <!--    &lt;!&ndash;      <el-option label="是" :value=true></el-option>&ndash;&gt;-->
+      <!--    &lt;!&ndash;      <el-option label="否" :value=false></el-option>&ndash;&gt;-->
+      <!--    &lt;!&ndash;    </el-select>&ndash;&gt;-->
+      <!--    &lt;!&ndash;  </el-form-item>&ndash;&gt;-->
+      <!--    &lt;!&ndash;</el-col>&ndash;&gt;-->
+      <!--  </el-row>-->
+      <!--  <el-divider/>-->
+      <!--</el-form>-->
+      <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" style="display: flex; align-items: center;">
         <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>-->
@@ -212,6 +312,7 @@
     </el-card>
 
   </div>
+
 </template>
 
 <script>
@@ -234,13 +335,28 @@ 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 {getAdminId, getToken} from '@/utils/auth';
+import { executeFuc, getHead } 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: [],
@@ -249,7 +365,8 @@ export default {
         productsType: 2,
         page: 1,
         limit: 20,
-        addType: 1
+        addType: 1,
+        keyWords:"",
       },
       addDrugVisible: false,
       chooseDrugVisible: false,
@@ -309,7 +426,8 @@ export default {
         productsType: 2,
         page: 1,
         limit: 20,
-        addType: 1
+        addType: 1,
+        keyWords:""
       };
       this.getList();
     },
@@ -460,6 +578,14 @@ 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();
+    });
     this.getList()
   }
 }
diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index 182661b..97d350f 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="invoiceQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="invoiceQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-form-item" label="发票编码:">-->
@@ -46,6 +46,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="invoiceQuery[item.columnName]"
@@ -107,6 +108,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
@@ -796,7 +798,7 @@ export default {
     return {
 
       BASE_URL: process.env.VUE_APP_BASE_API,
-      showSearch: true,
+      showSearch: false,
       checkInvoice: false,
       //发票相关参数
       curInvoice: {},
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 5e03ac5..c340ac9 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -1,7 +1,7 @@
 <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-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
         <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -114,6 +114,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]"
@@ -189,6 +190,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
@@ -898,7 +900,7 @@ export default {
       imgList: [],
       imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index e9a4213..78a6b07 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -2,7 +2,7 @@
   <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">
+               label-width="100px" >
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
         <!--            <el-form-item class="query-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
@@ -150,12 +151,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"
@@ -397,7 +399,7 @@ export default {
   data() {
     return {
       defaultSort: {prop: 'createTime', order: 'desc'},
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
index 50b44a6..61e57c1 100644
--- a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
@@ -2,7 +2,7 @@
   <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">
+               label-width="100px" >
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
         <!--            <el-form-item class="query-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
@@ -150,12 +151,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"
diff --git a/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue b/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue
index a61ec7f..b93b1e7 100644
--- a/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue
+++ b/src/views/pharmaceuticals/inout/InvoiceRegByFp.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form :model="invoiceQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form :model="invoiceQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
 <!--            <el-form-item class="query-form-item" label="发票编码:">-->
@@ -46,6 +46,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="invoiceQuery[item.columnName]"
@@ -107,12 +108,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"
@@ -796,7 +798,7 @@ export default {
     return {
 
       BASE_URL: process.env.VUE_APP_BASE_API,
-      showSearch: true,
+      showSearch: false,
       checkInvoice: false,
       //发票相关参数
       curInvoice: {},
diff --git a/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue b/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue
index 1a0f8b2..81f48e3 100644
--- a/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue
+++ b/src/views/pharmaceuticals/inout/InvoiceRegByOrder.vue
@@ -1,7 +1,7 @@
 <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-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
         <!--            <el-form-item class="query-form-item" label="单号:">-->
@@ -114,6 +114,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]"
@@ -189,12 +190,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"
@@ -898,7 +900,7 @@ export default {
       imgList: [],
       imgViewerVisible: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/supplier/drugProducts/supProductsAddDi.vue b/src/views/supplier/drugProducts/supProductsAddDi.vue
index 8a45c53..c5eccde 100644
--- a/src/views/supplier/drugProducts/supProductsAddDi.vue
+++ b/src/views/supplier/drugProducts/supProductsAddDi.vue
@@ -3,65 +3,6 @@
   <div>
     <el-card class="el-card">
       <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="100px" >
-        <!--        <el-row>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="DI产品标识:">-->
-        <!--              <el-input-->
-        <!--                v-model="filterQuery.code"-->
-        <!--                style="width: 90%"-->
-        <!--                placeholder="请输入DI产品标识"-->
-        <!--                clearable-->
-        <!--                @keyup.enter.native="keyupErp_submit($event)"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="物资名称:">-->
-        <!--              <el-input-->
-        <!--                v-model="filterQuery.name"-->
-        <!--                style="width: 90%"-->
-        <!--                clearable-->
-        <!--                placeholder="请输入物资名称"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="规格型号:">-->
-        <!--              <el-input-->
-        <!--                v-model="filterQuery.spec"-->
-        <!--                style="width: 90%"-->
-        <!--                clearable-->
-        <!--                placeholder="请输入规格型号"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
-        <!--        <el-row>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="注册证编号:">-->
-        <!--              <el-input-->
-        <!--                v-model="filterQuery.registerNo"-->
-        <!--                style="width: 90%"-->
-        <!--                clearable-->
-        <!--                placeholder="请输入注册证编号"-->
-        <!--              ></el-input>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--          <el-col :span="8">-->
-        <!--            <el-form-item label="审核状态:">-->
-        <!--              <el-select-->
-        <!--                v-model="filterQuery.checkStatus"-->
-        <!--                style="width: 90%"-->
-        <!--                placeholder="请选择审核状态"-->
-        <!--              >-->
-        <!--                <el-option label="全部" value=""></el-option>-->
-        <!--                <el-option label="已审核" value="2"></el-option>-->
-        <!--                <el-option label="未审核" value="1"></el-option>-->
-        <!--                <el-option label="未通过" value="3"></el-option>-->
-        <!--              </el-select>-->
-        <!--            </el-form-item>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList">
             <div v-if="showSearch || item.isImport">
diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue
index b787b87..90a75cf 100644
--- a/src/views/system/customConfig/configQueryDetail.vue
+++ b/src/views/system/customConfig/configQueryDetail.vue
@@ -24,6 +24,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="columnDesc" label="列描述"></el-table-column>
+        <el-table-column prop="isShow" label="是否常用查询" width="120">
+          <template slot-scope="scope">
+            <span>{{ isImportMap[scope.row.isImport] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="columnType" label="列类型">
           <template slot-scope="scope">
             <span>{{ columnTypeMap[scope.row.columnType] }}</span>
@@ -289,6 +294,10 @@
           "1": "显示",
           "2": "隐藏",
         },
+        isImportMap: {
+          true: "是",
+          false: "否",
+        },
         columnTypeMap: {
           "input": "输入框",
           "select": "下拉框",