Skip to content

S
SuperMan
Commit ef8e9b28 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 5de15bdb d9ab9126
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 69 deletions
src/assets/css/newTravelManager.css
View file @ ef8e9b28
......@@ -1510,7 +1510,7 @@
/* 审核单*/
.AuditUserInfo {
width:160px;
margin-left:30px;
/* margin-left:30px; */
}
.AuditLog {
margin-left:15px;
......@@ -1541,7 +1541,7 @@
}
.AuditStatus {
float:left;
width:23%;
width:20%;
margin:0 15px;
margin-top:5px
}
......@@ -1909,7 +1909,7 @@
.AU_creatName{float:left;margin:12px 0 0 10px;}
.quoTation ._right{flex: 1;align-items: center;display: flex;padding-left: 20px !important;border-left: 1px dashed #DCDFE6;}
.quoTation .Quo_Content{width:300px;display: inline-block;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;margin-left:20px;}
.quoTation ._left{display: flex;flex: 1;align-items: center;border-right: 1px dashed #dddddd;padding-right: 20px;}
.quoTation ._left{align-items: center;border-right: 1px dashed #dddddd;padding-right: 20px;}
.QT_CodeNum{min-width:70px;margin-left: 10%;}
.quoTation ._cent{flex: 1;display: flex;align-items: center;}
.quoTation ._rightAudit{flex: 1;align-items: center;display: flex;padding-left: 20px !important;border-left: 1px dashed #DCDFE6;}
......
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ ef8e9b28
<style>
@import "../../../assets/css/newTravelManager.css";
.opbdList{
font-weight: bold;
display: inline-block;
width: 25px;
height: 25px;
color: #fff;
border-radius: 50%;
line-height: 25px;
font-size: 12px;
cursor: pointer;
text-align: center;
}
.Audian_cent{
-webkit-box-flex: 1;
-ms-flex: 1;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
</style>
<template>
<div class="flexOne quoTation">
......@@ -50,41 +71,38 @@
<div class="commonContent" v-loading="loading">
<ul class="_content">
<li v-for="item in dataList" :key="item.subCode" :data-id='item.ID'>
<div class="_left">
<div class="_left" style="width:80px">
<div>
<p class="quoListName">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.ID" placement="top-start">
<span>{{item.ID}}</span>
<span style="position:relative;top:15px;">{{item.ID}}</span>
</el-tooltip>
</p>
</div>
</div>
<div class="_left">
<div class="_left" style="width:20%;">
<div>
<p class="quoListName">
<p class="quoListName" style="padding-right:20px;width:100%;">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.LineName" placement="top-start">
<span>{{item.LineName}}</span>
</el-tooltip>
</p>
<p class="Quo_Content"><i v-if="item.LtName" class="iconfont icon-richeng"></i>
<p class="Quo_Content" style="padding-right:20px;width:100%;"><i v-if="item.LtName" class="iconfont icon-richeng"></i>
<span>{{item.LtName}}</span>
</p>
</div>
</div>
<div class="_left">
<div class="_left" style="width:20%;">
<div>
<p class="quoListName">
<p class="quoListName" style="padding-right:20px;width:100%;">
<el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
<span>{{item.Title}}</span>
</el-tooltip>
</p>
<p class="Quo_Content"><i v-if="item.CustomerName" class="iconfont icon-richeng"></i>
<p class="Quo_Content" style="padding-right:20px;width:100%;"><i v-if="item.CustomerName" class="iconfont icon-richeng"></i>
<span>{{item.CustomerName}}</span>
</p>
</div>
</div>
<div class="_cent">
<div class="Audian_cent" style="width:260px;">
<div class="stayDays">{{item.DayNum}}天</div>
<div class="">
销售定价
......@@ -141,7 +159,7 @@
<img v-else src="../../../assets/img/default_head_img.jpg" alt="">
</div>
<div class="AuditUserInfoDetail">
<div>{{item.CreateUserName}}</div>
<div style="width:85px;">{{item.CreateUserName}}</div>
<div class="AuditChangeDate">{{item.CreateDate}}</div>
</div>
</div>
......@@ -177,17 +195,17 @@
</div>
</div>
<div class="AD_Operation">
<span class="openGroup opbd">
<span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" content="查看" placement="top-start" popper-class="max-w250">
<span @click="goUrl('QuotationAduit',item.ID,1)">查</span>
</el-tooltip>
</span>
<span class="openGroup opbd" v-if="item.TravelState==2">
<span class="openGroup opbdList" v-if="item.TravelState==2">
<el-tooltip class="item" effect="dark" content="审核" placement="top-start" popper-class="max-w250">
<span @click="goUrl('QuotationAduit',item.ID,2)">审</span>
</el-tooltip>
</span>
<span class="openGroup opbd">
<span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" content="日志" placement="top-start" popper-class="max-w250">
<el-popover popper-class="salsSetPrice" trigger="click">
<div class="priceContentDiv">
......@@ -232,7 +250,7 @@
</div>
</el-col>
<el-col :span="10" style="margin-top:30px;">
<el-form-item label="审批说明" prop="AuditContent">
<el-form-item label="审批说明" >
<el-input type="textarea" class="w600" v-model="AuditInfo.AuditContent"></el-input>
</el-form-item>
</el-col>
......@@ -460,6 +478,7 @@
name: path,
query: {
configId: configId,
Qtype: qType,
blank: 'y',
tab: '报价单审核'
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ ef8e9b28
......@@ -722,7 +722,7 @@
<el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
</td>
</tr>
<tr>
<tr v-if="IsEdit==2">
<td colspan="13" style="text-align:center;">
<input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" />
<input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" />
......@@ -737,7 +737,7 @@
<script>
export default {
props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
"CostCurrencyList", "teamPrice"
"CostCurrencyList", "teamPrice","IsEdit"
],
data() {
return {
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ ef8e9b28
......@@ -14,7 +14,7 @@
<CostNewPriceAudit ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
:teamPrice="teamPrice"
:teamPrice="teamPrice" :IsEdit="IsEdit"
></CostNewPriceAudit>
</div>
</div>
......@@ -132,7 +132,8 @@
TravelState:0,//3审核通过，4拒绝
},
LineList: [], //线路列表
loading: false
loading: false,
IsEdit:0,
};
},
methods: {
......@@ -184,7 +185,6 @@
res => {
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("tempData1", tempData);
if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID;
}
......@@ -253,6 +253,9 @@
if (this.$route.query.TeamType) {
this.postData.TeamType = this.$route.query.TeamType;
}
if (this.$route.query.Qtype) {
this.IsEdit = this.$route.query.Qtype;
}
this.getPostData();
},
components: {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ ef8e9b28
......@@ -118,65 +118,47 @@
<div class="">
{{$t('op.SalesPrice')}}
<el-popover popper-class="salsSetPrice" trigger="click">
<div class="priceContentDiv">
<div v-for="salesItem in SalesPriceList">
<div>{{$t('salesModule.Adult')}}</div>
<div class="priceContentDiv" v-if="item.QuotationPrice!=null">
<div>
<div>成人</div>
<div class="priceList">
<div>
<span class="pLeftPrice">成本价格：￥{{salesItem.B2BMemberPrice}}</span>
<span class="pRightPrice">销售价格：￥{{salesItem.B2BPrice}}</span>
</div>
<div class="priceDivCon">
<span
class="pLeftPrice">{{$t('Operation.Op_directMember')}}：￥{{salesItem.B2CMemberPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_direct')}}：￥{{salesItem.B2CPrice}}</span>
<span class="pLeftPrice">销售价格：￥{{item.QuotationPrice.B2BMemberPrice}}</span>
</div>
</div>
<div>{{$t('op.Child')}}</div>
<div>小孩</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{salesItem.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{salesItem.ChildNoNeedPrice}}</span>
<span class="pLeftPrice">占床：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
<span class="pRightPrice">不占床：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{salesItem.BabyPrice}}</span>
<span class="pRightPrice">{{$t('op.Surcharge')}}：￥{{salesItem.BabyChargePrice}}</span>
<span class="pLeftPrice">婴儿：￥{{item.QuotationPrice.BabyPrice}}</span>
<span class="pRightPrice">附加费：￥{{item.QuotationPrice.BabyChargePrice}}</span>
</div>
</div>
<div>{{$t('sm.laoren')}}</div>
<div>老人</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{salesItem.OldManChargePrice}}</span>
<span class="pLeftPrice">附加费：￥{{item.QuotationPrice.OldManChargePrice}}</span>
</div>
</div>
<div>{{$t('Operation.Op_zafei')}}</div>
<div>杂费</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{salesItem.VisaPrice}}</span>
<span
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{salesItem.SingleRoomPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_zafei')}}：￥{{salesItem.OtherPrice}}</span>
<span class="pLeftPrice">签证：￥{{item.QuotationPrice.VisaPrice}}</span>
<span class="pRightPrice">单房差：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
</div>
</div>
<div>{{$t('op.SingleQuotes')}}</div>
<div>单项报价</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{salesItem.SingleDMCPrice}}</span>
</div>
</div>
<div>{{$t('fnc.youhui')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('sm.tonghangfanyong')}}：￥{{salesItem.RebatePrice}}</span>
<span class="pRightPrice">{{$t('sm.zaoniaoyouhui')}}：￥{{salesItem.DiscountPrice}}</span>
<span class="pLeftPrice">单地接：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
</div>
</div>
</div>
</div>
<span slot="reference" class="diPrice">{{item.SalesPrice}}<span
class="qi">{{$t('op.Qi')}}</span></span>
<span slot="reference" class="diPrice">{{item.SalesPrice}}<span class="qi">起</span></span>
</el-popover>
</div>
......@@ -192,18 +174,18 @@
</div>
</div>
<div>
<span class="openGroup opbd" @click="goToOpenTravel(item)">
<span class="openGroup opbd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&&item.OpenState==2">
<el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-nav-hangzheng"></i>
</el-tooltip>
</span>
<span class="bianji opbd" @click="goMakeQuo('QuotationNewPrice',item.ID)">
<span class="bianji opbd" @click="goMakeQuo('QuotationNewPrice',item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i>
</el-tooltip>
</span>
<span class="QT-delete opbd" @click="delQuotation(item.ID)">
<span class="QT-delete opbd" @click="delQuotation(item.ID)" v-if="item.TravelState==1||item.TravelState==4||item.TravelState==5">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-shanchu"></i>
......@@ -542,9 +524,10 @@
name: path,
query: {
configId: item.ID,
openState: item.OpenState,
openState: 1,
isOffer: 1,
offerId: item.OfferId,
blank: 'y'
}
});
......@@ -594,7 +577,6 @@
}
},
created() {
if (this.$route.query.hasOwnProperty("cache")) {
if (this.$store.state.pageCondition != null) {
this.queryData = this.$store.state.pageCondition;
......@@ -603,5 +585,4 @@
this.getList();
}
};
</script>
</script>
\ No newline at end of file
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ ef8e9b28
......@@ -150,6 +150,7 @@
IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
DayNum: 0, //行程天数
OfferId: 0, //报价单Id
OpenState:2,//1-已开团，2-未开团
},
//行程
FeatureData: {
......@@ -631,6 +632,9 @@
if (this.$route.query.offerId) {
this.PostConfig.OfferId = this.$route.query.offerId;
}
if (this.$route.query.openState) {
this.PostConfig.OpenState = this.$route.query.openState;
}
if (this.modifyTcid > 0) {
this.modifyType = 2;
} else {
......@@ -731,9 +735,13 @@
this.PostConfig.IsDirect = tempData.IsDirect;
this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
this.PostConfig.OfferId = tempData.OfferId;
this.PostConfig.OpenState=tempData.OpenState;
if (this.$route.query.offerId) {
this.PostConfig.OfferId = this.$route.query.offerId;
}
if (this.$route.query.openState) {
this.PostConfig.OpenState = this.$route.query.openState;
}
//是否有报价单
this.IsHaveOffer = tempData.IsHaveOffer;
......@@ -775,7 +783,8 @@
this.UseTypeArray = tempData.UseTypeArray;
this.AirPickUp = tempData.AirPickUp;
this.AirSend = tempData.AirSend;
this.PostConfig["OpenState"] = this.OpenState;
this.PostConfig.OpenState = thtempData.OpenState;
if(this)
this.PostConfig.PDFAlias = tempData.PDFAlias;
} 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