From ad67e3a2aa0fa163d017ecf5de0da523d2d3f75c Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Wed, 7 May 2025 15:19:44 +0800
Subject: [PATCH] dev

---
 src/components/PopoverInput.vue               |   6 +-
 src/components/SearchInput.vue                |  46 ++++---
 src/components/outpatient/Case.vue            |   3 +-
 .../outpatient/DiagnosisSearchInput.vue       |   8 +-
 src/components/outpatient/MedicalQueue.vue    |   4 +-
 .../outpatient/PharmaceuticalConsumables.vue  | 128 +++++++++---------
 src/components/outpatient/ServiceItems.vue    |   1 -
 7 files changed, 102 insertions(+), 94 deletions(-)

diff --git a/src/components/PopoverInput.vue b/src/components/PopoverInput.vue
index 394e708..8aa243f 100644
--- a/src/components/PopoverInput.vue
+++ b/src/components/PopoverInput.vue
@@ -1,6 +1,8 @@
 <template>
-  <el-input v-model="input" style="width:100%;height: 100%" clearable :disabled="disabled" ref="inputRef" @click="showPopo" @focus="focus"></el-input>
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" :virtual-ref="inputRef" ref="popoverRef">
+  <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef">
+    <template #reference>
+      <el-input v-model="input" style="width:100%;height: 100%" clearable :disabled="disabled" ref="inputRef" @click="showPopo" @focus="focus"></el-input>
+    </template>
     <div class="code-popo" v-if="props.list.length > 0">
       <div class="code-item" v-for="item in props.list">
         <div class="code-item-header" v-if="item.header">
diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index eff91f8..642cfc7 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -1,24 +1,23 @@
 <template>
-  <el-input
-      ref="inputRef"
-      style="width: 100%;height: 100%"
-      v-model="keyword"
-      :prefix-icon="Plus"
-      :placeholder="props.placeholder"
-      :style="{'width': props.width+'px'}"
-      clearable
-      @input="changeInput"
-      class="no-border-input"
-      :disabled="disabled"
-      @focus="focus"
-      @click="changeInput"
-  >
 
-  >
-  </el-input>
-
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" :virtual-ref="inputRef"
+  <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
               :trigger-keys="[]">
+    <template #reference>
+      <el-input
+          ref="inputRef"
+          v-model="keyword"
+          :prefix-icon="Plus"
+          :placeholder="props.placeholder"
+          :style="{ width: props.width + 'px' }"
+          clearable
+          @input="changeInput"
+          class="no-border-input"
+          :disabled="disabled"
+          @focus="focus"
+          @blur="handlerBlur"
+          @click="changeInput"
+      />
+    </template>
     <div class="container">
       <el-table
           :data="searchList" style="width: 100%"
@@ -35,16 +34,18 @@
       </el-table>
     </div>
   </el-popover>
+
 </template>
 
-<script setup lang="ts">import {ref, unref} from "vue";
+<script setup lang="ts">
+import {ref, unref} from "vue";
 import {post} from "@/utils/request.ts";
 import {Plus} from "@element-plus/icons-vue";
 
 const keyword = ref("");
 const popoverRef = ref();
 const inputRef = ref();
