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

---
 src/components/SearchInput.vue                |   4 +-
 src/components/charge/TotalPrice.vue          |   2 +-
 .../outpatient/DiagnosisSearchInput.vue       |   3 +-
 .../outpatient/PharmaceuticalConsumables.vue  | 128 +++++++++---------
 src/views/charge/index.vue                    |   4 +-
 5 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index 4b3a868..17bdcb6 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -1,6 +1,6 @@
 <template>
 
-  <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
+  <el-popover placement="bottom-start" :visible="isVisible" width="40%" ref="popoverRef"
               :trigger-keys="[]">
     <template #reference>
       <el-input
@@ -8,7 +8,7 @@
           v-model="keyword"
           :prefix-icon="Plus"
           :placeholder="props.placeholder"
-          :style="{ width: props.width + 'px' }"
+          style="width: 100%"
           clearable
           @input="changeInput"
           class="no-border-input"
diff --git a/src/components/charge/TotalPrice.vue b/src/components/charge/TotalPrice.vue
index ae60814..b6a5666 100644
--- a/src/components/charge/TotalPrice.vue
+++ b/src/components/charge/TotalPrice.vue
@@ -19,7 +19,7 @@ const editItem= () => {
   <Panel :showTools="false" :showHeader="false">
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
-      <div class="btn-group">
+      <div class="btn-group" v-if="status  == 0">
         <el-button type="primary" disabled>追溯码</el-button>
         <el-button type="primary" @click="editItem">收费</el-button>
       </div>
diff --git a/src/components/outpatient/DiagnosisSearchInput.vue b/src/components/outpatient/DiagnosisSearchInput.vue
index 6785ead..7668176 100644
--- a/src/components/outpatient/DiagnosisSearchInput.vue
+++ b/src/components/outpatient/DiagnosisSearchInput.vue
@@ -60,7 +60,8 @@ const changeInput = (inputStr: string) => {
   if (!props.requestApi || props.requestApi === "") {
     return
   }
-  let tempList = inputStr.split(",");
+  debugger
+  let tempList = keyword.value.split(",");
   let searchKeyword = tempList[tempList.length - 1];
   nameList.value = []
   selectList.value = selectList.value ? selectList.value.slice(0, tempList.length) : []
diff --git a/src/components/outpatient/PharmaceuticalConsumables.vue b/src/components/outpatient/PharmaceuticalConsumables.vue
index 14319c1..5c19cc4 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/views/charge/index.vue b/src/views/charge/index.vue
index ea65c50..0783c90 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -51,8 +51,8 @@
             <GoodsDetail v-model="formData" @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
           </Panel>
         </div>
-        <div class="bottom" v-if="formData.status == 0">
-          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" ></TotalPrice>
+        <div class="bottom" >
+          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" :status="formData.status" ></TotalPrice>
         </div>
       </el-scrollbar>
     </div>