From ce4853e6d596ea5d549df0ec7ea039e526588433 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 20 Nov 2024 16:25:54 +0800
Subject: [PATCH] =?UTF-8?q?11/20=20=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=A1=B5=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/drugInventory/supInoutSearchOrder.vue |  3 ++-
 src/views/inventory/supInoutSearchOrder.vue     | 11 +++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/drugInventory/supInoutSearchOrder.vue b/src/views/drugInventory/supInoutSearchOrder.vue
index 3bcf1636..9daaa290 100644
--- a/src/views/drugInventory/supInoutSearchOrder.vue
+++ b/src/views/drugInventory/supInoutSearchOrder.vue
@@ -591,7 +591,8 @@ export default {
       let query = {
         code: _this.$store.getters.locInvCode,
         enabled: true,
-        detailType: _this.actionType
+        detailType: _this.actionType,
+        productType:2
       };
       getOrderDetailBusOptimize(query)
         .then((response) => {
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index 2040ac1d..f5a699d7 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <!-- <el-row>
            <el-col :span="18">
@@ -144,6 +144,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
@@ -232,12 +233,13 @@
                 end-placeholder="结束日期"
               ></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"
@@ -436,7 +438,7 @@ export default {
   name: "supInoutSearchOrder",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       list: [],
       busTypeOptions: [],
       filterQuery: {
@@ -586,7 +588,8 @@ export default {
       let query = {
         code: _this.$store.getters.locInvCode,
         enabled: true,
-        detailType: _this.actionType
+        detailType: _this.actionType,
+        productType: 1
       };
       getOrderDetailBusOptimize(query)
         .then((response) => {