Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/charge/GoodsDetail.vue

@@ -1,22 +1,24 @@
 <template>
   <el-table :data="data.goodsDetail" max-height="150" style="width: 100%">
-    <el-table-column prop="name" label="名称" show-overflow-tooltip ></el-table-column>
+    <el-table-column prop="name" label="名称" show-overflow-tooltip></el-table-column>
-    <el-table-column prop="selectedPrice" label="单价" >
+    <el-table-column prop="selectedPrice" label="单价">
       <template #default="scope">
-        ￥{{scope.row.selectedPrice}}
+        ￥{{ scope.row.selectedPrice }}
       </template>
     </el-table-column>
-    <el-table-column prop="number" label="数量" >
+    <el-table-column prop="number" label="数量">
       <template #default="scope">
         <div v-if="data.status == 0">
-          <el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange" size="small"></el-input-number>
+          <el-input-number v-model="scope.row.selectedNum" min="0" @change="handleNumChange"
+                           size="small"></el-input-number>
           <el-dropdown>
             <span style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
             <template #dropdown>
               <el-dropdown-menu v-if="scope.row.trdnFlag == 1">
-                <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{  scope.row.packagingUnit }}
+                <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{ scope.row.packagingUnit }}
                 </el-dropdown-item>
-                <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">{{  scope.row.minPackagingUnit }}
+                <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">
+                  {{ scope.row.minPackagingUnit }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -28,19 +30,22 @@
 
       </template>
     </el-table-column>
-    <el-table-column label="小计" >
+    <el-table-column label="小计">
       <template #default="scope">
-        ￥{{ scope.row.selectedNum*scope.row.selectedPrice }}
+        ￥{{ scope.row.selectedNum * scope.row.selectedPrice }}
       </template>
     </el-table-column>
-    <el-table-column label="操作" v-if="data.status == 0" >
+    <el-table-column label="操作" v-if="data.status == 0">
       <template #default="scope">
         <el-button type="danger" link @click="delGoods(scope.row)">X</el-button>
       </template>
     </el-table-column>
   </el-table>
-  <SearchInput v-if="data.status == 0" :request-api="goodsSearchApi" :show-config="goodsShowConfig" @selectedCallBack="goodsSelect"></SearchInput>
+  <div class="bottom">
-  <span>合计：￥{{getTotalPrice()}}</span>
+    <SearchInput v-if="data.status == 0" :request-api="goodsSearchApi" :show-config="goodsShowConfig"
+                 @selectedCallBack="goodsSelect"></SearchInput>
+    <span>合计：￥{{ getTotalPrice() }}</span>
+  </div>
 </template>
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
@@ -82,26 +87,30 @@ const selectUnit = (item: any, unit: any) => {
   item.selectedUnit = unit;
   if (unit == item.packagingUnit) {
     item.selectedPrice = item.unitPrice
-  }else if (unit == item.minPackagingUnit) {
+  } else if (unit == item.minPackagingUnit) {
     item.selectedPrice = item.disassemblyPrice
   }
   emit('totalPriceChange')
 
 }
 const emit = defineEmits(["totalPriceChange"])
-const handleNumChange = ()=>{
+const handleNumChange = () => {
- emit('totalPriceChange')
+  emit('totalPriceChange')
 }
-const getTotalPrice =()=>{
+const getTotalPrice = () => {
   let totalPrice = 0;
-  data.value.goodsDetail?.forEach((item:any)=>{
+  data.value.goodsDetail?.forEach((item: any) => {
-    totalPrice += item.selectedNum*item.selectedPrice
+    totalPrice += item.selectedNum * item.selectedPrice
   })
   return totalPrice;
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-table__cell){
+:deep(.el-table__cell) {
   padding: 0 4px;
 }
+
+.bottom {
+  text-align: right;
+}
 </style>

src/components/charge/PatientCard.vue

@@ -136,11 +136,9 @@ import {onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 const seeDockerInfo = ref<any>();
 const getSeeDockerInfo  = (newValue:any) => {
-  debugger
   if (!newValue)return;
   post('medical/record/getSeeDockerInfo', {regisId: newValue}).then((res: any) => {
     seeDockerInfo.value = res
-    debugger
   })
 }
 const init =(regisId:any)=>{

src/components/charge/ServiceDetail.vue

@@ -25,9 +25,12 @@
       </template>
     </el-table-column>
   </el-table>
-  <SearchInput v-if="data.status == 0" :request-api="serviceSearchApi" :show-config="serviceShowConfig"
+  <div class="bottom">
-               @selectedCallBack="serviceSelect"></SearchInput>
+    <SearchInput v-if="data.status == 0" :request-api="serviceSearchApi" :show-config="serviceShowConfig"
-  <span>合计：￥{{getTotalPrice()}}</span>
+                 @selectedCallBack="serviceSelect"></SearchInput>
+    <span>合计：￥{{getTotalPrice()}}</span>
+  </div>
+
 </template>
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
@@ -75,4 +78,7 @@ const getTotalPrice =()=>{
 :deep(.el-table__cell){
   padding: 0 4px;
 }
+.bottom{
+  text-align: right;
+}
 </style>

src/components/outpatient/DiagnosisSearchInput.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-input v-model="keyword" style="width:100%;height: 100%" @input="changeInput" :disabled="disabled" @click="changeInput"
+  <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">

src/components/outpatient/MedicalQueue.vue

@@ -31,7 +31,7 @@
   </Panel>
 </template>
 <script setup lang="ts">
-import {onMounted, ref, watch} from "vue";
+import {nextTick, onMounted, ref, watch} from "vue";
 import Panel from "@/components/common/Panel.vue";
 import {post} from "@/utils/request.ts";
 import {formatListTime} from "@/utils/dateUtils.ts";
@@ -48,13 +48,15 @@ const search = ref('')
 const curItem = ref<any>('')
 const emit = defineEmits(['getId', 'changeDetail', 'getStatus'])
 const tab = (item: any) => {
-  emit('getStatus', item.value)
+  nextTick(()=>{
-  init()
+    emit('getStatus', item.value)
-  if (item.value == 3) {
+    init()
-    emit('changeDetail', true)
+    if (item.value == 3) {
-  } else {
+      emit('changeDetail', true)
-    emit('changeDetail', false)
+    } else {
-  }
+      emit('changeDetail', false)
+    }
+  })
 
 }
 const list = ref<any>([])

src/views/charge/index.vue

@@ -7,28 +7,36 @@
       <el-scrollbar>
         <div>
           <Panel title="医疗诊断">
-            <template #tools>
-              <el-cascader
-                  v-model="formData.doctorId"
-                  :options="sectionDoctorOption"
-                  :props="props"
-                  @change="handleChange"
-                  clearable
-              />
-            </template>
             <template #default>
-              <div style="height:64px;padding:0 24px 24px">
+              <div class="diagnosis-content">
-                <DiagnosisSearchInput
+                <div class="diagnosis">
-                    v-model="diagnosisKeyword"
+                  诊断：
-                    :request-api="diagnosisSearchApi"
+                  <DiagnosisSearchInput
-                    :show-config="diagnosisShowConfig"
+                      v-model="diagnosisKeyword"
-                    @selectedCallBack="diagnosisSelect"
+                      :request-api="diagnosisSearchApi"
-                    ref="diagnosisSearchRef"
+                      :show-config="diagnosisShowConfig"
-                    :show-header="false"
+                      :width="600"
-                    :disabled="statusDisabled==1"
+                      @selectedCallBack="diagnosisSelect"
+                      ref="diagnosisSearchRef"
+                      :show-header="false"
+                      :disabled="statusDisabled==1"
+
+                  >
+                  </DiagnosisSearchInput>
+                </div>
+                <div class="doctor">
+                  医生：
+                  <el-cascader
+                      v-model="formData.doctorId"
+                      :options="sectionDoctorOption"
+                      :props="props"
+                      @change="handleChange"
+                      clearable
+                      size="large"
+                  />
+                </div>
+
 
-                >
-                </DiagnosisSearchInput>
               </div>
             </template>
           </Panel>
@@ -235,6 +243,12 @@ const generateOptions = () => {
     display: flex;
     flex-direction: column;
     overflow: hidden;
+    .diagnosis-content{
+      height:64px;
+      padding:0 24px 24px;
+      display: flex;
+      justify-content: left;
+    }
 
     .case {
       background: #FFFFFF;