This commit is contained in:
LiJianZhao 2025-05-07 17:21:30 +08:00
parent fadd3101b0
commit 067499bb03
4 changed files with 16 additions and 18 deletions

View File

@ -18,7 +18,7 @@ watch(() => isShow, (newVal) => {
<template> <template>
<transition name="el-fade-in"> <transition name="el-fade-in">
<div class="mask" v-if="_isShow"> <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%"> <el-scrollbar height="100%">
<slot></slot> <slot></slot>
</el-scrollbar> </el-scrollbar>
@ -41,7 +41,7 @@ watch(() => isShow, (newVal) => {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.content-wrapper { .mask-content-wrapper {
position: relative; position: relative;
background-color: #FFF; background-color: #FFF;
border-radius: 6px; border-radius: 6px;

View File

@ -1,12 +1,12 @@
<template> <template>
<Mask :width="300" :height="438" :is-show="show"> <Mask :width="800" :height="438" :is-show="show">
<el-card> <!-- <el-card>-->
<template #header> <!-- <template #header>-->
<div class="header"> <div class="header">
<span>收费</span> <span>收费</span>
<CloseBtn @click="show = false" style="margin-top: 12px"></CloseBtn> <CloseBtn @click="show = false" style="margin-top: 12px"></CloseBtn>
</div> </div>
</template> <!-- </template>-->
<div class="panel"> <div class="panel">
<div class="price">{{ retailOrder.totalPrice }}</div> <div class="price">{{ retailOrder.totalPrice }}</div>
<div class="social" > <div class="social" >
@ -26,13 +26,13 @@
</div> </div>
</div> </div>
</div> </div>
<template #footer> <!-- <template #footer>-->
<div class="footer"> <div class="footer">
<el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox> <el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox>
<el-button @click="completeSettlement()" type="primary">完成收费</el-button> <el-button @click="completeSettlement()" type="primary">完成收费</el-button>
</div> </div>
</template> <!-- </template>-->
</el-card> <!-- </el-card>-->
</Mask> </Mask>
<PersonalPayment ref="psnPaymentRef" @orderCompleted="orderCompleted" @orderCancel="orderCanceled"></PersonalPayment> <PersonalPayment ref="psnPaymentRef" @orderCompleted="orderCompleted" @orderCancel="orderCanceled"></PersonalPayment>
</template> </template>
@ -56,7 +56,6 @@ const printReceipt = ref(false);
const payType = ref(null); const payType = ref(null);
const retailOrder = ref<any>(null); const retailOrder = ref<any>(null);
const init = (code: any) => { const init = (code: any) => {
debugger
post ('charge/getByCode',{code:code}).then((res:any)=>{ post ('charge/getByCode',{code:code}).then((res:any)=>{
retailOrder.value = res; retailOrder.value = res;
show.value = true; show.value = true;

View File

@ -60,7 +60,6 @@ const changeInput = (inputStr: string) => {
if (!props.requestApi || props.requestApi === "") { if (!props.requestApi || props.requestApi === "") {
return return
} }
debugger
let tempList = keyword.value.split(","); let tempList = keyword.value.split(",");
let searchKeyword = tempList[tempList.length - 1]; let searchKeyword = tempList[tempList.length - 1];
nameList.value = [] nameList.value = []

View File

@ -71,6 +71,7 @@
@orderCompleted="orderCompleted" @orderCompleted="orderCompleted"
@orderCanceled="orderCanceled" @orderCanceled="orderCanceled"
></Settlement> ></Settlement>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
@ -304,7 +305,6 @@ const generateOptions = () => {
} }
.bottom { .bottom {
margin-top: 24px; margin-top: 24px;
height: 86px; height: 86px;