Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
45db652c by zhangmeng
Options

去除对公打款

1 parent 94a60674
Inline Side-by-side
Showing 2 changed files with 96 additions and 87 deletions
src/viewsPc/booking/pay.vue
......@@ -155,13 +155,13 @@
<!-- }}{{ language == 0 ? '元' : 'Euro' }} x 1-->
<!-- {{ language == 0 ? '张' : 'Tickets' }}-->
<!-- </el-col>-->
</el-row>
</div>
</div>
<div class="leftboderTT">{{ language == 0 ? '预订信息' : 'Booking information' }}</div>
<div class="border-info mt20">
<el-row v-if="type == 'hotel'">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
......@@ -184,12 +184,12 @@
<el-tag class="mr10">{{ car.carSeat }} {{ language == 0 ? '座 ' : 'Sets' }}</el-tag>
<el-tag>{{ car.carColor }}</el-tag>
</div>
<span v-if="car.num > 0"> {{ car.num }}{{
language == 0 ? '辆' : 'Cars'
}} * {{ language == 0 ? '¥' : '$' }}{{ car.price }}</span>
</div>
<div>{{ language == 0 ? '人数' : 'People' }}： {{ form.pickUpBo.count }}</div>
<div>{{ language == 0 ? '航班/火车班次' : 'Flight/Train' }}： {{ form.pickUpBo.no }}</div>
<div>{{ language == 0 ? '接机/接站地点' : 'Pick-up/Drop-off Place' }}：
......@@ -211,7 +211,7 @@
<el-tag class="mr10">{{ car.carSeat }} {{ language == 0 ? '座 ' : 'Sets' }}</el-tag>
<el-tag>{{ car.carColor }}</el-tag>
</div>
<span v-if="car.num > 0"> {{ car.num }}{{
language == 0 ? '辆' : 'Cars'
}} * {{ language == 0 ? '¥' : '$' }}{{ car.price }}</span>
......@@ -344,18 +344,19 @@
}}{{ Number(totalFee).toFixed(2) }}
</el-col>
</el-row>
</el-row>
</div>
<el-row align="middle" justify="space-between">
<el-col :lg="12">
<div v-if="form.payDate">{{ language == 0 ? '支付时间' : 'Payment Time' }}：{{ form.payDate }}</div>
<div class="mt10">{{ language == 0 ? '支付方式' : 'Payment Method' }}：
<span v-if="form.paymentType=='1'">{{ language == 0 ? '微信支付' : 'WePay' }}</span>
<span v-else-if="form.paymentType=='3'">PayPal</span>
<span v-else-if="form.paymentType=='4'|| form.paymentType=='5'">{{language == 0 ?'对公转账':'Bank Transfer'}}</span>
<span
v-else-if="form.paymentType=='4'|| form.paymentType=='5'">{{ language == 0 ? '对公转账' : 'Bank Transfer' }}</span>
<span v-else>--</span>
</div>
</el-col>
......@@ -411,9 +412,11 @@
{{ language == 0 ? '登录后查看明细' : 'View detailed information after logging in' }}
</el-button>
</div>
<div v-if="form.viewStatus == '0'&&(form.surplus!='0,0'&&form.surplus!='0')&&form.paymentType!='4'&&form.paymentType!='5'" class="pd20">
<div
v-if="form.viewStatus == '0'&&(form.surplus!='0,0'&&form.surplus!='0')&&form.paymentType!='4'&&form.paymentType!='5'"
class="pd20">
<div class="leftboderTT">{{ language == 0 ? '选择支付方式' : 'Choose payment method' }}</div>
<div class="mt20">
<el-radio-group v-model="payType">
......@@ -459,10 +462,10 @@
fill="#003087" p-id="22662"></path>
</svg>
</el-radio>
<el-radio value="4" v-if="language==0&&type=='hotel'" border>
对公打款
</el-radio>
<el-radio value="5" v-if="language==1&&type=='hotel'" border>
<!-- <el-radio value="4" v-if="language==0&&type=='hotel'" border>-->
<!-- 对公打款-->
<!-- </el-radio>-->
<el-radio v-if="language==1&&type=='hotel'" border value="5">
Corporate payment
</el-radio>
</el-radio-group>
......@@ -489,29 +492,29 @@
</div>
</div>
</div>
<!-- 线下支付且待支付状态-->
<el-row v-if="(form.paymentType=='4'|| form.paymentType=='5')&&form.viewStatus=='0'" class="proofBox">
<el-col :lg="12">
<div class="flex">
<label style="width: 10em">
{{ language==0?'上传缴费凭证：':'Upload proof:' }}
{{ language == 0 ? '上传缴费凭证：' : 'Upload proof:' }}
</label>
<file-upload :is-show-tip="false" v-model="form.pic" :limit="1"/>
<file-upload v-model="form.pic" :is-show-tip="false" :limit="1"/>
</div>
</el-col>
<el-col :lg="12">
<el-button class="fr" text type="primary" @click="downOfflineInvoice" icon="download">
<el-button class="fr" icon="download" text type="primary" @click="downOfflineInvoice">
{{ language == 0 ? '下载缴费单' : 'Download Invoice' }}
</el-button>
</el-col>
<!-- 如果没审批通过-->
<!-- 如果没审批通过-->
<el-col :lg="24" align="center" justify="center">
<el-button round type="primary" @click="submitProof">提交凭证</el-button>
</el-col>
</el-row>
<el-row align="middle" class="mt20 mb60" justify="center">
<el-col :span="24" class="text-center">
<el-button v-if="!hideconfirmbtn&&form.viewStatus == '0'" class="btn-lineG w200px" round type="primary"
......@@ -524,10 +527,10 @@
<el-button v-if="form.viewStatus == '0'" class="underline" link @click="cancel">
{{ language == 0 ? '取消订单' : 'Cancel Order' }}
</el-button>
</el-col>
</el-row>
<div v-if="form.payDate&&form.viewStatus=='1'">
<div class="text-center">
<el-icon color="#32B16C" size="80">
......@@ -539,7 +542,7 @@
</div>
</el-card>
</div>
<div v-if="errorBox" class="box">
<el-result
:sub-title="language==0?'请确认订单号是否正确':'Please confirm if the order number is correct'"
......@@ -554,7 +557,7 @@
</el-result>
</div>
<Dialog ref="DialogRef"/>
<el-dialog v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false"
:title="language==0?'开收据':'Issue a receipt'" width="460px">
<div class="flex">
......@@ -574,9 +577,9 @@
</el-dialog>
<el-dialog v-model="showOfflineSuccessDialog" :title="language==0?'提示':'Tip'" width="460px">
<el-result
:sub-title="language==0?'请在7日内上传凭证，否则订单取消':'Please upload the payment receipt within 7 days, otherwise the order will be cancelled'"
:title="language==0?'订单已提交':'Order submitted'"
icon="success"
:sub-title="language==0?'请在7日内上传凭证，否则订单取消':'Please upload the payment receipt within 7 days, otherwise the order will be cancelled'"
:title="language==0?'订单已提交':'Order submitted'"
icon="success"
>
<template #extra>
<el-button class="btn-lineG w200px" round type="primary" @click="downOfflineInvoice">
......@@ -726,7 +729,7 @@ function getData() {
form.value.extJsonObj = JSON.parse(form.value.extJson) || {}
matchId.value = form.value.extJsonObj?.activeId
//如果对公打款-
if(form.value.paymentType=='4' || form.value.paymentType=='5'){
if (form.value.paymentType == '4' || form.value.paymentType == '5') {
hideconfirmbtn.value = true
}
}).catch(err => {
......@@ -759,15 +762,15 @@ async function getTicketOrderInfoFN() {
form.value.extJson.message = JSON.parse(form.value.extJson.message)
await getDetail(form.value.extJson.ticketDate.activityId)
matchId.value = form.value.extJson.ticketDate.activityId
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
} catch (e) {
console.log(e)
} finally {
}
console.log(form.value)
}
async function getDetail(activeId) {
......@@ -797,13 +800,13 @@ function goPay() {
})
}
if (payType.value == '4' || payType.value == '5') {
//对公打款
//对公打款
booking.createOfflinePay({orderId: orderId.value}).then(res => {
console.log(res)
// booking.getRoomBillPayment({orderId: orderId.value}).then(res => {
// 显示付款单信息-上传凭证
hideconfirmbtn.value = true
showOfflineSuccessDialog.value = true
// 显示付款单信息-上传凭证
hideconfirmbtn.value = true
showOfflineSuccessDialog.value = true
// })
})
}
......@@ -949,7 +952,7 @@ function exportPdf() {
...obj
}, `Hotel Reservation.pdf`)
}
}
// 套餐详情
......@@ -1003,7 +1006,7 @@ const showSJ = () => {
// proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
// ...obj
// }, `Receipt_${new Date().getTime()}.pdf`)
// 报名
proxy.download(`/ota/norder/getReceipt/${obj.orderId}`, {
...obj
......@@ -1023,7 +1026,7 @@ const downOfflineInvoice = () => {
}
const submitProof = () => {
//提交凭证
if(!form.value.pic){
if (!form.value.pic) {
ElMessage.warning(language.value == 0 ? '请上传凭证' : 'Please upload a voucher')
return
}
......@@ -1081,27 +1084,27 @@ const submitProof = () => {
width: 100%;
max-width: 1000px;
margin: 20px auto;
.head {
background: #EFF2F7;
height: 50px;
font-size: 16px;
font-weight: 400;
}
th {
background: #FAFBFD;
font-size: 14px;
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
}
td {
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
padding: 10px;
}
&.table-border {
border-top: 1px solid #E5E5E5;
border-left: 1px solid #E5E5E5;
......@@ -1120,23 +1123,23 @@ const submitProof = () => {
.result {
font-size: 22px;
.flex {
display: flex;
align-items: center;
font-weight: 500;
img {
margin-right: 10px
}
}
.priceb {
color: #7B7F83;
font-size: 16px;
text-align: right;
line-height: 50px;
span {
font-weight: bold;
font-size: 22px;
......@@ -1149,7 +1152,7 @@ const submitProof = () => {
.skeletonBox {
position: relative;
overflow: hidden;
.btn-lineG {
position: absolute;
left: 0;
......@@ -1159,7 +1162,7 @@ const submitProof = () => {
bottom: 0;
width: 200px;
box-shadow: 0 0 1000px 500px rgba(255, 255, 255, 0.5);
}
}
......@@ -1171,26 +1174,26 @@ const submitProof = () => {
.priceBar {
padding: 0 0 20px;
.flex {
display: flex;
justify-content: right;
align-items: baseline;
.item {
font-size: 16px;
margin-right: 15px;
label {
color: #95A1A6;
}
span {
font-family: DIN Alternate;
}
}
}
.size26 {
font-size: 26px;
}
......@@ -1205,5 +1208,10 @@ const submitProof = () => {
.price {
color: orange;
}
.proofBox{padding: 20px;margin: 0 20px;border: 1px dashed #999;}
.proofBox {
padding: 20px;
margin: 0 20px;
border: 1px dashed #999;
}
</style>
......
src/viewsPc/match/pay.vue
......@@ -9,7 +9,7 @@
<div v-if="isLogin">
<group-info-row v-if="groupId" :group-id="groupId" :match-id="matchId"/>
<coach-info-row v-if="groupId" :group-id="groupId" :match-id="matchId"/>
<div v-if="user.utype=='1'&&myMemberTable.length>0" class="pd20">
<div class="leftboderTT">{{ language == 0 ? '随行人员清单' : 'List of accompanying personnel' }}
</div>
......@@ -75,7 +75,7 @@
</el-icon>
{{ language == 0 ? '导出设项报名清单' : 'Export LIST OF REGISTERED COMPETITIONS' }}
</el-link>
<el-link type="primary" @click="exportPdf">
<el-icon>
<Upload/>
......@@ -105,7 +105,7 @@
</el-button>
</div>
</el-card>
<el-card class="mt20 mb20">
<el-row class="result">
<el-col :lg="12">
......@@ -227,7 +227,7 @@
</svg>
</el-radio>
</el-radio-group>
<div v-if="payType == '2'&&wePayCodeUrl">
<div class="payImgbox flexCenter">
<div>
......@@ -249,9 +249,10 @@
please refresh the page
</div>
</div>
<div v-if="payType == '3'">
<table cellpadding="0" cellspacing="0" class="table-border table">
<tbody>
<tr>
<th class="head" colspan="2">
{{ language == 0 ? '线下缴费的收款信息' : 'Offline Payment Collection Information' }}
......@@ -313,8 +314,8 @@
<span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
</td>
</tr>
</tbody>
</table>
<div class="text-center">
<el-button class="btn-lineG w200px" round type="primary" @click="upRR">{{
language == 0 ? '保存' : 'Save'
......@@ -336,7 +337,7 @@
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '$' }}{{ form.totalFee || 0 }}</h3>
<el-button v-if="language != 0" class="btn-lineG w200px" round type="primary" @click="downInvoice">
{{ language == 0 ? '下载收据' : 'DownLoad Invoice' }}
</el-button>
......@@ -357,7 +358,7 @@
</div>
</el-card>
</div>
<div v-if="errorBox" class="box">
<el-result
:sub-title="language==0?'请确认订单号是否正确':'Please confirm if the order number is correct'"
......@@ -371,7 +372,7 @@
</template>
</el-result>
</div>
<el-dialog v-model="showSJDialog" :close-on-click-modal="false" :close-on-press-escape="false"
:title="language==0?'开收据':'Issue a receipt'" width="460px">
<div class="flex">
......@@ -389,7 +390,7 @@
</div>
</div>
</el-dialog>
</div>
</template>
......@@ -460,7 +461,7 @@ onMounted(() => {
}
var is_mobile = navigator.userAgent.toLowerCase().match(/(ipod|ipad|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
console.log(is_mobile)
if (is_mobile) {
isphone.value = true
} else {
......@@ -524,7 +525,7 @@ function getSignList() {
}).catch(err => {
if (isLogin.value) {
router.push({name: 'myMatch'})
}
})
}
......@@ -617,7 +618,7 @@ function exportSignList(n) {
...obj
}, `${fileName}_${new Date().getTime()}.xlsx`)
}
}
function exportPdf() {
......@@ -637,7 +638,7 @@ function exportPdf() {
...obj
}, `${fileName}_${new Date().getTime()}.pdf`)
}
}
function copy(str) {
......@@ -747,27 +748,27 @@ const showSJ = () => {
width: 100%;
max-width: 1000px;
margin: 20px auto;
.head {
background: #EFF2F7;
height: 50px;
font-size: 16px;
font-weight: 400;
}
th {
background: #FAFBFD;
font-size: 14px;
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
}
td {
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
padding: 10px;
}
&.table-border {
border-top: 1px solid #E5E5E5;
border-left: 1px solid #E5E5E5;
......@@ -786,23 +787,23 @@ const showSJ = () => {
.result {
font-size: 22px;
.flex {
display: flex;
align-items: center;
font-weight: 500;
img {
margin-right: 10px
}
}
.priceb {
color: #7B7F83;
font-size: 16px;
text-align: right;
line-height: 50px;
span {
font-weight: bold;
font-size: 22px;
......@@ -815,7 +816,7 @@ const showSJ = () => {
.skeletonBox {
position: relative;
overflow: hidden;
.btn-lineG {
position: absolute;
left: 0;
......@@ -825,7 +826,7 @@ const showSJ = () => {
bottom: 0;
width: 200px;
box-shadow: 0 0 1000px 500px rgba(255, 255, 255, 0.5);
}
}
......@@ -837,26 +838,26 @@ const showSJ = () => {
.priceBar {
padding: 0 0 20px;
.flex {
display: flex;
justify-content: right;
align-items: baseline;
.item {
font-size: 16px;
margin-right: 15px;
label {
color: #95A1A6;
}
span {
font-family: DIN Alternate;
}
}
}
.size26 {
font-size: 26px;
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!