dev

src/components/charge/ChargeQueue.vue

@@ -141,6 +141,7 @@ const statusList = ref([
 ])
 const tab = (item: any) => {
   query.value.status = item.value
+  curItem.value={}
   emit('getStatus', item.value)
   init()
 }

src/components/charge/Settlement.vue

@@ -1,12 +1,12 @@
 <template>
-  <Mask :width="800" :height="438" :is-show="show">
+  <Mask :width="800" :height="438" :is-show="show" @close="show = false" :show-footer="true">
     <!--  <el-card>-->
-<!--      <template #header>-->
+    <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,12 @@
         </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>
   </Mask>
   <PersonalPayment ref="psnPaymentRef" @orderCompleted="orderCompleted" @orderCancel="orderCanceled"></PersonalPayment>
 </template>
@@ -48,6 +47,7 @@ import {medTypeJson, priceBtnList} from "@/assets/config/constants.ts"
 import {useWsStore} from "@/stores/wsStore.ts";
 import PersonalPayment from "@/components/charge/PersonalPayment.vue";
 import {ElMessage} from "element-plus";
+
 const wsStore = useWsStore();
 const socialCard = defineModel<any>();
 
@@ -124,7 +124,6 @@ const socialSettlement = ()=>{
   })
 
 
-
 }
 const psnPaymentRef = ref();
 const openPsnPayment = (payInfo: any, orderInfo: any) => {
@@ -137,7 +136,6 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{
 </script>
 
 
-
 <style scoped lang="scss">
 .panel {
   .price {
@@ -147,12 +145,14 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{
     font-weight: 600;
     color: rgba(237, 120, 23, 0.8);
   }
+
   .price-type {
     display: flex;
     margin-top: 20px;
     justify-content: space-between;
     flex-wrap: wrap;
     align-items: center;
+
     .btn {
       height: 45px;
       width: 95px;
@@ -165,6 +165,7 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{
       align-items: center;
       padding: 10px;
       cursor: pointer;
+
       .image {
         width: 16px;
         height: 16px;
@@ -190,6 +191,7 @@ const openPsnPayment = (payInfo:any,orderInfo:any)=>{
 
   }
 }
+
 .footer {
   display: flex;
   justify-content: space-between;

src/components/charge/TotalPrice.vue

@@ -19,7 +19,7 @@ const editItem= () => {
   <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" v-if="status  == 0">
+      <div class="btn-group" v-if="status">
         <el-button type="primary" disabled>追溯码</el-button>
         <el-button type="primary" @click="editItem">收费</el-button>
       </div>

src/views/charge/index.vue

@@ -30,7 +30,7 @@
                       @change="handleChange"
                       clearable
                       style="width: 100%"
-                      :disabled="statusDisabled == 1"
+                      :disabled="formData.status == 1"
                   >
                     <el-option
                         v-for="item in doctorList"
@@ -46,15 +46,15 @@
           </Panel>
         </div>
         <div style="margin-top: 24px">
-          <ServiceDetail v-model="formData.itemDetail" :status="statusDisabled == 0"
+          <ServiceDetail v-model="formData.itemDetail" :status="formData.status == 0"
                          @totalPriceChange="getOrderTotalPrice"></ServiceDetail>
         </div>
         <div style="margin-top: 24px">
-          <GoodsDetail v-model="formData.goodsDetail" :status="statusDisabled == 0"
+          <GoodsDetail v-model="formData.goodsDetail" :status="formData.status == 0"
                        @totalPriceChange="getOrderTotalPrice"></GoodsDetail>
         </div>
         <div class="bottom">
-          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" :status="statusDisabled==1"></TotalPrice>
+          <TotalPrice v-model="formData.totalPrice" @edit="saveAndCharge" :status="!(statusDisabled)&&formData.status==0"></TotalPrice>
         </div>
       </el-scrollbar>
     </div>
@@ -207,7 +207,14 @@ const list = () => {
   })
 }
 const getStatus=(status:any)=>{
-  statusDisabled.value = status
+  console.log(111)
+  formData.value = {
+    patientInfo: {},
+    diagnosisMedicalRecord: {},
+    goodsDetail: [],
+    itemDetail: [],
+    patientRegistration: {}
+  }
 }
 </script>