Skip to content

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

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

parents bc543e05 bb2ce689
Hide whitespace changes
Inline Side-by-side
Showing with 355 additions and 179 deletions
src/components/FinancialModule/OPRules.vue
View file @ 72824603
......@@ -107,11 +107,11 @@
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select>
</el-form-item>
<el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
<!-- <el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList" >
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="描述">
<el-input class="w220" v-model="form.Description"></el-input>
</el-form-item>
......@@ -236,6 +236,7 @@ export default {
this.getLineList();
this.getList();
this.getEmployeeList();
this.getDepartment();
},
methods:{
......@@ -294,7 +295,7 @@ export default {
FInternMoney:item.FInternMoney,
}
this.departmentMsg.RB_Branch_Id=item.BranchId;
this.getDepartment();
this.getLineTeamList();
},
RulesOk(formName){
......@@ -307,10 +308,10 @@ export default {
this.Error("请选择分负责OP！")
return;
}
if(this.form.FZLEmployeeIdList.length==0){
this.Error("请选择分助理！")
return;
}
// if(this.form.FZLEmployeeIdList.length==0){
// this.Error("请选择分助理！")
// return;
// }
if(this.form.FInternMoney==0){
this.Error("请填写分负责人金额！")
return;
......@@ -415,9 +416,9 @@ export default {
linkageDepartment(val){
this.departmentMsg.RB_Branch_Id=this.form.BranchId;
this.departmentList=[];
// this.departmentList=[];
this.form.DepartmentId=-1;
this.getDepartment();
// this.getDepartment();
if(this.departmentMsg.RB_Branch_Id==0){
this.stateShow=false;
......@@ -432,12 +433,13 @@ export default {
},
getDepart(id){
this.form.DepartmentId= id;
this.$forceUpdate();
// this.$forceUpdate();
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
console.log("this.departmentList",this.departmentList)
}
}, err => {})
},
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 72824603
......@@ -423,6 +423,7 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 72824603
<style>
@import "../../../assets/css/newTravelManager.css";
.singlePrice .el-form-item__content,
.el-form-item__label {
.CostNewPrice .el-form-item__content,
.CostNewPrice .el-form-item__label {
line-height: 30px;
}
.CP_halfWi {
.CostNewPrice .CP_halfWi {
width: 45%;
}
......@@ -14,7 +14,7 @@
<template>
<div>
<div class="singlePrice clearfix CP_Div">
<div class="CostNewPrice clearfix CP_Div">
<el-form>
<div class="QuotationFirstDiv">
<el-row :gutter="40">
......@@ -30,8 +30,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="系列">
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')"
@change="getCountryId(postConfig.LineteamId)" filterable>
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
<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>
......@@ -92,7 +91,7 @@
<el-col :span="6">
<el-form-item>
<el-input class="w120 LowNum" v-model="postConfig.DayNum"
@keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()">
@keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
<template slot="append">天</template>
</el-input>
</el-form-item>
......@@ -100,7 +99,7 @@
<el-col :span="6">
<el-form-item>
<el-input class="w120 LowNum" v-model="postConfig.NightNum"
@keyup.native="checkInteger(postConfig,'NightNum')">
@keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
<template slot="append">晚</template>
</el-input>
</el-form-item>
......@@ -112,7 +111,7 @@
<table class="CP_comTable">
<tr>
<td class="CP_comBack" width="170">币种</td>
<td v-for='(item,index) in OtherPrice.CostCurrencyList'>
<td v-for='(item,index) in CostCurrencyList'>
{{item.CurrencyName}}
<span>
<i class="iconfont icon-quxiao" @click="DeleteCurrency(index)"></i>
......@@ -129,10 +128,10 @@
</tr>
<tr>
<td class="CP_comBack">汇率</td>
<!-- <td v-for='item in OfferCostPriceObj.CostCurrencyList'>
<td v-for='item in CostCurrencyList'>
<el-input class="w80" v-model='item.ExchangeRate' @keyup.native="checkRate(item,'ExchangeRate')">
</el-input>
</td> -->
</td>
<td>
<el-input class="w100" v-model='queryMsg.RateInput' @keyup.native="checkRate(queryMsg,'RateInput')">
</el-input>
......@@ -142,7 +141,7 @@
<table class="CP_comTable">
<tr>
<td class="CP_comBack" width="170">人数</td>
<td v-for="(item,index) in OfferCostPriceObj.CostNumberList" :key='item.subCode'>
<td v-for="(item,index) in CostNumberList" :key='item.subCode'>
<el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
</el-input>
<span>
......@@ -159,7 +158,7 @@
</div>
</td>
</tr>
<tr v-for="item in OfferCostPriceObj.CostCurrencyList">
<tr v-for="item in CostCurrencyList">
<td class="CP_comBack">地接报价（{{item.CurrencyName}}）</td>
<td v-if="checkExists(item.CurrencyId)" v-for="childItem in getCurrencyNumberList(item.CurrencyId)">
<el-form-item>
......@@ -172,7 +171,7 @@
</td>
</tr>
</table>
<table class="CostPriceTable">
<tr>
<th rowspan="2" width='100'>Day</th>
......@@ -188,48 +187,47 @@
<th width="90">中</th>
<th width="90">晚</th>
</tr>
<!-- <tr v-for="subItem in OfferCostPriceObj.CostLocalList" :key="subItem.subCode">
<tr v-for="subItem in dayCostPrice" :key="subItem.subCode">
<td align="center">{{subItem.DayNum}}</td>
<td>
<el-input type="textarea" resize="none"></el-input>
<el-input type="textarea" resize="none" v-model="subItem.Title"></el-input>
</td>
<td>
<el-form-item>
<el-select v-model='subItem.CurrencyId'>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
:value='items.CurrencyId' :key='items.CurrencyId'>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'>
</el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-input v-if="!showHotel" type='text' v-model="subItem.HotelMoney"
@keyup.native="checkPrice(subItem,'HotelMoney')"></el-input>
<el-input type='text' v-model="subItem.HotelCostPrice"
@keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
</td>
<td>
<span v-if="showCar">{{subItem.CarName}}</span>
<el-input type='text' v-model="subItem.CarMoney" @keyup.native="checkPrice(subItem,'CarMoney')"
v-if="!showCar"></el-input>
<el-input type='text' v-model="subItem.BusCostPrice" @keyup.native="checkPrice(subItem,'BusCostPrice')">
</el-input>
</td>
<td>
<span v-if="showTicket" class="QD_DetailName">{{subItem.TicketName}}</span>
<el-input type='text' v-model="subItem.TicketMoney" @keyup.native="checkPrice(subItem,'TicketMoney')"
v-if="!showTicket"></el-input>
<el-input type='text' v-model="subItem.ScenicCostPrice"
@keyup.native="checkPrice(subItem,'ScenicCostPrice')"></el-input>
</td>
<td>
<el-input type="text" :disabled='disabMoney' v-model='subItem.FoodItem[0].money'
@keyup.native="checkPrice(subItem.FoodItem[0],'money')"></el-input>
<el-input type="text" v-model='subItem.BreakfastCostPrice'
@keyup.native="checkPrice(subItem,'BreakfastCostPrice')">
</el-input>
</td>
<td>
<el-input type="text" :disabled='disabMoney' v-model='subItem.FoodItem[1].money'
@keyup.native="checkPrice(subItem.FoodItem[1],'money')"></el-input>
<el-input type="text" v-model='subItem.LunchCostPrice'
@keyup.native="checkPrice(subItem,'LunchCostPrice')"></el-input>
</td>
<td>
<el-input type="text" :disabled='disabMoney' v-model='subItem.FoodItem[2].money'
@keyup.native="checkPrice(subItem.FoodItem[2],'money')"></el-input>
<el-input type="text" v-model='subItem.DinnerCostPrice'
@keyup.native="checkPrice(subItem,'DinnerCostPrice')"></el-input>
</td>
</tr> -->
</tr>
</table>
<div class="CP_ComTitle">内陆段交通部分</div>
<table class="CostPriceTable">
......@@ -238,12 +236,12 @@
<td width='200'>内陆段机位（每人）</td>
<td width='200'>
<el-form-item>
<!-- <el-select v-model='OfferCostPriceObj.InlandAirTicketCurrency'>
<el-select v-model='OtherPrice.InlandAirTicketCurrency'>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
:value='items.CurrencyId' :key='items.CurrencyId'>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'>
</el-option>
</el-select> -->
</el-select>
</el-form-item>
</td>
<td>
......@@ -257,14 +255,14 @@
<td>2</td>
<td>内陆段船票（每人</td>
<td>
<!-- <el-form-item>
<el-select v-model='OfferCostPriceObj.InlandShipTicketCurrency'>
<el-form-item>
<el-select v-model='OtherPrice.InlandShipTicketCurrency'>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
:value='items.CurrencyId' :key='items.CurrencyId'>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'>
</el-option>
</el-select>
</el-form-item> -->
</el-form-item>
</td>
<td>
<el-form-item>
......@@ -277,14 +275,14 @@
<td>3</td>
<td>内陆段火车票（每人）</td>
<td>
<!-- <el-form-item>
<el-select v-model='OfferCostPriceObj.InlandTrainTicketCurrency'>
<el-form-item>
<el-select v-model='OtherPrice.InlandTrainTicketCurrency'>
<el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
<el-option v-for="items in OfferCostPriceObj.CostCurrencyList" :label='items.CurrencyName'
:value='items.CurrencyId' :key='items.CurrencyId'>
<el-option v-for="items in CostCurrencyList" :label='items.CurrencyName' :value='items.CurrencyId'
:key='items.CurrencyId'>
</el-option>
</el-select>
</el-form-item> -->
</el-form-item>
</td>
<td>
<el-form-item>
......@@ -412,9 +410,9 @@
<tr>
<td width='200'>人数</td>
<td width="200"></td>
<!-- <td width="150" v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
<td width="150" v-for="item in CostNumberList" :key="item.subCode">
{{item.PeopleNumber}}+1
</td> -->
</td>
</tr>
<tr>
<td>机票</td>
......@@ -424,9 +422,9 @@
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney')"></el-input>
</el-form-item>
</td>
<!-- <td v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
<td v-for="item in CostNumberList" :key="item.subCode">
{{item.AirTicketMoney}}
</td> -->
</td>
</tr>
<tr>
<td>门票</td>
......@@ -436,9 +434,9 @@
@keyup.native="checkPrice(OtherPrice,'TicketShareMoney')"></el-input>
</el-form-item>
</td>
<!-- <td v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
<td v-for="item in CostNumberList" :key="item.subCode">
{{item.TicketMoney}}
</td> -->
</td>
</tr>
<tr>
<td>单房差</td>
......@@ -448,9 +446,9 @@
@keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney')"></el-input>
</el-form-item>
</td>
<!-- <td v-for="item in OfferCostPriceObj.CostNumberList" :key="item.subCode">
<td v-for="item in CostNumberList" :key="item.subCode">
{{item.SingleRoomMoney}}
</td> -->
</td>
</tr>
<tr>
<td>内陆段交通</td>
......@@ -460,7 +458,7 @@
@keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>杂费</td>
......@@ -470,12 +468,12 @@
@keyup.native="checkPrice(OtherPrice,'OtherShareMoney')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>小计</td>
<td></td>
</tr>
</table>
<div class="Cost_Line"></div>
......@@ -485,38 +483,213 @@
<td width='250' rowspan="2" class="CP_comBack">
人数统计
</td>
</tr>
<tr>
</tr>
</table>
</el-form>
</div>
</div>
</template>
<script>
export default {
props: ["postConfig", "OtherPrice", "dayCostPrice","LineList"],
props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
"CostCurrencyList"
],
data() {
return {
queryMsg: {
//下拉框默认值
defaultSelect: 0,
queryMsg: {
//汇率输入
RateInput: "",
//人数
PeopleNumber: ""
},
//币种下拉
currencyType: "",
checkedPei: [],
currencyTypeArr: [], //币种
LineTeamList:[],//系列列表
currencyTypeArr: [], //币种下拉列表
LineTeamList: [], //系列下拉列表
}
},
methods: {
ReCalc() {
// this.OfferCostPriceObj = JSON.parse(
// JSON.stringify(this.OfferCostPriceObj)
// );
// this.$emit("headCallBack", this.OfferCostPriceObj);
},
//判断币种是否相等
checkExists(CurrencyId) {
var flag = false;
this.CurrencyNumberListExt.forEach(item => {
if (!flag && item.Key == CurrencyId) {
flag = true;
}
});
return flag;
},
//获取系列列表
getLineTeamList(lineId) {
this.postConfig.LineteamId = 0;
let msg = {
lineID: lineId,
isTOOP: 1
};
var that = this;
//获取当前选中的对象
let obj = {};
obj = that.LineList.find(item => {
return item.LineID === lineId;
});
this.apipost("team_post_GetList", msg, res => {
if (res.data.resultCode == 1) {
this.LineTeamList = res.data.data;
}
});
},
//生成行程报价
createDayTripPrice() {
if (this.postConfig.DayNum > this.dayCostPrice.length) {
for (var i = this.dayCostPrice.length; i < this.postConfig.DayNum; i++) {
//去掉以前默认的交通
var dayItem = {
Id: 0, //主键编号
OfferId: 0, //报价单编号
ConfigId: 0, //配置编号
Title: "", //行程大点
DayNum: i + 1, //行程天数
CurrencyId: 0, //币种
HotelCostPrice: 0, //酒店报价
BusCostPrice: 0, //车辆报价
ScenicCostPrice: 0, //景点报价
BreakfastCostPrice: 0, //早餐报价
LunchCostPrice: 0, //午餐报价
DinnerCostPrice: 0, //晚餐报价
};
this.dayCostPrice.push(dayItem);
}
} else {
//删除多余的项
for (var i = this.postConfig.DayNum; i < this.dayCostPrice.length; i++) {
this.dayCostPrice.splice(i, 1);
}
this.dayCostPrice.length = this.postConfig.DayNum;
}
},
//获取币种对应 的人数报价
getCurrencyNumberList(CurrencyId) {
let currencyNumberList = [];
let flag = false;
this.CurrencyNumberListExt.forEach(item => {
if (!flag && item.Key == CurrencyId) {
flag = true;
currencyNumberList = item.currencyNumberList;
}
});
return currencyNumberList;
},
//添加币种
addCurrency() {
var currencyId = this.currencyType;
var ckedName;
var ckedRate = this.queryMsg.RateInput;
if (currencyId == "") {
this.Info("请选择币种");
return;
}
if (ckedRate == "") {
this.Info("请输入汇率");
return;
}
this.currencyTypeArr.forEach(x => {
if (currencyId == x.ID) {
ckedName = x.Name;
}
});
if (
this.$tripUtils.isInObjArr(
this.CostCurrencyList,
"CurrencyId",
currencyId
)
) {
this.Info("币种已经存在");
return;
}
var CurObj = this.$tripUtils.CostCurrency();
CurObj.CurrencyName = ckedName;
CurObj.ExchangeRate = ckedRate;
CurObj.CurrencyId = currencyId;
this.CostCurrencyList.push(CurObj);
this.currencyType = "";
this.queryMsg.RateInput = "";
let currencyNumberItem = {
Key: currencyId,
currencyNumberList: []
};
if (this.CurrencyNumberListExt.length > 0) {
if (
this.CurrencyNumberListExt[0].currencyNumberList
.length > 0
) {
this.CurrencyNumberListExt[0].currencyNumberList.forEach(
x => {
let tempData = JSON.parse(JSON.stringify(x));
tempData.CurrencyId = currencyId;
tempData.Money = 0.0;
currencyNumberItem.currencyNumberList.push(tempData);
}
);
}
}
this.CurrencyNumberListExt.push(currencyNumberItem);
},
//添加人数费用
addPeoNunber() {
var PeopleNumber = this.queryMsg.PeopleNumber;
if (PeopleNumber == "") {
this.Info("请输入人数");
return;
}
if (
this.$tripUtils.isInObjArr(
this.CostNumberList,
"PeopleNumber",
PeopleNumber
)
) {
this.Info("人数已经存在");
return;
}
var CostNumberObj = this.$tripUtils.CostNumber();
CostNumberObj.PeopleNumber = PeopleNumber;
this.CostNumberList.push(CostNumberObj);
this.CurrencyNumberListExt.forEach(x => {
var CurrencyNumberObj = this.$tripUtils.CurrencyNumber();
CurrencyNumberObj.CurrencyId = x.Key;
CurrencyNumberObj.PeopleNumber = PeopleNumber;
x.currencyNumberList.push(CurrencyNumberObj);
});
this.queryMsg.PeopleNumber = "";
this.queryMsg.Money = "";
this.shortPeopleNumber();
},
//人数排序
shortPeopleNumber() {
this.CurrencyNumberListExt.forEach(x => {
x.currencyNumberList.sort(
this.$commonUtils.createComprisonFunction("PeopleNumber")
);
});
this.CostNumberList.sort(
this.$commonUtils.createComprisonFunction("PeopleNumber")
);
},
//币种下拉获取汇率
getRate(ID) {
......@@ -543,11 +716,8 @@
this.getAllCurrency();
},
watch: {
}
created() {},
watch: {}
};
</script>
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @ 72824603
......@@ -107,14 +107,14 @@
</style>
<template>
<div class="DirectQuotation clearfix">
<div class="DirectNewQuotation clearfix">
<el-form label-width="100px" ref="currentOfferFrom">
<div class="switchDiv clearfix" style="width:98%;">
<div class="DirectPriceCenter">
<div class="singlePrice clearfix">
<CostPrice ref="CostPrice" :postConfig="postConfig" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPrice" :LineList="LineList"></CostPrice>
<CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice>
</div>
</div>
<div class="DirectRightPrice" style="margin-left:20px;">
......@@ -270,10 +270,10 @@
</div>
</template>
<script>
import CostPrice from "../TravelNewQuotation/CostNewPrice";
import CostNewPrice from "../TravelNewQuotation/CostNewPrice";
export default {
props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList"],
props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList","CostCurrencyList","CostNumberList","CurrencyNumberListExt"],
data() {
return {
CheckedVaule: 2,
......@@ -287,7 +287,7 @@
},
components: {
CostPrice: CostPrice
CostNewPrice: CostNewPrice
}
};
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 72824603
<template>
<div class="DirectQuotation clearfix">
<DirectQuotation ref="QuotationPrice" :postConfig="postData" :dayCostPrice="dayCostPriceList"
:otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList"></DirectQuotation>
:otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></DirectQuotation>
<div class="btnFixedDiv">
<div class="toTop">
<i class="iconfont icon-huidaodingbu"></i>
......@@ -21,6 +22,7 @@
export default {
data() {
return {
ConfigID: 0,
//基本配置
postData: {
ID: 0,
......@@ -32,11 +34,11 @@
IsSubstitution: 1,
IsB2B: 1,
IsB2C: 1,
FSeat: "",
CSeat: "",
YSeat: "",
FSeat: 0,
CSeat: 0,
YSeat: 0,
//最低成团人数
LowNum: "",
LowNum: 0,
//OP备注
OpRemark: "",
//产品经理备注
......@@ -45,13 +47,13 @@
PriceIsDirect: 1, //是否直采报价（1-否-2-是）【全部默认非直采】
PDFAlias: "", //pdf别名
ImgCover: "", //封面图
DayNum: "", //天数
NightNum: "", //晚数
DayNum: 0, //天数
NightNum: 0, //晚数
StartCityId: 0,
ReturnArriveCityId: 0, //返回抵达城市
},
dayCostPriceList: [], //报价列表
isSubmit:false,
isSubmit: true,
otherPrice: {
CostId: 0, //主键编号
ConfigID: 0, //配置编号
......@@ -77,39 +79,40 @@
SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用
CostCurrencyList:[],//选择的币种
CostNumberList:[],//人数
},
CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数
CurrencyNumberListExt: [], //币种和人数列表
//团报价信息
teamPrice:{
QuotationId:0,//主键编号
TeamId:0,//团期编号
ConfigID:0,//团队配置编号
OfferId:0,//报价编号
B2BMemberPrice:0,//同业会员价
B2BPrice:0,//同业价格
B2CMemberPrice:0,//直客会员价,
B2CPrice:0,//直客价格
ChildNeedPrice:0,//小孩占床价格,
ChildNoNeedPrice:0,//小孩不占床价格
BabyPrice:0,//婴儿价格
BabyChargePrice:0,//婴儿附加费
OldManChargePrice:0,//老人附加费
VisaPrice:0,//签证
OtherPrice:0,//杂费
SingleRoomPrice:0,//单房差
SingleDMCPrice:0,//单地接
RebatePrice:0,//同行返佣
DiscountPrice:0,//早鸟优惠
IsSupportChildren:1,//是否支持儿童出游（1-支持，2-不支持）
SafeMoney:0,//保险费
PeopleNumber:0,//人数
AirticketMoney:0,//机票费用
BackVisaPrice:0,//退签证费
BackSafeMoney:0,//退保险费
ContractUrl:"",//合同地址
teamPrice: {
QuotationId: 0, //主键编号
TeamId: 0, //团期编号
ConfigID: 0, //团队配置编号
OfferId: 0, //报价编号
B2BMemberPrice: 0, //同业会员价
B2BPrice: 0, //同业价格
B2CMemberPrice: 0, //直客会员价,
B2CPrice: 0, //直客价格
ChildNeedPrice: 0, //小孩占床价格,
ChildNoNeedPrice: 0, //小孩不占床价格
BabyPrice: 0, //婴儿价格
BabyChargePrice: 0, //婴儿附加费
OldManChargePrice: 0, //老人附加费
VisaPrice: 0, //签证
OtherPrice: 0, //杂费
SingleRoomPrice: 0, //单房差
SingleDMCPrice: 0, //单地接
RebatePrice: 0, //同行返佣
DiscountPrice: 0, //早鸟优惠
IsSupportChildren: 1, //是否支持儿童出游（1-支持，2-不支持）
SafeMoney: 0, //保险费
PeopleNumber: 0, //人数
AirticketMoney: 0, //机票费用
BackVisaPrice: 0, //退签证费
BackSafeMoney: 0, //退保险费
ContractUrl: "", //合同地址
},
LineList:[],//线路列表
LineList: [], //线路列表
};
},
methods: {
......@@ -119,49 +122,66 @@
},
//保存数据
SaveData() {
var nObj = {
config: this.postData,
dayCostPriceList: this.dayCostPriceList,
otherPrice: this.otherPrice,
teamPrice: this.teamPrice,
CostCurrencyList: this.CostCurrencyList,
CostNumberList: this.CostNumberList
};
console.log("请求参数", nObj);
this.apipost(
"travel_post_SetConfigOffer_V2", {
config: postData,
dayCostPriceList: dayCostPriceList,
otherPrice: otherPrice,
teamPrice:teamPrice
},
"travel_post_SetConfigOffer_V2", nObj,
res => {
console.log(res.data);
if (res.data.resultCode == 1) {}
if (res.data.resultCode == 1) {
this.Success(res.date.message);
this.goUrl('newQuotation');
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
goUrl(path) {
this.$router.push({
path: path,
query: {
cache: true
}
});
},
getPostData() {
let configId = this.$route.query.configId;
if (configId > 0) {
let msg = {
ID: configId
};
this.apipost(
"travel_get_GetMyTravelInfo_V2",
msg,
res => {
if (res.data.resultCode == 1) {
console.log("res.data.data",res.data);
this.postData = res.data.data;
} else {
this.Error(res.data.message);
let msg = {
ID: configId
};
this.apipost(
"travel_get_GetMyTravelInfo_V2",
msg,
res => {
console.log("res.data.data", res.data);
if (res.data.resultCode == 1) {
var tempData = res.data.data;
this.LineList = tempData.LineList;
if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
0) {
this.dayCostPriceList = tempData.dayCostPriceList;
}
if (tempData.otherPrice) {
this.otherPrice = tempData.otherPrice;
}
},
err => {}
);
} else {
let params = {
isNoOffer: false
};
this.$router.push({
name: "quoTation",
params: params
});
}
if (tempData.teamPrice) {
this.teamPrice = tempData.teamPrice;
}
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
created() {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 72824603
......@@ -26,16 +26,7 @@
</el-select>
</span>
</li>
<li>
<span>
<em>报价单状态</em>
<el-select v-model="queryData.TravelState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option v-for='item in TravelStateList' :key="item.Id" :label="item.label" :value="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>开团状态</em>
......@@ -148,14 +139,7 @@
<div>{{item.CreateUserName}}</div>
</div>
</div>
<div>
<span>报价单状态</span>
<span v-if="item.TravelState==1">草稿</span>
<span v-else-if="item.TravelState==2">待审核</span>
<span v-else-if="item.TravelState==3">审核通过</span>
<span v-else-if="item.TravelState==4">审核拒绝</span>
<span v-else-if="item.TravelState==5">已撤销</span>
</div>
<div>
<span v-if="item.TravelState==2" class="retract opbd" @click="revokeInfo(item.ID)">
<el-tooltip class="item" effect="dark" content="待审核" placement="top-start" popper-class="max-w250">
......@@ -460,7 +444,7 @@
this.$router.push({
path: path,
query: {
configId: 4288,
configId: 0,
blank:'y',
tab:'报价单'
}
......
src/components/TravelManager/TravelQuotationCenter/GroupStageSetting.vue
View file @ 72824603
......@@ -470,7 +470,6 @@
}
},
mounted() {
console.log("获取值",this.postConfig);
var dateObj = this.$calendarUtils.getCurrentDate();
this.yearInput = dateObj.CurrentYear;
this.monthInput = dateObj.CurrentMonth;
......
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