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>
<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;

View File

@ -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;

View File

@ -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 = []

View File

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