Skip to content

jijin / dance-pc

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

开票

1 parent 71507ba8
Inline Side-by-side
Showing 3 changed files with 56 additions and 36 deletions
src/viewsPc/booking/ticket/addInvoice.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </el-icon> 11 </el-icon>
12 返回 12 返回
13 </div> 13 </div>
14 {{ paymentType != 3 ? '发票开具' : 'Invoice application' }} 14 {{ language == 0 ? '发票开具' : 'Invoice application' }}
15 </div> 15 </div>
16 </div> 16 </div>
17 <el-row :gutter="20" class="pd20"> 17 <el-row :gutter="20" class="pd20">
...@@ -24,10 +24,22 @@ ...@@ -24,10 +24,22 @@
24 <p>地址：{{ matchForm.address }}</p> 24 <p>地址：{{ matchForm.address }}</p>
25 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p> 25 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
26 <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p> 26 <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p>
27 <p>通票：{{ paymentType != 3 ? '¥' : '€' }}{{ ticketForm.extJson?.ticketDate.price }}/1张</p> 27 <p>通票：{{
28 <p>优惠票：{{ paymentType != 3 ? '¥' : '€' }}{{ ticketForm.extJson?.ticketDate.rebatePrice }}/1张</p> 28 paymentType != 3 ? '¥' : '€'
29 }}
30 {{
31 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
32 }}
33 /1张</p>
34 <p>优惠票：{{
35 paymentType != 3 ? '¥' : '€'
36 }}
37 {{
38 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
39 }}
40 /1张</p>
29 41
30 <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ ticketForm.total }}</p> 42 <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
31 </div> 43 </div>
32 <div> 44 <div>
33 <el-row v-for="v in message" style="width: 100%"> 45 <el-row v-for="v in message" style="width: 100%">
...@@ -36,27 +48,25 @@ ...@@ -36,27 +48,25 @@
36 </div> 48 </div>
37 </el-col> 49 </el-col>
38 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 50 <el-col :lg="8" :md="12" :sm="12" :xs="24">
39 <div>{{ v.discount ? '通票' : '优惠票' }} 51 <div>{{ !v.discount ? '通票' : '优惠票' }}
40 </div> 52 </div>
41 </el-col> 53 </el-col>
42 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 54 <el-col :lg="8" :md="12" :sm="12" :xs="24">
43 {{ v.discount ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.rebatePrice }} 55 {{
56 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
57 }}
44 {{ paymentType != 3 ? '￥' : '€' }}/张 58 {{ paymentType != 3 ? '￥' : '€' }}/张
45 </el-col> 59 </el-col>
46 </el-row> 60 </el-row>
47 <el-row style="width: 100%"> 61 <el-row style="width: 100%">
48 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 62 <el-col :lg="8" :md="12" :sm="12" :xs="24">
49 <div>{{ 63 <div>购票数量：{{ ticketForm.num }}张
50 paymentType != 3 ? '购票数量' : 'Number of tickets purchased'
51 }}：{{ ticketForm.num }}{{ paymentType != 3 ? '张' : 'Tickets' }}
52 </div> 64 </div>
53 </el-col> 65 </el-col>
54 <el-col :lg="8" :md="12" :sm="12" :xs="24">{{ 66 <el-col :lg="8" :md="12" :sm="12" :xs="24">联系方式：{{ ticketForm.phone }}
55 paymentType != 3 ? '联系方式' : 'Contact Information'
56 }}：{{ ticketForm.phone }}
57 </el-col> 67 </el-col>
58 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 68 <el-col :lg="8" :md="12" :sm="12" :xs="24">
59 共计:{{ Number(ticketForm.total).toFixed(2) }}{{ 69 共计:{{ (totalMoney * 1).toFixed(2) }}{{
60 paymentType != 3 ? '￥' : '€' 70 paymentType != 3 ? '￥' : '€'
61 }} 71 }}
62 </el-col> 72 </el-col>
...@@ -70,30 +80,28 @@ ...@@ -70,30 +80,28 @@
70 <div class="border-rr mt20 pd20"> 80 <div class="border-rr mt20 pd20">
71 <el-form ref="formRef" :label-width="paymentType != 3 ?'100':'150'" :model="form" :rules="rules" 81 <el-form ref="formRef" :label-width="paymentType != 3 ?'100':'150'" :model="form" :rules="rules"
72 class="mw500"> 82 class="mw500">
73 <el-form-item :label="paymentType != 3 ?'开票金额':'Amount'"> 83 <el-form-item :label="language==0 ?'开票金额':'Amount'">
74 <span v-if="orderType==5||orderType==6" 84 <span class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
75 class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
76 <span v-else class="bigprice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</span>
77 </el-form-item> 85 </el-form-item>
78 86
79 <el-form-item :label="paymentType != 3 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required> 87 <el-form-item :label="language==0 ?`发票形式`:'Invoice Form'" prop="invoiceForm" required>
80 <el-radio-group v-model="form.invoiceForm"> 88 <el-radio-group v-model="form.invoiceForm">
81 <el-radio value="1">{{ paymentType != 3 ? '电子发票' : 'E-invoice' }}</el-radio> 89 <el-radio value="1">{{ language == 0 ? '电子发票' : 'E-invoice' }}</el-radio>
82 </el-radio-group> 90 </el-radio-group>
83 </el-form-item> 91 </el-form-item>
84 92
85 <el-form-item :label="paymentType != 3 ?`发票类型`:'Invoice Type'" prop="invoiceType" required> 93 <el-form-item :label="language==0 ?`发票类型`:'Invoice Type'" prop="invoiceType" required>
86 <el-radio-group v-model="form.invoiceType"> 94 <el-radio-group v-model="form.invoiceType">
87 <el-radio value="0">{{ paymentType != 3 ? '企业' : 'Company' }}</el-radio> 95 <el-radio value="0">{{ language == 0 ? '企业' : 'Company' }}</el-radio>
88 <el-radio value="1">{{ paymentType != 3 ? '个人非企业' : 'Individual' }}</el-radio> 96 <el-radio value="1">{{ language == 0 ? '个人非企业' : 'Individual' }}</el-radio>
89 </el-radio-group> 97 </el-radio-group>
90 </el-form-item> 98 </el-form-item>
91 <el-form-item v-if="form.invoiceType=='0'" :label="paymentType != 3 ?`发票抬头`:'Invoice Title'" 99 <el-form-item v-if="form.invoiceType=='0'" :label="language==0 ?`发票抬头`:'Invoice Title'"
92 prop="invoiceTitle" 100 prop="invoiceTitle"
93 required> 101 required>
94 <el-input v-model="form.invoiceTitle"/> 102 <el-input v-model="form.invoiceTitle"/>
95 </el-form-item> 103 </el-form-item>
96 <el-form-item v-if="form.invoiceType=='0'" :label="paymentType != 3 ?`税号`:'Duty Paragraph'" 104 <el-form-item v-if="form.invoiceType=='0'" :label="language==0 ?`税号`:'Duty Paragraph'"
97 prop="invoiceTfn" 105 prop="invoiceTfn"
98 required> 106 required>
99 <el-input v-model="form.invoiceTfn"/> 107 <el-input v-model="form.invoiceTfn"/>
...@@ -131,7 +139,7 @@ ...@@ -131,7 +139,7 @@
131 <el-row align="middle" class="pd20" justify="center"> 139 <el-row align="middle" class="pd20" justify="center">
132 <el-col :span="12" class="text-center"> 140 <el-col :span="12" class="text-center">
133 <el-button class="btn-lineG w200px" round size="large" type="primary" @click="submit"> 141 <el-button class="btn-lineG w200px" round size="large" type="primary" @click="submit">
134 {{ paymentType != 3 ? '提交' : 'Submit' }} 142 {{ language == 0 ? '提交' : 'Submit' }}
135 </el-button> 143 </el-button>
136 </el-col> 144 </el-col>
137 </el-row> 145 </el-row>
...@@ -240,8 +248,9 @@ async function getTickInfo() { ...@@ -240,8 +248,9 @@ async function getTickInfo() {
240 cptId = ticketForm.value.extJson.ticketDate.activityId 248 cptId = ticketForm.value.extJson.ticketDate.activityId
241 totalMoney.val = ticketForm.value.extJson.total 249 totalMoney.val = ticketForm.value.extJson.total
242 message.value = JSON.parse(ticketForm.value.extJson.message) 250 message.value = JSON.parse(ticketForm.value.extJson.message)
243 totalMoney.value = ticketForm.value.total 251 console.log(message.value)
244 paymentType.value = ticketForm.value.paymentType 252 paymentType.value = ticketForm.value.paymentType
253 totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total
245 await getDetail(ticketForm.value.extJson.ticketDate.activityId) 254 await getDetail(ticketForm.value.extJson.ticketDate.activityId)
246 console.log(ticketForm.value) 255 console.log(ticketForm.value)
247 } catch (e) { 256 } catch (e) {
......
src/viewsPc/booking/ticket/invoiceDetail.vue
...@@ -24,9 +24,17 @@ ...@@ -24,9 +24,17 @@
24 <p>地址：{{ matchForm.address }}</p> 24 <p>地址：{{ matchForm.address }}</p>
25 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p> 25 <p>票档：{{ ticketForm.extJson?.ticketType?.name }}</p>
26 <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p> 26 <p>时间：{{ ticketForm.extJson?.ticketDate.name }}</p>
27 <p>通票：{{ paymentType != 3 ? '¥' : '€' }}{{ ticketForm.extJson?.ticketDate.price }}/1张</p> 27 <p>通票：{{ paymentType != 3 ? '¥' : '€' }}
28 <p>优惠票：{{ paymentType != 3 ? '¥' : '€' }}{{ ticketForm.extJson?.ticketDate.rebatePrice }}/1张</p> 28 {{
29 <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ ticketForm.total }}</p> 29 paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn
30 }}
31 /1张</p>
32 <p>优惠票：{{ paymentType != 3 ? '¥' : '€' }}
33 {{
34 paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
35 }}
36 /1张</p>
37 <p class="poPrice">{{ paymentType != 3 ? '¥' : '€' }}{{ totalMoney }}</p>
30 </div> 38 </div>
31 <div> 39 <div>
32 <el-row v-for="v in message" style="width: 100%"> 40 <el-row v-for="v in message" style="width: 100%">
...@@ -35,11 +43,13 @@ ...@@ -35,11 +43,13 @@
35 </div> 43 </div>
36 </el-col> 44 </el-col>
37 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 45 <el-col :lg="8" :md="12" :sm="12" :xs="24">
38 <div>{{ v.discount ? '通票' : '优惠票' }} 46 <div>{{ !v.discount ? '通票' : '优惠票' }}
39 </div> 47 </div>
40 </el-col> 48 </el-col>
41 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 49 <el-col :lg="8" :md="12" :sm="12" :xs="24">
42 {{ v.discount ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.rebatePrice }} 50 {{
51 !v.discount ? paymentType != 3 ? ticketForm.extJson?.ticketDate.price : ticketForm.extJson?.ticketDate.priceEn : paymentType != 3 ? ticketForm.extJson?.ticketDate.rebatePrice : ticketForm.extJson?.ticketDate.rebatePriceEn
52 }}
43 {{ paymentType != 3 ? '￥' : '€' }}/张 53 {{ paymentType != 3 ? '￥' : '€' }}/张
44 </el-col> 54 </el-col>
45 </el-row> 55 </el-row>
...@@ -55,7 +65,7 @@ ...@@ -55,7 +65,7 @@
55 }}：{{ ticketForm.phone }} 65 }}：{{ ticketForm.phone }}
56 </el-col> 66 </el-col>
57 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 67 <el-col :lg="8" :md="12" :sm="12" :xs="24">
58 共计:{{ Number(ticketForm.total).toFixed(2) }}{{ 68 共计:{{ (totalMoney * 1).toFixed(2) }}{{
59 paymentType != 3 ? '￥' : '€' 69 paymentType != 3 ? '￥' : '€'
60 }} 70 }}
61 </el-col> 71 </el-col>
...@@ -202,7 +212,8 @@ async function getTickInfo() { ...@@ -202,7 +212,8 @@ async function getTickInfo() {
202 cptId = ticketForm.value.extJson.ticketDate.activityId 212 cptId = ticketForm.value.extJson.ticketDate.activityId
203 totalMoney.val = ticketForm.value.extJson.total 213 totalMoney.val = ticketForm.value.extJson.total
204 message.value = JSON.parse(ticketForm.value.extJson.message) 214 message.value = JSON.parse(ticketForm.value.extJson.message)
205 totalMoney.value = ticketForm.value.total 215 paymentType.value = ticketForm.value.paymentType
216 totalMoney.value = paymentType.value == 3 ? ticketForm.value.totalEn : ticketForm.value.total
206 await getDetail(ticketForm.value.extJson.ticketDate.activityId) 217 await getDetail(ticketForm.value.extJson.ticketDate.activityId)
207 console.log(ticketForm.value) 218 console.log(ticketForm.value)
208 } catch (e) { 219 } catch (e) {
......
src/viewsPc/center/myCanKP.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <div v-for="b in list" v-loading="loading" class="item"> 36 <div v-for="b in list" v-loading="loading" class="item">
37 <div class="title"> 37 <div class="title">
38 <label class="orangeTag"> {{ language == 0 ? '票务' : 'Ticket' }} </label> 38 <label class="orangeTag"> {{ language == 0 ? '票务' : 'Ticket' }} </label>
39 <span>{{ b.orderSn }}</span> 39 <span>{{ b.id }}</span>
40 <span class="fr text-warning status">{{ b.invoiceStr }}</span> 40 <span class="fr text-warning status">{{ b.invoiceStr }}</span>
41 </div> 41 </div>
42 42
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
51 </p> 51 </p>
52 </el-col> 52 </el-col>
53 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 53 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
54 <span class="text-warning"> {{ b.payType == '2' ? '€' : '￥' }} 54 <span class="text-warning"> {{ b.paymentType == '3' ? '€' : '￥' }}
55 <span class="bigMoney">{{ b.total }}</span> 55 <span class="bigMoney">{{ b.totalStr }}</span>
56 </span> 56 </span>
57 </el-col> 57 </el-col>
58 <el-col :lg="6" :md="16" :sm="16" :xs="16"> 58 <el-col :lg="6" :md="16" :sm="16" :xs="16">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!