dev

src/components/charge/ChargeQueue.vue

@@ -1,8 +1,18 @@
 <template>
+  <Panel title="收费队列">
+    <template #tools>
+      <el-button type="primary" size="small">新增患者</el-button>
+    </template>
+    <template #default>
       <div class="container">
+        <div class="tabs">
+          <span v-for="(item,index) in statusList " :key="index" :class="query.status == item.value ? 'tabs-item' : ''"
+                @click="tab(item)">{{ item.label }}&nbsp;{{ item.num }}
+          </span>
+        </div>
         <div class="search">
-      <el-input v-model="query.keyword" placeholder="根据姓名搜索"/>
+          <el-input v-model="query.keyword" style="height: 100%;width: 100%" placeholder="根据姓名搜索"/>
-      <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>
+          <!--         <el-button type="success" @click="addChargeOrder" size="small">+收费</el-button>-->
         </div>
         <div class="list">
           <el-scrollbar>
@@ -10,9 +20,11 @@
               <li class="list-item" :class="curItem.id == item.id ? 'active' : ''" v-for="(item, index) in orderList"
                   :key="index" @click="clickItem(item)">
                 <span>
-                  <img v-if="item.patientRegistration.gender=='男'" class="avatar" src="/static/images/outpatient/man.png"
+                  <img v-if="item.patientRegistration.gender=='1'" class="avatar"
+                       src="/static/images/outpatient/man.png"
                        alt="头像"/>
-                  <img v-if="item.patientRegistration.gender=='女'" class="avatar" src="/static/images/outpatient/women.png"
+                  <img v-if="item.patientRegistration.gender=='2'" class="avatar"
+                       src="/static/images/outpatient/women.png"
                        alt="头像"/>
                 </span>
                 <span class="item_name">{{ item.patientInfo.name }}</span>
@@ -26,14 +38,15 @@
                 {{ formatTime(item.patientRegistration.createDatetime) || '-' }}
               </span>
                 </el-tooltip>
-            <span :class="[item.status == 0 ?'status-active':'']">{{item.status == 0 ? '未收' : '已收'}}</span>
+                <span :class="[item.status == 0 ?'status-active':'']">{{ item.status == 0 ? '未收' : '已收' }}</span>
               </li>
             </ul>
           </el-scrollbar>
 
         </div>
       </div>
-
+    </template>
+  </Panel>
 
 </template>
 <script setup lang="ts">
