Commit 6cf152c3 authored by zhengke's avatar zhengke

增加单男单女显示

parent ec65f4ba
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
<span style="font-size: 14px;color: #333333">名单:</span> <span style="font-size: 14px;color: #333333">名单:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<!-- <span v-else>暂无名单</span>--> <!-- <span v-else>暂无名单</span>-->
<span style="display: block;font-size: 14px;color: #333333">房间信息:{{item.orderGuestHouseStr}}</span> <span style="display: block;font-size: 14px;color: #333333">房间信息<span v-if="item.oneSex>0">{{item.oneSex==1?'单男':'单女'}}</span>{{item.orderGuestHouseStr}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -932,8 +932,8 @@ ...@@ -932,8 +932,8 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单男男女"> <el-form-item label="单男男女">
<el-radio v-model="addMsg.OneSex" label="1"></el-radio> <el-radio v-model="addMsg.OneSex" :label="1"></el-radio>
<el-radio v-model="addMsg.OneSex" label="2"></el-radio> <el-radio v-model="addMsg.OneSex" :label="2"></el-radio>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1758,7 +1758,7 @@ ...@@ -1758,7 +1758,7 @@
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
<span style="display: block">房间信息:{{item.orderGuestHouseStr}}</span> <span style="display: block">房间信息<span v-if="item.oneSex>0">{{item.oneSex==1?'单男':'单女'}}</span>{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">(小费:{{item.tipMoney}}</span> <span v-if="item.tipMoney" style="color:red">(小费:{{item.tipMoney}}</span>
</td> </td>
</tr> </tr>
...@@ -2011,6 +2011,7 @@ ...@@ -2011,6 +2011,7 @@
BackCityTime: '', BackCityTime: '',
CommissionSharePeople: '-1', CommissionSharePeople: '-1',
CommissionShareMoney: '0', CommissionShareMoney: '0',
OneSex:0
}, },
employeeMsg: { employeeMsg: {
BranchId: '-1', BranchId: '-1',
...@@ -2734,7 +2735,6 @@ ...@@ -2734,7 +2735,6 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsUnion = res.data.data.IsUnion this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder this.isAllowUpdate = res.data.data.IsUpdatePlatOrder
console.log('res.data.data', res.data.data)
this.addObj = res.data.data.modelPrice this.addObj = res.data.data.modelPrice
let x = res.data.data.model; let x = res.data.data.model;
...@@ -2742,7 +2742,8 @@ ...@@ -2742,7 +2742,8 @@
this.addObj.OpSetLossMoney = x.OpSetLossMoney; this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg = x; this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.addMsg.OneSex = x.OneSex;
this.addMsg.PlatformAccount = '' this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid) this.getScenicRefund(obj.tcid)
this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount); this.getPlatformAccount(obj.platformAccountTypeId, obj.platformAccount);
...@@ -2774,7 +2775,6 @@ ...@@ -2774,7 +2775,6 @@
}else { }else {
this.HightUnitPrice = '2' this.HightUnitPrice = '2'
this.Unit_Price = this.addObj.SingleDMCPrice this.Unit_Price = this.addObj.SingleDMCPrice
console.log(this.addObj.SingleDMCPrice)
} }
if (this.stratPrice == 0) { if (this.stratPrice == 0) {
this.stratPriceShow = false this.stratPriceShow = false
...@@ -3667,7 +3667,6 @@ ...@@ -3667,7 +3667,6 @@
this.loading = false this.loading = false
this.total = res.data.data.count this.total = res.data.data.count
this.list = res.data.data.pageData; this.list = res.data.data.pageData;
console.log(this.list,'list');
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
...@@ -834,9 +834,6 @@ ...@@ -834,9 +834,6 @@
<el-input v-model='addMsg.CommissionShareMoney' :disabled="true"></el-input> <el-input v-model='addMsg.CommissionShareMoney' :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -1239,8 +1236,11 @@ ...@@ -1239,8 +1236,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
&nbsp; <el-form-item label="单男单女">
</el-col> <el-radio v-model="addMsg.OneSex" :label="1"></el-radio>
<el-radio v-model="addMsg.OneSex" :label="2"></el-radio>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -1758,7 +1758,7 @@ ...@@ -1758,7 +1758,7 @@
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
<span style="display: block">房间信息:{{item.orderGuestHouseStr}}</span> <span style="display: block">房间信息<span v-if="item.oneSex>0">({{item.oneSex==1?'单男':'单女'}})</span>:{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">(小费:{{item.tipMoney}})</span> <span v-if="item.tipMoney" style="color:red">(小费:{{item.tipMoney}})</span>
</td> </td>
</tr> </tr>
...@@ -2350,7 +2350,8 @@ ...@@ -2350,7 +2350,8 @@
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: "-1", CommissionSharePeople: "-1",
CommissionShareMoney: "0" CommissionShareMoney: "0",
OneSex: 0,
}, },
employeeMsg: { employeeMsg: {
BranchId: "-1", BranchId: "-1",
...@@ -3062,7 +3063,7 @@ ...@@ -3062,7 +3063,7 @@
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
this.addObj.OrderId=x.OrderId; this.addObj.OrderId=x.OrderId;
this.addObj.OpSetLossMoney=x.OpSetLossMoney; this.addObj.OpSetLossMoney=x.OpSetLossMoney;
this.addMsg.OneSex = x.OneSex;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.tcid);
this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount); this.getPlatformAccount(obj.platformAccountTypeId,obj.platformAccount);
...@@ -4103,7 +4104,6 @@ ...@@ -4103,7 +4104,6 @@
this.tuanMsg, this.tuanMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("res",res);
this.loading = false; this.loading = false;
this.total = res.data.data.count; this.total = res.data.data.count;
this.list = res.data.data.pageData.rtData; this.list = res.data.data.pageData.rtData;
...@@ -4356,7 +4356,6 @@ ...@@ -4356,7 +4356,6 @@
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.Unit_PriceList = [];
console.log(this.Unit_PriceList)
this.apipost('sellorder_post_GetLessPrice', { this.apipost('sellorder_post_GetLessPrice', {
"TCID": this.addMsg.TCID, "TCID": this.addMsg.TCID,
"MaxPeopleNum": maxPeopleNum "MaxPeopleNum": maxPeopleNum
......
...@@ -373,8 +373,8 @@ ...@@ -373,8 +373,8 @@
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle"><span style="font-weight: 100;" v-if="item.ScoreNum >= 0">(评分{{item.ScoreNum}})</span> {{$t('Operation.Op_TeamName')}}</div> <div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;" v-if="item.ScoreNum >= 0">(评分{{item.ScoreNum}})</span> {{$t('Operation.Op_TeamName')}}</div>
<div class="TCL_Content">{{item.Title}}</div> <div class="TCL_Content" style="width:90%">{{item.Title}}</div>
</div> </div>
</div> </div>
<div> <div>
......
...@@ -145,7 +145,6 @@ ...@@ -145,7 +145,6 @@
} }
}, },
mounted() { mounted() {
console.log(this.HotelObj,'HotelObjHotelObj');
} }
}; };
......
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