Skip to content

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

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

parents 2c77aaf5 48b8c965
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 66 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 09309a06
......@@ -17,7 +17,7 @@
.CostNewPrice .QuotationFirstDiv1 .el-form-item__content .el-select {
width: calc(100% - 100px);
}
.CostNewPrice .CP_ComTitle2{ color:blue;font-weight: bold;}
</style>
<template>
......@@ -49,12 +49,31 @@
<el-row>
<el-col :span="24">
<el-form-item label="团队标题" label-width="100px">
<el-input v-model="postConfig.Title" type="textarea" style="width:94%"
<el-input v-model="postConfig.Title" type="textarea" style="width:91%"
:autosize="{minRows: 1, maxRows: 2 }" resize="none" placeholder="请填写团队标题" maxlength="200"></el-input>
</el-form-item>
</el-col>
</el-row>
<div class="seat-box">
<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-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行程天数" label-width="100px">
<el-input class="w120 LowNum" v-model="postConfig.DayNum"
@keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
<template slot="append">天</template>
</el-input>
<el-input class="w120 LowNum" v-model="postConfig.NightNum" style="display:none;"
@keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
<template slot="append">晚</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<div class="seat-box" style="display:none;">
<div class="left" style="float:left;margin:6px 0 0 64px;">座位</div>
<div class="right">
<el-row :gutter="20">
......@@ -92,25 +111,6 @@
</el-row>
</div>
</div>
<div class="seat-box">
<div class="left" style="float:left;margin:6px 0 0 34px;">行程天数</div>
<div class="right">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item>
<el-input class="w120 LowNum" v-model="postConfig.DayNum"
@keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
<template slot="append">天</template>
</el-input>
<el-input class="w120 LowNum" v-model="postConfig.NightNum"
@keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
<template slot="append">晚</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</div>
<table class="CP_comTable">
<tr>
......@@ -143,9 +143,7 @@
</el-input>
</td>
</tr>
</table>
<table class="CP_comTable">
<tr>
<tr>
<td class="CP_comBack" width="170">人数</td>
<td v-for="(item,index) in CostNumberList" :key='item.subCode'>
<el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
......@@ -176,16 +174,17 @@
</td>
</tr>
</table>
<table class="CostPriceTable">
<tr>
<th rowspan="2" width='80'>Day</th>
<th rowspan="2" width='50'>Day</th>
<th rowspan="2" width='200'>行程大点</th>
<th rowspan="2" width="200">币种</th>
<th rowspan="2" width='200'>酒店</th>
<th rowspan="2" width='200'>车</th>
<th rowspan="2" width='200'>门票</th>
<th colspan="3" width='200'>餐</th>
<th rowspan="2" width="100">币种</th>
<th rowspan="2" width='100'>酒店</th>
<th rowspan="2" width='100'>车</th>
<th rowspan="2" width='100'>门票</th>
<th colspan="3" width='100'>餐</th>
</tr>
<tr>
<th width="90">早</th>
......@@ -234,9 +233,22 @@
@keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
</td>
</tr>
</table>
<div class="CP_ComTitle">内陆段交通部分</div>
<table class="CostPriceTable">
<tr>
<td class="CP_ComTitle2" colspan="4">
内陆段交通部分
</td>
<td>
</td>
<td>
</td>
<td class="CP_ComTitle2" colspan="3">
杂支部分
</td>
</tr>
<tr>
<td width='50'>1</td>
<td width='200'>内陆段机位（每人）</td>
......@@ -256,6 +268,18 @@
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
</td>
<td>
</td>
<td width='50'>1</td>
<td width='200'>签证费（每人）</td>
<td colspan='3'>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.VisaMoney"
@keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>2</td>
......@@ -276,6 +300,18 @@
@keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
<td>
</td>
<td>
</td>
<td>2</td>
<td>保险费（每人）</td>
<td>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.SafeMoney"
@keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>3</td>
......@@ -296,32 +332,11 @@
@keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
</el-form-item>
</td>
</tr>
</table>
<div class="CP_ComTitle">杂支部分</div>
<table class="CostPriceTable">
<tr>
<td width='50'>1</td>
<td width='200'>签证费（每人）</td>
<td colspan='3'>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.VisaMoney"
@keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
</el-form-item>
<td>
</td>
</tr>
<tr>
<td>2</td>
<td>保险费（每人）</td>
<td>
<el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.SafeMoney"
@keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
</el-form-item>
<td>
</td>
</tr>
<tr>
<td>3</td>
<td>3</td>
<td>领队小费</td>
<td>
<el-form-item>
......@@ -330,7 +345,19 @@
</el-form-item>
</td>
</tr>
<tr>
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>4</td>
<td>司机、导游小费</td>
<td>
......@@ -341,6 +368,7 @@
</td>
</tr>
</table>
<div class="CP_ComTitle">其他支出</div>
<table class="CostPriceTable">
<tr>
......@@ -601,12 +629,11 @@
return totalMoney;
},
//获取系列列表
getLineTeamList(lineId,isClear) {
if(isClear&&isClear==1)
{
this.postConfig.LineteamId = 0;
getLineTeamList(lineId, isClear) {
if (isClear && isClear == 1) {
this.postConfig.LineteamId = 0;
}
let msg = {
lineID: lineId,
isTOOP: 1
......
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @ 09309a06
......@@ -145,22 +145,22 @@
<el-form-item>
<el-input placeholder="" v-model="teamPrice.B2BMemberPrice"
@keyup.native="checkPrice(teamPrice,'B2BMemberPrice')" class="w200 ComSeat">
<template slot="prepend">同行会员</template>
<template slot="prepend">成本价格</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.B2BPrice" @keyup.native="checkPrice(teamPrice,'B2BPrice')"
class="w200 ComSeat">
<template slot="prepend">同行</template>
<template slot="prepend">销售价格</template>
</el-input>
</el-form-item>
<el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.B2CMemberPrice"
@keyup.native="checkPrice(teamPrice,'B2CMemberPrice')" class="w200 ComSeat">
<template slot="prepend">直客会员</template>
</el-input>
</el-form-item>
<el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.B2CPrice" @keyup.native="checkPrice(teamPrice,'B2CPrice')"
class="w200 ComSeat">
<template slot="prepend">直客</template>
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 09309a06
......@@ -51,6 +51,7 @@
NightNum: 0, //晚数
StartCityId: 0,
ReturnArriveCityId: 0, //返回抵达城市
CustomerName:"",//客户名称
},
dayCostPriceList: [], //报价列表
isSubmit: true,
......@@ -204,6 +205,7 @@
if (tempData.NightNum && tempData.NightNum > 0) {
this.postData.NightNum = tempData.NightNum;
}
this.postData.CustomerName=tempData.CustomerName;
this.LineList = tempData.LineList;
if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
0) {
......
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