Skip to content

S
SuperMan
Commit 37b5e9b6 authored by 王悦's avatar 王悦
Browse files
Options

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

parents edd132d3 7bfd23fb
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 46 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ 37b5e9b6
...@@ -87,15 +87,27 @@ ...@@ -87,15 +87,27 @@
</el-row> </el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="标准间成本价" prop="CostPrice"> <!-- <el-form-item label="标准间成本价" prop="CostPrice">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> -->
<el-form-item>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">标准间成本价</div>
<input type="text" class="toolInput inpuOne" v-model="msg2.CostPrice" onkeyup="value=value.replace(/[^\d^\.]+/g,'')" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">散客价</div>
<input type="text" class="toolInput inpuTwo" v-model="msg2.SanKePrice" onkeyup="value=value.replace(/[^\d^\.]+/g,'')" maxlength="20">
</div>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="散客价"> <el-form-item label="散客价">
<el-input-number v-model="msg2.SanKePrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.SanKePrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="大床间成本价" prop="BidroomPrice"> <el-form-item label="大床间成本价" prop="BidroomPrice">
<el-input-number v-model="msg2.BidroomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.BidroomPrice" :precision="2" :min="0"></el-input-number>
...@@ -273,15 +285,27 @@ ...@@ -273,15 +285,27 @@
</el-row> </el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
<el-form-item label="标准间成本价" prop="CostPrice"> <!-- <el-form-item label="标准间成本价" prop="CostPrice">
<el-input-number v-model="msg.CostPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.CostPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> -->
<el-form-item>
<div class="RabateDiv clearfix">
<div class="RebateCount reOne">
<div class="leftPnum">标准间成本价</div>
<input type="text" class="toolInput inpuOne" v-model="msg.CostPrice" onkeyup="value=value.replace(/[^\d^\.]+/g,'')" maxlength="20">
</div>
<div class="RebateCount reTwo">
<div class="fanNum">散客价</div>
<input type="text" class="toolInput inpuTwo" v-model="msg.SanKePrice" onkeyup="value=value.replace(/[^\d^\.]+/g,'')" maxlength="20">
</div>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <!-- <el-col :span="6">
<el-form-item label="散客价"> <el-form-item label="散客价">
<el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.SanKePrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item label="大床间成本价" prop="BidroomPrice"> <el-form-item label="大床间成本价" prop="BidroomPrice">
<el-input-number v-model="msg.BidroomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.BidroomPrice" :precision="2" :min="0"></el-input-number>
...@@ -900,8 +924,10 @@ ...@@ -900,8 +924,10 @@
}, },
// 取消按钮 // 取消按钮
editCanel: function () { editCanel: function () {
this.editShow = false this.editShow = false;
this.$refs['hotelProductForm'].resetFields() this.$refs['hotelProductForm'].resetFields();
this.msg.CostPrice=0;
this.msg.SanKePrice=0;
}, },
// 保存按钮 // 保存按钮
editSave: function () { editSave: function () {
...@@ -912,7 +938,9 @@ ...@@ -912,7 +938,9 @@
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.getMonths() this.getMonths()
this.editShow = false this.editShow = false
this.$refs['hotelProductForm'].resetFields() this.$refs['hotelProductForm'].resetFields();
this.msg.CostPrice=0;
this.msg.SanKePrice=0;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -924,7 +952,9 @@ ...@@ -924,7 +952,9 @@
}, },
// 页面编辑重置 // 页面编辑重置
edit2Reset: function () { edit2Reset: function () {
this.$refs['hotelProductForm2'].resetFields() this.$refs['hotelProductForm2'].resetFields();
this.msg2.CostPrice=0;
this.msg2.SanKePrice=0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -937,7 +967,9 @@ ...@@ -937,7 +967,9 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
this.getMonths() this.getMonths()
this.$refs['hotelProductForm2'].resetFields() this.$refs['hotelProductForm2'].resetFields();
this.msg2.CostPrice=0;
this.msg2.SanKePrice=0;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -957,7 +989,9 @@ ...@@ -957,7 +989,9 @@
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.getMonths() this.getMonths()
this.$refs['hotelProductForm2'].resetFields() this.$refs['hotelProductForm2'].resetFields();
this.msg2.CostPrice=0;
this.msg2.SanKePrice=0;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -1348,5 +1382,61 @@ ...@@ -1348,5 +1382,61 @@
margin: 7px 10px 0 0; margin: 7px 10px 0 0;
padding: 0 0 0 0; padding: 0 0 0 0;
} }
.hotelProductManage2 .RabateDiv {
margin-left: 25px;
}
.hotelProductManage2 .RebateCount {
height: 34px;
border-radius: 17px;
float: left;
}
.hotelProductManage2 .reOne,.hotelProductManage2 .reTwo,
.hotelProductManage2.dayNum {
position: relative;
}
.hotelProductManage2 .leftPnum {
float: left;
background-color: #f5f7fa;
height: 40px;
line-height: 40px;
text-align: center;
border-right: 1px solid #cccccc;
position: absolute;
left: 1px;
top: 1px;
font-size:14px;
padding:0 10px;
color:#606266;
}
.hotelProductManage2 .toolInput {
height: 42px;
padding-left: 5px;
border: none;
}
.hotelProductManage2 .inpuOne {
width: 225px;
padding-left: 120px;
border: 1px solid #d1d1d1;
border-right: none;
}
.hotelProductManage2 .inpuTwo {
width: 166px;
padding: 0 45px 0 77px;
border: 1px solid #d1d1d1;
}
.hotelProductManage2 .fanNum {
float: left;
background-color: #f5f7fa;
height: 40px;
line-height: 40px;
text-align: center;
border-right: 1px solid #cccccc;
position: absolute;
left: 1px;
top: 1px;
padding:0 10px;
color:#606266;
font-size:14px;
}
</style> </style>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 37b5e9b6
...@@ -1539,6 +1539,8 @@ ...@@ -1539,6 +1539,8 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<!-- 其他类型 -->
<template v-for="(subItem,subIndex) in OrderDataList.OtherOrderList"> <template v-for="(subItem,subIndex) in OrderDataList.OtherOrderList">
<tr> <tr>
<td colspan="14"> <td colspan="14">
...@@ -1675,7 +1677,8 @@ ...@@ -1675,7 +1677,8 @@
<div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div> <div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
<div @click="transfer(childItem)">订单转团</div> <div @click="transfer(childItem)">订单转团</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId'>OP备注</div> <div @click="OrderLoading=true,OrderLossInfo(childItem)">订单收损</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId,OPRemarkMsg.OP_Remarks=childItem.OP_Remarks'>OP备注</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate,TCMsg.LatestCommissionMoney=childItem.LatestCommissionMoney, TiChengLoading = true'>修改提成</div> <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate,TCMsg.LatestCommissionMoney=childItem.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'" <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'> @click='deleteItem(childItem)'>
...@@ -1761,6 +1764,9 @@ ...@@ -1761,6 +1764,9 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<!-- 取消订单 -->
<tr v-if="OrderDataList.cancelList!=null && OrderDataList.cancelList.length>0"> <tr v-if="OrderDataList.cancelList!=null && OrderDataList.cancelList.length>0">
<td colspan="14"> <td colspan="14">
<span class="RL-redType" @click="isShowCancelOrder=!isShowCancelOrder" style="cursor:pointer" title="点击查看">取消订单（<span <span class="RL-redType" @click="isShowCancelOrder=!isShowCancelOrder" style="cursor:pointer" title="点击查看">取消订单（<span
...@@ -1898,7 +1904,7 @@ ...@@ -1898,7 +1904,7 @@
<div class="groupTourOrder_more"> <div class="groupTourOrder_more">
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div> <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div> <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId,OPRemarkMsg.OP_Remarks=item.OP_Remarks'>OP备注</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div> <div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div> <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
</div> </div>
...@@ -2081,6 +2087,23 @@ ...@@ -2081,6 +2087,23 @@
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;"> <div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan> <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div> </div>
<!-- 订单收损弹窗 -->
<el-dialog custom-class='w350' title="修改订单收损" :visible.sync="OrderLoading" center>
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<el-form-item label="收损人数：" class="w280">
<el-input :rows="2" v-model="OrderLossMsg.PeopleNum"></el-input>
</el-form-item>
<el-form-item label="收损金额：" class="w280">
<el-input :rows="2" v-model="OrderLossMsg.LossMoney"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="OrderLossOk">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="OrderLoading=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg"> <el-dialog custom-class='w350' title="修改OP备注" :visible.sync="zhuanLoading" center :before-close="initOPRemarkMsg">
<!--zhaunMsg.TCNUM--> <!--zhaunMsg.TCNUM-->
<el-form label-width="110px"> <el-form label-width="110px">
...@@ -2123,6 +2146,12 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2123,6 +2146,12 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
export default { export default {
data() { data() {
return { return {
OrderLoading:false,
OrderLossMsg:{
OrderId:"",
PeopleNum:0,
LossMoney:0,
},
pickerOptions0: { pickerOptions0: {
disabledDate: time => { disabledDate: time => {
let starTime = new Date(this.starTime); let starTime = new Date(this.starTime);
...@@ -2485,6 +2514,24 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2485,6 +2514,24 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan updateSalesMan:updateSalesMan
}, },
methods: { methods: {
// 获取订单收损详情
OrderLossInfo(childItem){
this.OrderLossMsg.OrderId=childItem.OrderId;
this.OrderLossMsg.LossMoney=childItem.OpSetLossMoney;
this.OrderLossMsg.PeopleNum=childItem.OpSetLossPeople;
},
// 修改订单收损
OrderLossOk(){
this.apipost('sellorder_post_SetOrderRevenueLoss', this.OrderLossMsg, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.getList()
this.OrderLoading = false
} else {
this.$message.error(res.data.message);
}
}, null)
},
//跳转 //跳转
goUrlTS (path, id, orderId, title) { goUrlTS (path, id, orderId, title) {
this.$router.push({ this.$router.push({
......
src/components/leaderPay2.vue
View file @ 37b5e9b6
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
{{getTotal(subItem.ReimburseList.ReimburseDetailsList)}} {{subItem.TotalPrice}} {{subItem.CurrencyStr}}
</div> </div>
</td> </td>
<td> <td>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<span v-if='index==dataList.BusList.length-1'>送机</span> <span v-if='index==dataList.BusList.length-1'>送机</span>
</td> </td>
<td> <td>
{{item.TotalPrice}} {{item.TotalPrice}} {{subItem.CurrencyStr}}
</td> </td>
<td> <td>
{{item.Remarks}} {{item.Remarks}}
...@@ -140,12 +140,12 @@ ...@@ -140,12 +140,12 @@
<td v-if="index==0" :rowspan="dataList.DiningList.length">餐饮</td> <td v-if="index==0" :rowspan="dataList.DiningList.length">餐饮</td>
<td> <td>
<div class="itemName" v-for="subItem in item.DiningSummaryList"> <div class="itemName" v-for="subItem in item.DiningSummaryList">
{{subItem.DiningName}} {{subItem.NewDiningName}}
</div> </div>
</td> </td>
<td> <td>
<div v-for="subItem in item.DiningSummaryList"> <div v-for="subItem in item.DiningSummaryList">
{{getTotal(subItem.ReimburseList.ReimburseDetailsList)}} {{subItem.TotalPrice}} {{subItem.CurrencyStr}}
</div> </div>
</td> </td>
<td> <td>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<td width="30%"> <td width="30%">
<div class="itemName" >{{item.NewHotelName}}</div> <div class="itemName" >{{item.NewHotelName}}</div>
</td> </td>
<td>{{item.TotalPrice}}</td> <td>{{item.TotalPrice}} {{item.CurrencyStr}}</td>
<td>{{item.Remarks}}</td> <td>{{item.Remarks}}</td>
</tr> </tr>
</template> </template>
...@@ -202,7 +202,7 @@ export default { ...@@ -202,7 +202,7 @@ export default {
this.apipost('dmcstatistics_post_GetNewLeaderPayStatics', this.msg, res => { this.apipost('dmcstatistics_post_GetNewLeaderPayStatics', this.msg, res => {
this.loading = false this.loading = false
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'ressssssss'); console.log(res.data.data,'ressssssss');
this.dataList = res.data.data; this.dataList = res.data.data;
this.dataList.HotelList.forEach(x=>{ this.dataList.HotelList.forEach(x=>{
this.totalHotelPrice+=x.TotalPrice this.totalHotelPrice+=x.TotalPrice
......
src/router/config.js
View file @ 37b5e9b6
...@@ -1032,22 +1032,22 @@ export default { ...@@ -1032,22 +1032,22 @@ export default {
title: '机票列表' title: '机票列表'
}, },
}, },
// { {
// path: '/individualTicket', //散客机票 path: '/individualTicket', //散客机票
// name: 'individualTicket', name: 'individualTicket',
// component: resolve => require(['@/components/Ticketing/individualTicket'], resolve), component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
// meta: { meta: {
// title: '散客机票' title: '散客机票'
// }, },
// }, },
// ,{ ,{
// path: '/IndividualTicketOrder', //散客今日机票订单 path: '/IndividualTicketOrder', //散客今日机票订单
// name: 'IndividualTicketOrder', name: 'IndividualTicketOrder',
// component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve), component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
// meta: { meta: {
// title: '散客机票今日订单' title: '散客机票今日订单'
// }, },
// }, },
{ {
path: '/IndividualTicketOrderDetails', //散客机票订单详情 path: '/IndividualTicketOrderDetails', //散客机票订单详情
name: 'IndividualTicketOrderDetails', name: 'IndividualTicketOrderDetails',
...@@ -1500,11 +1500,13 @@ export default { ...@@ -1500,11 +1500,13 @@ export default {
meta: { meta: {
title: '旅客名单' title: '旅客名单'
}, },
}, { },
{
path: '/RegistrationList', path: '/RegistrationList',
name: 'RegistrationList', name: 'RegistrationList',
component: resolve => require(['@/components/TravelManager/TravelList/RegistrationList'], resolve) component: resolve => require(['@/components/TravelManager/TravelList/RegistrationList'], resolve)
}, { },
{
path: '/DistributionTransport', //分销联运 path: '/DistributionTransport', //分销联运
name: 'DistributionTransport', name: 'DistributionTransport',
component: resolve => require(['@/components/TravelManager/TravelList/DistributionTransport'], resolve), component: resolve => require(['@/components/TravelManager/TravelList/DistributionTransport'], resolve),
...@@ -1868,14 +1870,14 @@ export default { ...@@ -1868,14 +1870,14 @@ export default {
title: '机票订单' title: '机票订单'
}, },
}, },
// { // 销售 散卖机票订单 { // 销售 散卖机票订单
// path: '/BulkAirTicketOrders', path: '/BulkAirTicketOrders',
// name: 'BulkAirTicketOrders', name: 'BulkAirTicketOrders',
// component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve), component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
// meta: { meta: {
// title: '散卖机票订单' title: '散卖机票订单'
// }, },
// }, },
{ // 销售 报名统计 { // 销售 报名统计
path: '/enrollTotal', path: '/enrollTotal',
......
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