From 067499bb03b9d51bf83e81f0266d58c1bcd21ca9 Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Wed, 7 May 2025 17:21:30 +0800
Subject: [PATCH] dev

---
 src/components/Mask.vue                           |  4 ++--
 src/components/charge/Settlement.vue              | 15 +++++++--------
 .../outpatient/DiagnosisSearchInput.vue           |  1 -
 src/views/charge/index.vue                        | 14 +++++++-------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/components/Mask.vue b/src/components/Mask.vue
index 75a31bd..494e262 100644
--- a/src/components/Mask.vue
+++ b/src/components/Mask.vue
@@ -18,7 +18,7 @@ watch(() => isShow, (newVal) => {
 <template>
   <transition name="el-fade-in">
     <div class="mask" v-if="_isShow">
-        <div class="content-wrapper" :style="{ width: _width + 'px', height: _height + 'px' }" v-if="_isShow">
+        <div class="mask-content-wrapper" :style="{ width: _width + 'px', height: _height + 'px' }" v-if="_isShow">
           <el-scrollbar height="100%">
             <slot></slot>
           </el-scrollbar>
@@ -41,7 +41,7 @@ watch(() => isShow, (newVal) => {
   justify-content: center;
   align-items: center;
 
-  .content-wrapper {
+  .mask-content-wrapper {
     position: relative;
     background-color: #FFF;
     border-radius: 6px;
diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue
index ee407d7..06565e4 100644
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@@ -1,12 +1,12 @@
 <template>
-  <Mask :width="300" :height="438" :is-show="show">
-  <el-card>
-      <template #header>
+  <Mask :width="800" :height="438" :is-show="show">
+<!--  <el-card>-->
+<!--      <template #header>-->
         <div class="header">
           <span>收费</span>
           <CloseBtn @click="show = false" style="margin-top: 12px"></CloseBtn>
         </div>
-      </template>
+<!--      </template>-->
       <div class="panel">
         <div class="price">￥{{ retailOrder.totalPrice }}</div>
         <div class="social" >
@@ -26,13 +26,13 @@
           </div>
         </div>
       </div>
-      <template #footer>
+<!--      <template #footer>-->
         <div class="footer">
           <el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox>
           <el-button @click="completeSettlement()" type="primary">完成收费</el-button>
         </div>
-        </template>
-    </el-card>
+<!--        </template>-->
+<!--    </el-card>-->
   </Mask>
   <PersonalPayment ref="psnPaymentRef" @orderCompleted="orderCompleted" @orderCancel="orderCanceled"></PersonalPayment>
 </template>
@@ -56,7 +56,6 @@ const printReceipt = ref(false);
 const payType = ref(null);
 const retailOrder = ref<any>(null);
 const init = (code: any) => {
-  debugger
   post ('charge/getByCode',{code:code}).then((res:any)=>{
     retailOrder.value = res;
     show.value = true;
diff --git a/src/components/outpatient/DiagnosisSearchInput.vue b/src/components/outpatient/DiagnosisSearchInput.vue
index 7668176..6fcaa96 100644
--- a/src/components/outpatient/DiagnosisSearchInput.vue
+++ b/src/components/outpatient/DiagnosisSearchInput.vue
@@ -60,7 +60,6 @@ const changeInput = (inputStr: string) => {
   if (!props.requestApi || props.requestApi === "") {
     return
   }
-  debugger
   let tempList = keyword.value.split(",");
   let searchKeyword = tempList[tempList.length - 1];
   nameList.value = []
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index 0783c90..b840c14 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -65,12 +65,13 @@
       </div>
     </div>
   </div>
-  <Settlement
-      ref="settlementRef"
-      v-model="socialCard"
-      @orderCompleted="orderCompleted"
-      @orderCanceled="orderCanceled"
-  ></Settlement>
+    <Settlement
+        ref="settlementRef"
+        v-model="socialCard"
+        @orderCompleted="orderCompleted"
+        @orderCanceled="orderCanceled"
+    ></Settlement>
+
 </template>
 <script setup lang="ts">
 
@@ -304,7 +305,6 @@ const generateOptions = () => {
 
 
 }
-
 .bottom {
   margin-top: 24px;
   height: 86px;