Skip to content

jijin / 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 @@
<div v-if="!b.orderType">
<p v-if="b.groupName">{{ language==0?'团队名称':'Team name' }}：{{b.groupName}}</p>
<p v-if="b.payTime">{{ language==0?'支付时间':'Payment time' }}：{{b.payTime}}</p>
<p class="poPrice" v-if="b.totalPayAmount">¥ {{b.totalPayAmount}}</p>
<p class="poPrice" v-if="b.totalPayAmount">{{ b.paymentType==3?'€' :'¥' }} {{b.totalPayAmount}}</p>
</div>
<!-- 酒店订单-->
<div v-if="b.orderType == 0">
<p>{{b.messageObj.roomInfo}}</p>
<p>{{b.messageObj.roomStayDate}}</p>
<p class="poPrice" v-if="b.total">¥{{b.total}}</p>
<p class="poPrice" v-if="b.totalStr">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 接送订单-->
<div v-if="b.orderType == 1">
<p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
<span>{{car.name}}：{{car.num}} 辆</span>
</p>
<p class="poPrice" v-if="b.total">¥{{b.total}}</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 餐饮订单-->
<div v-if="b.orderType == 2">
......@@ -45,7 +45,7 @@
{{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span>
</span>
</p>
<p class="poPrice" v-if="b.total">¥{{b.total}}</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.total}}</p>
</div>
<div v-if="b.orderType == 3 || b.orderType == 4">
<div>
......@@ -54,7 +54,7 @@
<div>
{{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
</div>
<p class="poPrice" v-if="b.total">¥{{b.total}}</p>
<p class="poPrice" v-if="b.total">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
</div>
</div>
......@@ -240,6 +240,7 @@ onMounted(() => {
arr.push(bill.id)
}
form.value.orders = arr.toString()
console.log(list.value)
}
if(route.query.activeId){
cptId = route.query.activeId
......
src/viewsPc/booking/invoiceDetail.vue
......@@ -20,14 +20,14 @@
<div v-if="b.orderType == 0">
<p>{{b.messageObj.roomInfo}}</p>
<p>{{b.messageObj.roomStayDate}}</p>
<p class="poPrice">¥{{b.total}}</p>
<p class="poPrice">¥{{b.totalStr}}</p>
</div>
<!-- 接送订单-->
<div v-if="b.orderType == 1">
<p v-for="(car,index) in b.messageObj.carsList" :key="index" v-show="car.num>0">
<span>{{car.name}}：{{car.num}} 辆</span>
</p>
<p class="poPrice">¥{{b.total}}</p>
<p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
</div>
<!-- 餐饮订单-->
<div v-if="b.orderType == 2">
......@@ -36,7 +36,7 @@
{{n.name}}({{n.categoryName}}) <span>{{n.num}} 份</span>
</span>
</p>
<p class="poPrice">¥{{b.total}}</p>
<p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
</div>
<div v-if="b.orderType == 3 || b.orderType == 4">
<div>
......@@ -45,7 +45,7 @@
<div>
{{language==0?'预约时间：':''}}{{b.deliveryTime.slice(0,10)}} {{b.messageObj.timePeriod}}
</div>
<p class="poPrice">¥{{b.total}}</p>
<p class="poPrice">{{ b.paymentType==3?'€' :'¥' }}{{b.totalStr}}</p>
</div>
</div>
......@@ -53,7 +53,7 @@
<div class="border-rr mt20 pd20">
<el-form class="mw500" :model="form" :label-width="language == 0 ?'100':'150'" :rules="rules" ref="formRef">
<el-form-item :label="'开票金额'">
<span class="bigprice">¥{{totalMoney}}</span>
<span class="bigprice">{{paymentType==1?'¥':'€'}}{{totalMoney}}</span>
</el-form-item>
<el-form-item :label="`发票形式`" required prop="invoiceForm">
......
src/viewsPc/center/myCanKP.vue
......@@ -25,9 +25,9 @@
@change="getList"
>
<el-option label="全部" value="0" />
<el-option label="未申请发票" value="1" />
<el-option label="已申请发票" value="2" />
<el-option label="已开发票" value="3" />
<el-option label="未申请" value="1" />
<el-option label="申请中" value="2" />
<el-option label="已开票" value="3" />
</el-select>
</el-form-item>
</el-form>
......@@ -59,13 +59,13 @@
</el-col>
<el-col :lg="6" :md="16" :sm="16" :xs="16">
<div class="text-right">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.payType!='2'" @click.stop="gokp(b)">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId" @click.stop="gokp(b)">
{{ language == 0 ? '申请开票' : 'Invoice' }}
</el-button>
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.payType!='2'" @click.stop="editkp(b)">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId" @click.stop="editkp(b)">
{{ language == 0 ? '重新申请' : 'Rebilling' }}
</el-button>
<el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'"
<el-button type="primary" plain round v-if="b.invoiceId"
@click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
</el-button>
</div>
......@@ -89,27 +89,27 @@
</div>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
<span class="text-warning"> {{ b.languageSource=='100'?'¥':'€' }}
<span class="bigMoney">{{b.totalPayAmount}}</span>
<span class="text-warning"> {{ b.payType!='2'?'¥':'€' }}
<span class="bigMoney">{{b.totalPayAmount||b.totalAmount}}</span>
</span>
</el-col>
<el-col :lg="6" :md="16" :sm="16" :xs="16">
<div class="text-right">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource=='100'" @click.stop="gokp(b)">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId" @click.stop="gokp(b)">
{{ language == 0 ? '申请开票' : 'Invoice' }}
</el-button>
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.languageSource=='100'" @click.stop="editkp(b)">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId" @click.stop="editkp(b)">
{{ language == 0 ? '重新申请' : 'Rebilling' }}
</el-button>
<el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource=='100'"
<el-button type="primary" plain round v-if="b.invoiceId"
@click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
</el-button>
<el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource!='100'" plain round @click.stop="goSj(b)">
{{ language == 0 ? '开收据' : 'Receipt' }}
</el-button>
<el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource!='100'"
@click.stop="showSJ(b)">{{ language == 0 ? '查看收据' : 'Detail' }}
</el-button>
<!-- <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.languageSource!='100'" plain round @click.stop="goSj(b)">-->
<!-- {{ language == 0 ? '开收据' : 'Receipt' }}-->
<!-- </el-button>-->
<!-- <el-button type="primary" plain round v-if="b.invoiceId&&b.languageSource!='100'"-->
<!-- @click.stop="showSJ(b)">{{ language == 0 ? '查看收据' : 'Detail' }}-->
<!-- </el-button>-->
</div>
</el-col>
</el-row>
......@@ -158,19 +158,19 @@
</div>
</el-col>
<el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
<span class="text-warning"> {{ language==0?'¥':'€' }}
<span class="bigMoney">{{language==0?b.total:b.totalEn}}</span>
<span class="text-warning"> {{ b.paymentType==3?'€':'¥' }}
<span class="bigMoney">{{b.totalStr}}</span>
</span>
</el-col>
<el-col :lg="6" :md="16" :sm="16" :xs="16">
<div class="text-right">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType!='3'" @click.stop="gokp(b)">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId" @click.stop="gokp(b)">
{{ language == 0 ? '申请开票' : 'Invoice' }}
</el-button>
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.paymentType!='3'" @click.stop="editkp(b)">
<el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId" @click.stop="editkp(b)">
{{ language == 0 ? '重新申请' : 'Rebilling' }}
</el-button>
<el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'"
<el-button type="primary" plain round v-if="b.invoiceId"
@click.stop="showDetail(b)">{{ language == 0 ? '发票信息' : 'Detail' }}
</el-button>
<!-- <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) => {
path: '/booking/addInvoice',
query: {
orders: encodeURIComponent(JSON.stringify(item)),
totalMoney:item.total||item.totalPayAmount||item.payAmount,
totalMoney:item.totalStr||item.totalPayAmount||item.payAmount||item.totalAmount,
paymentType:query.value.orderType==6||query.value.orderType==5?item.payType:item.paymentType,
orderType:query.value.orderType
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!