From f5f189d7117bfb195d2a4b676281174c32d298ea Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 15:04:27 +0800
Subject: [PATCH] =?UTF-8?q?11/15=20=E7=89=A9=E8=B5=84=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue         |  9 ++++++---
 src/views/basic/product/udiInfoManageSp.vue | 10 +++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index e74d1ea..dcb71aa 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -42,10 +42,11 @@
             :model="filterQuery"
             size="mini"
             label-width="100px"
-            v-show="showSearch"
+
           >
             <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
@@ -113,6 +114,7 @@
                     :placeholder="item.columnDesc"
                   ></el-date-picker>
                 </el-form-item>
+                </div>
               </template>
             </el-row>
             <!--            <el-row>-->
@@ -255,7 +257,7 @@
           <div class="top-right-btn">
             <el-button-group>
               <el-button icon="el-icon-view" type="primary" @click="hideSearch"
-              >显示/隐藏搜索栏
+              >高级查询
               </el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
               >重置
@@ -1867,7 +1869,7 @@ export default {
       selectHospProductVisible: false,
       selectUnBindHospProductVisible: false,
       loading: false,
-      showSearch: true,
+      showSearch: false,
       productType: null,
       editQuery: null,
       editFormat: {},
@@ -1992,6 +1994,7 @@ export default {
         page: 1,
         limit: 20,
         addType: 1,
+        productsType: 1
       };
       this.getList();
     },
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index 685967c..93542ab 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="120px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" label-width="120px" >
 <!--        <el-row>-->
 <!--          <el-col :span="6">-->
 <!--            <el-form-item label="供应商:">-->
@@ -85,6 +85,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]"
@@ -150,6 +151,7 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
@@ -157,7 +159,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 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="search">查询</el-button>
           <el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine">锁定</el-button>
@@ -342,7 +344,7 @@ import {
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         lockStatus: null,
         unionCode: null,
@@ -358,6 +360,7 @@ export default {
         filterType: null,
         companyName: null,
         unitFk: null,
+        productType: 1
       },
       fromOptions: [],
       editQuery: null,
@@ -431,6 +434,7 @@ export default {
         page: 1,
         limit: 20,
         addType: 1,
+        productType: 1
       };
       this.total = 0;
       this.list = [];