From a6adfb63004d3fe33232ab4bf5f7a78abce6a043 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 14 May 2025 13:18:13 +0800
Subject: [PATCH] dev

---
 src/components/charge/ChargeQueue.vue      | 23 +++++++--
 src/components/outpatient/MedicalQueue.vue |  1 +
 src/components/registration/Edit.vue       | 11 ++--
 src/views/inventory/goods.vue              | 60 +++++++++++++---------
 4 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/src/components/charge/ChargeQueue.vue b/src/components/charge/ChargeQueue.vue
index e1ecf6f..f9df768 100644
--- a/src/components/charge/ChargeQueue.vue
+++ b/src/components/charge/ChargeQueue.vue
@@ -29,10 +29,18 @@
                v-model="query.keyword"
                style="height: 100%;width: 100%"
                placeholder="根据姓名搜索"
-               @input="search"
+               @input="searchInput"
            />
          </div>
-          <div class="add" @click="addChargeOrder">新增患者</div>
+          <div class="add" @click="addChargeOrder" @mousemove="selected=true" @mouseleave="selected=false">
+            <el-icon style="margin-right: 7px">
+              <template #default>
+                <img v-if="!selected" style="width: 26px ;height: 22px" src="/static/images/charge/1.png" alt="" srcset="">
+                <img v-else style="width: 26px ;height: 22px" src="/static/images/charge/1-active.png" alt="" srcset="">
+              </template>
+            </el-icon>
+            新增患者
+          </div>
           <!--         <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
         </div>
         <div class="list" v-loading="loading">
@@ -68,7 +76,7 @@ import {nextTick, onMounted, ref, watch} from "vue";
 import {post} from "@/utils/request.ts";
 import Panel from "@/components/common/Panel.vue";
 import {formatListTime, getCurrentDate, getEndOfDay} from "@/utils/dateUtils.ts";
-import {Calendar} from "@element-plus/icons-vue";
+import { Search,Calendar} from "@element-plus/icons-vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import Edit from "@/components/registration/Edit.vue";
 
@@ -184,10 +192,11 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   }
   init()
 })
