From 2447a79911ca9190cc14ab6f12572e484298fa2e Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 18 Nov 2024 17:01:59 +0800
Subject: [PATCH] =?UTF-8?q?11/18=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/udiInfoManageCp.vue         | 10 +++++++---
 src/views/supplier/company/basicCompanyProducts.vue |  8 +++++---
 src/views/supplier/products/supProductsAddDi.vue    |  8 +++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/basic/product/udiInfoManageCp.vue b/src/views/basic/product/udiInfoManageCp.vue
index d7e131c..c71c6ad 100644
--- a/src/views/basic/product/udiInfoManageCp.vue
+++ b/src/views/basic/product/udiInfoManageCp.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>-->
@@ -386,7 +388,7 @@ import {
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         lockStatus: null,
         unionCode: null,
@@ -403,6 +405,7 @@ export default {
         companyName: null,
         unitFk: null,
         userFlag: 0,
+        productType:1
       },
       cpSpData:{
         customerId:null
@@ -482,6 +485,7 @@ export default {
         limit: 20,
         addType: 1,
         userFlag: 0,
+        productType:1
       };
       this.total = 0;
       this.list = [];
diff --git a/src/views/supplier/company/basicCompanyProducts.vue b/src/views/supplier/company/basicCompanyProducts.vue
index add1918..1c7ab7e 100644
--- a/src/views/supplier/company/basicCompanyProducts.vue
+++ b/src/views/supplier/company/basicCompanyProducts.vue
@@ -2,7 +2,7 @@
   <div>
     <el-card>
       <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px"
-               v-show="showSearch">
+               >
         <!--        <el-row>-->
         <!--          <el-col :span="6">-->
         <!--            <el-form-item label="物资编码:">-->
@@ -61,6 +61,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">
@@ -152,12 +153,13 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
+            </div>
           </template>
         </el-row>
       </el-form>
       <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="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
@@ -523,7 +525,7 @@ import {
 export default {
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         unionCode: null,
         udiCode: null,
diff --git a/src/views/supplier/products/supProductsAddDi.vue b/src/views/supplier/products/supProductsAddDi.vue
index c960d2b..3486d15 100644
--- a/src/views/supplier/products/supProductsAddDi.vue
+++ b/src/views/supplier/products/supProductsAddDi.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: 1,