From b461148c88e2c4a1ad39a453761ac704bad1c6ee Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 20 Nov 2024 14:22:49 +0800
Subject: [PATCH] =?UTF-8?q?11/20=20=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/chooseHouseDrug.vue | 10 +++++-----
 src/views/drugInventory/supInoutSearchOrder.vue  |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/views/basic/product/drug/chooseHouseDrug.vue b/src/views/basic/product/drug/chooseHouseDrug.vue
index 01728eb9..3e1556fc 100644
--- a/src/views/basic/product/drug/chooseHouseDrug.vue
+++ b/src/views/basic/product/drug/chooseHouseDrug.vue
@@ -10,7 +10,7 @@
               </el-form-item>
             </el-col>
           <el-col :span="6">
-            <el-form-item label="物资编码:">
+            <el-form-item label="药品编码:">
               <el-input v-model="erpQuery.code" style="width: 90%" placeholder="请输入药品编码" clearable="true"
                         @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
@@ -89,8 +89,8 @@
         <!--<el-table-column v-if="!isImport" type="selection" width="55"></el-table-column>-->
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="医保编码" prop="ybbm"></el-table-column>
-        <el-table-column label="物资编码" prop="code"></el-table-column>
-        <el-table-column label="物资名称" prop="name"></el-table-column>
+        <el-table-column label="药品编码" prop="code"></el-table-column>
+        <el-table-column label="药品名称" prop="name"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="包装规格" prop="spec"></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec"></el-table-column>
@@ -118,13 +118,13 @@
       <el-form label-width="120px">
         <el-row>
           <el-col :span="12" class="el-col">
-            <el-form-item label="物资名称:">
+            <el-form-item label="药品名称:">
               <el-input style="width: 90%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="data.cpmctymc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="产品标识:">
+            <el-form-item label="药品编码:">
               <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
                         v-model="data.nameCode"></el-input>
             </el-form-item>
diff --git a/src/views/drugInventory/supInoutSearchOrder.vue b/src/views/drugInventory/supInoutSearchOrder.vue
index c32df309..3bcf1636 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"
@@ -437,7 +439,7 @@ export default {
   name: "supInoutSearchOrder",
   data() {
     return {
-      showSearch: true,
+      showSearch: false,
       list: [],
       busTypeOptions: [],
       filterQuery: {