From 62b476a5c31fbea354e4bde5a1ca965701490d1d Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 10:33:11 +0800
Subject: [PATCH] =?UTF-8?q?11/15=20=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=89?=
 =?UTF-8?q?=E5=85=A5=E8=8D=AF=E5=93=81=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

---
 .../supplier/drugProducts/supProductsOptinDi.vue     | 12 ++++++++----
 src/views/supplier/products/supProductsOptinDi.vue   |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/supplier/drugProducts/supProductsOptinDi.vue b/src/views/supplier/drugProducts/supProductsOptinDi.vue
index 7b53249..7f9bea2 100644
--- a/src/views/supplier/drugProducts/supProductsOptinDi.vue
+++ b/src/views/supplier/drugProducts/supProductsOptinDi.vue
@@ -2,7 +2,7 @@
   <!-- 物资入院申请 -->
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="100px">
         <!--        <el-row>-->
         <!--          <el-col :span="8">-->
         <!--            <el-form-item label="DI产品标识:">-->
@@ -64,6 +64,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' && item.columnName !='queryName' && executeEval(row,item.expression,true)"
               :label="item.columnDesc+`:`" :key="item.id">
@@ -155,6 +156,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
@@ -162,7 +164,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 type="primary" icon="el-icon-refresh" @click="onReset"
@@ -442,7 +444,7 @@ import store from "@/store";
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       thisDetail: null,
       filterQuery: {
         sourceType: 0,
@@ -454,7 +456,7 @@ export default {
         checkStatus: null,
         page: 1,
         limit: 20,
-        productType: 2
+        productsType: 2
       },
       total: 0,
       tableHeader: [],
@@ -504,6 +506,7 @@ export default {
         path: "",
       });
       this.filterQuery = {
+        sourceType: 0,
         code: null,
         spec: null,
         registerNo: null,
@@ -512,6 +515,7 @@ export default {
         name: null,
         page: 1,
         limit: 20,
+        productsType: 2
       };
       this.getList();
     },
diff --git a/src/views/supplier/products/supProductsOptinDi.vue b/src/views/supplier/products/supProductsOptinDi.vue
index 4d02a2c..5093d31 100644
--- a/src/views/supplier/products/supProductsOptinDi.vue
+++ b/src/views/supplier/products/supProductsOptinDi.vue
@@ -454,6 +454,7 @@ export default {
         checkStatus: null,
         page: 1,
         limit: 20,
+        productsType: 1
       },
       total: 0,
       tableHeader: [],
@@ -511,6 +512,7 @@ export default {
         name: null,
         page: 1,
         limit: 20,
+        productsType: 1
       };
       this.getList();
     },