Commit d37c305e authored by 黄奎's avatar 黄奎

制单权限判断修改

parent 1e16698d
...@@ -174,15 +174,15 @@ ...@@ -174,15 +174,15 @@
style="white-space:nowrap; ">{{outItem.UseTimeStr}} style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td> </td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; "> <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''"> <template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{subItem.HotelName}}</span> <span style="text-decoration:line-through"> {{subItem.HotelName}}</span>
</template> </template>
<template v-else> <template v-else>
{{subItem.HotelName}} {{subItem.HotelName}}
</template> </template>
</td> </td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; "> <td v-if="childIndex==0" :rowspan="6" style="text-align:left;color:red; ">
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}} {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号:{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号:{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.DMCPayType === 1">现付</span> <span v-if="subItem.DMCPayType === 1">现付</span>
<span v-else-if="subItem.DMCPayType === 2">签单</span> <span v-else-if="subItem.DMCPayType === 2">签单</span>
<span v-else-if="subItem.DMCPayType === 3">实物抵扣</span> <span v-else-if="subItem.DMCPayType === 3">实物抵扣</span>
...@@ -581,15 +581,15 @@ ...@@ -581,15 +581,15 @@
LeaderGetPrice: 0, LeaderGetPrice: 0,
HangingList: [], HangingList: [],
showHotelObj: { showHotelObj: {
showPrice: true,//是否显示价格 showPrice: true, //是否显示价格
showPay: true,//是否显示支付方式 showPay: true, //是否显示支付方式
showZhan: true,//占房时间 showZhan: true, //占房时间
showBtnList: false,//是否下载、确认按钮 showBtnList: false, //是否下载、确认按钮
ShowTaxType: true, //显示税入税别 ShowTaxType: true, //显示税入税别
ShowRebateRatio: true, //显示返佣比列 ShowRebateRatio: true, //显示返佣比列
ShowSupplier:true,//是否显示供应商 ShowSupplier: true, //是否显示供应商
showCaozuoTime:true,//操作时间 showCaozuoTime: true, //操作时间
colspanLength:6//跨行 colspanLength: 6 //跨行
}, },
} }
}, },
...@@ -764,9 +764,7 @@ ...@@ -764,9 +764,7 @@
if (obj.PayStyle === 1) { if (obj.PayStyle === 1) {
if (index == 4 && obj.DMCPayType == 9) { if (index == 4 && obj.DMCPayType == 9) {
totalPrice += 0; totalPrice += 0;
} } else {
else
{
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio / totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (coefficient - item.RebateRatio /
100); 100);
} }
...@@ -842,9 +840,9 @@ ...@@ -842,9 +840,9 @@
if (str == 3) if (str == 3)
return '晚餐' return '晚餐'
}, },
CompareDate(d1, d2){ CompareDate(d1, d2) {
console.log(d1, d2) console.log(d1, d2)
return ((new Date(d1.replace(/-/g,"\/"))) <= (new Date(d2.replace(/-/g,"\/")))); return ((new Date(d1.replace(/-/g, "\/"))) <= (new Date(d2.replace(/-/g, "\/"))));
}, },
getNav() { getNav() {
let _this = this let _this = this
...@@ -857,10 +855,9 @@ ...@@ -857,10 +855,9 @@
nav.forEach(x => { nav.forEach(x => {
nav.LeaderGetPriceT = 0; nav.LeaderGetPriceT = 0;
num += x.LeaderGetPrice num += x.LeaderGetPrice
let dd = this.CompareDate(x.DMCRemark, new Date().Format("yyyy-MM-dd")) x.hideZDBtn = false;
x.hideZDBtn = false if (Number(x.DMCRemark) >= 0) {
if(dd) { x.hideZDBtn = true;
x.hideZDBtn = true
} }
}) })
nav.forEach((x, i) => { nav.forEach((x, i) => {
......
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