From 56406bebbffc96d2acf42a1933b49b18e92a85c8 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Fri, 15 Nov 2024 15:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=8D=AF=E5=93=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=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/vendorDrug.vue | 8 +++++---
 src/views/supplier/company/basicCompany.vue | 7 +++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/basic/product/drug/vendorDrug.vue b/src/views/basic/product/drug/vendorDrug.vue
index fc75e5e..28a4d37 100644
--- a/src/views/basic/product/drug/vendorDrug.vue
+++ b/src/views/basic/product/drug/vendorDrug.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>
@@ -346,7 +348,7 @@ import {
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         lockStatus: null,
         unionCode: null,
diff --git a/src/views/supplier/company/basicCompany.vue b/src/views/supplier/company/basicCompany.vue
index 223d0fd..94e4a8e 100644
--- a/src/views/supplier/company/basicCompany.vue
+++ b/src/views/supplier/company/basicCompany.vue
@@ -731,6 +731,13 @@ export default {
         })
     },
 
+
+
+
+
+
+
+
     onModifySubmit(val) {
       //this.$message.error(val);
       var status = this.inputQuery.auditStatus