Skip to content

S
SuperMan
Commit 2cf4f35f authored by 黄奎's avatar 黄奎
Browse files
Options

新增司导间付款方式

parent 06b61fec
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 30 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 2cf4f35f
......@@ -27,7 +27,8 @@
</li>
</ul>
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br/>
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100) <br/>
司导间【月结】不计入总金额
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle">
......@@ -325,7 +326,7 @@
<tr>
<td width="70" style="text-align:right;color:red">付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
......@@ -336,20 +337,21 @@
</el-select>
</td>
</tr>
<tr style="display:none;">
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr style="display:none;">
<td width="70" style="text-align:right;">报账付款方式：</td>
<tr>
<td width="70" style="text-align:right;">司导房付款方式：</td>
<td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false">
<el-select class='w135 sel' v-model='subItem.DMCPayType' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false" @change="calculationPrice(subItem)">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='月结' :value='9' ></el-option>
<el-option label='现付' :value='1' ></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3' ></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='预付款抵扣' :value='5' ></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
......@@ -717,11 +719,19 @@
let totalPrice = 0;
obj.OrderDetailsList.forEach((item, index) => {
var tempPrice=0;
//税别 && item.RebateRatio>0
if (obj.TaxType == 2 ) {
tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
} else {
tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
var coefficient=1;
//税别
if(obj.TaxType == 2)
{
coefficient=1+0.08;
}
if(index==4 && obj.DMCPayType==9)
{
tempPrice=0;
}
else
{
tempPrice= item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio / 100);
}
totalPrice+=tempPrice;
})
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 2cf4f35f
......@@ -132,12 +132,13 @@
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="22" class="bgwhite">酒店使用 </th>
<th colspan="23" class="bgwhite">酒店使用 </th>
</tr>
<tr>
<th colspan="22" class="bgwhite">
<th colspan="23" class="bgwhite">
税别计算: 单价 * (预订人数-免减人数) * (1 + 0.08 - 返佣比例 / 100) <br />
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)
税入计算: 单价 * (预订人数-免减人数) * (1 - 返佣比例 / 100)<br />
司导间【月结】不计入总金额
</th>
</tr>
<tr class="title">
......@@ -160,6 +161,7 @@
<th width="60">税入<br />税别</th>
<th width="60">总金额</th>
<th width="60">付款<br />方式</th>
<th width="60">司导间<br />付款方式</th>
<th width="100">供应商</th>
<th width="100">状态</th>
<th width="100">备注</th>
......@@ -281,6 +283,16 @@
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.DMCPayType === 1">现付</span>
<span v-else-if="subItem.DMCPayType === 2">签单</span>
<span v-else-if="subItem.DMCPayType === 4">预付</span>
<span v-else-if="subItem.DMCPayType === 5">实物抵扣</span>
<span v-else-if="subItem.DMCPayType === 6">公司合团支付</span>
<span v-else-if="subItem.DMCPayType === 9">月结</span>
</br>
<span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="6">
<span>{{subItem.SupplierName}} <span v-if="subItem.SupplierPayType !== 0"
......@@ -305,14 +317,14 @@
</template>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="21">
<td colspan="22">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="11" class="bgwhite">餐食使用</th>
<th colspan="12" class="bgwhite">餐食使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
......@@ -733,16 +745,22 @@
hotelTotalPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach((item, index) => {
if (obj.PayStyle === 1) {
//税别 && item.RebateRatio>0
var coefficient = 1;
//税别
if (obj.TaxType == 2) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100);
//税入
} else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
coefficient = 1 + 0.08;
}
if (obj.PayStyle === 1) {
if (index == 4 && obj.DMCPayType == 9) {
totalPrice += 0;
}
else
{
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
100);
}
} else {
totalPrice += 0
totalPrice += 0;
}
})
totalPrice += obj.ParkFee + obj.CityTax + obj.InTangTax;
......
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