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

src/components/charge/ChargeQueue.vue

@@ -320,7 +320,7 @@ const selected= ref(false)
   font-style: normal;
   display: flex;
   justify-content: space-between;
-  padding: 0 67px;
+  padding: 0 18px;
 
   span {
     width: 66px;

src/components/common/Header.vue

@@ -173,17 +173,22 @@ header {
   display: flex;
   align-items: center;
   font-weight: 400;
-  font-size: 28px;
+  font-size: 24px;
   color: #FFFFFF;
   font-style: normal;
 }
 
 /* 响应式设计 */
-@media (max-width: 1630px) {
+@media (max-width: 1299px) {
   .logo span {
     display: none; // 隐藏文字
   }
 }
+@media (width: 1920px) {
+  .logo span {
+    font-size: 28px; // 隐藏文字
+  }
+}
 </style>
 <script setup lang="ts">
 import {useRouter} from 'vue-router'

src/components/common/goods/GoodsDetail.vue

@@ -8,7 +8,7 @@
             <el-popover
                 placement="top-start"
                 trigger="hover"
-                width="500"
+                width="600"
                 @show="getHilistInfo(scope.row)"
                 @hide="colosInfo"
 

src/components/outpatient/Case.vue

@@ -14,7 +14,8 @@
     <div class="container">
       <el-form :model="formDate" label-width="auto" ref="formRef">
         <el-form-item label="主诉:">
-          <PopoverInput :disabled="props.disabled" v-model="formDate.mainAppeal" :list="mainAppealList" @focus="focus"/>
+          <PopoverInput :disabled="props.disabled" v-model="formDate.mainAppeal"
+                        :list="mainAppealList" @focus="focus"/>
         </el-form-item>
         <el-form-item label="诊断:">
           <DiagnosisSearchInput
@@ -156,7 +157,8 @@ defineExpose({initDiagnosisSearch, clearDiagnosis})
   border: 1px solid #EAEAEC;
   box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
 }
-:deep(.is-disabled .el-input__wrapper){
+
+:deep(.is-disabled .el-input__wrapper) {
   box-shadow: 0 0 0 0 var(--el-input-border-color, var(--el-border-color)) inset;
 }
 </style>

src/components/outpatient/Settlement.vue

@@ -20,8 +20,8 @@ const editItem= () => {
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
       <div class="btn-group">
-        <span v-if="status" @click="deleteItem">取消接诊</span>
+        <span class="default-btn" v-if="status" @click="deleteItem">取消接诊</span>
-        <span v-if="status" @click="save">完成接诊</span>
+        <span class="default-btn" v-if="status" @click="save">完成接诊</span>
 <!--        <el-button v-if="status == 3" type="primary" @click="editItem">修改</el-button>-->
       </div>
     </div>
@@ -48,18 +48,7 @@ const editItem= () => {
   .btn-group{
     display: flex;
     span{
-      width: 119px;
-      height: 48px;
-      text-align: center;
-      line-height: 48px;
-      border-radius: 8px;
-      border: 1px solid #D8D8D8;
       margin-left: 24px;
-      cursor: pointer;
-      &:hover{
-        background: #4D6DE4 ;
-        color: #fff;
-      }
     }
   }
 }

src/components/registration/Edit.vue

@@ -260,7 +260,6 @@ const save = () => {
           close()
         })
       } else {
-        console.log(socialCard.value)
         post('registration/add', {
           data: data,
           mdtrtCertNo: socialCard.value?.mdtrtCertNo,

src/views/outpatient/index.vue

@@ -145,6 +145,7 @@ const changeTab = (e: any) => {
   initFormData()
   patientRegistration.value = {}
   itemId.value = null
+  isShowFrom.value = false
   nextTick(() => {
     medicalHistoryRef.value?.clearList();
   })
@@ -163,8 +164,8 @@ const getOrderTotalPrice = () => {
   formData.value.goodsDetail?.forEach((item: any) => {
     totalPrice += item.selectedPrice * item.selectedNum
   })
-  formData.value.preTotalPrice = Math.round((totalPrice * 100) / 100 )
+  formData.value.preTotalPrice = Math.round((totalPrice * 100) / 100)
-  formData.value.totalPrice = Math.round((totalPrice * 100) / 100 )
+  formData.value.totalPrice = Math.round((totalPrice * 100) / 100)
 }
 const caseRef = ref<any>("")
 const copyForm = (item: any) => {