Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
8ea6b012 by zhangmeng
Options

Merge remote-tracking branch 'origin/devmatch' into devmatch

2 parents 3bb29bd7 e21670cf
Inline Side-by-side
Showing 5 changed files with 65 additions and 127 deletions
src/viewsPc/booking/ticket/addInvoice.vue
......@@ -20,43 +20,12 @@
<label class="blueTag">{{ paymentType != 3 ? '票务订单' : 'Ticket' }}</label>
<h3>{{ matchForm.name }}</h3>
<div>
<p>地址：{{ matchForm.address }}</p>
<p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
<p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p>
<p>通票：{{
paymentType != 3 ? '¥' : '€'
}}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
}}
/1张</p>
<p>优惠票：{{
paymentType != 3 ? '¥' : '€'
}}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
/1张</p>
<p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
<p>票档：{{ ticketForm.extJson?.atName }}</p>
<p>场馆：{{ ticketForm.extJson?.atsName }}</p>
<p>场次：{{ ticketForm.extJson?.sessionType =='1000'? '日间场' : '夜间场' }}</p>
<p>票型：{{ ticketForm.extJson?.atstName }}</p>
</div>
<div>
<el-row v-for="v in message" style="width: 100%">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{ v.name }}
</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{ !v.discount ? '通票' : '优惠票' }}
</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
{{
!v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
{{ paymentType != 3 ? '￥' : '€' }}/张
</el-col>
</el-row>
<el-row style="width: 100%">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>购票数量：{{ ticketForm.num }}张
......@@ -65,8 +34,8 @@
<el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
共计:{{ (totalMoney * 1).toFixed(2) }}{{
paymentType != 3 ? '￥' : '€'
共计:{{ (totalMoney*1).toFixed(2) }}{{
paymentType == 1 ? '￥' : '€'
}}
</el-col>
</el-row>
......@@ -82,7 +51,7 @@
class="mw500"
>
<el-form-item :label="language==0 ?'开票金额':'Amount'">
<span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
<span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ paymentType != 3?ticketForm.total:ticketForm.totalEn }}</span>
</el-form-item>
<el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
......@@ -248,16 +217,16 @@ async function getTickInfo() {
ticketForm.value = res.data
try {
ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
cptId = ticketForm.value.extJson.ticketDate.activityId
totalMoney.value.val = ticketForm.value.extJson.total
message.value = JSON.parse(ticketForm.value.extJson.message)
console.log(message.value)
// ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
// ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
cptId = ticketForm.value.activeId
totalMoney.value = ticketForm.value.paymentType != 3 ? ticketForm.value.total : ticketForm.value.totalEn
// message.value = JSON.parse(ticketForm.value.extJson.message)
// console.log(message.value)
paymentType.value = ticketForm.value.paymentType
totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total
await getDetail(ticketForm.value.extJson.ticketDate.activityId)
console.log(ticketForm.value)
await getDetail(ticketForm.value.activeId)
// console.log(ticketForm.value)
} catch (e) {
console.log(e)
} finally {
......@@ -268,7 +237,7 @@ async function getTickInfo() {
async function getDetail(activeId) {
const res = await getTicketInfoByActivityId({ activityId: activeId })
matchForm.value = res.data
console.log(matchForm.value)
// console.log(matchForm.value)
}
function getList() {
......
src/viewsPc/booking/ticket/invoiceDetail.vue
......@@ -6,7 +6,7 @@
<div class="bg-lineg">
<div class="pl-back" @click="goBack">
<el-icon>
<ArrowLeftBold/>
<ArrowLeftBold />
</el-icon>
返回
</div>
......@@ -21,52 +21,22 @@
<label class="blueTag">票务订单</label>
<h3>{{ matchForm.name }}</h3>
<div>
<p>地址：{{ matchForm.address }}</p>
<p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
<p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p>
<p>通票：{{ paymentType != 3 ? '¥' : '€' }}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
}}
/1张</p>
<p>优惠票：{{ paymentType != 3 ? '¥' : '€' }}
{{
paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
/1张</p>
<p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
<p>票档：{{ ticketForm.extJson?.atName }}</p>
<p>场馆：{{ ticketForm.extJson?.atsName }}</p>
<p>场次：{{ ticketForm.extJson?.sessionType =='1000'? '日间场' : '夜间场' }}</p>
<p>票型：{{ ticketForm.extJson?.atstName }}</p>
</div>
<div>
<el-row v-for="v in message" style="width: 100%">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{ v.name }}
</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{ !v.discount ? '通票' : '优惠票' }}
</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
{{
!v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
}}
{{ paymentType != 3 ? '￥' : '€' }}/张
</el-col>
</el-row>
<el-row style="width: 100%">
<el-col :lg="8" :md="12" :sm="12" :xs="24">
<div>{{
language == 0 ? '购票数量' : 'Number of tickets purchased'
}}：{{ ticketForm.num }}张
<div>购票数量：{{ ticketForm.num }}张
</div>
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">{{
language == 0 ? '联系方式' : 'Contact Information'
}}：{{ ticketForm.phone }}
<el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
共计:{{ (totalMoney * 1).toFixed(2) }}{{
paymentType != 3 ? '￥' : '€'
共计:{{ (totalMoney*1).toFixed(2) }}{{
paymentType == 1 ? '￥' : '€'
}}
</el-col>
</el-row>
......@@ -74,8 +44,10 @@
</div>
<div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div>
<div class="border-rr mt20 pd20">
<el-form ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
class="mw500">
<el-form
ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
class="mw500"
>
<el-form-item :label="'开票金额'">
<span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
</el-form-item>
......@@ -124,27 +96,27 @@
<el-button plain round type="primary" @click="backList">返回</el-button>
</div>
</el-card>
<div style="height: 60px;"></div>
<div style="height: 60px;" />
</div>
</div>
</template>
<script setup>
import {useRouter, useRoute} from "vue-router";
import {ref, onMounted} from "vue";
import {useStorage} from "@vueuse/core/index";
import { useRouter, useRoute } from 'vue-router'
import { ref, onMounted } from 'vue'
import { useStorage } from '@vueuse/core/index'
import dayjs from 'dayjs'
import {ElMessage, ElMessageBox} from "element-plus";
import useUserStore from "@/store/modules/user";
import {getCurrentInstance} from "@vue/runtime-core";
import { ElMessage, ElMessageBox } from 'element-plus'
import useUserStore from '@/store/modules/user'
import { getCurrentInstance } from '@vue/runtime-core'
import {
getInvoiceDetail,
getTicketOrderInfo,
getTicketInfoByActivityId
} from "@/apiPc/booking";
import {getOrderDetail} from "@/viewsPc/seat/api/index";
} from '@/apiPc/booking'
import { getOrderDetail } from '@/viewsPc/seat/api/index'
const {proxy} = getCurrentInstance()
const { proxy } = getCurrentInstance()
const user = useUserStore().user
const language = useStorage('language', 0)
......@@ -164,58 +136,57 @@ const invoiceId = ref()
const rules = ref({
invoiceType: [
{required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change'}
{ required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change' }
],
invoiceEmail: [
{required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur'}
{ required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur' }
],
invoiceForm: [
{required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change'}
{ required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change' }
],
invoiceTitle: [
{required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur'}
{ required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur' }
],
invoiceTfn: [
{required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur'}
{ required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur' }
],
invoiceAddress: [
{required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur'}
{ required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur' }
],
invoicePhone: [
{required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur'}
{ required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur' }
],
invoiceBank: [
{required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur'}
{ required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur' }
],
invoiceAccount: [
{required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur'}
],
{ required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur' }
]
})
onMounted(() => {
if (route.query.invoiceId) {
invoiceId.value = route.query.invoiceId
getList()
}
// 获取票务订单信息
// 获取票务订单信息
getTickInfo()
})
// 票务订单详情
async function getTickInfo() {
const res = await getTicketOrderInfo({orderId: route.query.orderId})
const res = await getTicketOrderInfo({ orderId: route.query.orderId })
ticketForm.value = res.data
try {
ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
cptId = ticketForm.value.extJson.ticketDate.activityId
totalMoney.val = ticketForm.value.extJson.total
message.value = JSON.parse(ticketForm.value.extJson.message)
// ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
// ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
cptId = ticketForm.value.activeId
totalMoney.value = ticketForm.value.paymentType != 3 ? ticketForm.value.total : ticketForm.value.totalEn
// message.value = JSON.parse(ticketForm.value.extJson.message)
paymentType.value = ticketForm.value.paymentType
totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total
await getDetail(ticketForm.value.extJson.ticketDate.activityId)
console.log(ticketForm.value)
await getDetail(cptId)
// console.log(ticketForm.value)
} catch (e) {
console.log(e)
} finally {
......@@ -224,19 +195,19 @@ async function getTickInfo() {
}
async function getDetail(activeId) {
const res = await getTicketInfoByActivityId({activityId: activeId})
const res = await getTicketInfoByActivityId({ activityId: activeId })
matchForm.value = res.data
console.log(matchForm.value)
}
async function getDataInfo() {
const res = await getOrderDetail({orderSn: route.query.orderSn})
const res = await getOrderDetail({ orderSn: route.query.orderSn })
formDate.value = res.data
}
function getList() {
getInvoiceDetail(invoiceId.value).then(res => {
form.value = res.data;
form.value = res.data
totalMoney.value = form.value.total
})
}
......
src/viewsPc/center/myCanKP.vue
......@@ -86,10 +86,10 @@
<el-col :lg="9" :md="12" :sm="12" :xs="24">
<h3 class="m0">{{ b.name }}</h3>
<p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{
b.messageObj.ticketDate.name
b.messageObj.atName
}}</p>
<p class="common">
{{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.num }}{{ language == 0 ? "张" : "tickets" }}
{{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.orderCustomerList.length }}{{ language == 0 ? "张" : "tickets" }}
</p>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
......@@ -336,8 +336,6 @@ const getList = () => {
list.value = res.rows
for (const b of list.value) {
b.messageObj = JSON.parse(b.extJson)
b.messageObj.ticketDate = JSON.parse(b.messageObj.ticketDate)
b.messageObj.ticketType = JSON.parse(b.messageObj.ticketType)
}
loading.value = false
console.log(list.value)
......
src/viewsPc/components/homeQuick.vue
......@@ -126,7 +126,7 @@ function popRemark(type) {
(form.value.isFoodView == 0 && type == '3') ||
(form.value.isMealView == 0 && type == '4') ||
(form.value.isPhotoView == 0 && type == '5') ||
(form.value.isTicket == 0 && type == '0') ||
(form.value.isTicketView == 0 && type == '0') ||
(form.value.isScenicView == 0 && type == '8')
) {
building()
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!