Skip to content

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

页面修改

parent 99084eea
Hide whitespace changes
Inline Side-by-side
Showing with 1553 additions and 1520 deletions
index.html
View file @ e6bb6d93
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
return _load return _load
}, },
set: function set(v) { set: function set(v) {
//console.log(v.toString()),
eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn")) eval("_load = " + v.toString().replace("maps.google.cn", "www.google.cn"))
} }
}); });
......
src/components/Hotel/singleProduct/components/ListCar.vue
View file @ e6bb6d93
...@@ -198,7 +198,6 @@ ...@@ -198,7 +198,6 @@
crmOrderObj: { crmOrderObj: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
this.crmOrderObj = val this.crmOrderObj = val
console.log(this.crmOrderObj)
if(this.crmOrderObj){ if(this.crmOrderObj){
this.parameters.LureEmpId = val.LureEmpId//引流id this.parameters.LureEmpId = val.LureEmpId//引流id
this.parameters.CRMGuestId = val.CRMGuestId //客人ID this.parameters.CRMGuestId = val.CRMGuestId //客人ID
......
src/components/SalesVisa/VisaProductAddOrder.vue
View file @ e6bb6d93
...@@ -712,8 +712,6 @@ ...@@ -712,8 +712,6 @@
}, err => {}) }, err => {})
}, },
saveVisa() { // 保存 saveVisa() { // 保存
console.log(this.addMsg,'===')
// return
this.$refs['addMsg'].validate((valid) => { this.$refs['addMsg'].validate((valid) => {
if (valid) { if (valid) {
this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => { this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {
......
src/components/SingleAirTicket/components/TicketOrder.vue
View file @ e6bb6d93
<style scoped> <style scoped>
.TC_leftSearch>div{ .TC_leftSearch>div {
padding: 5px 0; padding: 5px 0;
} }
.groupTourOrderByTuan_ico{
.groupTourOrderByTuan_ico {
margin-left: 5px; margin-left: 5px;
} }
.groupTourOrderByTuan_ico>i{
display: inline-block;
margin: 0 5px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #EAEAEA !important;
}
.HotelWorkList .HW_hotelDialog { .groupTourOrderByTuan_ico>i {
width: 900px; display: inline-block;
} margin: 0 5px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.HotelWorkList .Hw_tableOne { .HotelWorkList .has-gutter tr th,
width: 100%; .el-table th.is-leaf {
height: 40px; background-color: #EAEAEA !important;
background-color: #EAEAEA; }
}
.HotelWorkList .Hw_tableOne th { .HotelWorkList .HW_hotelDialog {
text-align: center; width: 900px;
} }
.HotelWorkList .HotelWorkInput .el-input { .HotelWorkList .Hw_tableOne {
width: 223px; width: 100%;
} height: 40px;
background-color: #EAEAEA;
}
.HotelWorkList .HworkInput .el-input { .HotelWorkList .Hw_tableOne th {
width: 210px; text-align: center;
} }
/deep/.query-box li span>em{
min-width: 60px;
}
</style> .HotelWorkList .HotelWorkInput .el-input {
width: 223px;
}
<template> .HotelWorkList .HworkInput .el-input {
<div class="HotelWorkList" @click="showWarningSearch=false"> width: 210px;
<div class="query-box HotelWorkInput" style="border-bottom: none;"> }
<ul>
<li> /deep/.query-box li span>em {
<span> min-width: 60px;
<em>{{$t('OrderList.search.status')}}</em> }
<el-select v-model="msg.OrderStatus" class="w200 HworkInput">
<el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option> </style>
<el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> <template>
</span> <div class="HotelWorkList" @click="showWarningSearch=false">
</li> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<li v-if="Title!='销售'"> <ul>
<span> <li>
<em>业务员</em> <span>
<el-select filterable v-model='msg.EnterID' class="w200"> <em>{{$t('OrderList.search.status')}}</em>
<el-option :value="0" label="不限"></el-option> <el-select v-model="msg.OrderStatus" class="w200 HworkInput">
<el-option v-for='item in EmployeeList' <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
:label='item.EmName' <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
:value='item.EmployeeId' </el-select>
:key='item.EmployeeId'> </span>
</el-option> </li>
</el-select> <li v-if="Title!='销售'">
</span> <span>
</li> <em>业务员</em>
<li v-if="Title!='销售'"> <el-select filterable v-model='msg.EnterID' class="w200">
<span> <el-option :value="0" label="不限"></el-option>
<em>引流人</em> <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
<el-select filterable v-model='msg.CreateBy' class="w200"> :key='item.EmployeeId'>
<el-option :value="0" label="不限"></el-option> </el-option>
<el-option v-for='item in EmployeeList' </el-select>
:label='item.EmName' </span>
:value='item.EmployeeId' </li>
:key='item.EmployeeId'> <li v-if="Title!='销售'">
</el-option> <span>
</el-select> <em>引流人</em>
</span> <el-select filterable v-model='msg.CreateBy' class="w200">
</li> <el-option :value="0" label="不限"></el-option>
<li> <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
<span> :key='item.EmployeeId'>
<em>订单状态</em> </el-option>
<el-select v-model='msg.OrderStatus' class="w200"> </el-select>
<el-option :value="0" label="不限"></el-option> </span>
<el-option v-for='item in OrderStatusList' </li>
:label='item.Name' <li>
:value='item.Id' <span>
:key='item.Id'> <em>订单状态</em>
</el-option> <el-select v-model='msg.OrderStatus' class="w200">
</el-select> <el-option :value="0" label="不限"></el-option>
</span> <el-option v-for='item in OrderStatusList' :label='item.Name' :value='item.Id' :key='item.Id'>
</li> </el-option>
<li> </el-select>
<span> </span>
<em>收款状态</em> </li>
<el-select v-model='msg.Q_IsCollect' class="w200"> <li>
<el-option v-for='item in QIsCollectList' <span>
:label='item.Name' <em>收款状态</em>
:value='item.Id' <el-select v-model='msg.Q_IsCollect' class="w200">
:key='item.Id'> <el-option v-for='item in QIsCollectList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em>{{$t('OrderList.search.orderNum')}}</em> <span><em>{{$t('OrderList.search.orderNum')}}</em>
<el-input clearable type="" v-model="msg.OrderId" :placeholder="$t('OrderList.search.orderNum')" class="w200"/> <el-input clearable type="" v-model="msg.OrderId" :placeholder="$t('OrderList.search.orderNum')"
</span> class="w200" />
</li> </span>
<!-- <li> </li>
<!-- <li>
<span><em>电话</em> <span><em>电话</em>
<el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/> <el-input clearable v-model="msg.Mobile" placeholder="电话" class="w200"/>
</span> </span>
</li> --> </li> -->
<li> <li>
<span><em>客人姓名</em> <span><em>客人姓名</em>
<el-input clearable v-model="msg.GuestName" placeholder="客人姓名" class="w200"/> <el-input clearable v-model="msg.GuestName" placeholder="客人姓名" class="w200" />
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>报名时间</em> <em>报名时间</em>
<el-date-picker <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistBM" type="daterange"
style="height: 34px;" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
value-format="yyyy-MM-dd" :end-placeholder="$t('OrderList.end')" @change="getDatesBM">
v-model="DatelistBM" </el-date-picker>
type="daterange" </span>
:range-separator="$t('OrderList.zhi')" </li>
:start-placeholder="$t('OrderList.star')" <li>
:end-placeholder="$t('OrderList.end')" @change="getDatesBM"> <span>
</el-date-picker> <em>出发时间</em>
</span> <el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
</li> :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
<li> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
<span> </el-date-picker>
<em>出发时间</em> </span>
<el-date-picker </li>
style="height: 34px;" <li>
value-format="yyyy-MM-dd" <span>
v-model="DatelistUse" <em @click.stop="showWarningSearch=true" style="margin-top: 10px;cursor: pointer;"> 高级查询 <i
type="daterange" class="el-icon-caret-bottom"></i></em>
:range-separator="$t('OrderList.zhi')" <el-popover width="300" v-model="showWarningSearch" trigger="click">
:start-placeholder="$t('OrderList.star')" <div>
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> <div class="TC_queryTitle">机票高级查询</div>
</el-date-picker> <div class="clearfix">
</span> <div class="TC_leftSearch">
</li>
<li>
<span>
<em @click.stop="showWarningSearch=true"
style="margin-top: 10px;cursor: pointer;"> 高级查询 <i class="el-icon-caret-bottom"></i></em>
<el-popover width="300" v-model="showWarningSearch" trigger="click">
<div> <div>
<div class="TC_queryTitle">机票高级查询</div> <span>出票状态</span>
<div class="clearfix"> <el-select v-model='msg.TicketStatus' class="w150">
<div class="TC_leftSearch"> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ticketingStatusList' :label='item.Name' :value='item.Id'
<div> :key='item.Id'>
<span>出票状态</span> </el-option>
<el-select v-model='msg.TicketStatus' class="w150"> </el-select>
<el-option :value="0" label="不限"></el-option> </div>
<el-option v-for='item in ticketingStatusList' <div>
:label='item.Name' <span>出签状态</span>
:value='item.Id' <el-select v-model='msg.VisaStatus' class="w150">
:key='item.Id'> <el-option v-for='item in VisaList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<span>出签状态</span> <span>完结时间</span>
<el-select v-model='msg.VisaStatus' class="w150"> <el-date-picker style="height: 34px;width: 210px;" value-format="yyyy-MM-dd" v-model="Datelist"
<el-option v-for='item in VisaList' type="daterange" :range-separator="$t('OrderList.zhi')"
:label='item.Name' :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')"
:value='item.Id' @change="getDates">
:key='item.Id'> </el-date-picker>
</el-option> </div>
</el-select> <div>
</div> <span>出行概述</span>
<div> <el-input v-model='msg.StartCityName' style="width: 210px;"></el-input>
<span>完结时间</span> </div>
<el-date-picker </div>
style="height: 34px;width: 210px;" <div style="text-align: right;margin-top: 10px;">
value-format="yyyy-MM-dd" <button class="normalBtn TC_SearchBtn"
v-model="Datelist" @click.stop="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}}
type="daterange" </button>
:range-separator="$t('OrderList.zhi')" </div>
:start-placeholder="$t('OrderList.star')" </div>
:end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker> </div>
</div> </el-popover>
<div> </span>
<span>出行概述</span>
<el-input v-model='msg.StartCityName' style="width: 210px;"></el-input> </li>
</div> <li>
</div> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
<div style="text-align: right;margin-top: 10px;"> @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
<button class="normalBtn TC_SearchBtn" </li>
@click.stop="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}} </ul>
</button> </div>
</div> <!-- 统计版块 -->
</div> <div class="groupTourOrder_count" v-if="TotalMsg">
<el-row :gutter="20">
</div> <el-col :span="5" class="groupTourOrder_count_col">
</el-popover> <div class="groupTourOrder_count_item HT_total">
</span> <div>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
</li> <span>{{$t('op.TotalMoney')}}</span>
<li> </div>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" /> <p>
</li> <span class="groupTourOrder_count_green">{{$t('op.TotalMoney')}}：
</ul> {{TotalMsg.Money.toFixed(2)}}
</div> </span>
<!-- 统计版块 --> <span class="groupTourOrder_count_green">{{$t('salesModule.TotalIncome')}}：
<div class="groupTourOrder_count" v-if="TotalMsg"> {{(TotalMsg.Money-TotalMsg.PayMoney).toFixed(2)}}
<el-row :gutter="20"> </span>
<el-col :span="5" class="groupTourOrder_count_col"> <span class="color_red_order">{{$t('op.Tocollected')}}：
<div class="groupTourOrder_count_item HT_total"> {{TotalMsg.DueinMoney.toFixed(2)}}
<div> </span>
<i class="iconfont icon-qian groupTourOrder_count_green"></i> </p>
<span>{{$t('op.TotalMoney')}}</span>
</div> </div>
<p> </el-col>
<span class="groupTourOrder_count_green">{{$t('op.TotalMoney')}}： <el-col :span="5" class="groupTourOrder_count_col">
{{TotalMsg.Money.toFixed(2)}} <div class="groupTourOrder_count_item HT_total">
</span> <div>
<span class="groupTourOrder_count_green">{{$t('salesModule.TotalIncome')}}： <i class="iconfont icon-tongji1 groupTourOrder_count_blue"></i>
{{(TotalMsg.Money-TotalMsg.PayMoney).toFixed(2)}} <span>{{$t('restaurant.res_Number')}}</span>
</span> </div>
<span class="color_red_order">{{$t('op.Tocollected')}}： <p>
{{TotalMsg.DueinMoney.toFixed(2)}} <span class="groupTourOrder_count_green">报名数：
</span> {{TotalMsg.NorNumber}}
</p> </span>
</div> <span class="color_red_order">取消数：
</el-col> {{TotalMsg.CancelNum}}
<el-col :span="5" class="groupTourOrder_count_col"> </span>
<div class="groupTourOrder_count_item HT_total"> </p>
<div>
<i class="iconfont icon-tongji1 groupTourOrder_count_blue"></i>
<span>{{$t('restaurant.res_Number')}}</span>
</div> </div>
<p> </el-col>
<span class="groupTourOrder_count_green">报名数： <!-- <el-col :span="5" class="groupTourOrder_count_col">
{{TotalMsg.NorNumber}}
</span>
<span class="color_red_order">取消数：
{{TotalMsg.CancelNum}}
</span>
</p>
</div>
</el-col>
<!-- <el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_total"> <div class="groupTourOrder_count_item HT_total">
<div> <div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i> <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
...@@ -272,429 +249,473 @@ ...@@ -272,429 +249,473 @@
</p> </p>
</div> </div>
</el-col> --> </el-col> -->
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item HT_totalFinacel"> <div class="groupTourOrder_count_item HT_totalFinacel">
<div> <div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i> <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>{{$t('fnc.cwdjshuoming')}}</span> <span>{{$t('fnc.cwdjshuoming')}}</span>
</div>
<p>
<p><span class="groupTourOrderByTuan_ico"><i
style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i
style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i
style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</p>
</div> </div>
<p> </el-col>
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</p>
</div>
</el-col>
</el-row> </el-row>
</div> </div>
<!-- <div style="display: flex;justify-content: end;margin-bottom: 10px;"> <!-- <div style="display: flex;justify-content: end;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span> <p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span> <span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p> <span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div> --> </div> -->
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList> <OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()">
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div> </OrderList>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
</el-pagination> <el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange"
:current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</div> </div>
</template> </template>
<script> <script>
import OrderList from './OrderList.vue'; import OrderList from './OrderList.vue';
export default { export default {
props:['pagesTitle','dataObj'], props: ['pagesTitle', 'dataObj'],
components: { OrderList }, components: {
data() { OrderList
return { },
showWarningSearch: false, data() {
TotalMsg: null, return {
MultipleChoiceList: [ //多选项目 showWarningSearch: false,
{ TotalMsg: null,
Name: '机票', MultipleChoiceList: [ //多选项目
Id: '1' {
}, { Name: '机票',
Name: '签证', Id: '1'
Id: '2' }, {
}, { Name: '签证',
Name: '地接', Id: '2'
Id: '3' }, {
}, { Name: '地接',
Name: '套餐', Id: '3'
Id: '4' }, {
}, { Name: '套餐',
Name: '其他', Id: '4'
Id: '5' }, {
} Name: '其他',
], Id: '5'
userInfo: {}, }
HotelList: [], ],
loading: false, userInfo: {},
isShow: false, HotelList: [],
outerVisible: false, loading: false,
//订单列表 isShow: false,
OrderList: [], outerVisible: false,
//默认高度 //订单列表
tableHeight: 0, OrderList: [],
msg:{ //默认高度
pageIndex: 1, tableHeight: 0,
pageSize: 15, msg: {
OrderId: "", //订单id pageIndex: 1,
GuestName: "", //客人姓名 pageSize: 15,
GuestId: "", //客人id OrderId: "", //订单id
StartCityName: "", //出发城市 GuestName: "", //客人姓名
EndCityName: "", //到达城市 GuestId: "", //客人id
EnterID: 0, //业务员id StartCityName: "", //出发城市
CreateBy: 0,//引流人员 EndCityName: "", //到达城市
TicketStatus: 0, //出票状态 EnterID: 0, //业务员id
VisaStatus: "0", //出签状态 CreateBy: 0, //引流人员
OrderStatus: 0, //订单状态 TicketStatus: 0, //出票状态
Q_IsCollect: "0", //收款状态 VisaStatus: "0", //出签状态
StartTime: "", OrderStatus: 0, //订单状态
EndTime: "", Q_IsCollect: "0", //收款状态
IsMyOrder: "1", //我的订单 StartTime: "",
FinishSTime: "",//完结开始时间 EndTime: "",
FinishETime: "",//完结结束时间 IsMyOrder: "1", //我的订单
DepartSTime: "",//出发开始 FinishSTime: "", //完结开始时间
DepartETime: "",//出发结束 FinishETime: "", //完结结束时间
DepartSTime: "", //出发开始
DepartETime: "", //出发结束
},
total: 0,
currentPage: 1,
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
}, },
total: 0, {
currentPage: 1, Name: this.$t('OrderList.orderStatus.check'),
OrderStatusType:[ ID: '2'
{Name: this.$t('OrderList.orderStatus.apply'),ID:'1'}, },
{Name: this.$t('OrderList.orderStatus.check'),ID:'2'}, {
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'}, Name: this.$t('OrderList.orderStatus.cancel'),
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'}, ID: '3'
], },
OrderStateType:[ {
{Name: '接机',ID:'1'}, Name: this.$t('OrderList.orderStatus.sun'),
{Name: '送机',ID:'2'}, ID: '4'
{Name: '包车',ID:'3'}, },
], ],
orderType:[ OrderStateType: [{
{Name: this.$t('OrderList.orderType.tour'),ID:'1'}, Name: '接机',
{Name: this.$t('OrderList.orderType.guest'),ID:'2'}, ID: '1'
], },
Datelist:'', {
DatelistUse:'', Name: '送机',
DatelistBM: [], ID: '2'
Title:'', },
EmployeeList:[], {
employeeMsg:{ // 员工 Name: '包车',
GroupId:'', ID: '3'
BranchId:-1, },
DepartmentId:0, ],
PostId:0, orderType: [{
IsLeave:0, Name: this.$t('OrderList.orderType.tour'),
}, ID: '1'
OrderStatusList: [], },
QIsCollectList: [ {
{ Name: "不限", Id: "0" }, Name: this.$t('OrderList.orderType.guest'),
{ Name: "已收齐", Id: "1" }, ID: '2'
{ Name: "未收齐", Id: "2" }, },
], ],
ticketingStatusList: [], Datelist: '',
VisaList: [ DatelistUse: '',
{ Name: "不限", Id: "0" }, DatelistBM: [],
{ Name: "未出签", Id: "1" }, Title: '',
{ Name: "已出签", Id: "2" }, EmployeeList: [],
], employeeMsg: { // 员工
}; GroupId: '',
}, BranchId: -1,
watch: { DepartmentId: 0,
pagesTitle(val,oldval){ PostId: 0,
this.Title = val IsLeave: 0,
}, },
dataObj:{ OrderStatusList: [],
handler(val, oldVal) { QIsCollectList: [{
this.msg.OrderType = val.tab Name: "不限",
this.msg.OrderId = val.OrderId Id: "0"
this.GetList()
}, },
deep: true, {
} Name: "已收齐",
}, Id: "1"
methods: { },
// 获取出票状态枚举 {
GetTicketStatusEnumList() { Name: "未收齐",
this.crmapipost("/api/Order/GetTicketStatusEnumList", {}, (res) => { Id: "2"
if (res.data.resultCode == 1) { },
this.ticketingStatusList = res.data.data; ],
} else { ticketingStatusList: [],
this.$message.error(res.data.message); VisaList: [{
} Name: "不限",
}); Id: "0"
}, },
// 获取订单状态枚举 {
GetOrderStatusEnumList() { Name: "未出签",
this.crmapipost("/api/Order/GetOrderStatusEnumList", {}, (res) => { Id: "1"
if (res.data.resultCode == 1) { },
this.OrderStatusList = res.data.data; {
} else { Name: "已出签",
this.$message.error(res.data.message); Id: "2"
} },
}); ],
};
}, },
getEmployee() { //员工 watch: {
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { pagesTitle(val, oldval) {
if(res.data.resultCode == 1) { this.Title = val
this.EmployeeList = res.data.data; },
} dataObj: {
}, err => {}) handler(val, oldVal) {
}, this.msg.OrderType = val.tab
getDatesBM(){ this.msg.OrderId = val.OrderId
if(this.DatelistBM){ this.GetList()
this.msg.StartTime = this.DatelistBM[0]
this.msg.EndTime = this.DatelistBM[1]
}if(!this.DatelistBM){
this.msg.StartTime = ''
this.msg.EndTime = ''
}
}, },
getDatesUse(){ deep: true,
if(this.DatelistUse){ }
this.msg.DepartSTime = this.DatelistUse[0] },
this.msg.DepartETime = this.DatelistUse[1] methods: {
}if(!this.DatelistUse){ // 获取出票状态枚举
this.msg.DepartSTime = '' GetTicketStatusEnumList() {
this.msg.DepartETime = '' this.crmapipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data;
} else {
this.$message.error(res.data.message);
} }
}, });
getDates(){ },
if(this.Datelist){ // 获取订单状态枚举
this.msg.FinishSTime = this.Datelist[0] GetOrderStatusEnumList() {
this.msg.FinishETime = this.Datelist[1] this.crmapipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
}if(!this.Datelist){ if (res.data.resultCode == 1) {
this.msg.FinishSTime = '' this.OrderStatusList = res.data.data;
this.msg.FinishETime = '' } else {
this.$message.error(res.data.message);
} }
}, });
setEdate() { },
return this.addMoth(new Date().Format("yyyy-MM-dd"), 1) getEmployee() { //员工
}, this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
addMoth(d, m) { if (res.data.resultCode == 1) {
let ds = d.split('-'), this.EmployeeList = res.data.data;
_d = ds[2] - 0;
let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0);
let max = nextM.getDate();
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d.toLocaleDateString().match(/\d+/g).join('-')
},
getyMDOne(){
let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月)
let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0'+ myMonth
myToday = myToday > 9 ? myToday : '0'+ myToday
let nowDate = myYear +'-'+ myMonth +'-01'
return nowDate
},
getyMDTwo(){
let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月)
let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0'+ myMonth
myToday = myToday > 9 ? myToday : '0'+ myToday
let nowDate = myYear +'-'+ myMonth +'-'+ myToday
return nowDate
},
//获取酒店订单列表
GetList() {
this.loading = true
let url = "/api/Order/GetGuestOrderStatisticsPageList"
// 销售 OP
if(this.pagesTitle=='销售'){
this.msg.IsMyOrder = '1'
}else{
this.msg.IsMyOrder = '0'
} }
this.crmapipost(url, this.msg, }, err => {})
res => { },
if (res.data.resultCode == 1) { getDatesBM() {
// console.log(res.data,'-----') if (this.DatelistBM) {
let data = res.data.data.Data.pageData this.msg.StartTime = this.DatelistBM[0]
let addList = function(arr) { this.msg.EndTime = this.DatelistBM[1]
arr.forEach((item) => { }
item.More = ""; if (!this.DatelistBM) {
item.actuallyReceived = false; this.msg.StartTime = ''
item.cost = false; this.msg.EndTime = ''
item.selectedType = ""; }
item.checkList = []; },
item.MultipleChoiceList = []; getDatesUse() {
item.MoreList = [ if (this.DatelistUse) {
{ this.msg.DepartSTime = this.DatelistUse[0]
Name: "取消订单", this.msg.DepartETime = this.DatelistUse[1]
Id: "1", }
show: if (!this.DatelistUse) {
item.OrderStatus != 2 && this.msg.DepartSTime = ''
item.OrderStatus != 5 && this.msg.DepartETime = ''
item.OrderStatus != 6 }
? true },
: false, getDates() {
}, if (this.Datelist) {
{ this.msg.FinishSTime = this.Datelist[0]
Name: "订单转交", this.msg.FinishETime = this.Datelist[1]
Id: "2", }
show: true, if (!this.Datelist) {
}, this.msg.FinishSTime = ''
{ this.msg.FinishETime = ''
Name: "修改订单金额", }
Id: "3", },
show: setEdate() {
item.OrderStatus != 2 && return this.addMoth(new Date().Format("yyyy-MM-dd"), 1)
item.OrderStatus != 5 && },
item.OrderStatus != 6 && addMoth(d, m) {
(item.TicketStatus == 1 || item.VisaStatus == 1) let ds = d.split('-'),
? true _d = ds[2] - 0;
: false, let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0);
}, let max = nextM.getDate();
{ d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
Name: "修改出票状态", return d.toLocaleDateString().match(/\d+/g).join('-')
Id: "4", },
show: getyMDOne() {
item.OrderStatus != 2 && let myDate = new Date()
item.OrderStatus != 5 && let myYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
item.OrderStatus != 6 && let myMonth = myDate.getMonth() + 1; //获取当前月份(0-11,8代表1月)
item.TicketStatus < 3 let myToday = myDate.getDate(); //获取当前日(1-31)
? true myMonth = myMonth > 9 ? myMonth : '0' + myMonth
: false, myToday = myToday > 9 ? myToday : '0' + myToday
}, let nowDate = myYear + '-' + myMonth + '-01'
{ return nowDate
Name: "修改出签状态", },
Id: "5", getyMDTwo() {
show: let myDate = new Date()
item.OrderStatus != 2 && let myYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
item.OrderStatus != 5 && let myMonth = myDate.getMonth() + 1; //获取当前月份(0-11,8代表1月)
item.OrderStatus != 6 && let myToday = myDate.getDate(); //获取当前日(1-31)
item.VisaStatus == 1 myMonth = myMonth > 9 ? myMonth : '0' + myMonth
? true myToday = myToday > 9 ? myToday : '0' + myToday
: false, let nowDate = myYear + '-' + myMonth + '-' + myToday
}, return nowDate
{ },
Name: "订单收损", //获取酒店订单列表
Id: "8", GetList() {
show: this.loading = true
item.OrderStatus != 2 && let url = "/api/Order/GetGuestOrderStatisticsPageList"
item.OrderStatus != 6 // 销售 OP
? true if (this.pagesTitle == '销售') {
: false, this.msg.IsMyOrder = '1'
}, } else {
{ this.msg.IsMyOrder = '0'
Name: "收损完结", }
Id: "9", this.crmapipost(url, this.msg,
show: res => {
(item.OrderStatus == 3 || item.OrderStatus == 4) && if (res.data.resultCode == 1) {
item.DueinMoney == 0 let data = res.data.data.Data.pageData
? true let addList = function (arr) {
: false, arr.forEach((item) => {
}, item.More = "";
{ item.actuallyReceived = false;
Name: '订单完结', item.cost = false;
Id: '6', item.selectedType = "";
show: item.OrderStatus == 1 && item.DueinMoney == 0 ? item.checkList = [];
item.MultipleChoiceList = [];
item.MoreList = [{
Name: "取消订单",
Id: "1",
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 ?
true :
false,
},
{
Name: "订单转交",
Id: "2",
show: true,
},
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
(item.TicketStatus == 1 || item.VisaStatus == 1) ?
true :
false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.TicketStatus < 3 ?
true :
false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus != 2 &&
item.OrderStatus != 5 &&
item.OrderStatus != 6 &&
item.VisaStatus == 1 ?
true :
false,
},
{
Name: "订单收损",
Id: "8",
show: item.OrderStatus != 2 &&
item.OrderStatus != 6 ?
true :
false,
},
{
Name: "收损完结",
Id: "9",
show: (item.OrderStatus == 3 || item.OrderStatus == 4) &&
item.DueinMoney == 0 ?
true :
false,
},
{
Name: '订单完结',
Id: '6',
show: item.OrderStatus == 1 && item.DueinMoney == 0 ?
true : false true : false
}, },
{ {
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
}, },
{ {
Name: "修改日期", Name: "修改日期",
Id: "10", Id: "10",
show: item.OrderType&&item.OrderType.indexOf(1) != -1?true:false, show: item.OrderType && item.OrderType.indexOf(1) != -1 ? true : false,
} }
]; ];
}); });
}; };
addList(data); addList(data);
data.forEach((item) => { data.forEach((item) => {
if (item.OrderType) { if (item.OrderType) {
let list = item.OrderType && item.OrderType.split(","); let list = item.OrderType && item.OrderType.split(",");
for (let j = 0; j < list.length; j++) { for (let j = 0; j < list.length; j++) {
for (let i = 0; i < this.MultipleChoiceList.length; i++) { for (let i = 0; i < this.MultipleChoiceList.length; i++) {
if (list[j] == this.MultipleChoiceList[i].Id) { if (list[j] == this.MultipleChoiceList[i].Id) {
item.MultipleChoiceList.push( item.MultipleChoiceList.push(
JSON.parse(JSON.stringify(this.MultipleChoiceList[i])) JSON.parse(JSON.stringify(this.MultipleChoiceList[i]))
); );
}
}
} }
} }
} if (item.LossList.length > 0) {
} for (let i = 0; i < item.LossList.length; i++) {
if (item.LossList.length > 0) { for (let j = 0; j < item.MultipleChoiceList.length; j++) {
for (let i = 0; i < item.LossList.length; i++) { if (
for (let j = 0; j < item.MultipleChoiceList.length; j++) { item.LossList[i].OrderType ==
if ( item.MultipleChoiceList[j].Id
item.LossList[i].OrderType == ) {
item.MultipleChoiceList[j].Id item.MultipleChoiceList[j].show = true;
) { }
item.MultipleChoiceList[j].show = true; }
} }
} }
} });
this.OrderList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.TotalMsg = res.data.data.StatModel
} else {
this.Error(res.data.message);
} }
}); this.loading = false
this.OrderList = res.data.data.Data.pageData; },
this.total = res.data.data.Data.count; err => {
this.TotalMsg = res.data.data.StatModel this.loading = false
}else {
this.Error(res.data.message);
}
this.loading = false
},
err => {this.loading = false}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.GetList();
},
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 40;
if (h < 110) {
return;
} }
//设置table的行高 );
this.tableHeight = h;
},
}, },
created() { handleCurrentChange(val) {
if(this.$route.query.OrderId){ this.msg.pageIndex = val;
this.msg.OrderId=this.$route.query.OrderId this.GetList();
}
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
// this.msg.EnterID = userInfo.EmployeeId;
}, },
mounted() { com_onresize() {
this.Title = this.pagesTitle //clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
if(this.Title!='销售'){ var contentsHeight = document.body.clientHeight;
this.getEmployee() var h = contentsHeight - 50 - 180 - 40;
if (h < 110) {
return;
} }
this.msg.StartTime = this.getBeforeDate(31, new Date()) //设置table的行高
this.msg.EndTime = this.$calendarUtils.formatDate(new Date(), "YYYY-MM-dd", 0) this.tableHeight = h;
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] },
this.GetOrderStatusEnumList() },
this.GetTicketStatusEnumList() created() {
this.Datelist = this.getyMDOne() if (this.$route.query.OrderId) {
this.userInfo = this.getLocalStorage(); this.msg.OrderId = this.$route.query.OrderId
this.GetList(); }
let userInfo = this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
// this.msg.EnterID = userInfo.EmployeeId;
},
mounted() {
this.Title = this.pagesTitle
if (this.Title != '销售') {
this.getEmployee()
}
this.msg.StartTime = this.getBeforeDate(31, new Date())
this.msg.EndTime = this.$calendarUtils.formatDate(new Date(), "YYYY-MM-dd", 0)
this.DatelistBM = [new Date(this.msg.StartTime), new Date()]
this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList()
this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage();
this.GetList();
//自适应高度调节 //自适应高度调节
this.com_onresize();
window.onresize = () => {
this.com_onresize(); this.com_onresize();
window.onresize = () => { }
this.com_onresize(); },
} };
},
};
</script> </script>
<style> <style>
</style> </style>
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ e6bb6d93
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<td width="80" class="txtRightCost">线路</td> <td width="80" class="txtRightCost">线路</td>
<td> <td>
<el-select style="width:100%" v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" <el-select style="width:100%" v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList(postConfig.LineId,1)" filterable> @change="changeLine()" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'> <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option> </el-option>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<tr> <tr>
<td width="80" class="txtRightCost">出团公司</td> <td width="80" class="txtRightCost">出团公司</td>
<td> <td>
<el-select class=" multiple_input" v-model="postConfig.OutBranchId" filterable> <el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable>
<el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
</td> </td>
<td width="80" class="txtRightCost">出团类型</td> <td width="80" class="txtRightCost">出团类型</td>
<td> <td>
<el-select class=" multiple_input" v-model="postConfig.TeamType" filterable> <el-select class="multiple_input" v-model="postConfig.TeamType" filterable>
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -1113,8 +1113,9 @@ ...@@ -1113,8 +1113,9 @@
<tr> <tr>
<td class="CP_ComTitle2">附件</td> <td class="CP_ComTitle2">附件</td>
<td colspan="13"> <td colspan="13">
<el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;" <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo"
:http-request="uploadFileBtn" :show-file-list="false" action=""> style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action="">
<el-button size="small" type="primary">报价单附件</el-button> <el-button size="small" type="primary">报价单附件</el-button>
</el-upload> </el-upload>
<template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0"> <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
...@@ -1475,6 +1476,18 @@ ...@@ -1475,6 +1476,18 @@
// this.getConvertMoney(this.OtherPrice.AirTicketMoeny) + // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
return totalMoney; return totalMoney;
}, },
//线路切换
changeLine() {
this.getLineTeamList(this.postConfig.LineId, 1);
//欧洲线(2)和韩国线(5)默认小包团(1)
if (this.postConfig.LineId == 2 || this.postConfig.LineId == 5) {
this.postConfig.TeamType = 1;
}
else
{
this.postConfig.TeamType=0;
}
},
//获取系列列表 //获取系列列表
getLineTeamList(lineId, isClear) { getLineTeamList(lineId, isClear) {
if (isClear && isClear == 1) { if (isClear && isClear == 1) {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ e6bb6d93
...@@ -423,7 +423,6 @@ ...@@ -423,7 +423,6 @@
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
// console.log('userInfo', userInfo)
this.queryData.CreateBy = userInfo.EmployeeId this.queryData.CreateBy = userInfo.EmployeeId
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: userInfo.RB_Group_id,
......
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @ e6bb6d93
...@@ -728,9 +728,7 @@ ...@@ -728,9 +728,7 @@
that.selectFilghtList.push(x); that.selectFilghtList.push(x);
}); });
that.selectFilghtList.forEach(y => { that.selectFilghtList.forEach(y => {
if (y.AirticketId == that.editForm.TicketId) { if (y.AirticketId == that.editForm.TicketId) {
console.log("1111");
y.IsSelected = true; y.IsSelected = true;
y.BindNum = that.editForm.TicketNum; y.BindNum = that.editForm.TicketNum;
that.TicketMsg = y.AlName + "/" + y.FlightDate; that.TicketMsg = y.AlName + "/" + y.FlightDate;
...@@ -832,7 +830,6 @@ ...@@ -832,7 +830,6 @@
if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) { if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) {
this.friendList = tempObj.TravelTeamPartnerList; this.friendList = tempObj.TravelTeamPartnerList;
} }
console.log('flightList>>>', this.addMsg.flightList)
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/TravelManager/TravelTeam/travelPayList.vue
View file @ e6bb6d93
...@@ -165,7 +165,6 @@ ...@@ -165,7 +165,6 @@
}, },
}, },
mounted() { mounted() {
console.log('mounted', this.$route)
this.queryMsg.TCID = this.$route.query.id this.queryMsg.TCID = this.$route.query.id
this.getTravelTeamList(); this.getTravelTeamList();
}, },
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ e6bb6d93
<template>
<el-table border ref="multipleTable" :data="OrderList" style="width: 100%"
:default-sort="{prop: 'Money', order: 'null'}"
:sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','DueInMoney']">
<el-table-column width="200" prop="CreateTimeStr" label="订单Id" show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)">
<el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag>
<span>{{scope.row.OrderId}}</span>
</p>
<p>{{scope.row.CreateTimeStr}}</p>
</div>
</template>
</el-table-column>
<el-table-column width="200" prop="CreateTimeStr" label="团号" show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class=" fz14" :class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p>
</div>
</template>
</el-table-column>
<el-table-column label="客人" show-overflow-tooltip>
<template slot-scope="scope">
<span :class="{'colorblue font-color-link':pagesTitle!='详情'}"
@click="pagesTitle!='详情'?openNameDetails(scope.row):''">
{{scope.row.GuestName}}
</span>
</template>
</el-table-column>
<el-table-column prop="SaleName" label="销售" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="LureEmpName" label="引流" show-overflow-tooltip>
</el-table-column>
<el-table-column label="商品名称" show-overflow-tooltip>
<template slot-scope="scope">
<div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Name}}</div>
</template>
</el-table-column>
<el-table-column label="商品详情" show-overflow-tooltip>
<template slot-scope="scope">
<div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Description}}</div>
</template>
</el-table-column>
<el-table-column sortable prop="Money" label="总金额" show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{scope.row.Money}}&ensp;({{scope.row.CurrencyName}})
</template>
</el-table-column>
<el-table-column sortable prop="Income" label="实收" show-overflow-tooltip>
</el-table-column>
<el-table-column sortable prop="PreferTipAmount" label="人头小费" show-overflow-tooltip min-width="101">
</el-table-column>
<el-table-column sortable prop="PlatformTax" label="手续费" show-overflow-tooltip min-width="100">
</el-table-column>
<el-table-column sortable prop="Refund" label="退款" show-overflow-tooltip>
</el-table-column>
<el-table-column sortable prop="CostMoney" label="成本" show-overflow-tooltip>
</el-table-column>
<el-table-column sortable prop="DueInMoney" label="待收" show-overflow-tooltip>
<template slot-scope="scope">
<span :class="{'red':scope.row.DueInMoney>0}">{{scope.row.DueInMoney}}</span>
</template>
</el-table-column>
<el-table-column sortable prop="DiscountsMoney" label="优惠" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="StateName" label="状态" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.StateName}}</span>
</template>
</el-table-column>
<template> <!-- <el-table-column
<el-table
border
ref="multipleTable"
:data="OrderList"
style="width: 100%"
:default-sort = "{prop: 'Money', order: 'null'}"
:sort-by="['Money','Income','PreferTipAmount','PlatformTax','Refund','CostMoney','DueInMoney']">
<el-table-column
width="200"
prop="CreateTimeStr"
label="订单Id"
show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p>
<p>{{scope.row.CreateTimeStr}}</p>
</div>
</template>
</el-table-column>
<el-table-column
width="200"
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class=" fz14"
:class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p>
</div>
</template>
</el-table-column>
<el-table-column
label="客人"
show-overflow-tooltip>
<template slot-scope="scope">
<span :class="{'colorblue font-color-link':pagesTitle!='详情'}" @click="pagesTitle!='详情'?openNameDetails(scope.row):''">
{{scope.row.GuestName}}
</span>
</template>
</el-table-column>
<el-table-column
prop="SaleName"
label="销售"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="LureEmpName"
label="引流"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="商品名称"
show-overflow-tooltip>
<template slot-scope="scope">
<div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Name}}</div>
</template>
</el-table-column>
<el-table-column
label="商品详情"
show-overflow-tooltip>
<template slot-scope="scope">
<div style="max-width: 100px;overflow: hidden;text-overflow: ellipsis">{{scope.row.Description}}</div>
</template>
</el-table-column>
<el-table-column
sortable
prop="Money"
label="总金额"
show-overflow-tooltip min-width="100">
<template slot-scope="scope">
{{scope.row.Money}}&ensp;({{scope.row.CurrencyName}})
</template>
</el-table-column>
<el-table-column
sortable
prop="Income"
label="实收"
show-overflow-tooltip>
</el-table-column>
<el-table-column
sortable
prop="PreferTipAmount"
label="人头小费"
show-overflow-tooltip min-width="101">
</el-table-column>
<el-table-column
sortable
prop="PlatformTax"
label="手续费"
show-overflow-tooltip min-width="100">
</el-table-column>
<el-table-column
sortable
prop="Refund"
label="退款"
show-overflow-tooltip>
</el-table-column>
<el-table-column
sortable
prop="CostMoney"
label="成本"
show-overflow-tooltip>
</el-table-column>
<el-table-column
sortable
prop="DueInMoney"
label="待收"
show-overflow-tooltip>
<template slot-scope="scope">
<span :class="{'red':scope.row.DueInMoney>0}">{{scope.row.DueInMoney}}</span>
</template>
</el-table-column>
<el-table-column
sortable
prop="DiscountsMoney"
label="优惠"
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="StateName"
label="状态"
show-overflow-tooltip>
<template slot-scope="scope">
<span>{{scope.row.StateName}}</span>
</template>
</el-table-column>
<!-- <el-table-column
label="操作" label="操作"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button> <el-button size="mini" type="primary" @click="goDetails(scope.row)">查看</el-button>
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
</template> </template>
<script> <script>
import offset from '../../public/offset.vue'; import offset from '../../public/offset.vue';
export default { export default {
components: { offset }, components: {
props: ["OrderList","pagesTitle"], offset
data() { },
return { props: ["OrderList", "pagesTitle"],
S_CheckBranchOrder: false, data() {
S_CheckAllOrder: false, return {
queryObj:null, S_CheckBranchOrder: false,
cdState: false, S_CheckAllOrder: false,
copyId: 0, queryObj: null,
loading0: false, cdState: false,
loading1: false, copyId: 0,
loading2: false, loading0: false,
loading3: false, loading1: false,
BillMakingMsg: { loading2: false,
// PeroidsId: null, loading3: false,
// Type: null, BillMakingMsg: {
// EmpIds:'', // PeroidsId: null,
OtherType: 61, // Type: null,
ReFinanceId: "", // EmpIds:'',
ReFinanceId2: "" OtherType: 61,
}, ReFinanceId: "",
userInfo: {}, ReFinanceId2: ""
msg: {
OrderId: "",
LossMoney: 0,
State: '',//状态 1确认 2已邮寄 3设置自提 4收损
SelffetchAddress: ''
},
msgParameter: {
IsUpdateMailing: 1,
OrderId: 0,
Money: 0.0,
Remark: '',
MailingState: '1',//邮寄状态 1自取 2邮寄
MailingAddress: '',//MailingState =2 填写邮寄
UseDate:'',//门票日期
Name:'',
EName:'',
Sex: '1',//1男2女
Birthday: '',
Mobile:'',
CouponsId:'',//景点id
DetailList:[],
},
rules2:{
Name: [{
required: true,
message: '请输入中文名',
trigger: 'blur'
}],
EName: [{
required: true,
message: '请输入英文名',
trigger: 'blur'
}],
Mobile: [
{ required: true, message: "请输入联系电话", trigger: "blur" },
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
}
],
MailingAddress: [{
required: true,
message: '请输入邮寄地址',
trigger: 'blur'
}],
},
outerVisible: false,
rules: {
State: [
{
required: true,
message: "请选择订单状态",
trigger: "change"
}
],
SelffetchAddress: [
{
required: true,
message: "请输入自提地址",
trigger: "blur"
}
],
LossMoney: [
{
required: true,
message: "请输入收损金额",
trigger: "blur"
}
]
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0,
uploadOrderId: 0,
loading: false,
fileList:[],
GuestFile: '',
ChangeOrderDialog: false,
OrderStatusType:[
{Name: this.$t('OrderList.orderStatus.apply'),ID:'1'},
{Name: this.$t('OrderList.orderStatus.check'),ID:'2'},
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
],
items: null,
typeState: '',
Title: ''
};
}, },
watch: { userInfo: {},
pagesTitle(val,oldval){ msg: {
this.Title = val OrderId: "",
}, LossMoney: 0,
OrderList:{ State: '', //状态 1确认 2已邮寄 3设置自提 4收损
handler(val, oldVal){ SelffetchAddress: ''
}
}
}, },
methods: { msgParameter: {
goTuanDetails(row){ IsUpdateMailing: 1,
let name = '' OrderId: 0,
if(row.IsOneDayOrder==1){ Money: 0.0,
name = 'groupTourOrderByTuanOne' Remark: '',
}else{ MailingState: '1', //邮寄状态 1自取 2邮寄
name = 'groupTourOrderByTuan' MailingAddress: '', //MailingState =2 填写邮寄
UseDate: '', //门票日期
Name: '',
EName: '',
Sex: '1', //1男2女
Birthday: '',
Mobile: '',
CouponsId: '', //景点id
DetailList: [],
},
rules2: {
Name: [{
required: true,
message: '请输入中文名',
trigger: 'blur'
}],
EName: [{
required: true,
message: '请输入英文名',
trigger: 'blur'
}],
Mobile: [{
required: true,
message: "请输入联系电话",
trigger: "blur"
},
{
pattern: this.$commonUtils.Regex.el_ISphone,
message: "请输入正确的电话"
} }
this.$router.push({ ],
name: name, MailingAddress: [{
query: { required: true,
id: row.TCID, message: '请输入邮寄地址',
tcmun: row.TCNUM, trigger: 'blur'
blank: "y", }],
} },
}); outerVisible: false,
rules: {
State: [{
required: true,
message: "请选择订单状态",
trigger: "change"
}],
SelffetchAddress: [{
required: true,
message: "请输入自提地址",
trigger: "blur"
}],
LossMoney: [{
required: true,
message: "请输入收损金额",
trigger: "blur"
}]
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId: 0,
uploadOrderId: 0,
loading: false,
fileList: [],
GuestFile: '',
ChangeOrderDialog: false,
OrderStatusType: [{
Name: this.$t('OrderList.orderStatus.apply'),
ID: '1'
}, },
goDetails(row){ {
console.log(this.pagesTitle,this.S_CheckBranchOrder,this.S_CheckAllOrder) Name: this.$t('OrderList.orderStatus.check'),
let data = [{ ID: '2'
},
{
Name: this.$t('OrderList.orderStatus.cancel'),
ID: '3'
},
{
Name: this.$t('OrderList.orderStatus.sun'),
ID: '4'
},
],
items: null,
typeState: '',
Title: ''
};
},
watch: {
pagesTitle(val, oldval) {
this.Title = val
},
OrderList: {
handler(val, oldVal) {
}
}
},
methods: {
goTuanDetails(row) {
let name = ''
if (row.IsOneDayOrder == 1) {
name = 'groupTourOrderByTuanOne'
} else {
name = 'groupTourOrderByTuan'
}
this.$router.push({
name: name,
query: {
id: row.TCID,
tcmun: row.TCNUM,
blank: "y",
}
});
},
goDetails(row) {
let data = [{
path: "", path: "",
OrderId: row.OrderId, OrderId: row.OrderId,
Type: '' Type: ''
}] }]
let href let href
let url = this.domainManager().crmRoutingUrl; let url = this.domainManager().crmRoutingUrl;
if (row.OrderType == 1) { if (row.OrderType == 1) {
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){ if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
data[0].path = 'myCustomerOrderAllType' data[0].path = 'myCustomerOrderAllType'
}else{ } else {
data[0].path = 'customerOrderAllType' data[0].path = 'customerOrderAllType'
}
href = url+'automaticLogin?token='+this.getLocalStorage().token+'&data=' + JSON.stringify(data)
window.open(href);
}else{
let name = ''
if (row.OrderType == 6) {
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'VisaProductEditOrder'
}else{
name = 'VisaProductEditOrderOP'
} }
this.$router.push({ href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
name: name, window.open(href);
});
}else if (row.OrderType == 2) {//跟团 一日游 } else {
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){ let name = ''
if(row.TravelType==1){ if (row.OrderType == 6) {
name = 'groupTourOrder' if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
}else{ name = 'VisaProductEditOrder'
name = 'groupTourOrderOne' } else {
name = 'VisaProductEditOrderOP'
} }
}else{ this.$router.push({
name = 'enrollTotal' name: name,
} });
} } else if (row.OrderType == 2) { //跟团 一日游
else if (row.OrderType == 3) {//酒店 if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){ if (row.TravelType == 1) {
name = 'singleProductHotelOrder' name = 'groupTourOrder'
}else{ } else {
name = 'singleProductHotelOrderOP' name = 'groupTourOrderOne'
}
} else {
name = 'enrollTotal'
}
} else if (row.OrderType == 3) { //酒店
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
name = 'singleProductHotelOrder'
} else {
name = 'singleProductHotelOrderOP'
}
} else if (row.OrderType == 4) { //门票
if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
name = 'SingleticketOrderList'
} else {
name = 'SingleticketOrderListOP'
}
} else if (row.OrderType == 5) { //包车
this.GetAdminCarOrderPageList(row, url, href, data)
} else if (row.OrderType == 7) { //jalan酒店
this.$message.info('jalan酒店暂不支持查看')
// if(this.pagesTitle=='销售'){
// name = 'CharterOrderList'
// }else{
// name = 'CharterOrderListOP'
// }
} }
} if (name) {
else if (row.OrderType == 4) {//门票 this.$router.push({
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){ name: name,
name = 'SingleticketOrderList' query: {
}else{ OrderId: row.OrderId,
name = 'SingleticketOrderListOP' blank: "y",
}
});
} }
} }
else if (row.OrderType == 5) {//包车 },
this.GetAdminCarOrderPageList(row,url,href,data) GetAdminCarOrderPageList(row, url, href, data) {
} let msg = {
else if (row.OrderType == 7) {//jalan酒店 pageIndex: 1,
this.$message.info('jalan酒店暂不支持查看') pageSize: 5,
// if(this.pagesTitle=='销售'){ OrderType: '',
// name = 'CharterOrderList' OrderId: row.OrderId,
// }else{ OrderNo: '',
// name = 'CharterOrderListOP' SurName: '',
// } Name: '',
} OrderStatus: 0,
if(name){ StartTime: '',
this.$router.push({ EndTime: '',
name: name, OrderSTime: '',
query: { OrderETime: '',
OrderId: row.OrderId, ProductName: '',
blank: "y", Mobile: '', //电话
IsSelectSale: 1,
EnterID: 0, //业务员
}
let name
this.apipost('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData
let OrderType
if (pageData && pageData.length > 0) {
OrderType = pageData[0].OrderType
} }
}); if (this.pagesTitle == '销售' || (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)) {
} name = 'CharterOrderList'
} else {
} name = 'CharterOrderListOP'
}, }
GetAdminCarOrderPageList(row,url,href,data){ this.$router.push({
let msg = { name: name,
pageIndex: 1, query: {
pageSize: 5, OrderId: row.OrderId,
OrderType: '', OrderType: OrderType ? OrderType : 4,
OrderId: row.OrderId, blank: "y",
OrderNo: '',
SurName: '',
Name: '',
OrderStatus: 0,
StartTime: '',
EndTime: '',
OrderSTime: '',
OrderETime: '',
ProductName: '',
Mobile: '',//电话
IsSelectSale: 1,
EnterID: 0,//业务员
}
let name
this.apipost('CarSingle_post_GetAdminCarOrderPageList', msg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData
let OrderType
if(pageData&&pageData.length>0){
OrderType = pageData[0].OrderType
}
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'CharterOrderList'
}else{
name = 'CharterOrderListOP'
}
this.$router.push({
name: name,
query: {
OrderId: row.OrderId,
OrderType: OrderType?OrderType:4,
blank: "y",
}
});
} }
}) });
},
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
this.userInfo = this.getLocalStorage();
// 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 ){
this.S_CheckBranchOrder = true
}if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1 ){
this.S_CheckAllOrder = true
} }
} })
}; },
</script>
},
<style scoped> mounted() {
.row { let userInfo = this.getLocalStorage();
display: flex; let ActionMenuCode = userInfo.ActionMenuCode;
} this.userInfo = this.getLocalStorage();
.row-c { // 判断是否销售
display: flex; if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
align-items: center; this.S_CheckBranchOrder = true
} }
.column { if (ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
display: flex; this.S_CheckAllOrder = true
flex-direction: column; }
} }
.column-jac { };
display: flex;
flex-direction: column; </script>
align-items: center;
justify-content: center; <style scoped>
} .row {
.column-ac { display: flex;
display: flex; }
flex-direction: column;
align-items: center; .row-c {
} display: flex;
.wrap { align-items: center;
flex-wrap: wrap; }
}
.justify-sb { .column {
justify-content: space-between; display: flex;
} flex-direction: column;
.justify-c { }
justify-content: center;
} .column-jac {
.justify-e { display: flex;
justify-content: flex-end; flex-direction: column;
align-items: flex-end; align-items: center;
} justify-content: center;
.flex-g { }
flex-grow: 1;
} .column-ac {
.flex-s { display: flex;
flex-shrink: 0; flex-direction: column;
} align-items: center;
.align-c { }
align-items: center;
} .wrap {
.cblack { flex-wrap: wrap;
color: black; }
}
.cf { .justify-sb {
color: #ffffff; justify-content: space-between;
} }
.c9e {
color: #9e9e9e; .justify-c {
} justify-content: center;
.c20C997 { }
color: #20c997;
} .justify-e {
.c02C854 { justify-content: flex-end;
color: #02c854; align-items: flex-end;
} }
.cff9800 {
color: #ff9800; .flex-g {
} flex-grow: 1;
}
.cF1416C {
color: #f1416c; .flex-s {
} flex-shrink: 0;
.cF57A98 { }
color: #f57a98;
} .align-c {
.c04C8C8 { align-items: center;
color: #04c8c8; }
}
.c059FF6 { .cblack {
color: #059ff6; color: black;
} }
.c3FC4FF {
color: #3fc4ff; .cf {
} color: #ffffff;
.fz10 { }
font-size: 10px;
} .c9e {
.fz11 { color: #9e9e9e;
font-size: 11px; }
}
.fz12 { .c20C997 {
font-size: 12px; color: #20c997;
} }
.fz13 {
font-size: 13px; .c02C854 {
} color: #02c854;
.fz14 { }
font-size: 14px;
} .cff9800 {
.fz15 { color: #ff9800;
font-size: 15px; }
}
.fz16 { .cF1416C {
font-size: 16px; color: #f1416c;
} }
.fz17 {
font-size: 17px; .cF57A98 {
} color: #f57a98;
.fz18 { }
font-size: 18px;
} .c04C8C8 {
.fbold { color: #04c8c8;
font-weight: bold; }
}
.ml { .c059FF6 {
margin-left: 10px; color: #059ff6;
} }
.mr {
margin-right: 10px; .c3FC4FF {
} color: #3fc4ff;
.mt { }
margin-top: 10px;
} .fz10 {
.mt20 { font-size: 10px;
margin-top: 20px; }
}
.mb { .fz11 {
margin-bottom: 10px; font-size: 11px;
} }
.mb20 {
margin-bottom: 20px; .fz12 {
} font-size: 12px;
.mx { }
margin-left: 10px;
margin-right: 10px; .fz13 {
} font-size: 13px;
.mx5 { }
margin-left: 5px;
margin-right: 5px; .fz14 {
} font-size: 14px;
.mb5 { }
margin-bottom: 5px;
} .fz15 {
.py { font-size: 15px;
padding: 15px 0; }
}
.py5 { .fz16 {
padding: 5px 0; font-size: 16px;
} }
.px5 {
padding: 0 5px; .fz17 {
} font-size: 17px;
.px15 { }
padding: 0 15px;
} .fz18 {
.pa15 { font-size: 18px;
padding: 15px; }
}
.py20 { .fbold {
padding: 20px 0; font-weight: bold;
} }
.pb5 {
padding: 0 0 5px 0; .ml {
} margin-left: 10px;
.pa { }
padding: 10px 20px;
} .mr {
.pa20 { margin-right: 10px;
padding: 20px; }
}
.pt20 { .mt {
padding: 20px 0; margin-top: 10px;
} }
.borderD {
border-bottom: 1px dashed #dddddd; .mt20 {
} margin-top: 20px;
.bgf { }
background: #ffffff;
} .mb {
.bgf5 { margin-bottom: 10px;
background: #f5f5f5; }
}
.bgE8F5E9 { .mb20 {
background: #e8f5e9; margin-bottom: 20px;
} }
.bgD9F3FF {
background: #d9f3ff; .mx {
} margin-left: 10px;
.bgFAEAED { margin-right: 10px;
background: #faeaed; }
}
.bj { .mx5 {
background: #ffffff; margin-left: 5px;
} margin-right: 5px;
.bjFFF3E0 { }
background: #FFF3E0;
} .mb5 {
.radius5 { margin-bottom: 5px;
border-radius: 5px; }
}
.cursor-pointer { .py {
cursor: pointer; padding: 15px 0;
} }
.relative {
position: relative; .py5 {
} padding: 5px 0;
.absolute { }
position: absolute;
} .px5 {
.left0 { padding: 0 5px;
left: 0; }
}
.right0 { .px15 {
right: 0; padding: 0 15px;
} }
.top0 {
top: 0; .pa15 {
} padding: 15px;
.bottom0 { }
bottom: 0;
} .py20 {
.left20 { padding: 20px 0;
left: 020px; }
}
.right20 { .pb5 {
right: 20px; padding: 0 0 5px 0;
} }
.top20 {
top: 20px; .pa {
} padding: 10px 20px;
.bottom20 { }
bottom: 20px;
} .pa20 {
.text-center { padding: 20px;
text-align: center; }
}
</style> .pt20 {
padding: 20px 0;
}
\ No newline at end of file
.borderD {
border-bottom: 1px dashed #dddddd;
}
.bgf {
background: #ffffff;
}
.bgf5 {
background: #f5f5f5;
}
.bgE8F5E9 {
background: #e8f5e9;
}
.bgD9F3FF {
background: #d9f3ff;
}
.bgFAEAED {
background: #faeaed;
}
.bj {
background: #ffffff;
}
.bjFFF3E0 {
background: #FFF3E0;
}
.radius5 {
border-radius: 5px;
}
.cursor-pointer {
cursor: pointer;
}
.relative {
position: relative;
}
.absolute {
position: absolute;
}
.left0 {
left: 0;
}
.right0 {
right: 0;
}
.top0 {
top: 0;
}
.bottom0 {
bottom: 0;
}
.left20 {
left: 020px;
}
.right20 {
right: 20px;
}
.top20 {
top: 20px;
}
.bottom20 {
bottom: 20px;
}
.text-center {
text-align: center;
}
</style>
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList.vue
View file @ e6bb6d93
...@@ -353,7 +353,6 @@ ...@@ -353,7 +353,6 @@
}, },
//保存航班信息 //保存航班信息
savePriceFlight(item) { savePriceFlight(item) {
console.log('保存航班信息', item)
if(!/([0|1][0-9])|(2[0|1|2|3]):[0|1|2|3|4|5][0-9]/.test(item.DepartureTime)) { if(!/([0|1][0-9])|(2[0|1|2|3]):[0|1|2|3|4|5][0-9]/.test(item.DepartureTime)) {
this.$message.error('起飞时间格式不对, 格式如02:06, 23:00') this.$message.error('起飞时间格式不对, 格式如02:06, 23:00')
return return
......
src/components/orderCommon/order-form.vue
View file @ e6bb6d93
<style scoped> <style scoped>
.commonOrderForm { .commonOrderForm {
position: fixed; position: fixed;
left: 0; left: 0;
right: 0; right: 0;
...@@ -10,10 +10,12 @@ ...@@ -10,10 +10,12 @@
border-top: 3px solid #38425d; border-top: 3px solid #38425d;
background-color: #ffffff; background-color: #ffffff;
padding: 10px 10px 0; padding: 10px 10px 0;
width: 100%;padding:20px 20px 10px 80px; width: 100%;
padding: 20px 20px 10px 80px;
} }
.title {
border-left: 3px solid #e95252; .title {
border-left: 3px solid #e95252;
text-indent: 15px; text-indent: 15px;
height: 16px; height: 16px;
font-family: "PingFangSc-Fine"; font-family: "PingFangSc-Fine";
...@@ -21,7 +23,8 @@ ...@@ -21,7 +23,8 @@
margin-bottom: 20px; margin-bottom: 20px;
line-height: 14px; line-height: 14px;
color: #000; color: #000;
} }
</style> </style>
<template> <template>
<div class="commonOrderForm"> <div class="commonOrderForm">
...@@ -160,9 +163,8 @@ ...@@ -160,9 +163,8 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('salesModule.TeamPrice')" prop="TC_Price"> <el-form-item :label="$t('salesModule.TeamPrice')" prop="TC_Price">
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" <el-input v-if="addMsg.GroupType != 4" v-model="addMsg.TC_Price" :disabled="pagesTitle=='跟团游产品'?false:true"
:disabled="pagesTitle=='跟团游产品'?false:true" @input="getTotalPrice()">
@input="getTotalPrice()">
</el-input> </el-input>
<el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input> <el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
</el-form-item> </el-form-item>
...@@ -180,18 +182,18 @@ ...@@ -180,18 +182,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price" v-if="HightUnitPrice === '2'"> <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price" v-if="HightUnitPrice === '2'">
<el-select v-model="addMsg.Unit_Price" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.Unit_Price" filterable :placeholder="$t('pub.pleaseSel')"
@change="getTotalPrice(2)"> @change="getTotalPrice(2)">
<el-option v-for="item in Unit_PriceList" :label="item.LessMoney" :value="item.ID" :key="item.ID"> <el-option v-for="item in Unit_PriceList" :label="item.LessMoney" :value="item.ID" :key="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price" v-else> <el-form-item :label="$t('fnc.cjdanjia')" prop="Unit_Price" v-else>
<el-input v-if="addMsg.GroupType != 4" v-model="addMsg.Unit_Price" @change="getTotalPrice(3)"> <el-input v-if="addMsg.GroupType != 4" v-model="addMsg.Unit_Price" @change="getTotalPrice(3)">
</el-input> </el-input>
<el-input v-else v-model="SingleDMCPrice" @change="getTotalPrice(3)"></el-input> <el-input v-else v-model="SingleDMCPrice" @change="getTotalPrice(3)"></el-input>
</el-form-item> </el-form-item>
<!--高于本团单价--> <!--高于本团单价-->
<el-form-item :label="$t('salesModule.UpTeamPrice')" v-show="addMsg.GroupType != '4'"> <el-form-item :label="$t('salesModule.UpTeamPrice')" v-show="addMsg.GroupType != '4'">
<el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch> <el-switch v-model="HightUnitPrice" active-value="1" inactive-value="2"></el-switch>
...@@ -232,40 +234,45 @@ ...@@ -232,40 +234,45 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="pagesTitle=='跟团游产品'"> <template v-if="pagesTitle=='跟团游产品'">
<el-col :span="4"> <el-col :span="4">
<p v-if="priceObj.IsSupportChildren == 2" <p v-if="priceObj.IsSupportChildren == 2"
style="color:#e95252;font-size:12px;line-height:40px;text-align:center; "> style="color:#e95252;font-size:12px;line-height:40px;text-align:center; ">
{{ $t("salesModule.NoSupplier") }}! {{ $t("salesModule.NoSupplier") }}!
</p> </p>
<el-form-item v-if="priceObj.IsSupportChildren == 1" :label="$t('Operation.Op_childNobed')" <el-form-item v-if="priceObj.IsSupportChildren == 1" :label="$t('Operation.Op_childNobed')"
prop="ChirdNoNeedBedNum"> prop="ChirdNoNeedBedNum">
<el-input v-model="addMsg.ChirdNoNeedBedNum" @keyup.native="checkInteger(addMsg, 'ChirdNoNeedBedNum')" <el-input v-model="addMsg.ChirdNoNeedBedNum" @keyup.native="checkInteger(addMsg, 'ChirdNoNeedBedNum')"
@input=" @input="
getNumber(); getNumber();
getHouseNo(); getHouseNo();
getTotalPrice(); getTotalPrice();
autoRemarks('ChirdNoNeedBedNum', '儿童不占床'); autoRemarks('ChirdNoNeedBedNum', '儿童不占床');
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="priceObj.IsSupportChildren == 1" v-show="addMsg.GroupType !== '4'"> <el-col :span="4" v-if="priceObj.IsSupportChildren == 1" v-show="addMsg.GroupType !== '4'">
<el-form-item :label="$t('Operation.Op_childBed')" prop="ChirdNeedBedNum"> <el-form-item :label="$t('Operation.Op_childBed')" prop="ChirdNeedBedNum">
<el-input v-model="addMsg.ChirdNeedBedNum" :disabled="addMsg.GroupType === '4'" <el-input v-model="addMsg.ChirdNeedBedNum" :disabled="addMsg.GroupType === '4'"
@keyup.native="checkInteger(addMsg, 'ChirdNeedBedNum')" @input=" @keyup.native="checkInteger(addMsg, 'ChirdNeedBedNum')" @input="
getNumber(); getNumber();
getHouseNo(); getHouseNo();
getTotalPrice(); getTotalPrice();
autoRemarks('ChirdNeedBedNum', '儿童占床'); autoRemarks('ChirdNeedBedNum', '儿童占床');
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<template v-if="pagesTitle=='当地游产品'"> <template v-if="pagesTitle=='当地游产品'">
<el-col :span="4"> <el-col :span="4">
<p v-if='priceObj.IsSupportChildren==2' style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">{{$t('salesModule.NoSupplier')}}!</p> <p v-if='priceObj.IsSupportChildren==2'
<el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" :label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum"> style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'" @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')" {{$t('salesModule.NoSupplier')}}!</p>
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");' @change="getNumGuest"></el-input> <el-form-item v-if='priceObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'"
:label="$t('salesModule.ChildNum')" prop="ChirdNoNeedBedNum">
<el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'"
@keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@input='getNumber();getHouseNo();getTotalPrice();autoRemarks("ChirdNoNeedBedNum","儿童人数");'
@change="getNumGuest"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
...@@ -280,49 +287,49 @@ ...@@ -280,49 +287,49 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="pagesTitle=='跟团游产品'"> <template v-if="pagesTitle=='跟团游产品'">
<el-col :span="4" v-show="addMsg.GroupType !== '4'"> <el-col :span="4" v-show="addMsg.GroupType !== '4'">
<el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum"> <el-form-item :label="$t('salesModule.OldPeopleNum')" prop="OldPeopleNum">
<el-input v-model="addMsg.OldPeopleNum" :disabled="addMsg.GroupType === '4'" <el-input v-model="addMsg.OldPeopleNum" :disabled="addMsg.GroupType === '4'"
@keyup.native="checkInteger(addMsg, 'OldPeopleNum')" @input=" @keyup.native="checkInteger(addMsg, 'OldPeopleNum')" @input="
getNumber(); getNumber();
getHouseNo(); getHouseNo();
getTotalPrice(); getTotalPrice();
autoRemarks('OldPeopleNum', '老人人数'); autoRemarks('OldPeopleNum', '老人人数');
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<template v-if="pagesTitle=='跟团游产品'"> <template v-if="pagesTitle=='跟团游产品'">
<el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item :label="$t('salesModule.SingleRoomNum')" prop="SingleRoomNum"> <el-form-item :label="$t('salesModule.SingleRoomNum')" prop="SingleRoomNum">
<el-input v-model="addMsg.SingleRoomNum" @keyup.native="checkInteger(addMsg, 'SingleRoomNum')" @input=" <el-input v-model="addMsg.SingleRoomNum" @keyup.native="checkInteger(addMsg, 'SingleRoomNum')" @input="
yzSingleBed(); yzSingleBed();
getTotalPrice(); getTotalPrice();
autoRemarks('SingleRoomNum', '单房数量'); autoRemarks('SingleRoomNum', '单房数量');
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0' && showCity"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0' && showCity">
<el-form-item :label="$t('salesModule.BigRoomNum')" prop="BigRoomNum"> <el-form-item :label="$t('salesModule.BigRoomNum')" prop="BigRoomNum">
<el-input v-model="addMsg.BigRoomNum" @keyup.native="checkInteger(addMsg, 'BigRoomNum')" @input=" <el-input v-model="addMsg.BigRoomNum" @keyup.native="checkInteger(addMsg, 'BigRoomNum')" @input="
yzBigBed(); yzBigBed();
getTotalPrice(); getTotalPrice();
autoRemarks('BigRoomNum', '大床房'); autoRemarks('BigRoomNum', '大床房');
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0' && showCity"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0' && showCity">
<el-form-item :label="$t('salesModule.TripleRoomNum')" prop="TripleRoomNum"> <el-form-item :label="$t('salesModule.TripleRoomNum')" prop="TripleRoomNum">
<el-input v-model="addMsg.TripleRoomNum" @keyup.native="checkInteger(addMsg, 'TripleRoomNum')" @input=" <el-input v-model="addMsg.TripleRoomNum" @keyup.native="checkInteger(addMsg, 'TripleRoomNum')" @input="
yzThreeBed(); yzThreeBed();
getTotalPrice(); getTotalPrice();
autoRemarks('TripleRoomNum', '三人房'); autoRemarks('TripleRoomNum', '三人房');
"></el-input> "></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<el-col :span="4" v-if="pagesTitle=='跟团游产品'"> <el-col :span="4" v-if="pagesTitle=='跟团游产品'">
<el-form-item :label="$t('salesModule.VisaNum')" prop="VisaNum"> <el-form-item :label="$t('salesModule.VisaNum')" prop="VisaNum">
<el-input v-model="addMsg.VisaNum" @keyup.native="checkInteger(addMsg, 'VisaNum')" @input=" <el-input v-model="addMsg.VisaNum" @keyup.native="checkInteger(addMsg, 'VisaNum')" @input="
...@@ -351,16 +358,16 @@ ...@@ -351,16 +358,16 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<template v-if="pagesTitle=='跟团游产品'"> <template v-if="pagesTitle=='跟团游产品'">
<el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item :label="$t('salesModule.PredictRoomNum')" prop="PredictRoomNum"> <el-form-item :label="$t('salesModule.PredictRoomNum')" prop="PredictRoomNum">
<el-input v-model="addMsg.PredictRoomNum" :disabled="true"></el-input> <el-input v-model="addMsg.PredictRoomNum" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('fnc.yszonge')" prop="PreferPrice"> <el-form-item :label="$t('fnc.yszonge')" prop="PreferPrice">
<el-input v-model="addMsg.PreferPrice" :disabled="true"></el-input> <el-input v-model="addMsg.PreferPrice" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<el-col :span="4" v-show="addMsg.CustomerType == 1 || addMsg.CustomerType == 2"> <el-col :span="4" v-show="addMsg.CustomerType == 1 || addMsg.CustomerType == 2">
<el-form-item :label="$t('salesModule.SharePeople')" prop="CommissionSharePeople"> <el-form-item :label="$t('salesModule.SharePeople')" prop="CommissionSharePeople">
...@@ -382,21 +389,21 @@ ...@@ -382,21 +389,21 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<template v-if="pagesTitle=='跟团游产品'"> <template v-if="pagesTitle=='跟团游产品'">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('Airticket.Air_EconomyClass')" prop="YSeatNum"> <el-form-item :label="$t('Airticket.Air_EconomyClass')" prop="YSeatNum">
<el-input v-model="addMsg.YSeatNum" @keyup.native="checkInteger(addMsg, 'YSeatNum')"></el-input> <el-input v-model="addMsg.YSeatNum" @keyup.native="checkInteger(addMsg, 'YSeatNum')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('Airticket.Air_businessClass')" prop="ESeatNum"> <el-form-item :label="$t('Airticket.Air_businessClass')" prop="ESeatNum">
<el-input v-model="addMsg.ESeatNum" @input="getNumber()"></el-input> <el-input v-model="addMsg.ESeatNum" @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('Airticket.Air_firstClass')" prop="FSeatNum"> <el-form-item :label="$t('Airticket.Air_firstClass')" prop="FSeatNum">
<el-input v-model="addMsg.FSeatNum" @input="getNumber()"></el-input> <el-input v-model="addMsg.FSeatNum" @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<!--<el-col :span="4"> <!--<el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum"> <el-form-item label="单地接数量" prop="AirticketNum">
...@@ -407,7 +414,8 @@ ...@@ -407,7 +414,8 @@
<el-form-item :label="$t('salesModule.ScenicRefund')"> <el-form-item :label="$t('salesModule.ScenicRefund')">
<el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr" <el-select filterable multiple class="multiple_input" v-model="addMsg.ScenicRefundArr"
:placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods"> :placeholder="$t('pub.pleaseSel')" @change="ScenicRefundMethods">
<el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id" :key="index"> <el-option v-for="(item,index) in ScenicRefundList" :label="item.ScenicName" :value="item.Id"
:key="index">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -496,8 +504,8 @@ ...@@ -496,8 +504,8 @@
//团期编号，订单编号(新增传0),下单人选择的公司 //团期编号，订单编号(新增传0),下单人选择的公司
props: [ props: [
'showCity', 'showCity',
'PTCID',//团期编号(必须传), 'PTCID', //团期编号(必须传),
'POrderId',//订单编号(新增传0) 'POrderId', //订单编号(新增传0)
'PBranchId', //销售公司/联运公司 'PBranchId', //销售公司/联运公司
'PProductType', //产品类型(1-常规团，2-包机团) 'PProductType', //产品类型(1-常规团，2-包机团)
'productObj', 'productObj',
...@@ -531,63 +539,63 @@ ...@@ -531,63 +539,63 @@
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0, LessMoney: 0,
addMsg: { addMsg: {
price: 0, price: 0,
GroupTypeNeedHouse: 0, GroupTypeNeedHouse: 0,
OrderId: 0, OrderId: 0,
OneSex: 0, OneSex: 0,
TCID: 0, TCID: 0,
CustomerType: "", CustomerType: "",
GroupType: "", GroupType: "",
IndustryCategory: "", IndustryCategory: "",
ContactName: "", ContactName: "",
ContactMobile: "", ContactMobile: "",
CustomerId: "", CustomerId: "",
DepartureCityId: 0, DepartureCityId: 0,
ReturnArriveCityId: "", ReturnArriveCityId: "",
IsIntermodal: "2", IsIntermodal: "2",
IsReturnIntermodal: "2", IsReturnIntermodal: "2",
Unit_Price: 0, Unit_Price: 0,
TC_Price: 0, TC_Price: 0,
ManNum: 0, // 成人数量 ManNum: 0, // 成人数量
ChirdNum: 0, // 小孩数量 ChirdNum: 0, // 小孩数量
ChirdNoNeedBedNum: 0, ChirdNoNeedBedNum: 0,
ChirdNeedBedNum: 0, ChirdNeedBedNum: 0,
BabyNum: 0, BabyNum: 0,
OldPeopleNum: 0, OldPeopleNum: 0,
SingleRoomNum: 0, SingleRoomNum: 0,
PreferPrice: 0, PreferPrice: 0,
YSeatNum: 0, YSeatNum: 0,
ESeatNum: 0, ESeatNum: 0,
FSeatNum: 0, FSeatNum: 0,
Commission: 0, Commission: 0,
ClientSource: 0, ClientSource: 0,
BrandId: 0, BrandId: 0,
TradeWay: "2", TradeWay: "2",
PlatformAccount: "", PlatformAccount: "",
PlatformOrder: "", PlatformOrder: "",
GuestNum: 0, GuestNum: 0,
IsChildrenTour: 0, IsChildrenTour: 0,
IsBirdDiscount: 0, IsBirdDiscount: 0,
PredictRoomNum: 0, PredictRoomNum: 0,
BigRoomNum: 0, BigRoomNum: 0,
TripleRoomNum: 0, TripleRoomNum: 0,
TradeDate: "", TradeDate: "",
CostType: "", CostType: "",
Remarks: "", Remarks: "",
VisaNum: 0, VisaNum: 0,
SafeNum: 0, SafeNum: 0,
AirticketNum: 0, AirticketNum: 0,
ScenicRefundArr: [], ScenicRefundArr: [],
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: 0, CommissionSharePeople: 0,
CommissionShareMoney: 0, CommissionShareMoney: 0,
OrderForm: "1", OrderForm: "1",
SonControlID: "-1", SonControlID: "-1",
IsShowMessagesMoney: "2", IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件 QuotationUrl: "", //单团附件
LureEmpId: 0, //引流id LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID CRMGuestId: 0, //客人ID
}, },
uploadLloading: false, uploadLloading: false,
rules: { rules: {
...@@ -1048,7 +1056,7 @@ ...@@ -1048,7 +1056,7 @@
}, },
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.minPrice = res.data.data&&res.data.data.LowDeposit; this.minPrice = res.data.data && res.data.data.LowDeposit;
} }
}, },
); );
...@@ -1068,11 +1076,11 @@ ...@@ -1068,11 +1076,11 @@
}, },
//计算少价金额 //计算少价金额
getTypePrice() { getTypePrice() {
if(this.pagesTitle=='当地游产品'){ if (this.pagesTitle == '当地游产品') {
this.addMsg.ContactName = '' this.addMsg.ContactName = ''
this.addMsg.ContactMobile = '' this.addMsg.ContactMobile = ''
} }
if (this.addMsg.CustomerType == 1) { if (this.addMsg.CustomerType == 1) {
this.addMsg.TC_Price = this.priceObj.B2BMemberPrice; this.addMsg.TC_Price = this.priceObj.B2BMemberPrice;
this.addMsg.Unit_Price = this.priceObj.B2BMemberPrice; this.addMsg.Unit_Price = this.priceObj.B2BMemberPrice;
...@@ -1334,63 +1342,63 @@ ...@@ -1334,63 +1342,63 @@
//清空表单信息 //清空表单信息
clearMsg() { clearMsg() {
this.addMsg = { this.addMsg = {
price: 0, price: 0,
GroupTypeNeedHouse: 0, GroupTypeNeedHouse: 0,
OrderId: 0, OrderId: 0,
OneSex: 0, OneSex: 0,
TCID: 0, TCID: 0,
CustomerType: "", CustomerType: "",
GroupType: "", GroupType: "",
IndustryCategory: "", IndustryCategory: "",
ContactName: "", ContactName: "",
ContactMobile: "", ContactMobile: "",
CustomerId: "", CustomerId: "",
DepartureCityId: 0, DepartureCityId: 0,
ReturnArriveCityId: "", ReturnArriveCityId: "",
IsIntermodal: "2", IsIntermodal: "2",
IsReturnIntermodal: "2", IsReturnIntermodal: "2",
Unit_Price: 0, Unit_Price: 0,
TC_Price: 0, TC_Price: 0,
ManNum: 0, // 成人数量 ManNum: 0, // 成人数量
ChirdNum: 0, // 小孩数量 ChirdNum: 0, // 小孩数量
ChirdNoNeedBedNum: 0, ChirdNoNeedBedNum: 0,
ChirdNeedBedNum: 0, ChirdNeedBedNum: 0,
BabyNum: 0, BabyNum: 0,
OldPeopleNum: 0, OldPeopleNum: 0,
SingleRoomNum: 0, SingleRoomNum: 0,
PreferPrice: 0, PreferPrice: 0,
YSeatNum: 0, YSeatNum: 0,
ESeatNum: 0, ESeatNum: 0,
FSeatNum: 0, FSeatNum: 0,
Commission: 0, Commission: 0,
ClientSource: 0, ClientSource: 0,
BrandId: 0, BrandId: 0,
TradeWay: "2", TradeWay: "2",
PlatformAccount: "", PlatformAccount: "",
PlatformOrder: "", PlatformOrder: "",
GuestNum: 0, GuestNum: 0,
IsChildrenTour: 0, IsChildrenTour: 0,
IsBirdDiscount: 0, IsBirdDiscount: 0,
PredictRoomNum: 0, PredictRoomNum: 0,
BigRoomNum: 0, BigRoomNum: 0,
TripleRoomNum: 0, TripleRoomNum: 0,
TradeDate: "", TradeDate: "",
CostType: "", CostType: "",
Remarks: "", Remarks: "",
VisaNum: 0, VisaNum: 0,
SafeNum: 0, SafeNum: 0,
AirticketNum: 0, AirticketNum: 0,
ScenicRefundArr: [], ScenicRefundArr: [],
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: 0, CommissionSharePeople: 0,
CommissionShareMoney: 0, CommissionShareMoney: 0,
OrderForm: "1", OrderForm: "1",
SonControlID: "-1", SonControlID: "-1",
IsShowMessagesMoney: "2", IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件 QuotationUrl: "", //单团附件
LureEmpId: 0, //引流id LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID CRMGuestId: 0, //客人ID
} }
this.remarkMsg = { this.remarkMsg = {
zc: "", zc: "",
...@@ -1405,7 +1413,7 @@ ...@@ -1405,7 +1413,7 @@
qz: "", qz: "",
qzf: "", qzf: "",
} }
if(this.pagesTitle=='当地游产品'){ if (this.pagesTitle == '当地游产品') {
this.addMsg.GroupType = "1" this.addMsg.GroupType = "1"
} }
this.clientSourceList = []; this.clientSourceList = [];
...@@ -1518,9 +1526,9 @@ ...@@ -1518,9 +1526,9 @@
this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren; this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren;
this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount;
let url let url
if(this.PProductType==1){ if (this.PProductType == 1) {
url = 'sellorder_post_SetOrderInfo_02' url = 'sellorder_post_SetOrderInfo_02'
}else if(this.PProductType==2){ } else if (this.PProductType == 2) {
url = 'sellorder_post_SetTravelTeamOrderForB2B' //团下单接口sellorder_post_SetOrderInfoForB2B url = 'sellorder_post_SetTravelTeamOrderForB2B' //团下单接口sellorder_post_SetOrderInfoForB2B
} }
this.apipost(url, this.apipost(url,
...@@ -1675,11 +1683,10 @@ ...@@ -1675,11 +1683,10 @@
"sellorder_get_GetSellClientTypeEnumList", {}, "sellorder_get_GetSellClientTypeEnumList", {},
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if(this.showCity) { if (this.showCity) {
this.customerTypeList = res.data.data; this.customerTypeList = res.data.data;
} else { } else {
this.customerTypeList = res.data.data.filter(item => item.Id < 3); this.customerTypeList = res.data.data.filter(item => item.Id < 3);
console.log('this.customerTypeList', this.customerTypeList)
} }
} }
}, },
...@@ -1807,8 +1814,8 @@ ...@@ -1807,8 +1814,8 @@
this.getTradeWay(); this.getTradeWay();
}, },
watch: { watch: {
productObj:{ productObj: {
handler(oldValue, newVal){ handler(oldValue, newVal) {
this.clearMsg(); this.clearMsg();
this.getTravelPirceInfo() this.getTravelPirceInfo()
this.addMsg.DepartureCityId = oldValue.StartCityID this.addMsg.DepartureCityId = oldValue.StartCityID
...@@ -1816,7 +1823,7 @@ ...@@ -1816,7 +1823,7 @@
this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime; this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime; this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
this.priceObj = JSON.parse(JSON.stringify(oldValue)) this.priceObj = JSON.parse(JSON.stringify(oldValue))
if(this.pagesTitle=='当地游产品'){ if (this.pagesTitle == '当地游产品') {
let str = '' let str = ''
if (oldValue.OtherPrice > 0) { if (oldValue.OtherPrice > 0) {
str += '杂费' + oldValue.OtherPrice + '/人;' str += '杂费' + oldValue.OtherPrice + '/人;'
...@@ -1844,4 +1851,5 @@ ...@@ -1844,4 +1851,5 @@
} }
} }
}; };
</script>
\ No newline at end of file </script>
src/components/platformModule/menuManagement.vue
View file @ e6bb6d93
...@@ -363,14 +363,10 @@ ...@@ -363,14 +363,10 @@
this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1 this.addMsg.menutype = updateList.MenuType?updateList.MenuType:1
this.addMsg.MenuStatus = updateList.MenuStatus.toString() this.addMsg.MenuStatus = updateList.MenuStatus.toString()
let style = JSON.parse(updateList.MenuStyle) let style = JSON.parse(updateList.MenuStyle)
// this.addMsg.MenuStyleIcon = style.icon
console.log(updateList.MenuType,'----')
this.addMsg.MenuStyleIcon = style.icon this.addMsg.MenuStyleIcon = style.icon
this.addMsg.MenuStyleColor = style.color this.addMsg.MenuStyleColor = style.color
this.currentUpdateIndex = index this.currentUpdateIndex = index
}, err => {}) }, err => {})
this.getChildMenu(); this.getChildMenu();
if (this.addMsg.MenuStyle && this.addMsg.MenuStyle != "") { if (this.addMsg.MenuStyle && this.addMsg.MenuStyle != "") {
let style = JSON.parse(this.DataList[index].MenuStyle) let style = JSON.parse(this.DataList[index].MenuStyle)
......
src/components/scenicSpot/scenicSpotPackagePrice.vue
View file @ e6bb6d93
...@@ -786,7 +786,7 @@ export default { ...@@ -786,7 +786,7 @@ export default {
} }
}, },
e=>{ e=>{
console.log(e.message)
} }
); );
}, },
......
src/pubComponents/buyGroup.vue
View file @ e6bb6d93
...@@ -1374,7 +1374,6 @@ ...@@ -1374,7 +1374,6 @@
}, },
// 计算价格 // 计算价格
getTotalPrice(t) { getTotalPrice(t) {
console.log('getTotalPrice', this.addObj)
if (t === 3) { if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") { if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error("请输入正确的价格！"); this.$message.error("请输入正确的价格！");
...@@ -1525,18 +1524,6 @@ ...@@ -1525,18 +1524,6 @@
dandijie = dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum); this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
} }
console.log('this.addObj.OtherPrice', this.addObj.OtherPrice, (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),this.addObj.VisaPrice,(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) -
Number(this.addMsg.VisaNum)))
this.addMsg.PreferPrice = this.addMsg.PreferPrice =
dandijie + dandijie +
lianyun + lianyun +
...@@ -1689,12 +1676,10 @@ ...@@ -1689,12 +1676,10 @@
}, },
saveOrder() { saveOrder() {
this.addMsg.TCID = this.addObj.TCID this.addMsg.TCID = this.addObj.TCID
console.log('saveOrder', this.addMsg)
this.$emit('change', this.addMsg) this.$emit('change', this.addMsg)
}, },
// todo 购买的产品信息，需要从外部传入 // todo 购买的产品信息，需要从外部传入
goBuy(obj) { goBuy(obj) {
console.log('goBuy', obj)
if(!obj) return if(!obj) return
this.isUpdateSharePeople = false; this.isUpdateSharePeople = false;
this.isShowLayer = true; this.isShowLayer = true;
......
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