Skip to content

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

页面修改

parent 8dcf3e27
Expand all Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 485 deletions
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ 4a47577c
<style>
@import "../../../assets/css/newTravelManager.css";
.Audit_left{
display: -webkit-box;
-webkit-box-align: center;
align-items: center;
border-right: 1px dashed #dddddd;
}
</style>
<template>
<div class="flexOne quoTation">
......@@ -55,9 +50,9 @@
<div class="commonContent" v-loading="loading">
<ul class="_content">
<li v-for="item in dataList" :key="item.subCode" :data-id='item.ID'>
<div class="Audit_left" style="width:100px;">
<div class="_left">
<div>
<p class="quoListName" style="width:80px;">
<p class="quoListName">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.ID" placement="top-start">
<span>{{item.ID}}</span>
</el-tooltip>
......@@ -65,9 +60,9 @@
</div>
</div>
<div class="Audit_left">
<div class="_left">
<div>
<p class="quoListName" >
<p class="quoListName">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.LineName" placement="top-start">
<span>{{item.LineName}}</span>
</el-tooltip>
......@@ -77,9 +72,9 @@
</p>
</div>
</div>
<div class="Audit_left">
<div class="_left">
<div>
<p class="quoListName" >
<p class="quoListName">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
<span>{{item.Title}}</span>
</el-tooltip>
......@@ -184,12 +179,12 @@
<div class="AD_Operation">
<span class="openGroup opbd">
<el-tooltip class="item" effect="dark" content="查看" placement="top-start" popper-class="max-w250">
<span @click="goUrl('QuotationDetails',item.ID,1)">查</span>
<span @click="goUrl('QuotationAduit',item.ID,1)">查</span>
</el-tooltip>
</span>
<span class="openGroup opbd" v-if="item.TravelState==2">
<el-tooltip class="item" effect="dark" content="审核" placement="top-start" popper-class="max-w250">
<span @click="goUrl('QuotationDetails',item.ID,2)">审</span>
<span @click="goUrl('QuotationAduit',item.ID,2)">审</span>
</el-tooltip>
</span>
<span class="openGroup opbd">
......@@ -465,7 +460,9 @@
name: path,
query: {
configId: configId,
Qtype: qType
Qtype: qType,
blank: 'y',
tab: '报价单审核'
}
});
} else {
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 4a47577c
......@@ -290,7 +290,7 @@
{{childItem.PeopleNumber}}
</td>
<td>
{{(Number(subItem.BusCostPrice)/Number(childItem.PeopleNumber)).toFixed(0)}}
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(childItem.PeopleNumber)).toFixed(0)}}
</td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length">
<el-input type='text' v-model="subItem.ScenicCostPrice" class="w70"
......@@ -435,7 +435,7 @@
</td>
<td>
<template v-if="CostNumberList&&CostNumberList.length>0">
{{(Number(subItem.BusCostPrice)/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
{{((Number(subItem.BusCostPrice)+Number(subItem.PassFee))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
</template>
</td>
<td>
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 4a47577c
......@@ -10,9 +10,9 @@
</style>
<template>
<div class="DirectQuotation clearfix" v-loading="loading">
<div class="singlePrice clearfix">
<div class="singlePrice clearfix" v-show="IsShow">
<CostNewPriceAudit ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
:dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
:teamPrice="teamPrice"
></CostNewPriceAudit>
......@@ -37,6 +37,7 @@
data() {
return {
ConfigID: 0,
IsShow:false,
//基本配置
postData: {
ID: 0,
......@@ -66,7 +67,9 @@
StartCityId: 0,
ReturnArriveCityId: 0, //返回抵达城市
CustomerName: "", //客户名称
TeamType: 0, //团队类型
TeamType: 0, //团队类型,
LineName:"",//线路名称
LtName:"",//系列名称
},
dayCostPriceList: [], //报价列表
isSubmit: true,
......@@ -146,41 +149,29 @@
},
//保存数据
SaveData() {
var currencyNumList = [];
if (this.CurrencyNumberListExt != null && this.CurrencyNumberListExt.length > 0) {
this.CurrencyNumberListExt.forEach((item, index) => {
item.currencyNumberList.forEach(subItem => {
currencyNumList.push(subItem);
});
});
}
var nObj = {
config: this.postData,
dayCostPriceList: this.dayCostPriceList,
otherPrice: this.otherPrice,
teamPrice: this.teamPrice,
CostCurrencyList: this.CostCurrencyList,
CostNumberList: this.CostNumberList,
CurrencyNumberListExt: currencyNumList
};
this.loading = true;
this.apipost(
"travel_post_SetConfigOffer_V2", nObj,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
if (this.postData.TeamType == 1) {
this.goUrl('newQuotation2');
} else {
this.goUrl('newQuotation');
}
} else {
this.Error(res.data.message);
}
},
err => {}
);
// this.loading = true;
// this.apipost(
// "travel_post_SetConfigOffer_V2", nObj,
// res => {
// this.loading = false;
// if (res.data.resultCode == 1) {
// this.Success(res.data.message);
// if (this.postData.TeamType == 1) {
// this.goUrl('newQuotation2');
// } else {
// this.goUrl('newQuotation');
// }
// } else {
// this.Error(res.data.message);
// }
// },
// err => {}
// );
},
goUrl(path) {
this.$router.push({
......@@ -200,13 +191,14 @@
ID: configId,
offerId: offerId
};
this.apipost(
"travel_get_GetMyTravelInfo_V2",
msg,
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("tempData", tempData);
console.log("tempData1", tempData);
if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID;
}
......@@ -238,6 +230,8 @@
this.postData.NightNum = tempData.NightNum;
}
this.postData.CustomerName = tempData.CustomerName;
this.postData.LineName=tempData.LineName;
this.postData.LtName=tempData.LtName;
this.LineList = tempData.LineList;
if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
0) {
......@@ -260,18 +254,7 @@
.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.IsShow=true;
} else {
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