Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
d39c19a0 by zhangmeng
Options

票务

1 parent 900d42f9
Inline Side-by-side
Showing 4 changed files with 301 additions and 174 deletions
src/viewsPc/booking/addInvoice.vue
...@@ -6,148 +6,176 @@ ...@@ -6,148 +6,176 @@
6 <div slot="header"> 6 <div slot="header">
7 <div class="bg-lineg"> 7 <div class="bg-lineg">
8 <div class="pl-back" @click="goBack"> 8 <div class="pl-back" @click="goBack">
9 <el-icon><ArrowLeftBold /></el-icon> 返回 9 <el-icon>
10 <ArrowLeftBold/>
11 </el-icon>
12 返回
10 </div> 13 </div>
11 {{ language == 0 ? '发票开具' : 'Invoice application' }}</div> 14 {{ language == 0 ? '发票开具' : 'Invoice application' }}
15 </div>
12 </div> 16 </div>
13 <el-row class="pd20" :gutter="20"> 17 <el-row :gutter="20" class="pd20">
14 <el-col :span="24"> 18 <el-col :span="24">
15 <!--已选订单--> 19 <!--已选订单-->
16 <div v-if="orderType!=6" class="border-info" v-for="b in list" :key="b.id"> 20 <div v-for="b in list" v-if="orderType!=6" :key="b.id" class="border-info">
17 <label class="blueTag" v-if="orderType == 0"> {{ language==0?'酒店订单':'HOTEL' }}</label> 21 <label v-if="orderType == 0" class="blueTag"> {{ language == 0 ? '酒店订单' : 'HOTEL' }}</label>
18 <label class="orangeTag" v-if="b.orderType == 1"> {{ language==0?'车辆订单':'TRANSPORTATION' }}</label> 22 <label v-if="b.orderType == 1" class="orangeTag"> {{
19 <label class="purpleTag" v-if="b.orderType == 2"> {{ language==0?'餐饮订单':'DINING' }}</label> 23 language == 0 ? '车辆订单' : 'TRANSPORTATION'
20 <label class="pinkTag" v-if="b.orderType == 3"> {{ language==0?'化妆订单':'MakeUp' }}</label> 24 }}</label>
21 <label class="yellowTag" v-if="b.orderType == 4"> {{ language==0?'拍摄订单':'Shooting'}}</label> 25 <label v-if="b.orderType == 2" class="purpleTag"> {{ language == 0 ? '餐饮订单' : 'DINING' }}</label>
22 <label class="yellowTag" v-if="!b.orderType&&orderType==5">{{ language==0?'赛事报名':'REGISTRATION' }}</label> 26 <label v-if="b.orderType == 3" class="pinkTag"> {{ language == 0 ? '化妆订单' : 'MakeUp' }}</label>
27 <label v-if="b.orderType == 4" class="yellowTag"> {{ language == 0 ? '拍摄订单' : 'Shooting' }}</label>
28 <label v-if="!b.orderType&&orderType==5" class="yellowTag">{{
29 language == 0 ? '赛事报名' : 'REGISTRATION'
30 }}</label>
23 <h3 v-if="b.name">{{ b.name }}</h3> 31 <h3 v-if="b.name">{{ b.name }}</h3>
24 <h3 v-if="b.cptName">{{ b.cptName }}</h3> 32 <h3 v-if="b.cptName">{{ b.cptName }}</h3>
25 33
26 <div v-if="!b.orderType&&orderType==5"> 34 <div v-if="!b.orderType&&orderType==5">
27 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}：{{b.groupName}}</p> 35 <p v-if="b.groupName">{{ language == 0 ? '团队名称' : 'Team name' }}：{{ b.groupName }}</p>
28 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}：{{b.payTime}}</p> 36 <p v-if="b.payTime">{{ language == 0 ? '支付时间' : 'Payment time' }}：{{ b.payTime }}</p>
29 <p class="poPrice" v-if="b.totalPayAmount">{{paymentType!=2?'¥':'€'}} {{b.totalPayAmount}}</p> 37 <p v-if="b.totalPayAmount" class="poPrice">{{ paymentType != 2 ? '¥' : '€' }} {{ b.totalPayAmount }}</p>
30 </div> 38 </div>
31 <!-- 酒店订单--> 39 <!-- 酒店订单-->
32 <div v-if="b.orderType == 0"> 40 <div v-if="b.orderType == 0">
33 <p>{{b.messageObj.roomInfo}}</p> 41 <p>{{ b.messageObj.roomInfo }}</p>
34 <p>{{b.messageObj.roomStayDate}}</p> 42 <p>{{ b.messageObj.roomStayDate }}</p>
35 <p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p> 43 <p v-if="b.totalStr" class="poPrice">{{ b.paymentType == 3 ? '€' : '¥' }}{{ b.totalStr }}</p>
36 </div> 44 </div>
37 <!-- 接送订单--> 45 <!-- 接送订单-->
38 <div v-if="b.orderType == 1"> 46 <div v-if="b.orderType == 1">
39 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0"> 47 <p v-for="(car,index) in b.messageObj.carsList" v-show="car.num>0" :key="index">
40 <span>{{car.name}}：{{car.num}} 辆</span> 48 <span>{{ car.name }}：{{ car.num }} 辆</span>
41 </p> 49 </p>
42 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p> 50 <p v-if="b.total" class="poPrice">{{ b.paymentType == 3 ? '€' : '¥' }}{{ b.totalStr }}</p>
43 </div> 51 </div>
44 <!-- 餐饮订单--> 52 <!-- 餐饮订单-->
45 <div v-if="b.orderType == 2"> 53 <div v-if="b.orderType == 2">
46 <p v-for="(n,index) in b.messageObj.foodsList" :key="index"> 54 <p v-for="(n,index) in b.messageObj.foodsList" :key="index">
47 <span v-if="n.num > 0"> 55 <span v-if="n.num > 0">
48 {{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span> 56 {{ n.name }}({{ n.categoryName }}) <span>{{ n.num }} 份</span>
49 </span> 57 </span>
50 </p> 58 </p>
51 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.total}}</p> 59 <p v-if="b.total" class="poPrice">{{ b.paymentType == 3 ? '€' : '¥' }}{{ b.total }}</p>
52 </div> 60 </div>
53 <div v-if="b.orderType == 3 || b.orderType == 4"> 61 <div v-if="b.orderType == 3 || b.orderType == 4">
54 <div> 62 <div>
55 {{language==0?'套餐名称：':''}}{{b.messageObj.packageName}} 63 {{ language == 0 ? '套餐名称：' : '' }}{{ b.messageObj.packageName }}
56 </div> 64 </div>
57 <div> 65 <div>
58 {{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}} 66 {{ language == 0 ? '预约时间：' : '' }}{{ b.deliveryTime.slice(0, 10) }} {{ b.messageObj.timePeriod }}
59 </div> 67 </div>
60 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p> 68 <p v-if="b.total" class="poPrice">{{ b.paymentType == 3 ? '€' : '¥' }}{{ b.totalStr }}</p>
61 </div> 69 </div>
62 </div> 70 </div>
63 71
64 <div class="border-info" v-if="orderType==6"> 72 <div v-if="orderType==6" class="border-info">
65 <label class="blueTag" >{{language==0?'票务订单':'Ticket'}}</label> 73 <label class="blueTag">{{ language == 0 ? '票务订单' : 'Ticket' }}</label>
66 <h3>{{ formDate.name }}</h3> 74 <h3>{{ matchForm.name }}</h3>
67 <div> 75 <div>
68 <p>地点：{{formDate.placeName}}</p> 76 <p>地址：{{ matchForm.address }}</p>
69 <p>单价：{{paymentType!=2?'¥':'€'}}{{formDate.singlePrice}}</p> 77 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
70 <p>数量：{{formDate.seatList?.length}}张</p> 78 <p>日期：{{ ticketForm.extJson?.ticketDate.name }}</p>
71 <p class="poPrice">{{paymentType!=2?'¥':'€'}}{{formDate.payAmount}}</p> 79 <p>单价：{{ paymentType != 2 ? '¥' : '€' }}{{ ticketForm.extJson?.ticketDate.price }}/1张</p>
80 <p>数量：{{ ticketForm.num }}张</p>
81
82 <p class="poPrice">{{ paymentType != 2 ? '¥' : '€' }}{{ ticketForm.total }}</p>
72 </div> 83 </div>
73 </div> 84 </div>
74 85
86 <!-- <div class="border-info" v-if="orderType==6">-->
87 <!-- <label class="blueTag" >{{language==0?'票务订单':'Ticket'}}</label>-->
88 <!-- <h3>{{ formDate.name }}</h3>-->
89 <!-- <div>-->
90 <!-- <p>地点：{{formDate.placeName}}</p>-->
91 <!-- <p>单价：{{paymentType!=2?'¥':'€'}}{{formDate.singlePrice}}</p>-->
92 <!-- <p>数量：{{formDate.seatList?.length}}张</p>-->
93 <!-- <p class="poPrice">{{paymentType!=2?'¥':'€'}}{{formDate.payAmount}}</p>-->
94 <!-- </div>-->
95 <!-- </div>-->
96
75 <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div> 97 <div class="leftboderTT">{{ language == 0 ? '开票信息' : 'Invoice information' }}</div>
76 <div class="border-rr mt20 pd20"> 98 <div class="border-rr mt20 pd20">
77 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef"> 99 <el-form ref="formRef" :label-width="language == 0 ?'100':'150'" :model="form" :rules="rules"
100 class="mw500">
78 <el-form-item :label="language == 0 ?'开票金额':'Amount'"> 101 <el-form-item :label="language == 0 ?'开票金额':'Amount'">
79 <span v-if="orderType==5||orderType==6" class="bigprice">{{paymentType!=2?'¥':'€'}}{{totalMoney}}</span> 102 <span v-if="orderType==5||orderType==6"
80 <span v-else class="bigprice">{{paymentType!=3?'¥':'€'}}{{totalMoney}}</span> 103 class="bigprice">{{ paymentType != 2 ? '¥' : '€' }}{{ totalMoney }}</span>
104 <span v-else class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
81 </el-form-item> 105 </el-form-item>
82 106
83 <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" required prop="invoiceForm"> 107 <el-form-item :label="language == 0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
84 <el-radio-group v-model="form.invoiceForm"> 108 <el-radio-group v-model="form.invoiceForm">
85 <el-radio value="1">{{ language == 0 ? '电子发票' : 'E-invoice' }}</el-radio> 109 <el-radio value="1">{{ language == 0 ? '电子发票' : 'E-invoice' }}</el-radio>
86 <!-- <el-radio value="2" v-if="kpType.indexOf('2')!=-1">{{ language == 0 ? '纸质普票' : 'Paper-invoice' }}</el-radio>--> 110 <!-- <el-radio value="2" v-if="kpType.indexOf('2')!=-1">{{ language == 0 ? '纸质普票' : 'Paper-invoice' }}</el-radio>-->
87 <!-- <el-radio value="3" v-if="kpType.indexOf('3')!=-1">{{ language == 0 ? '纸质专票' : 'Paper-special-invoice' }}</el-radio>--> 111 <!-- <el-radio value="3" v-if="kpType.indexOf('3')!=-1">{{ language == 0 ? '纸质专票' : 'Paper-special-invoice' }}</el-radio>-->
88 </el-radio-group> 112 </el-radio-group>
89 </el-form-item> 113 </el-form-item>
90 114
91 <!-- <el-form-item :label="`邮寄地址`" v-else required>--> 115 <!-- <el-form-item :label="`邮寄地址`" v-else required>-->
92 <!-- <el-button plain type="primary" size="small" v-if="addrList.length==0" @click="goEditAddress">--> 116 <!-- <el-button plain type="primary" size="small" v-if="addrList.length==0" @click="goEditAddress">-->
93 <!-- +{{ language==0?'添加地址':'Add' }}--> 117 <!-- +{{ language==0?'添加地址':'Add' }}-->
94 <!-- </el-button>--> 118 <!-- </el-button>-->
95 <!-- <div v-else class="flexCenter">--> 119 <!-- <div v-else class="flexCenter">-->
96 <!-- <div>--> 120 <!-- <div>-->
97 <!-- <div class="bigSize">{{nowAddress.contact}} {{nowAddress.phone}}</div>--> 121 <!-- <div class="bigSize">{{nowAddress.contact}} {{nowAddress.phone}}</div>-->
98 <!-- <div class="smallSize">{{nowAddress.addName}}</div>--> 122 <!-- <div class="smallSize">{{nowAddress.addName}}</div>-->
99 <!-- </div>--> 123 <!-- </div>-->
100 <!-- <a @click="goEditAddress" class="text-primary">--> 124 <!-- <a @click="goEditAddress" class="text-primary">-->
101 <!-- <el-icon><Switch /></el-icon>切换--> 125 <!-- <el-icon><Switch /></el-icon>切换-->
102 <!-- </a>--> 126 <!-- </a>-->
103 <!-- </div>--> 127 <!-- </div>-->
104 <!-- </el-form-item>--> 128 <!-- </el-form-item>-->
105 <el-form-item :label="language == 0 ?`发票类型`:'Invoice Type'" required prop="invoiceType"> 129 <el-form-item :label="language == 0 ?`发票类型`:'Invoice Type'" prop="invoiceType" required>
106 <el-radio-group v-model="form.invoiceType"> 130 <el-radio-group v-model="form.invoiceType">
107 <el-radio value="0">{{ language == 0 ? '企业' : 'Company' }}</el-radio> 131 <el-radio value="0">{{ language == 0 ? '企业' : 'Company' }}</el-radio>
108 <el-radio value="1">{{ language == 0 ? '个人非企业' : 'Individual' }}</el-radio> 132 <el-radio value="1">{{ language == 0 ? '个人非企业' : 'Individual' }}</el-radio>
109 </el-radio-group> 133 </el-radio-group>
110 </el-form-item> 134 </el-form-item>
111 <el-form-item v-if="form.invoiceType=='0'" :label="language == 0 ?`发票抬头`:'Invoice Title'" required prop="invoiceTitle"> 135 <el-form-item v-if="form.invoiceType=='0'" :label="language == 0 ?`发票抬头`:'Invoice Title'"
136 prop="invoiceTitle"
137 required>
112 <el-input v-model="form.invoiceTitle"/> 138 <el-input v-model="form.invoiceTitle"/>
113 </el-form-item> 139 </el-form-item>
114 <el-form-item :label="language == 0 ?`税号`:'Duty Paragraph'" required v-if="form.invoiceType=='0'" prop="invoiceTfn"> 140 <el-form-item v-if="form.invoiceType=='0'" :label="language == 0 ?`税号`:'Duty Paragraph'"
141 prop="invoiceTfn"
142 required>
115 <el-input v-model="form.invoiceTfn"/> 143 <el-input v-model="form.invoiceTfn"/>
116 </el-form-item> 144 </el-form-item>
117 <el-form-item :label="`邮箱`" v-if="form.invoiceForm=='1'" required prop="invoiceEmail"> 145 <el-form-item v-if="form.invoiceForm=='1'" :label="`邮箱`" prop="invoiceEmail" required>
118 <el-input v-model="form.invoiceEmail"/> 146 <el-input v-model="form.invoiceEmail"/>
119 </el-form-item> 147 </el-form-item>
120 <el-form-item label="备注" prop="remarks"> 148 <el-form-item label="备注" prop="remarks">
121 <el-input type="textarea" v-model="form.remarks"/> 149 <el-input v-model="form.remarks" type="textarea"/>
122 </el-form-item> 150 </el-form-item>
123 <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'"> 151 <div v-if="form.invoiceForm=='3'&&form.invoiceType=='0'">
124 <el-form-item :label="`地址`" required prop="invoiceAddress"> 152 <el-form-item :label="`地址`" prop="invoiceAddress" required>
125 <el-input v-model="form.invoiceAddress"/> 153 <el-input v-model="form.invoiceAddress"/>
126 </el-form-item> 154 </el-form-item>
127 <el-form-item :label="`电话`" required prop="invoicePhone"> 155 <el-form-item :label="`电话`" prop="invoicePhone" required>
128 <el-input v-model="form.invoicePhone"/> 156 <el-input v-model="form.invoicePhone"/>
129 </el-form-item> 157 </el-form-item>
130 <el-form-item :label="`开户行`" required prop="invoiceBank"> 158 <el-form-item :label="`开户行`" prop="invoiceBank" required>
131 <el-input v-model="form.invoiceBank"/> 159 <el-input v-model="form.invoiceBank"/>
132 </el-form-item> 160 </el-form-item>
133 <el-form-item :label="`账户`" required prop="invoiceAccount"> 161 <el-form-item :label="`账户`" prop="invoiceAccount" required>
134 <el-input v-model="form.invoiceAccount"/> 162 <el-input v-model="form.invoiceAccount"/>
135 </el-form-item> 163 </el-form-item>
136 </div> 164 </div>
137 </el-form> 165 </el-form>
138 166
139 <div class="tip" v-if="remark"> 167 <div v-if="remark" class="tip">
140 <label>{{ language == 0 ?'开票须知':'Invoice Notice' }}:</label> 168 <label>{{ language == 0 ? '开票须知' : 'Invoice Notice' }}:</label>
141 <div v-html="remark"></div> 169 <div v-html="remark"></div>
142 </div> 170 </div>
143 </div> 171 </div>
144 </el-col> 172 </el-col>
145 </el-row> 173 </el-row>
146 174
147 <el-row justify="center" align="middle" class="pd20"> 175 <el-row align="middle" class="pd20" justify="center">
148 <el-col :span="12" class="text-center"> 176 <el-col :span="12" class="text-center">
149 <el-button type="primary" class="btn-lineG w200px" size="large" round @click="submit"> 177 <el-button class="btn-lineG w200px" round size="large" type="primary" @click="submit">
150 {{ language==0?'提交':'Submit' }} 178 {{ language == 0 ? '提交' : 'Submit' }}
151 </el-button> 179 </el-button>
152 </el-col> 180 </el-col>
153 </el-row> 181 </el-row>
...@@ -157,7 +185,7 @@ ...@@ -157,7 +185,7 @@
157 </div> 185 </div>
158 </div> 186 </div>
159 <address-list-dialog ref="dialogAddressListRef" @submit="getAddress"/> 187 <address-list-dialog ref="dialogAddressListRef" @submit="getAddress"/>
160 <!-- 开票须知 --> 188 <!-- 开票须知 -->
161 </template> 189 </template>
162 190
163 <script setup> 191 <script setup>
...@@ -166,7 +194,7 @@ import {ref, reactive, onMounted} from "vue"; ...@@ -166,7 +194,7 @@ import {ref, reactive, onMounted} from "vue";
166 import {useStorage} from "@vueuse/core/index"; 194 import {useStorage} from "@vueuse/core/index";
167 import AddressListDialog from "./component/addressList" 195 import AddressListDialog from "./component/addressList"
168 import dayjs from 'dayjs' 196 import dayjs from 'dayjs'
169 import {ElMessage,ElMessageBox} from "element-plus"; 197 import {ElMessage, ElMessageBox} from "element-plus";
170 import useUserStore from "@/store/modules/user"; 198 import useUserStore from "@/store/modules/user";
171 import {getCurrentInstance} from "@vue/runtime-core"; 199 import {getCurrentInstance} from "@vue/runtime-core";
172 import {submitTitckInvoice, invoice, TitckUpdateInvoice} from '@/viewsPc/seat/api/index' 200 import {submitTitckInvoice, invoice, TitckUpdateInvoice} from '@/viewsPc/seat/api/index'
...@@ -177,7 +205,13 @@ import { ...@@ -177,7 +205,13 @@ import {
177 submitInvoice, 205 submitInvoice,
178 getInvoiceDetailBills, 206 getInvoiceDetailBills,
179 getInvoiceDetail, 207 getInvoiceDetail,
180 submitCptInvoice, getBaseInfoByActiveId, getLeagueInvoiceDetail, getLeagueInvoiceDetailPC,getInvoiceDetailMatch 208 submitCptInvoice,
209 getBaseInfoByActiveId,
210 getLeagueInvoiceDetail,
211 getLeagueInvoiceDetailPC,
212 getInvoiceDetailMatch,
213 getTicketOrderInfo,
214 getTicketInfoByActivityId,
181 } from "@/apiPc/booking"; 215 } from "@/apiPc/booking";
182 import {getOrderDetail} from "@/viewsPc/seat/api/index"; 216 import {getOrderDetail} from "@/viewsPc/seat/api/index";
183 217
...@@ -193,8 +227,8 @@ const form = ref({ ...@@ -193,8 +227,8 @@ const form = ref({
193 invoiceType: '0' 227 invoiceType: '0'
194 }) 228 })
195 const formDate = ref({}) 229 const formDate = ref({})
196 const orderType=ref(1) 230 const orderType = ref(1)
197 const paymentType=ref(1) 231 const paymentType = ref(1)
198 const list = ref([]) 232 const list = ref([])
199 const addrList = ref([]) 233 const addrList = ref([])
200 const nowAddress = ref({}) 234 const nowAddress = ref({})
...@@ -203,57 +237,57 @@ const kpType = ref('1') ...@@ -203,57 +237,57 @@ const kpType = ref('1')
203 const remark = ref('') 237 const remark = ref('')
204 const rules = ref({ 238 const rules = ref({
205 invoiceType: [ 239 invoiceType: [
206 {required: true, message: language.value==0?'请选择发票类型':'Please select invoice type', trigger: 'change'} 240 {required: true, message: language.value == 0 ? '请选择发票类型' : 'Please select invoice type', trigger: 'change'}
207 ], 241 ],
208 invoiceEmail: [ 242 invoiceEmail: [
209 {required: true, message: language.value==0?'请输入邮箱':'Please enter email', trigger: 'blur'} 243 {required: true, message: language.value == 0 ? '请输入邮箱' : 'Please enter email', trigger: 'blur'}
210 ], 244 ],
211 invoiceForm: [ 245 invoiceForm: [
212 {required: true, message: language.value==0?'请选择发票形式':'Please select invoice form', trigger: 'change'} 246 {required: true, message: language.value == 0 ? '请选择发票形式' : 'Please select invoice form', trigger: 'change'}
213 ], 247 ],
214 invoiceTitle: [ 248 invoiceTitle: [
215 {required: true, message: language.value==0?'请输入发票抬头':'Please enter invoice title', trigger: 'blur'} 249 {required: true, message: language.value == 0 ? '请输入发票抬头' : 'Please enter invoice title', trigger: 'blur'}
216 ], 250 ],
217 invoiceTfn: [ 251 invoiceTfn: [
218 {required: true, message: language.value==0?'请输入税号':'Please enter TFN', trigger: 'blur'} 252 {required: true, message: language.value == 0 ? '请输入税号' : 'Please enter TFN', trigger: 'blur'}
219 ], 253 ],
220 invoiceAddress: [ 254 invoiceAddress: [
221 {required: true, message: language.value==0?'请输入地址':'Please enter address', trigger: 'blur'} 255 {required: true, message: language.value == 0 ? '请输入地址' : 'Please enter address', trigger: 'blur'}
222 ], 256 ],
223 invoicePhone: [ 257 invoicePhone: [
224 {required: true, message: language.value==0?'请输入电话':'Please enter phone', trigger: 'blur'} 258 {required: true, message: language.value == 0 ? '请输入电话' : 'Please enter phone', trigger: 'blur'}
225 ], 259 ],
226 invoiceBank: [ 260 invoiceBank: [
227 {required: true, message: language.value==0?'请输入开户行':'Please enter bank', trigger: 'blur'} 261 {required: true, message: language.value == 0 ? '请输入开户行' : 'Please enter bank', trigger: 'blur'}
228 ], 262 ],
229 invoiceAccount: [ 263 invoiceAccount: [
230 {required: true, message: language.value==0?'请输入账户':'Please enter account', trigger: 'blur'} 264 {required: true, message: language.value == 0 ? '请输入账户' : 'Please enter account', trigger: 'blur'}
231 ], 265 ],
232 }) 266 })
233 const isEdit = ref(false) 267 const isEdit = ref(false)
268 const ticketForm = ref({})
269 const matchForm = ref({})
234 let invoiceId 270 let invoiceId
235 let cptId 271 let cptId
236 272
237 273
238 onMounted(() => { 274 onMounted(() => {
239 orderType.value=route.query.orderType 275 orderType.value = route.query.orderType
240 paymentType.value=route.query.paymentType 276 paymentType.value = route.query.paymentType
241 if(route.query.orders){ 277 if (route.query.orders) {
242 let obj = JSON.parse(decodeURIComponent(route.query.orders)) || {} 278 let obj = JSON.parse(decodeURIComponent(route.query.orders)) || {}
243 if(obj.cptId){ 279 if (obj.cptId) {
244 cptId = obj.cptId 280 cptId = obj.cptId
245 }else if(obj.activeId){ 281 } else if (obj.activeId) {
246 cptId = obj.activeId 282 cptId = obj.activeId
247 }else{ 283 } else {
248 cptId = '1778253367748993026' 284 cptId = '1778253367748993026'
249 } 285 }
250
251 console.log(obj)
252 getRemark() 286 getRemark()
253 let arr = [] 287 let arr = []
254 list.value.push(obj) 288 list.value.push(obj)
255 for (let bill of list.value) { 289 for (let bill of list.value) {
256 if(bill?.message){ 290 if (bill?.message) {
257 bill.messageObj = JSON.parse(bill.message) 291 bill.messageObj = JSON.parse(bill.message)
258 } 292 }
259 arr.push(bill.id) 293 arr.push(bill.id)
...@@ -261,7 +295,7 @@ onMounted(() => { ...@@ -261,7 +295,7 @@ onMounted(() => {
261 form.value.orders = arr.toString() 295 form.value.orders = arr.toString()
262 console.log(list.value) 296 console.log(list.value)
263 } 297 }
264 if(route.query.activeId){ 298 if (route.query.activeId) {
265 cptId = route.query.activeId 299 cptId = route.query.activeId
266 } 300 }
267 if (route.query.totalMoney) { 301 if (route.query.totalMoney) {
...@@ -283,34 +317,66 @@ onMounted(() => { ...@@ -283,34 +317,66 @@ onMounted(() => {
283 getList() 317 getList()
284 } 318 }
285 319
286 if(user.userName.indexOf('@')>-1){ 320 if (user.userName.indexOf('@') > -1) {
287 form.value.address = user.userName 321 form.value.address = user.userName
288 } 322 }
289 route.query.orderSn&&getDataInfo() 323 route.query.orderSn && getDataInfo()
324
325 // 获取票务订单信息
326 route.query.orderType == 6 && getTickInfo()
327 console.log(route.query)
290 }) 328 })
291 329
292 async function getDataInfo(){ 330 // 票务订单详情
293 const res =await getOrderDetail({orderSn:route.query.orderSn}) 331 async function getTickInfo() {
294 formDate.value=res.data 332 const res = await getTicketOrderInfo({orderId: route.query.orderId})
333 ticketForm.value = res.data
334 console.log(res.data)
335 try {
336 ticketForm.value.extJson = JSON.parse(ticketForm.value.extJson)
337 ticketForm.value.extJson.ticketDate = JSON.parse(ticketForm.value.extJson.ticketDate)
338 ticketForm.value.extJson.ticketType = JSON.parse(ticketForm.value.extJson.ticketType)
339 cptId = ticketForm.value.extJson.ticketDate.activityId
340 totalMoney.val = ticketForm.value.extJson.total
341 await getDetail(ticketForm.value.extJson.ticketDate.activityId)
342 } catch (e) {
343 console.log(e)
344 } finally {
345
346 }
347 console.log(form.value)
348
349 }
350
351 async function getDetail(activeId) {
352 const res = await getTicketInfoByActivityId({activityId: activeId})
353 matchForm.value = res.data
354 console.log(matchForm.value)
355 }
356
357
358 async function getDataInfo() {
359 const res = await getOrderDetail({orderSn: route.query.orderSn})
360 formDate.value = res.data
295 } 361 }
296 362
297 function getList() { 363 function getList() {
298 if(route.query.type=='5'){ 364 if (route.query.type == '5') {
299 getLeagueInvoiceDetailPC(invoiceId).then(res => { 365 getLeagueInvoiceDetailPC(invoiceId).then(res => {
300 // 订单 366 // 订单
301 list.value = res.rows 367 list.value = res.rows
302 console.log(list.value) 368 console.log(list.value)
303 cptId = res.rows[0].activeId||res.rows[0].cptId 369 cptId = res.rows[0].activeId || res.rows[0].cptId
304 getRemark() 370 getRemark()
305 for (var bill of list.value) { 371 for (var bill of list.value) {
306 if (bill.messageObj)bill.messageObj = JSON.parse(bill.message) 372 if (bill.messageObj) bill.messageObj = JSON.parse(bill.message)
307 } 373 }
308 }); 374 });
309 } else { 375 } else {
310 getInvoiceDetailBills(invoiceId).then(res => { 376 getInvoiceDetailBills(invoiceId).then(res => {
311 // 订单 377 // 订单
312 list.value = res.rows; 378 list.value = res.rows;
313 cptId = res.rows[0].activeId||res.rows[0].cptId 379 cptId = res.rows[0].activeId || res.rows[0].cptId
314 getRemark() 380 getRemark()
315 for (var bill of list.value) { 381 for (var bill of list.value) {
316 bill.messageObj = JSON.parse(bill.message) 382 bill.messageObj = JSON.parse(bill.message)
...@@ -319,14 +385,14 @@ function getList() { ...@@ -319,14 +385,14 @@ function getList() {
319 } 385 }
320 386
321 // 回显 387 // 回显
322 if (orderType.value==6){ 388 if (orderType.value == 6) {
323 invoice(invoiceId).then(res=>{ 389 invoice(invoiceId).then(res => {
324 // console.log(res) 390 // console.log(res)
325 form.value = res.data; 391 form.value = res.data;
326 form.value.invoiceForm='1' 392 form.value.invoiceForm = '1'
327 totalMoney.value = form.value.total 393 totalMoney.value = form.value.total
328 }) 394 })
329 }else if(orderType.value==5){ 395 } else if (orderType.value == 5) {
330 getInvoiceDetailMatch(invoiceId).then(res => { 396 getInvoiceDetailMatch(invoiceId).then(res => {
331 form.value = res.data; 397 form.value = res.data;
332 totalMoney.value = form.value.total 398 totalMoney.value = form.value.total
...@@ -335,7 +401,7 @@ function getList() { ...@@ -335,7 +401,7 @@ function getList() {
335 // } 401 // }
336 // getAddrList() 402 // getAddrList()
337 }); 403 });
338 }else{ 404 } else {
339 getInvoiceDetail(invoiceId).then(res => { 405 getInvoiceDetail(invoiceId).then(res => {
340 form.value = res.data; 406 form.value = res.data;
341 totalMoney.value = form.value.total 407 totalMoney.value = form.value.total
...@@ -350,87 +416,92 @@ function getList() { ...@@ -350,87 +416,92 @@ function getList() {
350 416
351 function goEditAddress(id) { 417 function goEditAddress(id) {
352 var obj = { 418 var obj = {
353 title: language.value==0?'地址列表':'Address list', 419 title: language.value == 0 ? '地址列表' : 'Address list',
354 show: true, 420 show: true,
355 id: id 421 id: id
356 } 422 }
357 proxy.$refs['dialogAddressListRef'].open(obj) 423 proxy.$refs['dialogAddressListRef'].open(obj)
358 } 424 }
425
359 function getRemark() { 426 function getRemark() {
360 getBaseInfoByActiveId(cptId).then(res=>{ 427 getBaseInfoByActiveId(cptId).then(res => {
361 if(res.data){ 428 if (res.data) {
362 // remark.value = res.data.remarks 429 // remark.value = res.data.remarks
363 remark.value = res.data.remarks.replace(/\n/g, '<br>') 430 remark.value = res.data.remarks.replace(/\n/g, '<br>')
364 } 431 }
365 }) 432 })
366 } 433 }
434
367 function getAddrList() { 435 function getAddrList() {
368 addressList(user.userId).then(res=>{ 436 addressList(user.userId).then(res => {
369 addrList.value = res.rows 437 addrList.value = res.rows
370 if(addrList.value.length>0){ 438 if (addrList.value.length > 0) {
371 nowAddress.value = addrList.value[0] 439 nowAddress.value = addrList.value[0]
372 } 440 }
373 }) 441 })
374 } 442 }
443
375 function getAddress(obj) { 444 function getAddress(obj) {
376 getAddrList() 445 getAddrList()
377 nowAddress.value = obj 446 nowAddress.value = obj
378 } 447 }
448
379 function submit() { 449 function submit() {
380 proxy.$refs['formRef'].validate((valid) => { 450 proxy.$refs['formRef'].validate((valid) => {
381 if(valid){ 451 if (valid) {
382 // 提交确认 452 // 提交确认
383 ElMessageBox.confirm(language.value == 0 ? '确认提交吗？' : 'Confirm to submit ?', { 453 ElMessageBox.confirm(language.value == 0 ? '确认提交吗？' : 'Confirm to submit ?', {
384 confirmButtonText: language.value == 0 ? '确定' : 'Confirm', 454 confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
385 cancelButtonText: language.value == 0 ? '取消' : 'Cancel', 455 cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
386 type: 'warning' 456 type: 'warning'
387 }).then(() => { 457 }).then(() => {
388 form.value.activeId = cptId 458 form.value.activeId = cptId
389 form.value.total = totalMoney.value 459 form.value.total = totalMoney.value
390 form.value.version = 2 460 form.value.version = 2
391 form.value.invoicePhone=paymentType.value 461 form.value.invoicePhone = paymentType.value
392 if (orderType.value==6) form.value.orders=route.query.orderSn 462 if (orderType.value == 6) form.value.orders = route.query.orderSn
393 if (isEdit.value) { 463 if (isEdit.value) {
394 update() 464 update()
395 } else { 465 } else {
396 add() 466 add()
397 } 467 }
398 }) 468 })
399 } 469 }
400 }) 470 })
401 } 471 }
402 472
403 function update() { 473 function update() {
404 if (orderType.value==6){ 474 if (orderType.value == 6) {
405 TitckUpdateInvoice(form.value).then(res=>{ 475 TitckUpdateInvoice(form.value).then(res => {
406 //返回列表 476 //返回列表
407 backList() 477 backList()
408 }) 478 })
409 }else if(orderType.value==5){ 479 } else if (orderType.value == 5) {
410 editInvoiceMatch(form.value).then(res=>{ 480 editInvoiceMatch(form.value).then(res => {
411 //返回列表 481 //返回列表
412 backList() 482 backList()
413 }) 483 })
414 }else{ 484 } else {
415 editInvoice(form.value).then(res=>{ 485 editInvoice(form.value).then(res => {
416 //返回列表 486 //返回列表
417 backList() 487 backList()
418 }) 488 })
419 } 489 }
420 490
421 } 491 }
492
422 function add() { 493 function add() {
423 if(orderType.value==6){ 494 if (orderType.value == 6) {
424 submitTitckInvoice(form.value).then((res)=>{ 495 submitTitckInvoice(form.value).then((res) => {
425 backList() 496 backList()
426 }) 497 })
427 }else if(list.value[0].orderType||list.value[0].orderType==0){ 498 } else if (list.value[0].orderType || list.value[0].orderType == 0) {
428 submitInvoice(form.value).then(res=>{ 499 submitInvoice(form.value).then(res => {
429 //返回列表 500 //返回列表
430 backList() 501 backList()
431 }) 502 })
432 } else { 503 } else {
433 submitCptInvoice(form.value).then(res=>{ 504 submitCptInvoice(form.value).then(res => {
434 //返回列表 505 //返回列表
435 backList() 506 backList()
436 }) 507 })
...@@ -438,38 +509,73 @@ function add() { ...@@ -438,38 +509,73 @@ function add() {
438 509
439 510
440 } 511 }
512
441 function backList() { 513 function backList() {
442 router.push({ 514 router.push({
443 // name: 'invoice' 515 // name: 'invoice'
444 name: 'myKP' 516 name: 'myKP'
445 }) 517 })
446 } 518 }
519
447 function goBack() { 520 function goBack() {
448 router.go(-1) 521 router.go(-1)
449 } 522 }
523
524 // 获取票务订单详情
525 function getTicketOrderDetail() {
526
527 }
450 </script> 528 </script>
451 529
452 <style scoped lang="scss"> 530 <style lang="scss" scoped>
453 .pl-back{position: absolute;padding: 0 15px;display: flex;align-items: center;cursor: pointer} 531 .pl-back {
532 position: absolute;
533 padding: 0 15px;
534 display: flex;
535 align-items: center;
536 cursor: pointer
537 }
538
454 .bigMoney { 539 .bigMoney {
455 font-size: 36px !important; 540 font-size: 36px !important;
456 font-family: 'DIN Alternate'; 541 font-family: 'DIN Alternate';
457 font-weight: bold; 542 font-weight: bold;
458 } 543 }
459 .btn-lineG{font-size: 16px} 544
545 .btn-lineG {
546 font-size: 16px
547 }
548
460 .bg-lineg { 549 .bg-lineg {
461 height: 40px; 550 height: 40px;
462 line-height: 40px; 551 line-height: 40px;
463 font-size: 18px; 552 font-size: 18px;
464 text-align: center; 553 text-align: center;
465 } 554 }
466 .border-info{position: relative; 555
467 &>label{position: absolute;right: 0;top: 0;margin: 0;border-radius: 0 0 0px 15px; 556 .border-info {
468 padding: 5px 15px;font-size: 14px; 557 position: relative;
558
559 & > label {
560 position: absolute;
561 right: 0;
562 top: 0;
563 margin: 0;
564 border-radius: 0 0 0px 15px;
565 padding: 5px 15px;
566 font-size: 14px;
567 }
568
569 .poPrice {
570 position: absolute;
571 bottom: 0px;
572 right: 10px;
573 font-size: 24px;
574 line-height: 1;
575 font-family: "DIN Alternate"
469 } 576 }
470 .poPrice{position: absolute;bottom: 0px;right: 10px;font-size: 24px;
471 line-height: 1;font-family: "DIN Alternate"}
472 } 577 }
578
473 .blueTag { 579 .blueTag {
474 color: #fff; 580 color: #fff;
475 background-color: #1EC886; 581 background-color: #1EC886;
...@@ -484,6 +590,7 @@ function goBack() { ...@@ -484,6 +590,7 @@ function goBack() {
484 color: #fff; 590 color: #fff;
485 background-color: #ff8124; 591 background-color: #ff8124;
486 } 592 }
593
487 .pinkTag { 594 .pinkTag {
488 color: #fff; 595 color: #fff;
489 background-color: #f55497; 596 background-color: #f55497;
...@@ -493,6 +600,7 @@ function goBack() { ...@@ -493,6 +600,7 @@ function goBack() {
493 color: #fff; 600 color: #fff;
494 background-color: #bad814; 601 background-color: #bad814;
495 } 602 }
603
496 .leftboderTT { 604 .leftboderTT {
497 font-weight: 600; 605 font-weight: 600;
498 font-size: 16px; 606 font-size: 16px;
...@@ -546,8 +654,18 @@ function goBack() { ...@@ -546,8 +654,18 @@ function goBack() {
546 .red { 654 .red {
547 color: #FF8124; 655 color: #FF8124;
548 } 656 }
549 .tip{font-size: 14px;color: #666;padding: 0 10px;} 657
550 .mw500{max-width: 500px;margin: auto} 658 .tip {
659 font-size: 14px;
660 color: #666;
661 padding: 0 10px;
662 }
663
664 .mw500 {
665 max-width: 500px;
666 margin: auto
667 }
668
551 .bigSize { 669 .bigSize {
552 font-size: 16px; 670 font-size: 16px;
553 margin-bottom: 5px; 671 margin-bottom: 5px;
...@@ -567,8 +685,10 @@ function goBack() { ...@@ -567,8 +685,10 @@ function goBack() {
567 padding: 10px; 685 padding: 10px;
568 box-sizing: border-box; 686 box-sizing: border-box;
569 } 687 }
688
570 .bigprice { 689 .bigprice {
571 font-size: 26px; 690 font-size: 26px;
572 line-height: 1;font-family: "DIN Alternate"; 691 line-height: 1;
692 font-family: "DIN Alternate";
573 } 693 }
574 </style> 694 </style>
......
src/viewsPc/booking/pay.vue
...@@ -113,16 +113,19 @@ ...@@ -113,16 +113,19 @@
113 <div v-if="type == 'ticket'"> 113 <div v-if="type == 'ticket'">
114 <div class="leftboderTT">{{ language == 0 ? '购票信息' : 'Ticket Information' }}</div> 114 <div class="leftboderTT">{{ language == 0 ? '购票信息' : 'Ticket Information' }}</div>
115 <div class="border-info mt20"> 115 <div class="border-info mt20">
116 <h3>{{ form?.extJson?.ticketType?.name }}</h3> 116 <h3>{{ matchForm.name }}</h3>
117 <el-row> 117 <el-row>
118 <el-col> 118 <el-col>
119 {{ language == 0 ? '地址' : 'Address' }}： 119 {{ language == 0 ? '地址' : 'Address' }}：
120 <span v-if="language == 0">{{ form.provinceName }} {{ form.cityName }} {{ form.areaName }} </span>
121 {{ matchForm.address }} 120 {{ matchForm.address }}
122 </el-col> 121 </el-col>
123 <el-col> 122 <el-col>
124 {{ language == 0 ? '票档' : 'Check-in&Check-out' }}：{{ form?.extJson?.ticketDate?.name }} x 1 123 {{ language == 0 ? '票档' : 'Check-in&Check-out' }}：{{ form?.extJson?.ticketType?.name }}
125 {{ language == 0 ? '张' : 'Tickets' }} 124 </el-col>
125 <el-col>
126 {{
127 language == 0 ? '时间' : 'Room Information'
128 }}：{{ dayjs(form?.extJson?.ticketDate?.ticketStart).format('YYYY-MM-DD') }}
126 </el-col> 129 </el-col>
127 <el-col> 130 <el-col>
128 {{ 131 {{
...@@ -132,11 +135,7 @@ ...@@ -132,11 +135,7 @@
132 }}{{ language == 0 ? '元' : 'Euro' }} x 1 135 }}{{ language == 0 ? '元' : 'Euro' }} x 1
133 {{ language == 0 ? '张' : 'Tickets' }} 136 {{ language == 0 ? '张' : 'Tickets' }}
134 </el-col> 137 </el-col>
135 <el-col> 138
136 {{
137 language == 0 ? '时间' : 'Room Information'
138 }}：{{ dayjs(form?.extJson?.ticketDate?.ticketStart).format('YYYY-MM-DD') }}
139 </el-col>
140 </el-row> 139 </el-row>
141 </div> 140 </div>
142 </div> 141 </div>
...@@ -648,11 +647,13 @@ async function getTicketOrderInfoFN() { ...@@ -648,11 +647,13 @@ async function getTicketOrderInfoFN() {
648 647
649 } 648 }
650 console.log(form.value) 649 console.log(form.value)
650
651 } 651 }
652 652
653 async function getDetail(activeId) { 653 async function getDetail(activeId) {
654 const res = await getTicketInfoByActivityId({activityId: activeId}) 654 const res = await getTicketInfoByActivityId({activityId: activeId})
655 matchForm.value = res.data 655 matchForm.value = res.data
656 console.log(matchForm.value)
656 } 657 }
657 658
658 659
......
src/viewsPc/center/myCanKP.vue
...@@ -48,15 +48,15 @@ ...@@ -48,15 +48,15 @@
48 <el-col :lg="9" :md="12" :sm="12" :xs="24"> 48 <el-col :lg="9" :md="12" :sm="12" :xs="24">
49 <h3 class="m0">{{ b.name }}</h3> 49 <h3 class="m0">{{ b.name }}</h3>
50 <p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{ 50 <p> {{ language == 0 ? "时间" : "Event Date & Time" }}：{{
51 b.dateStr 51 b.messageObj.ticketDate.name
52 }}</p> 52 }}</p>
53 <p class="common"> 53 <p class="common">
54 {{ language == 0 ? "张数" : "Location" }}：{{ b.ticketNum }}{{ language == 0 ? "张" : "tickets" }} 54 {{ language == 0 ? "张数" : "Location" }}：{{ b.messageObj.num }}{{ language == 0 ? "张" : "tickets" }}
55 </p> 55 </p>
56 </el-col> 56 </el-col>
57 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 57 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
58 <span class="text-warning"> {{ b.payType == '2' ? '€' : '￥' }} 58 <span class="text-warning"> {{ b.payType == '2' ? '€' : '￥' }}
59 <span class="bigMoney">{{ b.payAmount }}</span> 59 <span class="bigMoney">{{ b.total }}</span>
60 </span> 60 </span>
61 </el-col> 61 </el-col>
62 <el-col :lg="6" :md="16" :sm="16" :xs="16"> 62 <el-col :lg="6" :md="16" :sm="16" :xs="16">
...@@ -281,9 +281,13 @@ const getList = () => { ...@@ -281,9 +281,13 @@ const getList = () => {
281 }).then(res => { 281 }).then(res => {
282 list.value = res.rows 282 list.value = res.rows
283 for (let b of list.value) { 283 for (let b of list.value) {
284 b.messageObj = JSON.parse(b.message) 284 b.messageObj = JSON.parse(b.extJson)
285 b.messageObj.ticketDate = JSON.parse(b.messageObj.ticketDate)
286 b.messageObj.ticketType = JSON.parse(b.messageObj.ticketType)
285 } 287 }
286 loading.value = false 288 loading.value = false
289 console.log(list.value)
290
287 }) 291 })
288 } else { 292 } else {
289 getCanInvoiceBills(query.value).then(res => { 293 getCanInvoiceBills(query.value).then(res => {
...@@ -327,7 +331,8 @@ const gokp = (item) => { ...@@ -327,7 +331,8 @@ const gokp = (item) => {
327 query: { 331 query: {
328 orders: encodeURIComponent(JSON.stringify(item)), 332 orders: encodeURIComponent(JSON.stringify(item)),
329 totalMoney: item.totalStr || item.totalPayAmount || item.payAmount || item.totalAmount, 333 totalMoney: item.totalStr || item.totalPayAmount || item.payAmount || item.totalAmount,
330 paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType, 334 orderId: item.id,
335 paymentType: query.value.orderType == 5 ? item.payType : item.paymentType,
331 orderType: query.value.orderType, 336 orderType: query.value.orderType,
332 orderSn: query.value.orderType == 6 ? item.orderSn : null 337 orderSn: query.value.orderType == 6 ? item.orderSn : null
333 } 338 }
...@@ -338,11 +343,12 @@ const editkp = (item) => { ...@@ -338,11 +343,12 @@ const editkp = (item) => {
338 name: 'addInvoice', 343 name: 'addInvoice',
339 query: { 344 query: {
340 invoiceId: query.value.orderType == 6 ? item.invoiceIdStr : item.invoiceId, 345 invoiceId: query.value.orderType == 6 ? item.invoiceIdStr : item.invoiceId,
346 orderId: item.id,
341 type: activeName.value, 347 type: activeName.value,
342 isEdit: true, 348 isEdit: true,
343 orderType: query.value.orderType, 349 orderType: query.value.orderType,
344 paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType, 350 paymentType: query.value.orderType == 5 ? item.payType : item.paymentType,
345 orderSn: query.value.orderType == 6 ? item.orderSn : null 351 // orderSn: query.value.orderType == 6 ? item.orderSn : null
346 } 352 }
347 }) 353 })
348 } 354 }
...@@ -354,7 +360,7 @@ const showDetail = (item) => { ...@@ -354,7 +360,7 @@ const showDetail = (item) => {
354 type: activeName.value, 360 type: activeName.value,
355 orderType: query.value.orderType, 361 orderType: query.value.orderType,
356 paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType, 362 paymentType: query.value.orderType == 6 || query.value.orderType == 5 ? item.payType : item.paymentType,
357 orderSn: query.value.orderType == 6 ? item.orderSn : null 363 // orderSn: query.value.orderType == 6 ? item.orderSn : null
358 } 364 }
359 }) 365 })
360 } 366 }
......
src/viewsPc/center/myReservation.vue
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 <label v-if="b.orderType == 2" class="orangeTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label> 18 <label v-if="b.orderType == 2" class="orangeTag"> {{ language == 0 ? '餐饮' : 'DINING' }} </label>
19 <label v-if="b.orderType == 3" class="orangeTag"> {{ language == 0 ? '化妆' : 'MakeUp' }} </label> 19 <label v-if="b.orderType == 3" class="orangeTag"> {{ language == 0 ? '化妆' : 'MakeUp' }} </label>
20 <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'Shooting ' }} </label> 20 <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'Shooting ' }} </label>
21 <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
22 <label v-if="b.orderType == 5" class="orangeTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label> 21 <label v-if="b.orderType == 5" class="orangeTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
22
23 <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span> 23 <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
24 </div> 24 </div>
25 25
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!