Skip to content

S
SuperMan
Commit 9aa9f57a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 1ea0d2e9
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 93 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 9aa9f57a
...@@ -13,14 +13,17 @@ ...@@ -13,14 +13,17 @@
.rq_disImNote { .rq_disImNote {
color: #ea6d6d; color: #ea6d6d;
} }
.piliangPop .roomReserSet tr{
height:30px; .piliangPop .roomReserSet tr {
height: 30px;
} }
.piliangPop .roomReserSet tr th{
.piliangPop .roomReserSet tr th {
background-color: #eee; background-color: #eee;
text-align: center; text-align: center;
margin-bottom:10px; margin-bottom: 10px;
} }
</style> </style>
<template> <template>
...@@ -28,58 +31,96 @@ ...@@ -28,58 +31,96 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" /> <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
<input v-if="IsOperation==1&&(CurrentUserInfo.EmployeeId==615||CurrentUserInfo.EmployeeId==46)" type="button" class="fr normalBtn mb30" @click="saveList(1)" />
:value="$t('pub.saveBtn')" @click="saveList(1)" /> <input v-if="IsOperation==1&&(CurrentUserInfo.EmployeeId==615||CurrentUserInfo.EmployeeId==46)" type="button"
class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
</li> </li>
</ul> </ul>
{{$t('ground.jisuan1')}} <br /> {{$t('ground.jisuan1')}} <br />
{{$t('ground.jisuan2')}} <br /> {{$t('ground.jisuan2')}} <br />
{{$t('ground.sidaobsuan')}}<br /> {{$t('ground.sidaobsuan')}}<br />
付款方式是现付的，必須上传手配书. 付款方式是现付的，必須上传手配书.
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}" <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " :style="{height: boxHeight + 'px'}"
class="ownScrollbarStyle" ref="ownScrollbarStyle"> class="ownScrollbarStyle" ref="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
<tr> <tr>
<th class="fz14" colspan="5">{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}} &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}. <th class="fz14" colspan="5">
{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
</th> &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
<th class="fz14" colspan="17"> <th class="fz14" colspan="17">
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start" style="float:left;margin-left:20px;"> style="float:left;margin-left:20px;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click" v-model="isShowPiliangPop"> <el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
<table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0"> v-model="isShowPiliangPop">
<tr> <table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
<th>日期</th> <tr>
<th>酒店名称</th> <th>日期</th>
</tr> <th>酒店名称</th>
<template v-for="(lItem,lIndex) in list" > </tr>
<tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex"> <template v-for="(lItem,lIndex) in list">
<td style="width:100px;"> <tr v-for="(subItem,subIndex) in lItem.HotelOrderList" :key="subIndex+lIndex">
{{lItem.UseTimeStr}} <td style="width:100px;">
</td> {{lItem.UseTimeStr}}
</td>
<td style="width:280px;"> <td style="width:280px;">
<el-checkbox v-model="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}</el-checkbox> <el-checkbox v-model="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}
</el-checkbox>
</td> </td>
</tr> </tr>
</template> </template>
<tr> <tr>
<td colspan="2" style="text-align:center"> <td colspan="2" style="text-align:center">
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''> <el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" style="margin-top:10px;"> <el-button size="small" type="danger" style="margin-top:10px;">
选择文件</el-button> 选择文件</el-button>
</el-upload> </el-upload>
</td> </td>
</tr> </tr>
</table> </table>
<el-button slot="reference" style="background:#E95252; border-color:#E95252" type="primary"> <el-button slot="reference" style="background:#E95252; border-color:#E95252" type="primary">
批量上传手配书 批量上传手配书
</el-button> </el-button>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
<span style="margin-top:6px;display:inline-block;">{{$t('ground.dijiecaozuoxinxi')}}</span> <span style="margin-top:6px;display:inline-block;">{{$t('ground.dijiecaozuoxinxi')}}</span>
<el-tooltip class="item" effect="dark" content="批量修改" placement="top-start"
style="float:left;margin-left:20px;">
<el-popover placement="bottom" popper-class="piliangPop" width="400" trigger="click"
v-model="IsShowMoreUpdate">
<table class="dmcSetTable roomReserSet" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>房型</th>
<th>房间数量</th>
<th>人数</th>
</tr>
<tr v-for="(subItem,subIndex) in HotelHouseTypeList" :key="subIndex">
<td style="width:100px;">
{{subItem.Name}}
</td>
<td style="width:150px;">
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(subItem,'HouseCount')"
v-model='subItem.HouseCount'></el-input>
</td>
<td style="width:150px;">
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(subItem,'HousePeopleNum')"
v-model='subItem.HousePeopleNum'></el-input>
</td>
</tr>
<tr>
<td colspan="2" style="text-align:center">
保存
</td>
</tr>
</table>
<el-button slot="reference" style="background:#E95252; border-color:#E95252;display:none;" type="primary">
批量修改酒店
</el-button>
</el-popover>
</el-tooltip>
</th> </th>
</tr> </tr>
<tr> <tr>
...@@ -201,20 +242,23 @@ ...@@ -201,20 +242,23 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">{{$t('ground.wshoupeifei')}}</span> <span v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">{{$t('ground.wshoupeifei')}}</span>
<span v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">{{$t('ground.shoupeifei')}}:{{subItem.ShouPeiMoney}}</span> <span v-if="subItem.IsHaveShouPeiFee==1"
style="color:red;">{{$t('ground.shoupeifei')}}:{{subItem.ShouPeiMoney}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<p style="padding-top: 5px;"> <p style="padding-top: 5px;">
<template v-if="subItem.ContractUrl!=''"> <template v-if="subItem.ContractUrl!=''">
<span style="color:green">已上传手配书</span> <span style="color:green">已上传手配书</span>
&nbsp;&nbsp;<a v-if="subItem.ContractUrl" target="_blank" style="color:blue" :href="subItem.ContractUrl">查看</a> &nbsp;&nbsp;<a v-if="subItem.ContractUrl" target="_blank" style="color:blue"
:href="subItem.ContractUrl">查看</a>
</template> </template>
</p> </p>
<el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''> <el-upload :http-request="uploadFileBtnS" :multiple="false" :show-file-list="false" action=''>
<el-button size="small" type="danger" @click='getItem(index, subIndex)'>{{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button> <el-button size="small" type="danger" @click='getItem(index, subIndex)'>
</el-upload> {{!subItem.ContractUrl ? '上传手配书' : '重新上传手配书'}}</el-button>
</el-upload>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -441,7 +485,7 @@ ...@@ -441,7 +485,7 @@
<el-option :label="$t('ground.yufukuandk')" :value='5'></el-option> <el-option :label="$t('ground.yufukuandk')" :value='5'></el-option>
<el-option :label="$t('ground.gongsihetzf')" :value='6'></el-option> <el-option :label="$t('ground.gongsihetzf')" :value='6'></el-option>
<el-option :label="$t('ground.lingduidydf')" :value='10'></el-option> <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option :label="$t('ground.shuaka')" :value='11'></el-option> <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -517,7 +561,8 @@ ...@@ -517,7 +561,8 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.saveBtn')" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button> <el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" v-if="subItem.OPState!=1" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')" v-if="subItem.OPState!=1"
placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button> <el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark" <el-tooltip v-if="item.HotelOrderList.length>1 && subItem.OPState!=1" class="item" effect="dark"
...@@ -592,9 +637,41 @@ ...@@ -592,9 +637,41 @@
allCurrencyList: [], //币种列表 allCurrencyList: [], //币种列表
checkedIndex: '', checkedIndex: '',
checkedsubIndex: '', checkedsubIndex: '',
XiaoFeiTaxFee:0.1, XiaoFeiTaxFee: 0.1,
IsMoreUpdate:0,//批量上传手配书0-单个上传,1-批量上传 IsMoreUpdate: 0, //批量上传手配书0-单个上传,1-批量上传
isShowPiliangPop:false //是否显示批量上传popover isShowPiliangPop: false, //是否显示批量上传popover
IsShowMoreUpdate:false,
HotelHouseTypeList: [{
Id: 1,
Name: "单间",
HouseCount: 0,
HousePeopleNum: 0
},
{
Id: 2,
Name: "标准间",
HouseCount: 0,
HousePeopleNum: 0
},
{
Id: 3,
Name: "大床间",
HouseCount: 0,
HousePeopleNum: 0
},
{
Id: 4,
Name: "三人间",
HouseCount: 0,
HousePeopleNum: 0
},
{
Id: 5,
Name: "司导间",
HouseCount: 0,
HousePeopleNum: 0
},
]
} }
}, },
components: { components: {
...@@ -603,9 +680,8 @@ ...@@ -603,9 +680,8 @@
commonPHInfo: commonPHlInfo commonPHInfo: commonPHlInfo
}, },
methods: { methods: {
MoreUpdate(subItem) MoreUpdate(subItem) {
{ this.IsMoreUpdate = 1;
this.IsMoreUpdate=1;
}, },
//付款方式切换 //付款方式切换
PayChange(subItem) { PayChange(subItem) {
...@@ -647,7 +723,8 @@ ...@@ -647,7 +723,8 @@
if (objData.list && objData.list.length > 0) { if (objData.list && objData.list.length > 0) {
var str = ""; var str = "";
objData.list.forEach((cItem, cIndex) => { objData.list.forEach((cItem, cIndex) => {
str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + "使用了" + cItem.LastUseNum + this.$t('hotel.hotel_room'); str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + "使用了" + cItem.LastUseNum + this.$t(
'hotel.hotel_room');
}); });
if (str != "") { if (str != "") {
this.Info(str); this.Info(str);
...@@ -666,10 +743,10 @@ ...@@ -666,10 +743,10 @@
if (ckedObj.Supplier > 0) { if (ckedObj.Supplier > 0) {
this.list[this.findex].HotelOrderList[this.childIndex].SupplierId = ckedObj.Supplier; this.list[this.findex].HotelOrderList[this.childIndex].SupplierId = ckedObj.Supplier;
} }
this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem, this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem,
subIndex) => { subIndex) => {
//判断是否有库存价格 //判断是否有库存价格
if (subIndex == 1 && ckedObj.CostPrice > 0 && ckedObj.Inventory>0) { if (subIndex == 1 && ckedObj.CostPrice > 0 && ckedObj.Inventory > 0) {
subItem.IsHaveStockPrice = 1; subItem.IsHaveStockPrice = 1;
} else { } else {
subItem.IsHaveStockPrice = 0; subItem.IsHaveStockPrice = 0;
...@@ -753,31 +830,28 @@ ...@@ -753,31 +830,28 @@
let path = '/Upload/DMC/Hotel' let path = '/Upload/DMC/Hotel'
this.$message.info('上传中...') this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var fileUrl=this.domainManager().ViittoFileUrl + x.data.FilePath; var fileUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
//批量上传 //批量上传
if(this.IsMoreUpdate==1) if (this.IsMoreUpdate == 1) {
{ this.list.forEach((sItem, sIndex) => {
this.list.forEach((sItem,sIndex)=>{ sItem.HotelOrderList.forEach((subItem, subIndex) => {
sItem.HotelOrderList.forEach((subItem,subIndex)=>{ if (subItem.IsChecked) {
if(subItem.IsChecked){ subItem.ContractUrl = fileUrl;
subItem.ContractUrl=fileUrl; }
} subItem.IsChecked = false;
subItem.IsChecked=false; this.$forceUpdate();
this.$forceUpdate(); });
}); });
}); this.isShowPiliangPop = false;
this.isShowPiliangPop=false; } else {
} this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = fileUrl;
else }
{ // this.list.forEach((sItem,sIndex)=>{
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = fileUrl; // sItem.HotelOrderList.forEach((subItem,subIndex)=>{
} // subItem.IsChecked=false;
// this.list.forEach((sItem,sIndex)=>{ // });
// sItem.HotelOrderList.forEach((subItem,subIndex)=>{ // });
// subItem.IsChecked=false; this.IsMoreUpdate = 0;
// });
// });
this.IsMoreUpdate=0;
this.$forceUpdate() this.$forceUpdate()
}) })
}, },
...@@ -824,7 +898,7 @@ ...@@ -824,7 +898,7 @@
this.IsOperation = res.data.data.IsOperation; this.IsOperation = res.data.data.IsOperation;
this.IsEditHotel = res.data.data.IsEditHotel; this.IsEditHotel = res.data.data.IsEditHotel;
this.IsEditHotelPeople = res.data.data.IsEditHotelPeople; this.IsEditHotelPeople = res.data.data.IsEditHotelPeople;
if (this.CurrentUserInfo.EmployeeId == 615||this.CurrentUserInfo.EmployeeId==46) { if (this.CurrentUserInfo.EmployeeId == 615 || this.CurrentUserInfo.EmployeeId == 46) {
this.IsEditHotel = 1; this.IsEditHotel = 1;
this.IsEditHotelPeople = 1; this.IsEditHotelPeople = 1;
} }
...@@ -940,14 +1014,15 @@ ...@@ -940,14 +1014,15 @@
}); });
}) })
} }
var flag=true; var flag = true;
var isUpload=true; var isUpload = true;
var str=""; var str = "";
this.list.forEach(item => { this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => { item.HotelOrderList.forEach(subItem => {
if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''&&this.CurrentUserInfo.EmployeeId!=615){ if (isUpload && subItem.PayStyle == 1 && subItem.ContractUrl == '' && this.CurrentUserInfo
str+=`请上传${item.UseTimeStr}的手配书` .EmployeeId != 615) {
isUpload=false; str += `请上传${item.UseTimeStr}的手配书`
isUpload = false;
} }
subItem.OrderDetailsList.forEach((y, sIndex) => { subItem.OrderDetailsList.forEach((y, sIndex) => {
if (y.HouseTypeCount) { if (y.HouseTypeCount) {
...@@ -995,14 +1070,15 @@ ...@@ -995,14 +1070,15 @@
//单条保存 //单条保存
SaveSingle(item) { SaveSingle(item) {
item.HotelOrderState = 1; item.HotelOrderState = 1;
var flag=true; var flag = true;
var isUpload=true; var isUpload = true;
var str=""; var str = "";
this.list.forEach(item => { this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => { item.HotelOrderList.forEach(subItem => {
if(isUpload&&subItem.PayStyle==1&&subItem.ContractUrl==''&&this.CurrentUserInfo.EmployeeId!=615){ if (isUpload && subItem.PayStyle == 1 && subItem.ContractUrl == '' && this.CurrentUserInfo
str+=`请上传${item.UseTimeStr}的手配书` .EmployeeId != 615) {
isUpload=false; str += `请上传${item.UseTimeStr}的手配书`
isUpload = false;
} }
subItem.OrderDetailsList.forEach(y => { subItem.OrderDetailsList.forEach(y => {
if (y.HouseTypeCount) { if (y.HouseTypeCount) {
......
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