@@ -41,26 +54,28 @@ import {onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import Panel from "@/components/common/Panel.vue";
 import {formatTime} from "@/utils/dateUtils.ts";
+
 const curItem = ref<any>({});
 const emit = defineEmits(['clickItem'])
 const clickItem = (item: any) => {
   curItem.value = item
-  emit('clickItem', item);
+  emit('clickItem', item, query.value.status);
 }
 
 const orderList = ref<any>([]);
 const query = ref({
   pageSize: 20,
   pageNum: 1,
-  keyword: ""
+  keyword: "",
+  status: 0
 })
 const addChargeOrder = () => {
   const newOrder = {
-    id:-1,
+    id: -1,
-    patientName :"匿名患者",
+    patientName: "匿名患者",
-    payType : -1,
+    payType: -1,
   }
-  if (orderList.value[0]?.id == -1){
+  if (orderList.value[0]?.id == -1) {
     return
   }
   orderList.value.unshift(newOrder)
@@ -77,28 +92,45 @@ const getOrderList = () => {
       }
   )
 }
-const delDraft = () =>{
+const delDraft = () => {
   orderList.value.shift();
   clickFirst()
 }
-defineExpose({delDraft,getOrderList})
+defineExpose({delDraft, getOrderList})
-onMounted(()=>{
+onMounted(() => {
   getOrderList()
 })
-
+const statusList = ref([
+  {
+    label: '待收',
+    num: 0,
+    value: 0
+  },
+  {
+    label: '已收',
+    num: 0,
+    value: 1
+  },
+])
+const tab = (item: any) => {
+  query.value.status = item.value
+  getOrderList()
+}
 </script>
 <style scoped lang="scss">
-.container{
+.container {
   display: flex;
   flex-direction: column; // 确保子元素垂直排列
-  width: 100%;
+  width: 320px;
-  .search{
+
-    height: 25px;
+  .search {
+    padding: 16px;
+    height: 74px;
     width: 100%;
     display: flex;
     margin: 0;
-    padding: 0;
   }
+
   .list {
     display: flex;
     min-height: 0;
@@ -172,10 +204,12 @@ onMounted(()=>{
 
 
       }
-      .status-active{
+
+      .status-active {
         font-weight: bold;
         color: #409EFF;
       }
+
       .active {
         color: #fff;
         background: #4D6DE4;
@@ -187,4 +221,27 @@ onMounted(()=>{
     }
   }
 }
+
+.tabs {
+  height: 27px;
+  border-bottom: 1px solid #EAEAEC;
+  font-weight: 500;
+  color: #999999;
+  font-style: normal;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 67px;
+
+  span {
+    width: 66px;
+    cursor: pointer;
+    text-align: center;
+  }
+
+  .tabs-item {
+    border-bottom: 2px solid #4D6DE4;
+    color: #4D6DE4;
+    padding-bottom: 10px;
+  }
+}
 </style>

src/components/charge/GoodsDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <el-table :data="data.goodsDetail" max-height="150">
-    <el-table-column prop="name" label="名称"></el-table-column>
+    <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
     <el-table-column prop="selectedPrice" label="单价"></el-table-column>
     <el-table-column prop="number" label="数量">
       <template #default="scope">
@@ -30,11 +30,17 @@
       </template>
     </el-table-column>
   </el-table>
-  <SearchInput :request-api="goodsSearchApi" :show-config="goodsShowConfig" @selectedCallBack="goodsSelect"></SearchInput>
+  <SearchInput :disabled="data.status == 1" :request-api="goodsSearchApi" :show-config="goodsShowConfig" @selectedCallBack="goodsSelect"></SearchInput>
 </template>
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
 
+const props = defineProps({
+  disabled: {
+    type: Boolean,
+    default: false
+  }
+})
 const data = defineModel<any>();
 const delGoods = (item: any) => {
   data.value.goodsDetail = data.value.filter((i: any) => i.id != item.id)

src/components/charge/ServiceDetail.vue

@@ -1,16 +1,12 @@
 <template>
   <el-table :data="data.itemDetail" max-height="150">
-            <el-table-column prop="itemName" label="名称"></el-table-column>
+    <el-table-column prop="itemName" label="名称" show-overflow-tooltip></el-table-column>
     <el-table-column prop="selectedUnit" label="单位"></el-table-column>
     <el-table-column prop="selectedPrice" label="单价"></el-table-column>
     <el-table-column label="数量">
       <template #default="scope">
-                <div v-if="data.status == 0">
+        <el-input-number v-model="scope.row.selectedNum" min="0"
-                  <el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange"></el-input-number>
+                         @change="handleNumChange"></el-input-number>
-                </div>
-                <div v-else>
-                  {{ scope.row.selectedNum }}
-                </div>
       </template>
     </el-table-column>
     <el-table-column label="操作" v-if="data.status ==0">
@@ -19,16 +15,16 @@
       </template>
     </el-table-column>
   </el-table>
-          <SearchInput :request-api="serviceSearchApi" :show-config="serviceShowConfig" @selectedCallBack="serviceSelect"></SearchInput>
+  <SearchInput :disabled="data.status == 1" :request-api="serviceSearchApi" :show-config="serviceShowConfig"
+               @selectedCallBack="serviceSelect"></SearchInput>
 </template>
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
 
-const data =defineModel<any>();
+const data = defineModel<any>();
 const delService = (item: any) => {
   data.value.itemDetail = data.value.filter((i: any) => i.id != item.id)
 }
-
 const serviceSearchApi = "item/search";
 const serviceShowConfig = [
   {
@@ -50,9 +46,9 @@ const serviceSelect = (row: any) => {
   row.selectedUnit = row.unit
   row.selectedPrice = row.unitPrice
   data.value.itemDetail.push(row)
-  emit('totalPriceChange',row)
+  emit('totalPriceChange', row)
 }
-const handleNumChange = ()=>{
+const handleNumChange = () => {
   emit('totalPriceChange')
 }
 

src/components/charge/TotalPrice.vue

@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import Panel from '../common/Panel.vue';
+import {defineEmits, defineModel,defineProps} from 'vue'
+const {status}=defineProps(['status'])
+const emit = defineEmits(['save','deleteItem','edit']);
+const save = () => {
+  emit('save');
+};
+const deleteItem = () => {
+  emit('deleteItem');
+};
+const totalAmount = defineModel<any>()
+const editItem= () => {
+  emit('edit');
+};
+</script>
+
+<template>
+  <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">
+        <el-button type="primary" disabled>追溯码</el-button>
+        <el-button type="primary" @click="editItem">收费</el-button>
+      </div>
+    </div>
+  </Panel>
+</template>
+
+<style scoped lang="scss">
+.footer {
+  height: 86px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 400;
+  font-size: 22px;
+  color: #333333;
+  font-style: normal;
+  padding:0 24px 0 24px;
+  .icon{
+    font-size: 16px;
+  }
+  .text {
+    color: #FF282E
+  }
+}
+</style>

src/components/outpatient/DiagnosisSearchInput.vue

@@ -1,7 +1,7 @@
 <template>
   <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" @before-enter="beforeShow">
     <template #reference>
-      <el-input v-model="keyword" :style="{'width': props.width+'px'}" @input="changeInput" :disabled="disabled"
+      <el-input v-model="keyword" style="width:100%;height: 100%" @input="changeInput" :disabled="disabled"
                 placeholder="诊断选择"></el-input>
     </template>
     <div class="container" v-if="searchList.length > 0">

src/components/settings/ItemSearch.vue

@@ -12,11 +12,10 @@
               clearable/>
           <el-button type="primary" @click="searchSocialItem">搜索</el-button>
         </div>
-        <el-scrollbar style="width: 100%;overflow: hidden">
+        <div class="search_result" style="width: 100%;padding: 0 12px">
-          <div class="search_result" style="width: 100%;padding: 0 24px">
+          <div class="result_table" style="width: 100%;height: 100%;box-sizing: border-box;padding-bottom: 20px">
-            <div class="result_table" style="">
             <el-table v-loading="isloading" :data="searchResult.list"
-                        style="width: 100%"
+                      style="width: 100%;height: 100%"
                       highlight-current-row
                       @row-click="changeCurRow"
                       :row-class-name="tableRowClassName">
@@ -26,7 +25,6 @@
             </el-table>
           </div>
         </div>
-        </el-scrollbar>
       </div>
     </template>
     <template #footer>

src/views/charge/index.vue

@@ -1,71 +1,74 @@
 <template>
   <div class="container">
     <div class="left">
-      <Panel title="收费队列">
       <chargeQueue @clickItem="clickItem" ref="chargeQueueRef"></ChargeQueue>
-      </Panel>
     </div>
     <div class="middle">
+      <el-scrollbar>
         <Panel title="零售收费">
-        <template #tools>
-          <span>{{formData.totalPrice}}</span>
-          <div v-if="formData.status == 0 ">
-            <el-button type="primary" @click="delDraft()" v-if="formData.id == -1" >删除</el-button>
-            <el-button type="primary" @click="saveAndCharge" >收费</el-button>
-            <el-button type="primary" >追溯码</el-button>
-            <el-button type="primary" >挂单</el-button>
-          </div>
-
-        </template>
           <el-form :model="formData" inline label-width="0">
             <el-form-item>
-            <el-input v-model="formData.patientInfo.name" placeholder="请输入姓名"></el-input>
+              <el-input v-model="formData.patientInfo.name" :disabled="statusDisabled==1"
+                        placeholder="请输入姓名"></el-input>
             </el-form-item>
             <el-form-item>
-            <el-select v-model="formData.patientInfo.sex" style="width: 80px;">
+              <el-select v-model="formData.patientInfo.sex" style="width: 80px;" :disabled="statusDisabled==1">
-              <el-option :label="'男'" :value="'男'"></el-option>
+                <el-option :label="'男'" :value="'1'"></el-option>
-              <el-option :label="'女'" :value="'女'"></el-option>
+                <el-option :label="'女'" :value="'2'"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
-            <el-input v-model="formData.patientInfo.age">
+              <el-input v-model="formData.patientInfo.age" :disabled="statusDisabled==1">
                 <template #suffix>
                   岁
                 </template>
               </el-input>
             </el-form-item>
             <el-form-item>
-            <el-input v-model="formData.patientInfo.phone" placeholder="手机号">
+              <el-input v-model="formData.patientInfo.phone" placeholder="手机号" :disabled="statusDisabled==1">
               </el-input>
             </el-form-item>
             <el-form-item>
-            <el-button>卡</el-button>
+              <el-select v-model="formData.diagnosisMedicalRecord.dockerId" placeholder="医生" style="width: 100px"
-            <el-button>+</el-button>
+                         :disabled="statusDisabled==1">
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="formData.diagnosisMedicalRecord.dockerId" placeholder="医生" style="width: 100px">
                 <el-option v-for="item in dockerList" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-form>
+
+        </Panel>
+        <div style="margin-top: 24px">
+          <Panel title="医疗诊断">
+            <div style="height:64px;padding:0 24px 24px">
               <DiagnosisSearchInput
                   v-model="diagnosisKeyword"
                   :request-api="diagnosisSearchApi"
                   :show-config="diagnosisShowConfig"
                   @selectedCallBack="diagnosisSelect"
                   ref="diagnosisSearchRef"
-            :show-header="false">
+                  :show-header="false"
+                  :disabled="statusDisabled==1"
+
+              >
               </DiagnosisSearchInput>
-
+            </div>
           </Panel>
+        </div>
+        <div style="margin-top: 24px">
           <Panel title="服务项目">
-        <ServiceDetail v-model="formData"  @totalPriceChange="getOrderTotalPrice"> </ServiceDetail>
+            <ServiceDetail v-model="formData" @totalPriceChange="getOrderTotalPrice"></ServiceDetail>
-
           </Panel>
+        </div>
+        <div style="margin-top: 24px">
           <Panel title="药品耗材">
-        <GoodsDetail v-model="formData" @totalPriceChange="getOrderTotalPrice" ></GoodsDetail>
+            <GoodsDetail v-model="formData" @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
           </Panel>
         </div>
+        <div class="bottom">
+         <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge"></TotalPrice>
+        </div>
+      </el-scrollbar>
+    </div>
     <div class="right">
       <div class="top">
       </div>
@@ -91,12 +94,14 @@ import ServiceDetail from "@/components/charge/ServiceDetail.vue";
 import GoodsDetail from "@/components/charge/GoodsDetail.vue";
 import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.vue";
 import Settlement from "@/components/charge/Settlement.vue";
+import TotalPrice from "@/components/charge/TotalPrice.vue";
 
-const socialCard = ref<any>({payInfo:{}})
+const socialCard = ref<any>({payInfo: {}})
 const formData = ref<any>({
-  patientInfo:{},
+  patientInfo: {},
-  diagnosisMedicalRecord:{},
+  diagnosisMedicalRecord: {},
 })
+const statusDisabled = ref(0)
 const diagnosisKeyword = ref("")
 const chargeQueueRef = ref()
 const delDraft = () => {
@@ -106,9 +111,9 @@ const delDraft = () => {
 }
 const settlementRef = ref()
 const saveAndCharge = () => {
-  post('charge/save', {data:formData.value}).then((res: any) => {
+  post('charge/save', {data: formData.value}).then((res: any) => {
     formData.value.code = res
-    nextTick(()=>{
+    nextTick(() => {
       settlementRef.value?.init(res)
     })
   })
@@ -131,38 +136,40 @@ const diagnosisSelect = (list: any) => {
   formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
 }
 
-const clickItem = (item: any) => {
+const clickItem = (item: any, status: any) => {
   formData.value = item
+  statusDisabled.value = status
   getOrderTotalPrice()
   nextTick(() => {
     let list = JSON.parse(formData.value.diagnosisMedicalRecord.diagnosisDetail)
     let nList = formData.value.diagnosisMedicalRecord.diagnosisSummary.split(',')
-    diagnosisSearchRef.value?.init(list,nList);
+    diagnosisSearchRef.value?.init(list, nList);
   })
+
 }
 const dockerList = ref<any[]>([])
 const getDockerList = () => {
-  let query={
+  let query = {
-    role:1
+    role: 1
   }
-  post('organization/member/search',{query:query}).then((res: any) => {
+  post('organization/member/search', {query: query}).then((res: any) => {
     dockerList.value = res
   })
 }
 const orderCompleted = () => {
-  nextTick(()=>{
+  nextTick(() => {
     chargeQueueRef.value?.getOrderList()
   })
 }
 const orderCanceled = () => {
-  nextTick(()=>{
+  nextTick(() => {
     chargeQueueRef.value?.getOrderList()
   })
 
 }
 
 
-onMounted(()=>{
+onMounted(() => {
   getDockerList()
 })
 const getOrderTotalPrice = () => {
@@ -252,5 +259,10 @@ const getOrderTotalPrice = () => {
 
 
 }
-
+.bottom{
+  margin-top: 24px;
+  height: 86px;
+  background: #FFFFFF;
+  border-radius: 8px;
+}
 </style>