Skip to content

S
SuperMan
Commit 918a32c6 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 24ecfc67 93562824
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 93 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 918a32c6
...@@ -286,11 +286,17 @@ ...@@ -286,11 +286,17 @@
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr> <tr>
<td width="70" style="text-align:right;">备注：</td> <td width="70" style="text-align:right;">对供应商备注：</td>
<td> <td>
<el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input> <el-input type='textarea' class='w135' v-model='subItem.Remarks'></el-input>
</td> </td>
</tr> </tr>
<tr v-if="subItem.SupplierToDmcRemarks">
<td width="70" style="text-align:right;">供应商对地接备注：</td>
<td>
{{subItem.SupplierToDmcRemarks}}
</td>
</tr>
</table> </table>
</td> </td>
<!-- 操作 --> <!-- 操作 -->
......
src/components/SalesModule/addPassenger.vue
View file @ 918a32c6
...@@ -1522,8 +1522,8 @@ ...@@ -1522,8 +1522,8 @@
} }
}, },
savePassenger(type) { savePassenger(type) {
if ((this.LineId === 14 || LineId === 2) && (this.addMsg.IdCard === '' || this.addMsg.IdCard.length < 18)) { if ((this.LineId === 14 || this.LineId === 2) && (this.addMsg.IdCard === '' || this.addMsg.IdCard.length < 18)) {
this.$message.error('请填写身份证号码！'); return this.$message.error('请填写身份证号码！');
} }
this.addMsg.EconomicCapabilityList = []; this.addMsg.EconomicCapabilityList = [];
this.EconomicCapabilityS.forEach(x => { this.EconomicCapabilityS.forEach(x => {
...@@ -1764,6 +1764,9 @@ ...@@ -1764,6 +1764,9 @@
this.SafeStartStatus = this.addMsg.IsNeedSafe; this.SafeStartStatus = this.addMsg.IsNeedSafe;
this.$forceUpdate(); this.$forceUpdate();
this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed) this.getHouselist(obj.Sex.toString(),obj.TCID,obj.OrderId,obj.IsBed)
if ( this.$route.query.isOneDay === 1) {
this.addMsg.IsBed = 0
}
// this.Roominformation() // this.Roominformation()
} else { } else {
this.$message.error(); this.$message.error();
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 918a32c6
...@@ -1135,12 +1135,12 @@ ...@@ -1135,12 +1135,12 @@
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')" @input='yzSafeNum();getTotalPrice()'></el-input> <el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')" @input='yzSafeNum();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <!-- <el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" > <el-form-item label="拒签人数" prop="RefuseVisaNum" >
<el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')" <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
</el-row> </el-row>
<!-- <el-row :gutter="20"> --> <!-- <el-row :gutter="20"> -->
<!-- <el-col :span="4"> <!-- <el-col :span="4">
...@@ -3136,10 +3136,10 @@ ...@@ -3136,10 +3136,10 @@
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy); this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getDdlyList(this.addMsg.CustomerType); this.getDdlyList(this.addMsg.CustomerType);
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) ) let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid, "MaxPeopleNum": maxPeopleNum}, res => { this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid, "MaxPeopleNum": maxPeopleNum}, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){ if (parseFloat(this.LessMoney)>0){
this.Unit_PriceList=[];
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) { for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = { var obj = {
ID: '', ID: '',
...@@ -3160,6 +3160,7 @@ ...@@ -3160,6 +3160,7 @@
} }
} }
else{ else{
this.Unit_PriceList=[];
var obj = { var obj = {
ID: '', ID: '',
LessMoney: '' LessMoney: ''
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 918a32c6
...@@ -3362,21 +3362,21 @@ ...@@ -3362,21 +3362,21 @@
}, },
saveOrder() { saveOrder() {
//验证人数和机位数 //验证人数和机位数
if ( // if (
Number(this.addMsg.ManNum) + // Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) + // Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum) != // Number(this.addMsg.OldPeopleNum) !=
Number(this.addMsg.YSeatNum) + // Number(this.addMsg.YSeatNum) +
Number(this.addMsg.ESeatNum) + // Number(this.addMsg.ESeatNum) +
Number(this.addMsg.FSeatNum) // Number(this.addMsg.FSeatNum)
) { // ) {
if (this.IsChargeLossOrders == 1) { // if (this.IsChargeLossOrders == 1) {
} else { // } else {
this.$message.warning('人数和机位数不相等！') // this.$message.warning('人数和机位数不相等！')
return // return
} // }
} // }
if ( if (
Number(this.addMsg.AirticketNum) + Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) + Number(this.addMsg.ManNum) +
...@@ -3401,22 +3401,22 @@ ...@@ -3401,22 +3401,22 @@
return return
} }
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) { // if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning('儿童占床不能大于儿童数！') // this.$message.warning('儿童占床不能大于儿童数！')
return // return
} // }
if ( // if (
Number(this.addMsg.ChirdNum) - // Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum) + // Number(this.addMsg.ChirdNeedBedNum) +
Number(this.addMsg.BabyNum) > // Number(this.addMsg.BabyNum) >
Number(this.addMsg.ManNum) + // Number(this.addMsg.ManNum) +
Number(this.addMsg.OldPeopleNum) + // Number(this.addMsg.OldPeopleNum) +
Number(this.addMsg.ChirdNeedBedNum) // Number(this.addMsg.ChirdNeedBedNum)
) { // ) {
this.$message.warning('儿童占床数量不足！') // this.$message.warning('儿童占床数量不足！')
return // return
} // }
if (this.userId == this.createByInfo) { if (this.userId == this.createByInfo) {
if (this.addMsg.CommissionSharePeople == '-1') { if (this.addMsg.CommissionSharePeople == '-1') {
...@@ -3434,7 +3434,7 @@ ...@@ -3434,7 +3434,7 @@
this.addMsg.IsChildrenTour = this.IsChildrenTour this.addMsg.IsChildrenTour = this.IsChildrenTour
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount
this.apipost( this.apipost(
'sellorder_post_SetOrderInfo_02', 'sellorder_post_SetOneDayOrderInfo',
this.addMsg, this.addMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
......
src/components/SalesModule/productQueryOne.vue
View file @ 918a32c6
...@@ -1531,12 +1531,12 @@ ...@@ -1531,12 +1531,12 @@
this.addMsg.CustomerId = '0' this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
} }
this.Unit_PriceList=[];
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) ) let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
if(maxPeopleNum >0 ){ if(maxPeopleNum >0 ){
this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID,"MaxPeopleNum" :maxPeopleNum }, res => { this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID,"MaxPeopleNum" :maxPeopleNum }, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){ if (parseFloat(this.LessMoney)>0){
this.Unit_PriceList=[];
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) { for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = { var obj = {
ID: '', ID: '',
...@@ -1555,8 +1555,8 @@ ...@@ -1555,8 +1555,8 @@
obj.LessMoney = this.addMsg.Unit_Price; obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj); this.Unit_PriceList.push(obj);
} }
} } else {
else{ this.Unit_PriceList=[];
var obj = { var obj = {
ID: '', ID: '',
LessMoney: '' LessMoney: ''
......
src/components/Supplier/roomQuery2.vue
View file @ 918a32c6
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
<div style="font-size:12px;padding:2px 4px 3px 20px;"> <div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div> <div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明: <div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span <span class="rq_span1">新增团体</span><span class="rq_span2">取消团体</span>
class="rq_span4">机位数和人数不相符</span>
</div> </div>
</div><br /> </div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
...@@ -66,19 +65,16 @@ ...@@ -66,19 +65,16 @@
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start"> <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
<el-popover placement="bottom" width="1250" trigger="click" popper-class="rq_HotelDetails"> <el-popover placement="bottom" width="800" trigger="click" popper-class="rq_HotelDetails">
<table class="rq_HotelTable" v-loading="hotelLoading"> <table class="rq_HotelTable" v-loading="hotelLoading">
<tr> <tr>
<th width="150"> <th width="120">
时间 时间
</th> </th>
<th width="150"> <th width="150">
酒店 酒店
</th> </th>
<th width="150"> <th width="250">
更换名称
</th>
<th width="450">
价格 价格
</th> </th>
<th width="100"> <th width="100">
...@@ -96,12 +92,14 @@ ...@@ -96,12 +92,14 @@
{{subItem.UseTimeStr}} {{subItem.UseTimeStr}}
</td> </td>
<td> <td>
{{childItem.HotelName}} <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
</td> {{childItem.HotelName}}<br/>
<td> <div class="rq_changeName">{{childItem.NewHotelName!=childItem.HotelName?'更换为:'+childItem.NewHotelName:""}}</div>
{{childItem.NewHotelName!=childItem.HotelName?childItem.NewHotelName:""}} </template>
<template v-else>业者自理</template>
</td> </td>
<td> <td>
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList" <template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList"
v-if="detailsItem.HouseTypeCount>0"> v-if="detailsItem.HouseTypeCount>0">
<template v-if="detailsItem.HouseType==1">单间</template> <template v-if="detailsItem.HouseType==1">单间</template>
...@@ -114,22 +112,28 @@ ...@@ -114,22 +112,28 @@
返佣: {{detailsItem.RebateRatio}} 返佣: {{detailsItem.RebateRatio}}
<br /> <br />
</template> </template>
</template>
</td> </td>
<td> <td>
<template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.TaxType==1">税入</template> <template v-if="childItem.TaxType==1">税入</template>
<template v-if="childItem.TaxType==2">税别</template> <template v-if="childItem.TaxType==2">税别</template>
</template>
</td> </td>
<td> <td>
<!-- <el-select v-model='childItem.SupplierToDmcHotelStatus' <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
<select class="rq_status" v-model='childItem.SupplierToDmcHotelStatus'
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <option label='请选择' :value='0'></option>
<el-option label='一般提醒' :value='1'></el-option> <option label='一般提醒' :value='1'></option>
<el-option label='重要提醒' :value='2'></el-option> <option label='重要提醒' :value='2'></option>
</el-select> --> </select>
</template>
</td> </td>
<td> <td>
<!-- <el-input type='textarea' class='w135' v-model='childItem.SupplierToDmcRemarks'> <template v-if="childItem.SupplierId==0||childItem.SupplierId==UserInfo.SupplierId">
</el-input> --> <textarea class="w135" cols="25" rows="5" v-model='childItem.SupplierToDmcRemarks'></textarea>
</template>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -180,10 +184,19 @@ ...@@ -180,10 +184,19 @@
</tr> </tr>
<tr> <tr>
<td colspan="8" style="text-align:left;padding-left:5px;"> <td colspan="8" style="text-align:left;padding-left:5px;">
<div class="rQ_HtList" v-if="item.IsBookTeam==2&&item.Numbers>=0"> <div class="rq_remark" v-if="item.IsBookTeam==2&&item.Numbers>=0">
<span class="rq_reSpan">取消团体提醒</span>
<span class="rQ_HtList">
<span v-for="subItem in item.Numbers"></span> <span v-for="subItem in item.Numbers"></span>
</span>
</div> </div>
<div>注意事项： {{item.SupplierRemarks}}</div> <div class="rq_remark" v-if="item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0">
<span class="rq_reSpan">酒店提醒</span>
<span class="rQ_HtList">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
<div><span class="rq_reSpan">注意事项</span> {{item.SupplierRemarks}}</div>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -203,7 +216,6 @@ ...@@ -203,7 +216,6 @@
return { return {
loading: false, loading: false,
hotelLoading: false, hotelLoading: false,
HotelUseLoading: false,
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
...@@ -267,9 +279,9 @@ ...@@ -267,9 +279,9 @@
}, },
//保存信息 //保存信息
saveSupplierjourneyorder(HotelList) { saveSupplierjourneyorder(HotelList) {
this.HotelUseLoading = true; this.hotelLoading = true;
this.ApiPost2('dmcstatistics_post_SetSupplierjourneyorderService', HotelList, res => { this.ApiPost2('dmcstatistics_post_SetSupplierjourneyorderService', HotelList, res => {
this.HotelUseLoading = false; this.hotelLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
this.getList(); this.getList();
...@@ -315,7 +327,6 @@ ...@@ -315,7 +327,6 @@
this.hotelLoading = false; this.hotelLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.HotelList = res.data.data; this.HotelList = res.data.data;
console.log(this.HotelList, 'hotellist')
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -434,19 +445,12 @@ ...@@ -434,19 +445,12 @@
margin-right: 10px; margin-right: 10px;
} }
.roomQuery .rq_span1 {
background-color: #333;
}
.roomQuery .rq_span2 { .roomQuery .rq_span1 {
background-color: #7abd53; background-color: #7abd53;
} }
.roomQuery .rq_span3 { .roomQuery .rq_span2 {
background-color: blue;
}
.roomQuery .rq_span4 {
background-color: red; background-color: red;
} }
...@@ -555,7 +559,8 @@ ...@@ -555,7 +559,8 @@
} }
.rQ_HtList { .rQ_HtList {
margin-top: 5px 0 3px 0; position: relative;
top:3px;
} }
.rQ_HtList span { .rQ_HtList span {
...@@ -574,5 +579,19 @@ ...@@ -574,5 +579,19 @@
.rq_disImNote { .rq_disImNote {
color: #ea6d6d; color: #ea6d6d;
} }
.rq_status{
height:25px;
}
.rq_changeName{
margin-top:10px;
color:red;
}
.roomQuery_SupplierTable .rq_remark{
margin-bottom:5px;
}
.roomQuery_SupplierTable .rq_reSpan{
display:inline-block;
width:75px;
text-align: right;
}
</style> </style>
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