From 08037e63b1bd48e17e65c72e72cf969b95fa8301 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 16:05:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961.0=2011/15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/drug/drugMaintain.vue |  2 +-
 src/views/drugInventory/InvProducts.vue       | 10 +++--
 .../drugInventory/supInoutSearchOrder.vue     |  8 ++--
 .../inout/IoDeliveryAuditOrderDrug.vue        | 19 +++-------
 .../inout/IoDeliverySearchOrder.vue           | 37 +++----------------
 5 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/src/views/basic/product/drug/drugMaintain.vue b/src/views/basic/product/drug/drugMaintain.vue
index 35a47b7..1f0eabc 100644
--- a/src/views/basic/product/drug/drugMaintain.vue
+++ b/src/views/basic/product/drug/drugMaintain.vue
@@ -181,7 +181,7 @@
 
       <div class="top-right-btn" style="display: flex; align-items: center;">
         <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" @click="onReset">重置</el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
           <!--<el-button type="primary" icon="el-icon-plus" @click="chooseDrug">选入药品信息</el-button>-->
diff --git a/src/views/drugInventory/InvProducts.vue b/src/views/drugInventory/InvProducts.vue
index 51d5ca1..65f44ab 100644
--- a/src/views/drugInventory/InvProducts.vue
+++ b/src/views/drugInventory/InvProducts.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" size="mini" label-width="100px" >
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form" size="mini" label-width="100px" >
        <!-- <el-row>
           <el-col :span="18">
             <el-form-item label="扫码查询:">
@@ -143,6 +143,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]"
@@ -208,12 +209,13 @@
                 :placeholder="item.columnDesc"
               ></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"
@@ -419,7 +421,7 @@ export default {
   name: "InvProducts",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         nameCode: null,
         cpmctymc: null,
@@ -435,6 +437,7 @@ export default {
         limit: 10,
         udiCode: null,
         filterNoInv: '1',
+        keyWords:"",
       },
       list: [],
      total: 0,
@@ -491,6 +494,7 @@ export default {
         productsType: 2,
         page: 1,
         limit: 10,
+        keyWords:""
       };
       this.getList();
       this.findMethod(this);
diff --git a/src/views/drugInventory/supInoutSearchOrder.vue b/src/views/drugInventory/supInoutSearchOrder.vue
index 63385e8..b636552 100644
--- a/src/views/drugInventory/supInoutSearchOrder.vue
+++ b/src/views/drugInventory/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" size="mini" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
         <!-- <el-row>
            <el-col :span="18">
              <el-form-item label="扫码查询:">
@@ -143,6 +143,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]"
@@ -221,12 +222,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" @click="optinPrint">选入打印</el-button>
           <el-button type="primary" icon="el-icon-refresh" @click="selectPrint">查询打印</el-button>
           <el-button
@@ -440,7 +442,7 @@ export default {
   name: "supInoutSearchOrder",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       list: [],
       busTypeOptions: [],
       filterQuery: {
diff --git a/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue b/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue
index a21c2f1..9bde4ba 100644
--- a/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue
+++ b/src/views/pharmaceuticals/inout/IoDeliveryAuditOrderDrug.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 
 
@@ -118,6 +118,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]"
@@ -193,12 +194,13 @@
                 :placeholder="item.columnDesc"
               ></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"
@@ -263,17 +265,6 @@
 <!--        </el-table-column>-->
 <!--        &lt;!&ndash;        <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
 <!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
-<!--        &lt;!&ndash;                reviceStatus[scope.row.status]&ndash;&gt;-->
-<!--        &lt;!&ndash;              }}&ndash;&gt;-->
-<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        &lt;!&ndash;        <el-table-column label="审核状态" prop="status" width="100">&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
-<!--        &lt;!&ndash;                checkStatus[scope.row.status]&ndash;&gt;-->
-<!--        &lt;!&ndash;              }}&ndash;&gt;-->
 <!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
 <!--        &lt;!&ndash;          </template>&ndash;&gt;-->
 <!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
@@ -1299,7 +1290,7 @@ export default {
       imgViewerVisible: false,
       imgViewerVisibleCold: false,
       BASE_URL: process.env.VUE_APP_BASE_API,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,
diff --git a/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue b/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue
index a18dfa2..40ca2e9 100644
--- a/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue
+++ b/src/views/pharmaceuticals/inout/IoDeliverySearchOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" >
 <!--        <el-row>-->
 <!--          <el-col :span="6">-->
 <!--            <el-form-item class="query-form-item" label="送货单号:">-->
@@ -135,6 +135,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]"
@@ -210,12 +211,13 @@
                 :placeholder="item.columnDesc"
               ></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"
@@ -272,34 +274,7 @@
 <!--        </el-table-column>-->
 
 
-<!--        <el-table-column label="审核状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        &lt;!&ndash;        <el-table-column label="验收状态" prop="status" width="100">&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
-<!--        &lt;!&ndash;                reviceStatus[scope.row.status]&ndash;&gt;-->
-<!--        &lt;!&ndash;              }}&ndash;&gt;-->
-<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        &lt;!&ndash;        <el-table-column label="审核状态" prop="status" width="100">&ndash;&gt;-->
-<!--        &lt;!&ndash;          <template slot-scope="scope">&ndash;&gt;-->
-<!--        &lt;!&ndash;            <el-tag :type="statusFilterType(scope.row.status)">{{&ndash;&gt;-->
-<!--        &lt;!&ndash;                checkStatus[scope.row.status]&ndash;&gt;-->
-<!--        &lt;!&ndash;              }}&ndash;&gt;-->
-<!--        &lt;!&ndash;            </el-tag>&ndash;&gt;-->
-<!--        &lt;!&ndash;          </template>&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="160" fixed="right">-->
-<!--          <template slot-scope="scope">-->
+
 
 <!--            <el-button-->
 <!--              type="text"-->
@@ -1328,7 +1303,7 @@ export default {
       BASE_URL: process.env.VUE_APP_BASE_API,
       currentManufacturer: {},
       Upinvoice: false,
-      showSearch: true,
+      showSearch: false,
       filterQuery: {
         id: "",
         billNo: null,