Skip to content

S
SuperMan
Commit d687216c authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 43d97e64 18a07a8c
Show whitespace changes
Inline Side-by-side
Showing with 250 additions and 183 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ d687216c
......@@ -19,7 +19,11 @@
}
.CostNewPrice .CP_ComTitle2{ color:blue;font-weight: bold;}
.CostNewTable{
width:80%;
width:74%;
}
.CostNewTable td{
padding:5px;
height: 40px;
}
.CostPriceDiv{
float:left;
......@@ -29,6 +33,9 @@
.CP_ComTitle{
color:blue;
}
.w505{
width:505px!important;
}
</style>
<template>
......@@ -37,9 +44,9 @@
<el-form>
<div class="QuotationFirstDiv1">
<el-row :gutter="40">
<el-col :span="12">
<el-col :span="6">
<el-form-item label="线路" label-width="100px">
<el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')"
<el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" class="w300"
@change="getLineTeamList(postConfig.LineId,1)" filterable>
<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'>
......@@ -47,33 +54,31 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="系列" label-width="100px">
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable class="w300">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="团队标题" label-width="100px">
<el-input v-model="postConfig.Title" type="textarea" style="width:91%"
:autosize="{minRows: 1, maxRows: 2 }" resize="none" placeholder="请填写团队标题" maxlength="200"></el-input>
<el-col :span="6">
<el-form-item label="客户名称" label-width="100px">
<el-input v-model="postConfig.CustomerName" type="text" class="w300" placeholder="客户名称" maxlength="200"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="40">
<el-col :span="12">
<el-form-item label="客户名称" label-width="100px">
<el-input v-model="postConfig.CustomerName" type="text" style="width:385px" placeholder="客户名称" maxlength="200"></el-input>
<el-col :span="6">
<el-form-item label="团队标题" label-width="100px">
<el-input v-model="postConfig.Title" type="textarea" class="w300"
:autosize="{minRows: 1, maxRows: 2 }" resize="none" placeholder="请填写团队标题" maxlength="200"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="行程天数" label-width="100px">
<el-input class="w120 LowNum" v-model="postConfig.DayNum"
<el-input class="w300 LowNum" v-model="postConfig.DayNum"
@keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
<template slot="append">天</template>
</el-input>
......@@ -185,11 +190,11 @@
</td>
</tr>
</table>
<br/>
<table class="CostPriceTable CostNewTable">
<tr>
<th rowspan="2" width='50'>Day</th>
<th rowspan="2" width='130'>Day</th>
<th rowspan="2" width='200'>行程大点</th>
<th rowspan="2" width="100">币种</th>
<th rowspan="2" width='100'>酒店</th>
......@@ -198,9 +203,9 @@
<th colspan="3" width='100'>餐</th>
</tr>
<tr>
<th width="90">早</th>
<th width="90">中</th>
<th width="90">晚</th>
<th width="120">早</th>
<th width="100">中</th>
<th width="100">晚</th>
</tr>
<tr v-for="subItem in dayCostPrice" :key="subItem.subCode">
<td align="center">{{subItem.DayNum}}</td>
......@@ -244,22 +249,17 @@
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td>
</tr>
</table>
<table class="CostPriceTable CostNewTable">
<tr>
<td class="CP_ComTitle2" colspan="4">
内陆段交通部分
</td>
<td class="CP_ComTitle2" colspan="3">
杂支部分
</td>
<td colspan="9"></td>
</tr>
<tr>
<td width='50'>1</td>
<td width='200'>内陆段机位（每人）</td>
<td width='200'>
<td class="CP_ComTitle2" colspan="5">内陆段交通部分</td>
<td class="CP_ComTitle2" colspan="4">杂支部分</td>
</tr>
<tr>
<td>1</td>
<td>内陆段机位（每人）</td>
<td>
<el-form-item>
<el-select v-model='OtherPrice.InlandAirTicketCurrency'>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
......@@ -269,15 +269,15 @@
</el-select>
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.InlandAirTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td width='50'>1</td>
<td width='200'>签证费（每人）</td>
<td colspan='3'>
<td>1</td>
<td>签证费（每人）</td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.VisaMoney"
@keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
......@@ -286,7 +286,7 @@
</tr>
<tr>
<td>2</td>
<td>内陆段船票（每人</td>
<td>内陆段船票（每人）</td>
<td>
<el-form-item>
<el-select v-model='OtherPrice.InlandShipTicketCurrency'>
......@@ -297,7 +297,7 @@
</el-select>
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.InlandShipTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
......@@ -305,7 +305,7 @@
</td>
<td>2</td>
<td>保险费（每人）</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.SafeMoney"
@keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
......@@ -325,7 +325,7 @@
</el-select>
</el-form-item>
</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.InlandTrainTicketMoney"
@keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
......@@ -333,7 +333,7 @@
</td>
<td>3</td>
<td>领队小费</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.LeaderTripMoney"
@keyup.native="checkPrice(OtherPrice,'LeaderTripMoney'),getchange()"></el-input>
......@@ -341,88 +341,74 @@
</td>
</tr>
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td colspan="5"></td>
<td>4</td>
<td>司机、导游小费</td>
<td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w180" v-model="OtherPrice.DriverGuideMoney"
@keyup.native="checkPrice(OtherPrice,'DriverGuideMoney'),getchange()"></el-input>
</el-form-item>
</td>
</tr>
</table>
<div class="clearfix">
<div class="CostPriceDiv">
<div class="CP_ComTitle">其他支出</div>
<table class="CostPriceTable">
<tr>
<td><span class="CP_ComTitle">摘要</span></td>
<td><span class="CP_ComTitle">金额（人民币）</span></td>
<td colspan="9"></td>
</tr>
<tr>
<td width='150'>销售提成1%</td>
<td colspan='3'>
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.SalesCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td class="CP_ComTitle2" colspan="2">其他支出</td>
<td class="CP_ComTitle2" colspan="2">机票</td>
<td class="CP_ComTitle2" colspan="2">收入</td>
<td class="CP_ComTitle2" colspan="3">团负费</td>
</tr>
<tr>
<td>作业处提成</td>
<td class="CP_ComTitle2">摘要</td>
<td class="CP_ComTitle2">金额（人民币）</td>
<td class="CP_ComTitle2">摘要</td>
<td class="CP_ComTitle2">金额（人民币）</td>
<td class="CP_ComTitle2">摘要</td>
<td class="CP_ComTitle2">金额（人民币）</td>
<td class="CP_ComTitle2">摘要</td>
<td class="CP_ComTitle2" colspan="2">金额（人民币）</td>
</tr>
<tr>
<td>销售提成1%</td>
<td>
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.OfficeCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
<el-input type='text' class="w160" v-model="OtherPrice.SalesCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
</el-form-item>
</td>
</tr>
</table>
</div>
<div class="CostPriceDiv">
<div class="CP_ComTitle">机票</div>
<table class="CostPriceTable">
<tr>
<td><span class="CP_ComTitle">摘要</span></td>
<td><span class="CP_ComTitle">金额（人民币）</span></td>
</tr>
<tr>
<td width='150'>机票</td>
<td>机票</td>
<td>
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.AirTicketMoeny"
@keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
</el-form-item>
</td>
</tr>
</table>
</div>
<div class="CostPriceDiv">
<div class="CP_ComTitle">收入</div>
<table class="CostPriceTable">
<tr>
<td><span class="CP_ComTitle">摘要</span></td>
<td><span class="CP_ComTitle">金额（人民币）</span></td>
</tr>
<tr>
<td width='150'>客人小费收入</td>
<td colspan='3'>
<td>客人小费收入</td>
<td>
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.TripMoney"
@keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input>
</el-form-item>
</td>
<td>KB</td>
<td colspan="2">
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.KBMoney"
@keyup.native="checkPrice(OtherPrice,'KBMoney',true)"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>作业处提成</td>
<td>
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.OfficeCommissionMoney"
@keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="2"></td>
<td>导游人头费</td>
<td>
<el-form-item>
......@@ -430,30 +416,82 @@
@keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="3"></td>
</tr>
<tr>
<td colspan="9"></td>
</tr>
</table>
</div>
<div class="CostPriceDiv">
<div class="CP_ComTitle">团负费</div>
<table class="CostPriceTable">
<tr>
<td><span class="CP_ComTitle">摘要</span></td>
<td><span class="CP_ComTitle">金额（人民币）</span></td>
<td colspan="9" class="CP_ComTitle2">领队分摊部分</td>
</tr>
<tr>
<td width='150'>KB</td>
<td>人数</td>
<td>机票</td>
<td>门票</td>
<td>单房差</td>
<td>内陆段交通</td>
<td>杂费</td>
<td colspan="3">小计</td>
</tr>
<tr>
<td></td>
<td>
<el-form-item>
<el-input type='text' class="w160" v-model="OtherPrice.KBMoney"
@keyup.native="checkPrice(OtherPrice,'KBMoney',true)"></el-input>
<el-input type='text' class="w120" v-model="OtherPrice.AirTicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.TicketShareMoney"
@keyup.native="checkPrice(OtherPrice,'TicketShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.SingleRoomShareMoney"
@keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.InlandTrafficShareMoney"
@keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.OtherShareMoney"
@keyup.native="checkPrice(OtherPrice,'OtherShareMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="3"></td>
</tr>
<tr v-for="item in CostNumberList" :key="item.subCode">
<td>{{item.PeopleNumber}}+1</td>
<td>{{item.AirTicketMoney}}</td>
<td>{{item.TicketMoney}}</td>
<td>{{item.SingleRoomMoney}}</td>
<td>{{item.InlandTrafficMoney}}</td>
<td>{{item.OtherMoney}}</td>
<td colspan="3">{{item.SubtotalMoney}}</td>
</tr>
<tr>
<td colspan="9"></td>
</tr>
<tr>
<td colspan="9" class="CP_ComTitle2">成本统计</td>
</tr>
<tr>
<td>人数统计</td>
<td colspan="8"></td>
</tr>
<tr v-for="item in CostNumberList" :key="item.subCode">
<td>{{item.PeopleNumber}}+1</td>
<td colspan="8">{{item.TotalMoney}}</td>
</tr>
</table>
</div>
</div>
<div class="CP_ComTitle">领队分摊部分</div>
<!-- <div class="CP_ComTitle">领队分摊部分</div>
<table class="CP_comTable">
<tr>
<td width='200'>人数</td>
......@@ -529,9 +567,9 @@
{{item.SubtotalMoney}}
</td>
</tr>
</table>
</table> -->
<div class="Cost_Line"></div>
<div class="CP_ComTitle Cost_Title">成本统计</div>
<!-- <div class="CP_ComTitle Cost_Title">成本统计</div>
<table class="CostPriceTable">
<tr>
<td width='250' rowspan="2" class="CP_comBack">
......@@ -546,7 +584,7 @@
{{item.TotalMoney}}
</td>
</tr>
</table>
</table> -->
</el-form>
</div>
</div>
......@@ -781,6 +819,7 @@
var CostNumberObj = this.$tripUtils.CostNumber();
CostNumberObj.PeopleNumber = PeopleNumber;
this.CostNumberList.push(CostNumberObj);
console.log(this.CostNumberList,'costnumerblist');
this.CurrencyNumberListExt.forEach(x => {
var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
CurrencyNumberObj.CurrencyId = x.Key;
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ d687216c
......@@ -9,7 +9,8 @@
<li>
<span>
<em>所属线路</em>
<el-select v-model="queryData.LineId" class='w200' filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-select v-model="queryData.LineId" class='w200' filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
......@@ -46,9 +47,14 @@
<div class="commonContent" v-loading="loading">
<ul class="_content">
<li v-for="item in dataList" :key="item.subCode" :data-id="item.ID">
<div class="_left" style="padding:0;flex:0.3">
<div class="QT_CodeNum">
{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}
</div>
</div>
<div class="_left">
<div>
<p class="quoListName" >
<div style="padding-left:10px">
<p style="font-size:14px">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
<span>线路名称:{{item.LineName}}</span>
......@@ -57,9 +63,9 @@
<span>系列名称:{{item.LtName}}</span>
</div>
</div>
<div class="_left">
<div class="_left" style="padding-left:10px">
<div>
<p class="quoListName" >
<p style="font-size:14px">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
<span>{{item.Title}}</span>
......@@ -69,7 +75,8 @@
</div>
</div>
<div class="_cent">
<div class="stayDays">{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</div>
<div style="margin: 0 13px 0 10px;" class="stayDays">
{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</div>
<div class="">
{{$t('op.SalesPrice')}}
<el-popover popper-class="salsSetPrice" trigger="click">
......@@ -82,7 +89,8 @@
<span class="pRightPrice">销售价格：￥{{salesItem.B2BPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_directMember')}}：￥{{salesItem.B2CMemberPrice}}</span>
<span
class="pLeftPrice">{{$t('Operation.Op_directMember')}}：￥{{salesItem.B2CMemberPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_direct')}}：￥{{salesItem.B2CPrice}}</span>
</div>
</div>
......@@ -107,7 +115,8 @@
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{salesItem.VisaPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{salesItem.SingleRoomPrice}}</span>
<span
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{salesItem.SingleRoomPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_zafei')}}：￥{{salesItem.OtherPrice}}</span>
......@@ -128,12 +137,11 @@
</div>
</div>
</div>
<span slot="reference" class="diPrice" @click="getSalsPrice(item.ID)">{{item.SalesPrice}}<span class="qi">{{$t('op.Qi')}}</span></span>
<span slot="reference" class="diPrice" @click="getSalsPrice(item.ID)">{{item.SalesPrice}}<span
class="qi">{{$t('op.Qi')}}</span></span>
</el-popover>
</div>
<div class="QT_CodeNum">
{{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}
</div>
</div>
<div class="_right">
<div class="AuditUserInfo clearfix aa">
......@@ -147,18 +155,28 @@
</div>
<div>
<span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item.ID,item.OpenState)">
{{$t('op.Kai')}}
<el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-nav-hangzheng"></i>
</el-tooltip>
</span>
<span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)" >
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start" popper-class="max-w250">
<span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i>
</el-tooltip>
</span>
<span class="QT-delete opbd" @click="delQuotation(item.ID)" >
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" popper-class="max-w250">
<span class="QT-delete opbd" @click="delQuotation(item.ID)">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-shanchu"></i>
</el-tooltip>
</span>
<span style="background:#85ce61;display:none;" class="opbd" @click="DownLoadFile(item.ID)">
<el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-bb-xiazai"></i>
</el-tooltip>
</span>
</div>
</div>
</li>
......@@ -167,8 +185,8 @@
{{$t('system.content_noData')}}
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryData.currentPage" layout="total,prev, pager, next, jumper"
:page-size="queryData.pageSize" :total="queryData.total">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryData.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryData.pageSize" :total="queryData.total">
</el-pagination>
<el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comDialog"></commonTeamInfo>
......@@ -414,8 +432,8 @@
this.$router.push({
path: path,
query: {
blank:'y',
tab:'报价单'
blank: 'y',
tab: '报价单'
}
});
},
......@@ -424,8 +442,8 @@
path: path,
query: {
configId: 0,
blank:'y',
tab:'报价单'
blank: 'y',
tab: '报价单'
}
});
},
......@@ -447,7 +465,7 @@
query: {
configId: configId,
openState: openState,
isOffer:1
isOffer: 1
}
});
} else {
......@@ -455,9 +473,19 @@
name: path
});
}
}
},
//报价单下载
DownLoadFile(configId) {
this.loading=true;
var newMsg = {
ID: configId
};
var fileName = "成本下载" + this.DataObj.TeamNum + ".xls";
this.GetLocalFile("quotation_get_DownLoadQuotation", newMsg, fileName, res => {
this.loading=false;
});
},
},
mounted() {
this.getLineList();
this.getList();
......
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