Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
3ec00bf5 by 杨炀
Options

Merge commit 'ff2b443b' into dev

2 parents 0a8f80e1 ff2b443b
Inline Side-by-side
Showing 3 changed files with 34 additions and 33 deletions
src/viewsPc/booking/addInvoice.vue
...@@ -23,20 +23,20 @@ ...@@ -23,20 +23,20 @@
23 <div v-if="!b.orderType"> 23 <div v-if="!b.orderType">
24 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}：{{b.groupName}}</p> 24 <p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}：{{b.groupName}}</p>
25 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}：{{b.payTime}}</p> 25 <p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}：{{b.payTime}}</p>
26 <p class="poPrice" v-if="b.totalPayAmount">¥ {{b.totalPayAmount}}</p> 26 <p class="poPrice" v-if="b.totalPayAmount">{{ b.paymentType==3?'€' :'¥' }} {{b.totalPayAmount}}</p>
27 </div> 27 </div>
28 <!-- 酒店订单--> 28 <!-- 酒店订单-->
29 <div v-if="b.orderType == 0"> 29 <div v-if="b.orderType == 0">
30 <p>{{b.messageObj.roomInfo}}</p> 30 <p>{{b.messageObj.roomInfo}}</p>
31 <p>{{b.messageObj.roomStayDate}}</p> 31 <p>{{b.messageObj.roomStayDate}}</p>
32 <p class="poPrice" v-if="b.total">¥{{b.total}}</p> 32 <p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
33 </div> 33 </div>
34 <!-- 接送订单--> 34 <!-- 接送订单-->
35 <div v-if="b.orderType == 1"> 35 <div v-if="b.orderType == 1">
36 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0"> 36 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
37 <span>{{car.name}}：{{car.num}} 辆</span> 37 <span>{{car.name}}：{{car.num}} 辆</span>
38 </p> 38 </p>
39 <p class="poPrice" v-if="b.total">¥{{b.total}}</p> 39 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
40 </div> 40 </div>
41 <!-- 餐饮订单--> 41 <!-- 餐饮订单-->
42 <div v-if="b.orderType == 2"> 42 <div v-if="b.orderType == 2">
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 {{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span> 45 {{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span>
46 </span> 46 </span>
47 </p> 47 </p>
48 <p class="poPrice" v-if="b.total">¥{{b.total}}</p> 48 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.total}}</p>
49 </div> 49 </div>
50 <div v-if="b.orderType == 3 || b.orderType == 4"> 50 <div v-if="b.orderType == 3 || b.orderType == 4">
51 <div> 51 <div>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <div> 54 <div>
55 {{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}} 55 {{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
56 </div> 56 </div>
57 <p class="poPrice" v-if="b.total">¥{{b.total}}</p> 57 <p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
58 </div> 58 </div>
59 </div> 59 </div>
60 60
...@@ -240,6 +240,7 @@ onMounted(() => { ...@@ -240,6 +240,7 @@ onMounted(() => {
240 arr.push(bill.id) 240 arr.push(bill.id)
241 } 241 }
242 form.value.orders = arr.toString() 242 form.value.orders = arr.toString()
243 console.log(list.value)
243 } 244 }
244 if(route.query.activeId){ 245 if(route.query.activeId){
245 cptId = route.query.activeId 246 cptId = route.query.activeId
......
src/viewsPc/booking/invoiceDetail.vue
...@@ -20,14 +20,14 @@ ...@@ -20,14 +20,14 @@
20 <div v-if="b.orderType == 0"> 20 <div v-if="b.orderType == 0">
21 <p>{{b.messageObj.roomInfo}}</p> 21 <p>{{b.messageObj.roomInfo}}</p>
22 <p>{{b.messageObj.roomStayDate}}</p> 22 <p>{{b.messageObj.roomStayDate}}</p>
23 <p class="poPrice">¥{{b.total}}</p> 23 <p class="poPrice">¥{{b.totalStr}}</p>
24 </div> 24 </div>
25 <!-- 接送订单--> 25 <!-- 接送订单-->
26 <div v-if="b.orderType == 1"> 26 <div v-if="b.orderType == 1">
27 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0"> 27 <p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
28 <span>{{car.name}}：{{car.num}} 辆</span> 28 <span>{{car.name}}：{{car.num}} 辆</span>
29 </p> 29 </p>
30 <p class="poPrice">¥{{b.total}}</p> 30 <p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
31 </div> 31 </div>
32 <!-- 餐饮订单--> 32 <!-- 餐饮订单-->
33 <div v-if="b.orderType == 2"> 33 <div v-if="b.orderType == 2">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 {{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span> 36 {{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span>
37 </span> 37 </span>
38 </p> 38 </p>
39 <p class="poPrice">¥{{b.total}}</p> 39 <p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
40 </div> 40 </div>
41 <div v-if="b.orderType == 3 || b.orderType == 4"> 41 <div v-if="b.orderType == 3 || b.orderType == 4">
42 <div> 42 <div>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
45 <div> 45 <div>
46 {{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}} 46 {{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
47 </div> 47 </div>
48 <p class="poPrice">¥{{b.total}}</p> 48 <p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
49 </div> 49 </div>
50 </div> 50 </div>
51 51
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <div class="border-rr mt20 pd20"> 53 <div class="border-rr mt20 pd20">
54 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef"> 54 <el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
55 <el-form-item :label="'开票金额'"> 55 <el-form-item :label="'开票金额'">
56 <span class="bigprice">¥{{totalMoney}}</span> 56 <span class="bigprice">{{paymentType==1?'¥':'€'}}{{totalMoney}}</span>
57 </el-form-item> 57 </el-form-item>
58 58
59 <el-form-item :label="`发票形式`" required prop="invoiceForm"> 59 <el-form-item :label="`发票形式`" required prop="invoiceForm">
......
src/viewsPc/center/myCanKP.vue
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
25 @change="getList" 25 @change="getList"
26 > 26 >
27 <el-option label="全部" value="0" /> 27 <el-option label="全部" value="0" />
28 <el-option label="未申请发票" value="1" /> 28 <el-option label="未申请" value="1" />
29 <el-option label="已申请发票" value="2" /> 29 <el-option label="申请中" value="2" />
30 <el-option label="已开发票" value="3" /> 30 <el-option label="已开票" value="3" />
31 </el-select> 31 </el-select>
32 </el-form-item> 32 </el-form-item>
33 </el-form> 33 </el-form>
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
59 </el-col> 59 </el-col>
60 <el-col :lg="6" :md="16" :sm="16" :xs="16"> 60 <el-col :lg="6" :md="16" :sm="16" :xs="16">
61 <div class="text-right"> 61 <div class="text-right">
62 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.payType!='2'" @click.stop="gokp(b)"> 62 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId" @click.stop="gokp(b)">
63 {{ language == 0 ? '申请开票' : 'Invoice' }} 63 {{ language == 0 ? '申请开票' : 'Invoice' }}
64 </el-button> 64 </el-button>
65 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.payType!='2'" @click.stop="editkp(b)"> 65 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId" @click.stop="editkp(b)">
66 {{ language == 0 ? '重新申请' : 'Rebilling' }} 66 {{ language == 0 ? '重新申请' : 'Rebilling' }}
67 </el-button> 67 </el-button>
68 <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'" 68 <el-button type="primary" plain round v-if="b.invoiceId"
69 @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }} 69 @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
70 </el-button> 70 </el-button>
71 </div> 71 </div>
...@@ -89,27 +89,27 @@ ...@@ -89,27 +89,27 @@
89 </div> 89 </div>
90 </el-col> 90 </el-col>
91 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 91 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
92 <span class="text-warning"> {{ b.languageSource=='100'?'¥':'€' }} 92 <span class="text-warning"> {{ b.payType!='2'?'¥':'€' }}
93 <span class="bigMoney">{{b.totalPayAmount}}</span> 93 <span class="bigMoney">{{b.totalPayAmount||b.totalAmount}}</span>
94 </span> 94 </span>
95 </el-col> 95 </el-col>
96 <el-col :lg="6" :md="16" :sm="16" :xs="16"> 96 <el-col :lg="6" :md="16" :sm="16" :xs="16">
97 <div class="text-right"> 97 <div class="text-right">
98 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource=='100'" @click.stop="gokp(b)"> 98 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId" @click.stop="gokp(b)">
99 {{ language == 0 ? '申请开票' : 'Invoice' }} 99 {{ language == 0 ? '申请开票' : 'Invoice' }}
100 </el-button> 100 </el-button>
101 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.languageSource=='100'" @click.stop="editkp(b)"> 101 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId" @click.stop="editkp(b)">
102 {{ language == 0 ? '重新申请' : 'Rebilling' }} 102 {{ language == 0 ? '重新申请' : 'Rebilling' }}
103 </el-button> 103 </el-button>
104 <el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource=='100'" 104 <el-button type="primary" plain round v-if="b.invoiceId"
105 @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }} 105 @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
106 </el-button> 106 </el-button>
107 <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource!='100'" plain round @click.stop="goSj(b)"> 107 <!-- <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource!='100'" plain round @click.stop="goSj(b)">-->
108 {{ language == 0 ? '开收据' : 'Receipt' }} 108 <!-- {{ language == 0 ? '开收据' : 'Receipt' }}-->
109 </el-button> 109 <!-- </el-button>-->
110 <el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource!='100'" 110 <!-- <el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource!='100'"-->
111 @click.stop="showSJ(b)">{{ language == 0 ? '查看收据' : 'Detail' }} 111 <!-- @click.stop="showSJ(b)">{{ language == 0 ? '查看收据' : 'Detail' }}-->
112 </el-button> 112 <!-- </el-button>-->
113 </div> 113 </div>
114 </el-col> 114 </el-col>
115 </el-row> 115 </el-row>
...@@ -158,19 +158,19 @@ ...@@ -158,19 +158,19 @@
158 </div> 158 </div>
159 </el-col> 159 </el-col>
160 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center"> 160 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
161 <span class="text-warning"> {{ language==0?'¥':'€' }} 161 <span class="text-warning"> {{ b.paymentType==3?'€':'¥' }}
162 <span class="bigMoney">{{language==0?b.total:b.totalEn}}</span> 162 <span class="bigMoney">{{b.totalStr}}</span>
163 </span> 163 </span>
164 </el-col> 164 </el-col>
165 <el-col :lg="6" :md="16" :sm="16" :xs="16"> 165 <el-col :lg="6" :md="16" :sm="16" :xs="16">
166 <div class="text-right"> 166 <div class="text-right">
167 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType!='3'" @click.stop="gokp(b)"> 167 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId" @click.stop="gokp(b)">
168 {{ language == 0 ? '申请开票' : 'Invoice' }} 168 {{ language == 0 ? '申请开票' : 'Invoice' }}
169 </el-button> 169 </el-button>
170 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.paymentType!='3'" @click.stop="editkp(b)"> 170 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId" @click.stop="editkp(b)">
171 {{ language == 0 ? '重新申请' : 'Rebilling' }} 171 {{ language == 0 ? '重新申请' : 'Rebilling' }}
172 </el-button> 172 </el-button>
173 <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'" 173 <el-button type="primary" plain round v-if="b.invoiceId"
174 @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }} 174 @click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
175 </el-button> 175 </el-button>
176 <!-- <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType=='3'" plain round @click.stop="goSj(b)">--> 176 <!-- <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType=='3'" plain round @click.stop="goSj(b)">-->
...@@ -294,7 +294,7 @@ const gokp = (item) => { ...@@ -294,7 +294,7 @@ const gokp = (item) => {
294 path: '/booking/addInvoice', 294 path: '/booking/addInvoice',
295 query: { 295 query: {
296 orders: encodeURIComponent(JSON.stringify(item)), 296 orders: encodeURIComponent(JSON.stringify(item)),
297 totalMoney:item.total||item.totalPayAmount||item.payAmount, 297 totalMoney:item.totalStr||item.totalPayAmount||item.payAmount||item.totalAmount,
298 paymentType:query.value.orderType==6||query.value.orderType==5?item.payType:item.paymentType, 298 paymentType:query.value.orderType==6||query.value.orderType==5?item.payType:item.paymentType,
299 orderType:query.value.orderType 299 orderType:query.value.orderType
300 } 300 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!