-const search = (v: any) => {
+const searchInput = (v: any) => {
   query.value.keyword = v
   init()
 }
+const selected= ref(false)
 </script>
 <style scoped lang="scss">
 .container {
@@ -214,6 +223,11 @@ const search = (v: any) => {
       border-radius: 6px;
       border: 1px solid #979797;
       margin-left: 16px;
+      cursor: pointer;
+      &:hover {
+        background: #4D6DE4;
+        color: #fff;
+      }
     }
   }
 
@@ -339,6 +353,7 @@ const search = (v: any) => {
   display: flex;
   justify-content: center;
   align-items: center;
+  cursor: pointer;
 }
 
 :deep(.el-input--prefix) {
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index d9d0bd1..abcfb10 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -331,6 +331,7 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   display: flex;
   justify-content: center;
   align-items: center;
+  cursor: pointer;
 }
 
 :deep(.el-input) {
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 00a5cb7..ff9e6dd 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -111,10 +111,10 @@
             </el-descriptions-item>
             <el-descriptions-item label="费用类型">
               <el-form-item prop="type">
-               <el-select v-model="edit_data.type">
-                 <el-option label="普通" :value="1"></el-option>
-                 <el-option label="医保" :value="2"></el-option>
-               </el-select>
+                <el-select v-model="edit_data.type">
+                  <el-option label="普通" :value="1"></el-option>
+                  <el-option label="医保" :value="2"></el-option>
+                </el-select>
               </el-form-item>
             </el-descriptions-item>
             <el-descriptions-item
@@ -246,7 +246,7 @@ const save = () => {
     ...edit_data.value,
     psnNo: socialCard.value?.data?.baseinfo.psn_no,
     insutype: socialCard.value?.data?.insuinfo[0].insutype,
-    insuBalance : socialCard.value?.data?.insuinfo[0].balc,
+    insuBalance: socialCard.value?.data?.insuinfo[0].balc,
 
   }
   form.value.validate((v: any) => {
@@ -374,6 +374,7 @@ const hide = () => {
 }
 const sectionList = ref<any>([])
 const getSectionList = () => {
+  if(!edit_data.value.organizationDoctorId)return
   post(apiConfig.OrganizationSectionListByMemberId, {memberId: edit_data.value.organizationDoctorId}).then((res: any) => {
     sectionList.value = res
     if (res.length > 0) {
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index b6dc23d..955a68f 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -68,14 +68,14 @@
         </div>
       </div>
       <div class="addBtn">
-        <el-button type="primary" :icon="Plus" @click="open_edit(1301,0)">新增中西成药</el-button>
-        <el-button type="primary" :icon="Plus" @click="open_edit(1302,0)">新增中药饮片</el-button>
-        <el-button type="primary" :icon="Plus" @click="open_edit(1306,0)">新增医疗器材</el-button>
-        <el-button type="primary" :icon="Plus" @click="open_edit(0,0)">新增其他商品</el-button>
+        <span @click="open_edit(1301,0)">新增中西成药</span>
+        <span @click="open_edit(1302,0)">新增中药饮片</span>
+        <span @click="open_edit(1306,0)">新增医疗器材</span>
+        <span @click="open_edit(0,0)">新增其他商品</span>
       </div>
     </div>
     <div class="content_goods" ref="content">
-      <el-table :data="tableData" style="width: 100%;height: 100%;padding: 0 24px" @row-click="openMack">
+      <el-table :data="tableData" style="width: 100%;height: 100%;padding: 0 24px" @row-click="openMack" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column fixed prop="name" label="名称" width="200" show-overflow-tooltip>
           <template #default="scope">
             {{ scope.row.name }}{{ scope.row.commonName ? "(" + scope.row.commonName + ")" : "" }}
@@ -118,7 +118,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="最近效期" prop="recentlyExpiryDate" width="100"></el-table-column>
+        <el-table-column label="最近效期" prop="recentlyExpiryDate" width="200" show-overflow-tooltip></el-table-column>
 
         <el-table-column label="进价" width="120">
           <template #default="scope">
@@ -131,7 +131,7 @@
           </template>
         </el-table-column>
         <el-table-column label="医保限价" prop="hilistPricUplmtAmt" show-overflow-tooltip></el-table-column>
-        <el-table-column label="限制说明" prop="hilistLmtpricType"></el-table-column>
+        <el-table-column label="限制说明" prop="hilistLmtpricType" show-overflow-tooltip></el-table-column>
         <el-table-column label="自付比例" prop="selfpayProp"></el-table-column>
         <el-table-column label="毛利率" width="120">
           <template #default="scope">
@@ -143,39 +143,34 @@
             {{ getProfitCategory(scope.row.interestRate) }}
           </template>
         </el-table-column>
-        <el-table-column label="药品成本" prop="costPrice" show-overflow-tooltip>
+        <el-table-column label="药品成本" prop="costPrice" width="200" show-overflow-tooltip>
           <template #default="scope">
             ￥{{ scope.row.costPrice.toFixed(2) }}
           </template>
         </el-table-column>
-
         <el-table-column label="医保码" prop="hilistCode" show-overflow-tooltip></el-table-column>
-
-
-        <el-table-column label="标签" prop="producer" width="200">
+        <el-table-column label="标签" prop="producer" width="100">
           <template #default="scope">
             <el-tag class="tags" type="success" v-for="item in getTagsArray(scope.row.tags)">{{ item }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark" width="150"/>
+        <el-table-column label="备注" prop="remark" width="100" show-overflow-tooltip/>
         <el-table-column label="医保类别">
           <template #default="scope">
             {{ getTypeName(scope.row.type) }}
           </template>
         </el-table-column>
-
-
       </el-table>
     </div>
     <div class="bottom">
-      <div  class="statistics">
-        <div class="">总成本:{{statisticsData.totalCost}}</div>
-        <div class="">总售价:{{statisticsData.totalPrice}}</div>
-        <div class="">医保药品:{{statisticsData.totalSocialCount}}个</div>
+      <div class="statistics">
+        <div class="">总成本:{{ statisticsData.totalCost }}</div>
+        <div class="">总售价:{{ statisticsData.totalPrice }}</div>
+        <div class="">医保药品:{{ statisticsData.totalSocialCount }}个</div>
         <div v-for="item in statisticsData.chrgitmLvInfoList">
-          {{item.name}}:{{item.ratio}}({{item.count}})
+          {{ item.name }}:{{ item.ratio }}({{ item.count }})
         </div>
-       </div>
+      </div>
       <div class="page_btn_list">
         <el-pagination
             background
@@ -213,6 +208,7 @@ import InventoryBatchDetail from "@/components/inventory/goods/InventoryBatchDet
 import InventoryStatistics from "@/components/inventory/goods/InventoryStatistics.vue";
 import CloseBtn from "@/components/CloseBtn.vue";
 import {Plus, SemiSelect} from "@element-plus/icons-vue";
+
 const statisticsData = ref<any>({})
 const inventoryNumber = ref(false)
 const status = ref(false)
@@ -439,7 +435,7 @@ const getStatisticsData = () => {
   flex-direction: column;
 
   .top {
-    height: 112px;
+    height: 157px;
     padding: 24px 24px 0;
     background: #fff;
     display: flex;
@@ -461,6 +457,23 @@ const getStatisticsData = () => {
       }
 
     }
+
+    .addBtn {
+      span {
+        display: inline-block;
+        width: 120px;
+        height: 42px;
+        background: #FFFFFF;
+        border-radius: 6px;
+        border: 1px solid #4D6DE4;
+        margin-right: 24px;
+        font-weight: 500;
+        font-size: 16px;
+        color: #4D6DE4;
+        text-align: center;
+        line-height: 42px;
+      }
+    }
   }
 
   .content_goods {
@@ -480,7 +493,8 @@ const getStatisticsData = () => {
     display: flex;
     justify-content: flex-end;
     align-items: center;
-    .statistics{
+
+    .statistics {
       display: flex;
     }
   }