dev

src/components/SearchInput.vue

@@ -28,7 +28,8 @@
         <el-table-column
             v-for="item in showConfig"
             :prop="item.prop"
-            :label="item.label"
+            :label="item.label||'-'"
+            show-overflow-tooltip
         ></el-table-column>
       </el-table>
     </div>
@@ -90,7 +91,7 @@ const changeInput = (inputStr: string) => {
 
 };
 
-const emit = defineEmits(['selectedCallBack','focus']);
+const emit = defineEmits(['selectedCallBack', 'focus']);
 
 const clickRow = (row: any) => {
   emit('selectedCallBack', row);
@@ -103,11 +104,11 @@ const beforeShow = () => {
     popoverRef.value.hide();
   }
 };
-const isVisible =ref(false)
+const isVisible = ref(false)
-const focus=()=>{
+const focus = () => {
-  isVisible.value=true
+  isVisible.value = true
-  console.log( "focus输入框")
+  console.log("focus输入框")
-  emit('focus',true)
+  emit('focus', true)
 }
 const handlerBlur = () => {
   isVisible.value = false

src/components/common/goods/GoodsDetail.vue

@@ -119,13 +119,33 @@ const goodsShowConfig = [
     prop: "name",
   },
   {
-    label: "项目类型",
+    label: "规格",
-    prop: "type",
+    prop: "specifications",
   },
   {
-    label: "售价",
+    label: "库存",
+    prop: "inventory",
+  },
+  {
+    label: "价格",
     prop: "unitPrice",
   },
+  {
+    label: "厂家",
+    prop: "producer",
+  },
+  {
+    label: "效期",
+    prop: "lifespan",
+  },
+  {
+    label: "收费项目等级",
+    prop: "category",
+  },
+  {
+    label: "限制条件",
+    prop: "limit",
+  }
 ]
 const goodsSelect = (row: any) => {
   row.selectedNum = 1
@@ -133,6 +153,10 @@ const goodsSelect = (row: any) => {
   row.selectedPrice = row.unitPrice
   if (goodsDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
+    goodsDetail.value.find((i: any) => i.id == row.id).selectedNum += 1
+    goodsDetail.value.find((i: any) => i.id == row.id).selectedUnit = row.packagingUnit
+    goodsDetail.value.find((i: any) => i.id == row.id).selectedPrice = row.unitPrice
+    emit('totalPriceChange')
     return
   }
   goodsDetail.value.push(row)

src/components/common/service/ServiceDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <Panel title="服务项目">
     <el-table v-if="itemDetail.length>0" :data="itemDetail" max-height="150">
-      <el-table-column prop="itemName" label="项目名称">
+      <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip width="200">
         <template #default="scope">
           <el-popover
               width="485"
@@ -32,7 +32,7 @@
           ￥{{ scope.row.selectedPrice }}
         </template>
       </el-table-column>
-      <el-table-column label="数量">
+      <el-table-column label="数量" width="180">
         <template #default="scope">
           <el-input-number v-if="props.status" v-model="scope.row.selectedNum" :min="0"
                            @change="handleNumChange" size="small"></el-input-number>
@@ -90,21 +90,34 @@ const serviceShowConfig = [
     prop: "itemName",
   },
   {
-    label: "服务医保码",
+    label: "单位",
-    prop: "itemSocialCode",
+    prop: "unit",
   },
   {
     label: "售价",
     prop: "unitPrice",
   },
+  {
+    label: "收费项目等级",
+    prop: "chrgitmLv",
+  },
+  {
+    label: "限制条件",
+    prop: "limit",
+  },
+
 ]
-const emit = defineEmits(['totalPriceChange','focus'])
+const emit = defineEmits(['totalPriceChange', 'focus'])
 const serviceSelect = (row: any) => {
   row.selectedNum = 1
   row.selectedUnit = row.unit
   row.selectedPrice = row.unitPrice
   if (itemDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
+    itemDetail.value.find((i: any) => i.id == row.id).selectedNum += 1
+    itemDetail.value.find((i: any) => i.id == row.id).selectedUnit = row.packagingUnit
+    itemDetail.value.find((i: any) => i.id == row.id).selectedPrice = row.unitPrice
+    emit('totalPriceChange')
     return
   }
   itemDetail.value.push(row)
@@ -144,9 +157,10 @@ const hide = () => {
 
 .bottom {
   text-align: right;
-  border-top: 1px solid #EAEAEC ;
+  border-top: 1px solid #EAEAEC;
   display: flex;
-  .search{
+
+  .search {
     flex: 1;
   }
 }

src/components/outpatient/DiagnosisSearchInput.vue

@@ -1,6 +1,5 @@
 <template>
 
-
   <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
               @before-enter="beforeShow" @hide="afterShow">
     <template #reference>

src/views/charge/index.vue

@@ -10,12 +10,11 @@
             <template #default>
               <div class="diagnosis-content">
                 <div class="diagnosis">
-                  诊断：
+                  <div style="width: 62px">诊断：</div>
                   <DiagnosisSearchInput
                       v-model="diagnosisKeyword"
                       :request-api="diagnosisSearchApi"
                       :show-config="diagnosisShowConfig"
-                      :width="600"
                       @selectedCallBack="diagnosisSelect"
                       ref="diagnosisSearchRef"
                       :show-header="false"
@@ -25,35 +24,36 @@
                   </DiagnosisSearchInput>
                 </div>
                 <div class="doctor">
-                  医生：
+                  <div>医生：</div>
                   <el-select
                       v-model="formData.doctorId"
                       @change="handleChange"
                       clearable
-                      size="large">
+                      style="width: 100%"
-                  <el-option
-                      v-for="item in doctorList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
                   >
-                  </el-option>
+                    <el-option
+                        v-for="item in doctorList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
                   </el-select>
                 </div>
-
-
               </div>
             </template>
           </Panel>
         </div>
         <div style="margin-top: 24px">
-            <ServiceDetail v-model="formData.itemDetail" :status="formData.status == 0" @totalPriceChange="getOrderTotalPrice"></ServiceDetail>
+          <ServiceDetail v-model="formData.itemDetail" :status="formData.status == 0"
+                         @totalPriceChange="getOrderTotalPrice"></ServiceDetail>
         </div>
         <div style="margin-top: 24px">
-            <GoodsDetail v-model="formData.goodsDetail" :status="formData.status == 0" @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
+          <GoodsDetail v-model="formData.goodsDetail" :status="formData.status == 0"
+                       @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
         </div>
-        <div class="bottom" >
+        <div class="bottom">
-          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" :status="formData.status" ></TotalPrice>
+          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" :status="formData.status"></TotalPrice>
         </div>
       </el-scrollbar>
     </div>
@@ -62,16 +62,16 @@
         <PatientCard ref="patientCardRef"></PatientCard>
       </div>
       <div class="bottom">
-          <RecordsLog ref="recordsConsumptionRef"></RecordsLog>
+        <RecordsLog ref="recordsConsumptionRef"></RecordsLog>
       </div>
     </div>
   </div>
-    <Settlement
+  <Settlement
-        ref="settlementRef"
+      ref="settlementRef"
-        v-model="socialCard"
+      v-model="socialCard"
-        @orderCompleted="orderCompleted"
+      @orderCompleted="orderCompleted"
-        @orderCanceled="orderCanceled"
+      @orderCanceled="orderCanceled"
-    ></Settlement>
+  ></Settlement>
 
 </template>
 <script setup lang="ts">
@@ -109,7 +109,7 @@ const delDraft = () => {
 }
 const settlementRef = ref()
 const saveAndCharge = () => {
-  post('charge/save', {data: {...formData.value,doctorId: doctorId.value}}).then((res: any) => {
+  post('charge/save', {data: {...formData.value, doctorId: doctorId.value}}).then((res: any) => {
     formData.value.code = res
     nextTick(() => {
       settlementRef.value?.init(res)
@@ -133,7 +133,7 @@ const diagnosisSelect = (list: any) => {
   formData.value.diagnosisMedicalRecord.diagnosisDetail = JSON.stringify(list)
   formData.value.diagnosisMedicalRecord.diagnosisSummary = diagnosisNames
 }
-const recordsConsumptionRef= ref<any>("")
+const recordsConsumptionRef = ref<any>("")
 const patientCardRef = ref()
 const clickItem = async (item: any, status: any) => {
   statusDisabled.value = status
@@ -174,7 +174,6 @@ onMounted(() => {
   list()
 })
 const getOrderTotalPrice = () => {
-  debugger
   let totalPrice = 0
   formData.value.itemDetail?.forEach((item: any) => {
     totalPrice += item.selectedPrice * item.selectedNum
@@ -191,7 +190,7 @@ const props = {
   expandTrigger: 'hover' as const,
 }
 
-const doctorId=ref<any>('')
+const doctorId = ref<any>('')
 const handleChange = (value: any) => {
   doctorId.value = value[value.length - 1]
 }
@@ -200,9 +199,9 @@ const cardTypeList = ref<any>(Object.entries(psnCertTypes).map(([id, name]) => (
 const doctorList = ref<any>([])
 const sectionDoctorOption = ref<any>('')
 const list = () => {
-    post(apiConfig.organizationMemberSearch, {query: {role: 1}}).then((res: any) => {
+  post(apiConfig.organizationMemberSearch, {query: {role: 1}}).then((res: any) => {
-      doctorList.value = res
+    doctorList.value = res
-    })
+  })
 }
 </script>
 
@@ -224,11 +223,11 @@ const list = () => {
     display: flex;
     flex-direction: column;
     overflow: hidden;
-    .diagnosis-content{
+
-      height:64px;
+    .diagnosis-content {
-      padding:0 24px 24px;
+      height: 64px;
+      padding: 0 24px 24px;
       display: flex;
-      justify-content: left;
     }
 
     .case {
@@ -285,6 +284,7 @@ const list = () => {
 
 
 }
+
 .bottom {
   margin-top: 24px;
   height: 86px;