Commit b22ad21f authored by 黄奎's avatar 黄奎

页面修改

parent 7936d278
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th colspan="14" class="bgwhite">酒店使用</th> <th colspan="15" class="bgwhite">酒店使用</th>
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="100">使用时间</th> <th width="100">使用时间</th>
...@@ -133,6 +133,7 @@ ...@@ -133,6 +133,7 @@
<th width="">单价/人</th> <th width="">单价/人</th>
<th width="">金额小计</th> <th width="">金额小计</th>
<th width="">返佣</th> <th width="">返佣</th>
<th width="">税入/税别</th>
<th width="">总金额</th> <th width="">总金额</th>
<th width="">付款方式</th> <th width="">付款方式</th>
<th width="100">备注</th> <th width="100">备注</th>
...@@ -179,10 +180,18 @@ ...@@ -179,10 +180,18 @@
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}} {{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td> </td>
<td> <td>
{{childItem.RebateRatio}}% {{childItem.RebateRatio}} %
</td>
<td>
<template v-if="childItem.TaxType==1">
税入
</template>
<template v-if="childItem.TaxType==2">
税别
</template>
</td> </td>
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
{{hotelTotalPrice(subItem.OrderDetailsList)}} {{hotelTotalPrice(subItem.OrderDetailsList,childItem)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="5"> <td v-if="childIndex==0" :rowspan="5">
<span v-if="subItem.PayStyle === 1">现付</span> <span v-if="subItem.PayStyle === 1">现付</span>
...@@ -202,7 +211,7 @@ ...@@ -202,7 +211,7 @@
</template> </template>
<tr v-if="TotalNav.reimburseTotalPrice"> <tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td> <td>总金额</td>
<td colspan="14"> <td colspan="15">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td> </td>
<!-- <td>签单/预付/抵扣总金额</td> <!-- <td>签单/预付/抵扣总金额</td>
...@@ -422,9 +431,7 @@ ...@@ -422,9 +431,7 @@
@click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p> @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
</td> </td>
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<input type="button" <input type="button" value="制单" class="normalBtn" @click="goZhiDan(item)" />
value="制单"
class="normalBtn" @click="goZhiDan(item)" />
</td> </td>
</tr> </tr>
</table> </table>
...@@ -542,15 +549,15 @@ ...@@ -542,15 +549,15 @@
goZhiDan: function (obj) { goZhiDan: function (obj) {
if (this.list.hotelNoSureInfo !== '') { if (this.list.hotelNoSureInfo !== '') {
this.$confirm(`${this.list.hotelNoSureInfo},是否去制单?`, this.$t('tips.tips'), { this.$confirm(`${this.list.hotelNoSureInfo},是否去制单?`, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.goZhiDan2(obj) this.goZhiDan2(obj)
}).catch(() => { }).catch(() => {
return false return false
}); });
}else{ } else {
this.goZhiDan2(obj) this.goZhiDan2(obj)
} }
}, },
...@@ -622,13 +629,22 @@ ...@@ -622,13 +629,22 @@
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
hotelTotalPrice(obj) { hotelTotalPrice(obj, subItem) {
console.log("subItem",subItem);
let totalPrice = 0 let totalPrice = 0
obj.forEach(x => { obj.forEach(x => {
if (x.PayStyle === 1) { if (subItem.TaxType == 2) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100) if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1+0.08 - x.RebateRatio / 100)
} else {
totalPrice += 0
}
} else { } else {
totalPrice += 0 if (x.PayStyle === 1) {
totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
} else {
totalPrice += 0
}
} }
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment