Skip to content

S
SuperMan
Commit 4b8a3882 authored by youjie's avatar youjie
Browse files
Options

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

parents f8d2996f cf28cb25
Show whitespace changes
Inline Side-by-side
Showing with 247 additions and 277 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 4b8a3882
...@@ -347,7 +347,6 @@ ...@@ -347,7 +347,6 @@
<!-- <template v-if="CostNumberList&&CostNumberList.length>0"> <!-- <template v-if="CostNumberList&&CostNumberList.length>0">
{{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}} {{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template> --> </template> -->
<div>测试</div>
</td> </td>
<td> <td>
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 4b8a3882
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
<tr> <tr>
<td class="CP_ComTitle2">默认报价单</td> <td class="CP_ComTitle2">默认报价单</td>
<td colspan="13"> <td colspan="13">
<el-switch type="textarea" :disabled="!canEdit" v-model="IsDefault" @change="queryMsg.IsDefault = IsDefault"></el-switch> <el-switch type="textarea" :disabled="!canEdit" v-model="IsDefault"
@change="queryMsg.IsDefault = IsDefault"></el-switch>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
<td colspan="4" class="CP_ComTitle2 CostcomCenter">车</td> <td colspan="4" class="CP_ComTitle2 CostcomCenter">车</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
<td colspan="3" class="CP_ComTitle2 CostcomCenter">餐</td> <td colspan="3" class="CP_ComTitle2 CostcomCenter">餐</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣<br />(不计入成本)</td>
<td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td> <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
</tr> </tr>
<tr> <tr>
...@@ -172,8 +173,6 @@ ...@@ -172,8 +173,6 @@
</el-form-item> </el-form-item>
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
<!-- <el-input type='text' v-model="subItem.HotelName" class="w100" placeholder="酒店备注"></el-input>
<br /> -->
<el-select style="margin:0 5px;" v-model='subItem.ContainDinnerType' class="w100" placeholder="含餐类型" <el-select style="margin:0 5px;" v-model='subItem.ContainDinnerType' class="w100" placeholder="含餐类型"
@change="DinnerTypeChange(subItem)"> @change="DinnerTypeChange(subItem)">
<el-option label="含餐类型" :value='0'></el-option> <el-option label="含餐类型" :value='0'></el-option>
...@@ -234,7 +233,6 @@ ...@@ -234,7 +233,6 @@
</tr> </tr>
</template> </template>
</template> </template>
<template v-for="(childItem,childIndex) in CostNumberList"> <template v-for="(childItem,childIndex) in CostNumberList">
<tr> <tr>
<td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0" <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
...@@ -251,10 +249,10 @@ ...@@ -251,10 +249,10 @@
{{getDayXiaoJi(7,1)}} {{getDayXiaoJi(7,1)}}
</td> </td>
<td> <td>
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}} 人
</td> </td>
<td> <td>
{{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
...@@ -292,10 +290,10 @@ ...@@ -292,10 +290,10 @@
{{getDayXiaoJi(7,2)}} {{getDayXiaoJi(7,2)}}
</td> </td>
<td> <td>
{{childItem.PeopleNumber}} {{childItem.PeopleNumber}} 人
</td> </td>
<td> <td>
{{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
...@@ -337,8 +335,6 @@ ...@@ -337,8 +335,6 @@
</el-form-item> </el-form-item>
</td> </td>
<td> <td>
<!-- <el-input type='text' v-model="subItem.HotelName" class="w100" placeholder="酒店备注"></el-input>
<br /> -->
<el-select v-model='subItem.ContainDinnerType' class="w100" placeholder="含餐类型" <el-select v-model='subItem.ContainDinnerType' class="w100" placeholder="含餐类型"
@change="DinnerTypeChange(subItem)"> @change="DinnerTypeChange(subItem)">
<el-option label="含餐类型" :value='0'></el-option> <el-option label="含餐类型" :value='0'></el-option>
...@@ -416,13 +412,11 @@ ...@@ -416,13 +412,11 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}} {{CostNumberList[0].PeopleNumber}} 人
</template> </template>
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template>
</td> </td>
<td> <td>
{{getDayXiaoJi(3,1)}} {{getDayXiaoJi(3,1)}}
...@@ -458,13 +452,11 @@ ...@@ -458,13 +452,11 @@
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0"> <template v-if="CostNumberList&&CostNumberList.length>0">
{{CostNumberList[0].PeopleNumber}} {{CostNumberList[0].PeopleNumber}} 人
</template> </template>
</td> </td>
<td> <td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template>
</td> </td>
<td> <td>
{{getDayXiaoJi(3,2)}} {{getDayXiaoJi(3,2)}}
...@@ -589,7 +581,7 @@ ...@@ -589,7 +581,7 @@
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2 CostcomCenter">3</td> <td class="CP_ComTitle2 CostcomCenter">3</td>
<td class="CP_ComTitle2">领队小费</td> <td class="CP_ComTitle2">领队小费(每人)</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.LeaderTripMoneyCurrencyId' class="w70"> <el-select v-model='OtherPrice.LeaderTripMoneyCurrencyId' class="w70">
...@@ -627,7 +619,7 @@ ...@@ -627,7 +619,7 @@
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2 CostcomCenter">4</td> <td class="CP_ComTitle2 CostcomCenter">4</td>
<td class="CP_ComTitle2">司机小费</td> <td class="CP_ComTitle2">司机小费(每人)</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.DriverGuideMoneyCurrencyId' class="w70"> <el-select v-model='OtherPrice.DriverGuideMoneyCurrencyId' class="w70">
...@@ -648,7 +640,7 @@ ...@@ -648,7 +640,7 @@
<tr> <tr>
<td colspan="7"></td> <td colspan="7"></td>
<td class="CP_ComTitle2 CostcomCenter">5</td> <td class="CP_ComTitle2 CostcomCenter">5</td>
<td class="CP_ComTitle2">导游小费</td> <td class="CP_ComTitle2">导游小费(每人)</td>
<td colspan="2"> <td colspan="2">
<el-form-item> <el-form-item>
<el-select v-model='OtherPrice.GuideMoneyCurrencyId' class="w70"> <el-select v-model='OtherPrice.GuideMoneyCurrencyId' class="w70">
...@@ -775,9 +767,6 @@ ...@@ -775,9 +767,6 @@
</tr> </tr>
<tr> <tr>
<td colspan="14" class="CP_ComTitle2">领队分摊部分 <td colspan="14" class="CP_ComTitle2">领队分摊部分
<span style="color:red;padding-left:5px;">
领队导游分摊，请直接输入日元
</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -845,9 +834,6 @@ ...@@ -845,9 +834,6 @@
</tr> </tr>
<tr> <tr>
<td colspan="14" class="CP_ComTitle2">成本回扣 <td colspan="14" class="CP_ComTitle2">成本回扣
<span style="color:red;padding-left:5px;">
成本回扣，请直接输入日元
</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -879,10 +865,22 @@ ...@@ -879,10 +865,22 @@
<tr> <tr>
<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 class="CP_ComTitle2">成本总价(日元)</td> <template v-if="postConfig.LineId==14">
成本价(日元)
</template>
</td>
<td class="CP_ComTitle2">
<template v-if="postConfig.LineId==14">
成本总价(日元)
</template>
</td>
<td class="CP_ComTitle2">销售价格(人民币)</td> <td class="CP_ComTitle2">销售价格(人民币)</td>
<td class="CP_ComTitle2">销售价格(日元)</td> <td class="CP_ComTitle2">
<template v-if="postConfig.LineId==14">
销售价格(日元)
</template>
</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>
...@@ -891,14 +889,22 @@ ...@@ -891,14 +889,22 @@
<tr v-for="item in CostNumberList" :key="item.subCode"> <tr v-for="item in CostNumberList" :key="item.subCode">
<td>{{item.PeopleNumber}}+1</td> <td>{{item.PeopleNumber}}+1</td>
<td>{{item.TotalMoney}}</td> <td>{{item.TotalMoney}}</td>
<td>{{item.JPYTotalMoney}}</td> <td>
<td>{{item.JPYTotalMoney*item.PeopleNumber}}</td> <template v-if="postConfig.LineId==14">
{{item.JPYTotalMoney}}
</template>
</td>
<td>
<template v-if="postConfig.LineId==14">
{{item.JPYTotalMoney*item.PeopleNumber}}
</template>
</td>
<td> <td>
<el-input type='text' class="w70" v-model="item.SalePrice" <el-input type='text' class="w70" v-model="item.SalePrice"
@keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input> @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
</td> </td>
<td> <td>
<el-input type='text' class="w70" v-model="item.JPYSalePrice" <el-input v-if="postConfig.LineId==14" type='text' class="w70" v-model="item.JPYSalePrice"
@keyup.native="checkPrice(item,'JPYSalePrice',true)" maxlength="8"></el-input> @keyup.native="checkPrice(item,'JPYSalePrice',true)" maxlength="8"></el-input>
</td> </td>
<td> <td>
...@@ -996,17 +1002,12 @@ ...@@ -996,17 +1002,12 @@
</el-input> </el-input>
</td> </td>
</tr> </tr>
<!-- <tr>
<td class="CP_ComTitle2">备注</td>
<td colspan="13">
<el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
</td>
</tr> -->
<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">
...@@ -1603,26 +1604,21 @@ ...@@ -1603,26 +1604,21 @@
var wuPrice = Number(this.getDayXiaoJi(5, 2)); //午餐 var wuPrice = Number(this.getDayXiaoJi(5, 2)); //午餐
var wanPrice = Number(this.getDayXiaoJi(6, 2)); //晚餐 var wanPrice = Number(this.getDayXiaoJi(6, 2)); //晚餐
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用 var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2))+ Number(this.getDayXiaoJi(7, 2)); //车费 var busFee = Number(this.getDayXiaoJi(2, 2)) + Number(this.getDayXiaoJi(7, 2)); //车费
totalMoney = busFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
return totalMoney.toFixed(0); return totalMoney.toFixed(0);
}, },
//获取地接项目报价 //获取地接项目报价
getLocalJpyTotalMoney(PeopleNumber) { getLocalJpyTotalMoney(PeopleNumber) {
let totalMoney = 0.0; let totalMoney = 0.0;
//每人车费 var busFee = Number(this.getDayXiaoJi(2, 1)) + Number(this.getDayXiaoJi(7, 1));
var perBusFee = 0;
if (PeopleNumber > 0) {
perBusFee = (Number(this.getDayXiaoJi(2, 1)) + Number(this.getDayXiaoJi(7, 1))) / Number(PeopleNumber)
.toFixed(0);
}
var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用 var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用 var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
var zaoPrice = Number(this.getDayXiaoJi(4, 1)); //早餐 var zaoPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
var wuPrice = Number(this.getDayXiaoJi(5, 1)); //午餐 var wuPrice = Number(this.getDayXiaoJi(5, 1)); //午餐
var wanPrice = Number(this.getDayXiaoJi(6, 1)); //晚餐 var wanPrice = Number(this.getDayXiaoJi(6, 1)); //晚餐
var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用 var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice; totalMoney = busFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
return totalMoney.toFixed(0); return totalMoney.toFixed(0);
}, },
//计算领队分摊 //计算领队分摊
...@@ -1650,7 +1646,6 @@ ...@@ -1650,7 +1646,6 @@
} }
}, },
mounted() { mounted() {
console.log('queryMsg', this.queryMsg)
this.IsDefault = this.queryMsg.IsDefault this.IsDefault = this.queryMsg.IsDefault
this.canEdit = this.queryMsg.canEdit this.canEdit = this.queryMsg.canEdit
this.getSubtotalMoney(); this.getSubtotalMoney();
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
View file @ 4b8a3882
...@@ -61,11 +61,15 @@ ...@@ -61,11 +61,15 @@
.CostNewPrice .el-form-item { .CostNewPrice .el-form-item {
margin-bottom: 0 !important; margin-bottom: 0 !important;
}; }
;
.select-tag { .select-tag {
font-weight: bold; font-weight: bold;
color: #f12a2a; color: #f12a2a;
} }
</style> </style>
<template> <template>
...@@ -75,12 +79,20 @@ ...@@ -75,12 +79,20 @@
<div class="QuotationFirstDiv1"> <div class="QuotationFirstDiv1">
<table> <table>
<tr> <tr>
<td width="80" class="txtRightCost">出团类型</td>
<td>
<el-select class="multiple_input" v-model="postConfig.TeamType"
@change="postConfig.LineId=0,postConfig.LineteamId=0">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</td>
<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="changeLine()" 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 getLineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
...@@ -92,11 +104,6 @@ ...@@ -92,11 +104,6 @@
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td width="80" class="txtRightCost">客户名称</td>
<td>
<el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
</el-input>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="6" style="height:20px;"> <td colspan="6" style="height:20px;">
...@@ -137,12 +144,10 @@ ...@@ -137,12 +144,10 @@
<el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder> <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder>
</el-date-picker> </el-date-picker>
</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-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID"> </el-input>
</el-option>
</el-select>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -186,43 +191,47 @@ ...@@ -186,43 +191,47 @@
</div> </div>
</div> </div>
<br /> <br />
<!-- <el-tabs v-model="tabsActive" @tab-click="changeTabs"> <el-tag v-for="(item, index) in orderList" :key="index"
<el-tab-pane :label="`报价单${index + 1}${item.queryMsg.IsDefault ? '(默认)' : ''}`" v-for="(item, index) in orderList" :key="index"></el-tab-pane> style="margin-right: 10px;margin-bottom: 10px; cursor: pointer;" :type="index ===tabsActive ? '':'info'"
</el-tabs> --> closable @click="selectTag(index)" :disable-transitions="false" @close="handleClose(index)">
<el-tag v-for="(item, index) in orderList" :key="index" style="margin-right: 10px;margin-bottom: 10px; cursor: pointer;" :type="index ===tabsActive ? '':'info'"
closable
@click="selectTag(index)"
:disable-transitions="false"
@close="handleClose(index)">
{{`报价单${index + 1}${item.queryMsg.IsDefault ? '(默认)' : ''}`}} {{`报价单${index + 1}${item.queryMsg.IsDefault ? '(默认)' : ''}`}}
</el-tag> </el-tag>
<el-button class="button-new-tag" size="small" @click="addOrderTag">新增报价单</el-button> <el-button class="button-new-tag" size="small" @click="addOrderTag">新增报价单</el-button>
<CostNewPriceFormVue ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="currentData.OtherPrice" <CostNewPriceFormVue ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="currentData.OtherPrice"
:dayCostPrice="currentData.dayCostPrice" :LineList="LineList" :CostCurrencyList="currentData.CostCurrencyList" :dayCostPrice="currentData.dayCostPrice" :LineList="LineList" :CostCurrencyList="currentData.CostCurrencyList"
:CostNumberList="currentData.CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :queryMsg="currentData.queryMsg" :CostNumberList="currentData.CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
:teamPrice="currentData.teamPrice" :queryMsg="currentData.queryMsg" :teamPrice="currentData.teamPrice"></CostNewPriceFormVue>
></CostNewPriceFormVue>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import CostNewPriceFormVue from './CostNewPriceForm.vue'; import CostNewPriceFormVue from './CostNewPriceForm.vue';
export default { export default {
props: ["OfferArray", "postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt", props: ["OfferArray", "postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList",
"CurrencyNumberListExt",
"CostCurrencyList", "teamPrice" "CostCurrencyList", "teamPrice"
], ],
components: {CostNewPriceFormVue}, components: {
CostNewPriceFormVue
},
data() { data() {
return { return {
tabsActive: 0, tabsActive: 0,
currentData: {dayCostPrice: [],CostCurrencyList: [],queryMsg: { currentData: {
dayCostPrice: [],
CostCurrencyList: [],
queryMsg: {
IsDefault: false, IsDefault: false,
//汇率输入 //汇率输入
RateInput: "", RateInput: "",
//人数 //人数
PeopleNumber: "" PeopleNumber: ""
},OtherPrice: {},teamPrice: {},CostNumberList: []}, },
OtherPrice: {},
teamPrice: {},
CostNumberList: []
},
orderList: [], orderList: [],
//下拉框默认值 //下拉框默认值
defaultSelect: 0, defaultSelect: 0,
...@@ -251,20 +260,41 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -251,20 +260,41 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
}, ] }, ]
} }
}, },
computed: {
//线路筛选
getLineList() {
var chooseLineList = [];
//散拼
if (this.postConfig.TeamType == 0) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2);
} //小包团
else if (this.postConfig.TeamType == 1) {
chooseLineList = this.LineList.filter(qItem => qItem.Is_PacketGroup == 1);
}
//当地游
else if (this.postConfig.TeamType == 2) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 3);
}
return chooseLineList;
},
},
methods: { methods: {
//线路切换
changeLine() {
this.getLineTeamList(this.postConfig.LineId, 1);
},
getData() { getData() {
return this.orderList return this.orderList;
}, },
addOrderTag() { addOrderTag() {
this.createOrderList() this.createOrderList()
}, },
selectTag(index) { selectTag(index) {
console.log('selectTag', index)
this.tabsActive = index this.tabsActive = index
this.changeTabs() this.changeTabs()
}, },
handleClose(index) { handleClose(index) {
if(this.tabsActive === index) { if (this.tabsActive === index) {
this.tabsActive = 0 this.tabsActive = 0
this.orderList.splice(index, 1) this.orderList.splice(index, 1)
this.changeTabs() this.changeTabs()
...@@ -274,11 +304,9 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -274,11 +304,9 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
} }
}, },
changeTabs() { changeTabs() {
// const canEdit = !this.currentData.queryMsg.IsDefault
this.currentData = this.orderList[this.tabsActive] this.currentData = this.orderList[this.tabsActive]
let index = this.getDefaultIndex() let index = this.getDefaultIndex()
this.currentData.queryMsg.canEdit = index === -1 || index === Number(this.tabsActive) this.currentData.queryMsg.canEdit = index === -1 || index === Number(this.tabsActive)
console.log('changeTabs>>>>', this.currentData, index, this.tabsActive)
this.prevKey = Number(this.tabsActive) this.prevKey = Number(this.tabsActive)
}, },
getDefaultIndex() { getDefaultIndex() {
...@@ -317,12 +345,6 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -317,12 +345,6 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
lineID: lineId, lineID: lineId,
isTOOP: 1 isTOOP: 1
}; };
var that = this;
//获取当前选中的对象
let obj = {};
obj = that.LineList.find(item => {
return item.LineID === lineId;
});
this.apipost("team_post_GetList", msg, res => { this.apipost("team_post_GetList", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineTeamList = res.data.data; this.LineTeamList = res.data.data;
...@@ -330,7 +352,7 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -330,7 +352,7 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
}); });
}, },
createDayTripPrice() { createDayTripPrice() {
for(let i = 0; i < this.orderList.length; i++) { for (let i = 0; i < this.orderList.length; i++) {
this.orderList[i].dayCostPrice = this.createDayTripPriceItem([...this.orderList[i].dayCostPrice]) this.orderList[i].dayCostPrice = this.createDayTripPriceItem([...this.orderList[i].dayCostPrice])
} }
}, },
...@@ -363,7 +385,6 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -363,7 +385,6 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
} else { } else {
dayCostPrice.length = this.postConfig.DayNum; dayCostPrice.length = this.postConfig.DayNum;
} }
console.log('//生成行程报价 createDayTripPrice', this.postConfig.DayNum, dayCostPrice)
return dayCostPrice return dayCostPrice
}, },
//价格转换器 //价格转换器
...@@ -432,17 +453,16 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -432,17 +453,16 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
this.getAllCurrency(); this.getAllCurrency();
this.getCompanyList(); this.getCompanyList();
this.getTeamList(); this.getTeamList();
console.log('CostNewPrice', this.OfferArray) this.getLineTeamList();
if(!this.OfferArray.length) { if (!this.OfferArray.length) {
console.log('CostNewPrice not OfferArray', this.OfferArray)
this.createOrderList(); this.createOrderList();
} else { } else {
this.OfferArray.forEach(item => { this.OfferArray.forEach(item => {
item.OtherPrice = item.otherPrice item.OtherPrice = item.otherPrice
item.dayCostPrice = item.dayCostPriceList item.dayCostPrice = item.dayCostPriceList
item.CostCurrencyList =item.CostCurrencyList || [] item.CostCurrencyList = item.CostCurrencyList || []
item.CurrencyNumberListExt = this.buildCostCurrency(item.CostCurrencyList, item.CurrencyNumberListExt) item.CurrencyNumberListExt = this.buildCostCurrency(item.CostCurrencyList, item.CurrencyNumberListExt)
item.queryMsg ={ item.queryMsg = {
IsDefault: Boolean(item.IsDefault), IsDefault: Boolean(item.IsDefault),
//汇率输入 //汇率输入
RateInput: "", RateInput: "",
...@@ -453,21 +473,12 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -453,21 +473,12 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
this.orderList = this.OfferArray this.orderList = this.OfferArray
this.changeTabs() this.changeTabs()
} }
console.log('this.orderList', this.orderList,this.OfferArray)
}, },
created() {}, created() {},
watch: { watch: {
postConfig: {
handler: function (val, oldVal) {
this.getLineTeamList(this.postConfig.LineId);
},
deep: true
},
},
OfferArray: { OfferArray: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log('watch CostNewPrice', this.OfferArray) if (!this.OfferArray.length) {
if(!this.OfferArray.length) {
this.createOrderList(); this.createOrderList();
} else { } else {
this.OfferArray.forEach(item => { this.OfferArray.forEach(item => {
...@@ -477,10 +488,10 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue'; ...@@ -477,10 +488,10 @@ import CostNewPriceFormVue from './CostNewPriceForm.vue';
this.orderList = this.OfferArray this.orderList = this.OfferArray
this.changeTabs() this.changeTabs()
} }
console.log('watch this.orderList', this.orderList,this.OfferArray)
}, },
deep: true deep: true
} }
},
}; };
</script> </script>
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 4b8a3882
...@@ -228,6 +228,11 @@ ...@@ -228,6 +228,11 @@
this.postData.OfferPayType = tempData.OfferPayType; this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType=tempData.SaleOfferPayType; this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
this.LineList = tempData.LineList; this.LineList = tempData.LineList;
this.postData.LineName = tempData.LineName
this.postData.LtName = tempData.LtName
this.postData.LtName = tempData.LtName
this.postData.OutBranchName = tempData.OutBranchName
this.postData.TeamTypeName = tempData.TeamTypeName
if(tempData.OfferArray) { if(tempData.OfferArray) {
console.log('getData', tempData.OfferArray) console.log('getData', tempData.OfferArray)
tempData.OfferArray.forEach(item => { tempData.OfferArray.forEach(item => {
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 4b8a3882
<template> <template>
<div class="DirectQuotation clearfix" v-loading="loading"> <div class="DirectQuotation clearfix" v-loading="loading">
<DirectQuotation v-if="haveData" ref="QuotationPrice" :OfferArray="OfferArray" :postConfig="postData" :dayCostPrice="dayCostPriceList" <DirectQuotation v-if="haveData" ref="QuotationPrice" :OfferArray="OfferArray" :postConfig="postData"
:otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :dayCostPrice="dayCostPriceList" :otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></DirectQuotation> :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList"
:CurrencyNumberListExt="CurrencyNumberListExt"></DirectQuotation>
<div class="btnFixedDiv"> <div class="btnFixedDiv">
<div class="toTop"> <div class="toTop">
<i class="iconfont icon-huidaodingbu"></i> <i class="iconfont icon-huidaodingbu"></i>
...@@ -17,9 +18,7 @@ ...@@ -17,9 +18,7 @@
</div> </div>
</template> </template>
<script> <script>
import DirectQuotation from "../TravelNewQuotation/DirectNewQuotation"; import DirectQuotation from "../TravelNewQuotation/DirectNewQuotation";
export default { export default {
data() { data() {
return { return {
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
OutBranchId: -1, //出团公司 OutBranchId: -1, //出团公司
OutDateTime: "", //出发时间 OutDateTime: "", //出发时间
OfferPayType: 0, //报价单付款方式 OfferPayType: 0, //报价单付款方式
SaleOfferPayType:0,//售价付款方式 SaleOfferPayType: 0, //售价付款方式
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
...@@ -149,7 +148,6 @@ ...@@ -149,7 +148,6 @@
SaveData(type) { SaveData(type) {
const data = this.$refs["QuotationPrice"].getData() const data = this.$refs["QuotationPrice"].getData()
function getCostCurrency(CurrencyNumberListExt) { function getCostCurrency(CurrencyNumberListExt) {
var currencyNumList = []; var currencyNumList = [];
if (CurrencyNumberListExt != null && CurrencyNumberListExt.length > 0) { if (CurrencyNumberListExt != null && CurrencyNumberListExt.length > 0) {
CurrencyNumberListExt.forEach((item, index) => { CurrencyNumberListExt.forEach((item, index) => {
...@@ -160,16 +158,7 @@ ...@@ -160,16 +158,7 @@
} }
return currencyNumList return currencyNumList
} }
this.postData.TravelState = this.postData.TravelState || type; this.postData.TravelState = type;
// var nObj = {
// config: this.postData,
// dayCostPriceList: this.dayCostPriceList,
// otherPrice: this.otherPrice,
// teamPrice: this.teamPrice,
// CostCurrencyList: this.CostCurrencyList,
// CostNumberList: this.CostNumberList,
// CurrencyNumberListExt: currencyNumList
// };
data.forEach(item => { data.forEach(item => {
item.IsDefault = item.queryMsg.IsDefault ? 1 : 0 item.IsDefault = item.queryMsg.IsDefault ? 1 : 0
item.otherPrice = item.OtherPrice item.otherPrice = item.OtherPrice
...@@ -182,8 +171,6 @@ ...@@ -182,8 +171,6 @@
config: this.postData, config: this.postData,
OfferArray: data OfferArray: data
} }
console.log('保存数据',data)
// return 0;
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"travel_post_SetConfigOffer_V3", nObj, "travel_post_SetConfigOffer_V3", nObj,
...@@ -224,7 +211,7 @@ ...@@ -224,7 +211,7 @@
IsDefault: 1, IsDefault: 1,
}; };
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V3", // travel_get_GetMyTravelInfo_V2 "travel_get_GetMyTravelInfo_V3",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -263,50 +250,15 @@ ...@@ -263,50 +250,15 @@
this.postData.OutBranchId = tempData.OutBranchId; this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime; this.postData.OutDateTime = tempData.OutDateTime;
this.postData.OfferPayType = tempData.OfferPayType; this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType=tempData.SaleOfferPayType; this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
this.postData.TravelState = tempData.TravelState; this.postData.TravelState = tempData.TravelState;
this.LineList = tempData.LineList; this.LineList = tempData.LineList;
if(tempData.OfferArray) { if (tempData.OfferArray) {
console.log('getData', tempData.OfferArray)
tempData.OfferArray.forEach(item => { tempData.OfferArray.forEach(item => {
this.OfferArray.push(item) this.OfferArray.push(item)
}) })
// this.OfferArray = tempData.OfferArray
} }
// if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
// 0) {
// this.dayCostPriceList = tempData.dayCostPriceList;
// }
// if (tempData.otherPrice) {
// this.otherPrice = tempData.otherPrice;
// }
// if (tempData.teamPrice) {
// this.teamPrice = tempData.teamPrice;
// }
// if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
// this.CostNumberList = tempData.CostNumberList;
// }
// if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
// 0) {
// this.CostCurrencyList = tempData.CostCurrencyList;
// }
// if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
// .CurrencyNumberListExt.length > 0) {
// this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
// }
// if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
// this.CurrencyNumberListExt) {
// this.CostCurrencyList.forEach(item => {
// let currencyNumberItem = {
// Key: item.CurrencyId,
// currencyNumberList: []
// };
// if (this.CurrencyNumberListExt.length == 0) {
// this.CurrencyNumberListExt.push(currencyNumberItem);
// }
// });
// }
this.haveData = true; this.haveData = true;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -326,5 +278,4 @@ ...@@ -326,5 +278,4 @@
DirectQuotation: DirectQuotation DirectQuotation: DirectQuotation
} }
}; };
</script> </script>
\ No newline at end of file
src/components/TravelManager/TravelNewQuotation/priceDialog.vue
View file @ 4b8a3882
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<div class="switchDiv clearfix" style="width:98%;"> <div class="switchDiv clearfix" style="width:98%;">
<div class="DirectPriceCenter"> <div class="DirectPriceCenter">
<div class="singlePrice clearfix"> <div class="singlePrice clearfix">
<CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice" <CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice"
:dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
:teamPrice="teamPrice" :teamPrice="teamPrice"
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
otherPrice: { OtherPrice: {
CostId: 0, //主键编号 CostId: 0, //主键编号
ConfigID: 0, //配置编号 ConfigID: 0, //配置编号
OfferId: 0, //报价单编号 OfferId: 0, //报价单编号
...@@ -376,7 +376,7 @@ ...@@ -376,7 +376,7 @@
offerId: offerId offerId: offerId
}; };
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V2", "travel_get_GetMyTravelInfo_V3",
msg, msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -417,40 +417,49 @@ ...@@ -417,40 +417,49 @@
this.postData.OfferPayType = tempData.OfferPayType; this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType=tempData.SaleOfferPayType; this.postData.SaleOfferPayType=tempData.SaleOfferPayType;
this.LineList = tempData.LineList; this.LineList = tempData.LineList;
if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length > if(tempData.OfferArray) {
0) { this.currentData = tempData.OfferArray.find(item => item.IsDefault)
this.dayCostPriceList = tempData.dayCostPriceList; this.OtherPrice = this.currentData.otherPrice
} this.dayCostPriceList = this.currentData.dayCostPriceList
this.CostCurrencyList = this.currentData.CostCurrencyList
this.CostNumberList = this.currentData.CostNumberList
this.queryMsg = this.currentData.queryMsg
this.teamPrice = this.currentData.teamPrice
}
// if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
// 0) {
// this.dayCostPriceList = tempData.dayCostPriceList;
// }
if (tempData.otherPrice) { // if (tempData.otherPrice) {
this.otherPrice = tempData.otherPrice; // this.otherPrice = tempData.otherPrice;
} // }
if (tempData.teamPrice) { // if (tempData.teamPrice) {
this.teamPrice = tempData.teamPrice; // this.teamPrice = tempData.teamPrice;
} // }
if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) { // if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
this.CostNumberList = tempData.CostNumberList; // this.CostNumberList = tempData.CostNumberList;
} // }
if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length > // if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
0) { // 0) {
this.CostCurrencyList = tempData.CostCurrencyList; // this.CostCurrencyList = tempData.CostCurrencyList;
} // }
if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData // if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
.CurrencyNumberListExt.length > 0) { // .CurrencyNumberListExt.length > 0) {
this.CurrencyNumberListExt = tempData.CurrencyNumberListExt; // this.CurrencyNumberListExt = tempData.CurrencyNumberListExt;
} // }
if (this.CostCurrencyList && this.CostCurrencyList.length > 0 && // if (this.CostCurrencyList && this.CostCurrencyList.length > 0 &&
this.CurrencyNumberListExt) { // this.CurrencyNumberListExt) {
this.CostCurrencyList.forEach(item => { // this.CostCurrencyList.forEach(item => {
let currencyNumberItem = { // let currencyNumberItem = {
Key: item.CurrencyId, // Key: item.CurrencyId,
currencyNumberList: [] // currencyNumberList: []
}; // };
if (this.CurrencyNumberListExt.length == 0) { // if (this.CurrencyNumberListExt.length == 0) {
this.CurrencyNumberListExt.push(currencyNumberItem); // this.CurrencyNumberListExt.push(currencyNumberItem);
} // }
}); // });
} // }
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
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