Skip to content

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

新增付款方式显示

parent 3b567153
Hide whitespace changes
Inline Side-by-side
Showing with 142 additions and 104 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ a473b474
......@@ -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 @ a473b474
<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>
......@@ -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 OtherPrice.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 OtherPrice.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>
......@@ -460,7 +459,7 @@
@keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney')"></el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>杂费</td>
......@@ -470,12 +469,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,10 +484,10 @@
<td width='250' rowspan="2" class="CP_comBack">
人数统计
</td>
</tr>
<tr>
</tr>
</table>
</el-form>
......@@ -497,26 +496,88 @@
</template>
<script>
export default {
props: ["postConfig", "OtherPrice", "dayCostPrice","LineList"],
props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList"],
data() {
return {
queryMsg: {
queryMsg: {
//汇率输入
RateInput: "",
//人数
PeopleNumber: ""
},
//币种下拉
currencyType: "",
checkedPei: [],
currencyTypeArr: [], //币种
LineTeamList:[],//系列列表
currencyTypeArr: [], //币种下拉列表
LineTeamList: [], //系列下拉列表
}
},
methods: {
//获取系列列表
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() {
},
//添加人数费用
addPeoNunber() {
var PeopleNumber = this.queryMsg.PeopleNumber;
if (PeopleNumber == "") {
this.Info("请输入人数");
return;
}
if (
this.$tripUtils.isInObjArr(
this.OfferCostPriceObj.CostNumberList,
"PeopleNumber",
PeopleNumber
)
) {
this.Info("人数已经存在");
return;
}
var CostNumberObj = this.$tripUtils.CostNumber();
CostNumberObj.PeopleNumber = PeopleNumber;
this.OfferCostPriceObj.CostNumberList.push(CostNumberObj);
this.OfferCostPriceObj.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.OfferCostPriceObj.CurrencyNumberListExt.forEach(x => {
// x.currencyNumberList.sort(
// this.$commonUtils.createComprisonFunction("PeopleNumber")
// );
// });
// this.OfferCostPriceObj.CostNumberList.sort(
// this.$commonUtils.createComprisonFunction("PeopleNumber")
// );
},
//币种下拉获取汇率
getRate(ID) {
......@@ -541,12 +602,10 @@
},
mounted() {
this.getAllCurrency();
console.log("line", this.LineList);
},
watch: {
}
};
......
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @ a473b474
......@@ -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"></CostNewPrice>
</div>
</div>
<div class="DirectRightPrice" style="margin-left:20px;">
......@@ -270,7 +270,7 @@
</div>
</template>
<script>
import CostPrice from "../TravelNewQuotation/CostNewPrice";
import CostNewPrice from "../TravelNewQuotation/CostNewPrice";
export default {
props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList"],
......@@ -287,7 +287,7 @@
},
components: {
CostPrice: CostPrice
CostNewPrice: CostNewPrice
}
};
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ a473b474
......@@ -21,6 +21,7 @@
export default {
data() {
return {
ConfigID: 0,
//基本配置
postData: {
ID: 0,
......@@ -51,7 +52,7 @@
ReturnArriveCityId: 0, //返回抵达城市
},
dayCostPriceList: [], //报价列表
isSubmit:false,
isSubmit: true,
otherPrice: {
CostId: 0, //主键编号
ConfigID: 0, //配置编号
......@@ -77,39 +78,39 @@
SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用
CostCurrencyList:[],//选择的币种
CostNumberList:[],//人数
CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数
},
//团报价信息
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: {
......@@ -124,7 +125,7 @@
config: postData,
dayCostPriceList: dayCostPriceList,
otherPrice: otherPrice,
teamPrice:teamPrice
teamPrice: teamPrice
},
res => {
console.log(res.data);
......@@ -135,33 +136,26 @@
},
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);
}
},
err => {}
);
} else {
let params = {
isNoOffer: false
};
this.$router.push({
name: "quoTation",
params: params
});
}
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;
this.dayCostPriceList=tempData.dayCostPriceList;
this.otherPrice=tempData.otherPrice;
this.teamPrice=tempData.teamPrice;
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
created() {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ a473b474
......@@ -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:'报价单'
}
......
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