-
+const isVisible = ref(false);
 interface showConfig {
   prop: string;
   label: string;
@@ -105,8 +106,13 @@ const beforeShow = () => {
 };
 
 const focus=()=>{
+  isVisible.value=true
+  console.log( "focus输入框")
   emit('focus',true)
 }
+const handlerBlur = () => {
+  isVisible.value = false
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/components/outpatient/Case.vue b/src/components/outpatient/Case.vue
index af2c4a7..f6123c0 100644
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@@ -26,8 +26,7 @@
               @selectedCallBack="diagnosisSelect"
               :show-header="false"
               @focus="focus"
-          >
-          </DiagnosisSearchInput>
+          />
         </el-form-item>
         <el-form-item label="现病史" v-if="!props.isShowFrom">
           <PopoverInput :disabled="disabled" v-model="formDate.nowMedicalHistory" :list="nowMedicalHistoryList"/>
diff --git a/src/components/outpatient/DiagnosisSearchInput.vue b/src/components/outpatient/DiagnosisSearchInput.vue
index 09ce6ce..2b3876e 100644
--- a/src/components/outpatient/DiagnosisSearchInput.vue
+++ b/src/components/outpatient/DiagnosisSearchInput.vue
@@ -1,9 +1,11 @@
 <template>
-  <el-input v-model="keyword" :style="{width:props.width+'px',height: 100+'%'}" @input="changeInput" :disabled="disabled" @click="changeInput"
-            placeholder="诊断选择" ref="inputRef" @focus="focus"></el-input>
 
-  <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" @before-enter="beforeShow" :virtual-ref="inputRef" @hide ="afterShow">
 
+  <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" @before-enter="beforeShow" @hide ="afterShow">
+    <template #reference>
+      <el-input v-model="keyword" :style="{width:props.width+'px',height: 100+'%'}" @input="changeInput" :disabled="disabled" @click="changeInput"
+                placeholder="诊断选择" ref="inputRef" @focus="focus"></el-input>
+    </template>
     <div class="container">
       <el-table :data="searchList" style="width: 100%"  @row-click="clickRow" :show-header="props.showHeader" size="small"
                 max-height="250px">
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 34196ad..7170038 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -18,9 +18,9 @@
                        alt="头像"/>
                   <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
                        alt="头像"/>
+                   {{ item.name }}
                 </span>
-            <span class="item_name">{{ item.name }}</span>
-            <span>{{ item.gender }}</span>
+
             <span class="item_time">
                 {{ formatListTime(item.createDatetime) || '-' }}
             </span>
diff --git a/src/components/outpatient/PharmaceuticalConsumables.vue b/src/components/outpatient/PharmaceuticalConsumables.vue
index 5c19cc4..14319c1 100644
--- a/src/components/outpatient/PharmaceuticalConsumables.vue
+++ b/src/components/outpatient/PharmaceuticalConsumables.vue
@@ -1,72 +1,72 @@
 <template>
   <Panel :title="'药品耗材'">
     <div class="content">
-      <div class="list">
-        <ul>
-          <li class="item" v-for="(item, index) in list" :key="index">
-            <div class="index">{{ index + 1 }}</div>
-            <div class="name">
-              <el-popover
-                  placement="top-start"
-                  trigger="hover"
-                  width="500"
-                  @show="getHilistInfo(item)"
-                  @hide="colosInfo"
+<!--      <div class="list">-->
+<!--        <ul>-->
+<!--          <li class="item" v-for="(item, index) in list" :key="index">-->
+<!--            <div class="index">{{ index + 1 }}</div>-->
+<!--            <div class="name">-->
+<!--              <el-popover-->
+<!--                  placement="top-start"-->
+<!--                  trigger="hover"-->
+<!--                  width="500"-->
+<!--                  @show="getHilistInfo(item)"-->
+<!--                  @hide="colosInfo"-->
 
-              >
-                <template #reference>
-                  {{ item.name }}
-                </template>
+<!--              >-->
+<!--                <template #reference>-->
+<!--                  {{ item.name }}-->
+<!--                </template>-->
 
-                <div class="detail">
-                  <div style="display: flex;justify-content: space-between">
-                    <div style="font-size: 18px;font-weight: 500;color: #000">{{ hilistInfo.name }}[{{ hilistInfo.json?.category||'-' }}]</div>
-                    <div>￥{{ item.selectedPrice }}/{{ item.selectedUnit }}</div>
-                  </div>
-                  <div style="display: flex;justify-content: space-between">
-                    <div>规格:{{hilistInfo.json?.dosage_specifications||'-'}}</div>
-                    <div>生产厂商:{{hilistInfo.json?.producer||'-'}}</div>
-                    <div>限价:{{hilistInfo.json?.stock||'0'}}</div>
-                  </div>
-                  <div style="display: flex;justify-content: space-between">
-                    <div>批准文号:{{hilistInfo.json?.approval_number||'-'}}</div>
-                    <div>本位码:{{hilistInfo.json?.standard_code ||'-'}}</div>
-                  </div>
-                  <div style="display: flex;justify-content: space-between">
-                    <div>限价:{{ hilistInfo.hilistPricUplmtAmt ? hilistInfo.hilistPricUplmtAmt : '无' }}</div>
-                    <div>限价类型:{{ hilistInfo.hilistLmtpricType ? hilistInfo.hilistLmtpricType : '无' }}</div>
-                  </div>
-                </div>
-              </el-popover>
-            </div>
-            <div class="price">￥{{ item.selectedPrice || '0' }}</div>
-            <div class="unit">
-              <div class="unit-content">
-                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>
-                <el-dropdown>
-                  <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>
-                  <template #dropdown>
-                    <el-dropdown-menu v-if="item.trdnFlag == 1">
-                      <el-dropdown-item @click="selectUnit(item,item.packagingUnit)">{{ item.packagingUnit }}
-                      </el-dropdown-item>
-                      <el-dropdown-item @click="selectUnit(item,item.minPackagingUnit)">{{ item.minPackagingUnit }}
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
-            </div>
-            <div class="sub-price">￥{{ item.unitPrice * item.selectedNum }}</div>
-            <div class="delete">
-              <div @click="deleteItem(item.id)" class="delete-btn">
-                <el-icon>
-                  <Close/>
-                </el-icon>
-              </div>
-            </div>
-          </li>
-        </ul>
-      </div>
+<!--                <div class="detail">-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div style="font-size: 18px;font-weight: 500;color: #000">{{ hilistInfo.name }}[{{ hilistInfo.json?.category||'-' }}]</div>-->
+<!--                    <div>￥{{ item.selectedPrice }}/{{ item.selectedUnit }}</div>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div>规格:{{hilistInfo.json?.dosage_specifications||'-'}}</div>-->
+<!--                    <div>生产厂商:{{hilistInfo.json?.producer||'-'}}</div>-->
+<!--                    <div>限价:{{hilistInfo.json?.stock||'0'}}</div>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div>批准文号:{{hilistInfo.json?.approval_number||'-'}}</div>-->
+<!--                    <div>本位码:{{hilistInfo.json?.standard_code ||'-'}}</div>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;justify-content: space-between">-->
+<!--                    <div>限价:{{ hilistInfo.hilistPricUplmtAmt ? hilistInfo.hilistPricUplmtAmt : '无' }}</div>-->
+<!--                    <div>限价类型:{{ hilistInfo.hilistLmtpricType ? hilistInfo.hilistLmtpricType : '无' }}</div>-->
+<!--                  </div>-->
+<!--                </div>-->
+<!--              </el-popover>-->
+<!--            </div>-->
+<!--            <div class="price">￥{{ item.selectedPrice || '0' }}</div>-->
+<!--            <div class="unit">-->
+<!--              <div class="unit-content">-->
+<!--                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>-->
+<!--                <el-dropdown>-->
+<!--                  <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>-->
+<!--                  <template #dropdown>-->
+<!--                    <el-dropdown-menu v-if="item.trdnFlag == 1">-->
+<!--                      <el-dropdown-item @click="selectUnit(item,item.packagingUnit)">{{ item.packagingUnit }}-->
+<!--                      </el-dropdown-item>-->
+<!--                      <el-dropdown-item @click="selectUnit(item,item.minPackagingUnit)">{{ item.minPackagingUnit }}-->
+<!--                      </el-dropdown-item>-->
+<!--                    </el-dropdown-menu>-->
+<!--                  </template>-->
+<!--                </el-dropdown>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="sub-price">￥{{ item.unitPrice * item.selectedNum }}</div>-->
+<!--            <div class="delete">-->
+<!--              <div @click="deleteItem(item.id)" class="delete-btn">-->
+<!--                <el-icon>-->
+<!--                  <Close/>-->
+<!--                </el-icon>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </li>-->
+<!--        </ul>-->
+<!--      </div>-->
       <div class="search">
         <div class="search-input">
           <SearchInput
diff --git a/src/components/outpatient/ServiceItems.vue b/src/components/outpatient/ServiceItems.vue
index 56eccbc..7daec8a 100644
--- a/src/components/outpatient/ServiceItems.vue
+++ b/src/components/outpatient/ServiceItems.vue
@@ -51,7 +51,6 @@
               @selectedCallBack="serviceSelect"
               :placeholder="'请输入项目名称'"
               :disabled="disabled"
-              style="height: 100%"
               @focus="focus"
           >
           </SearchInput>