Skip to content

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

页面修改

parent b9bc2a6d
Show whitespace changes
Inline Side-by-side
Showing with 482 additions and 484 deletions
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ 41534e2d
<style> <style>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
</style> </style>
<template> <template>
<div class="flexOne quoTation"> <div class="flexOne quoTation">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<span> <span>
<em>所属线路</em> <em>所属线路</em>
<el-select v-model="queryData.LineId" class='w200' filterable <el-select v-model="queryData.LineId" class='w200' filterable :placeholder="$t('pub.pleaseSel')"
:placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
v-for="item in LineList"
:label='item.LineName'
:value='item.LineID'
:key='item.LineID'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -23,14 +20,9 @@ ...@@ -23,14 +20,9 @@
<li> <li>
<span> <span>
<em>所属系列</em> <em>所属系列</em>
<el-select v-model="queryData.LineteamId" class='w200' filterable <el-select v-model="queryData.LineteamId" class='w200' filterable :placeholder="$t('pub.pleaseSel')">
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
v-for="item in LineTeamList"
:label='item.LtName'
:value='item.LtID'
:key='item.LtID'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -40,9 +32,7 @@ ...@@ -40,9 +32,7 @@
<em>提交人</em> <em>提交人</em>
<el-select v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option v-for="item in EmployeeList" <el-option v-for="item in EmployeeList" :label='item.EmName' :value='item.EmployeeId'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -54,42 +44,57 @@ ...@@ -54,42 +44,57 @@
</ul> </ul>
</div> </div>
<el-tabs v-model="activeName" @tab-click="handleClick(activeName)"> <el-tabs v-model="activeName" @tab-click="handleClick(activeName)">
<el-tab-pane v-for="item in $tripUtils.TravelStateList" :label="item.label" :name="item.Id" <el-tab-pane v-for="item in $tripUtils.TravelStateList" :label="item.label" :name="item.Id" :key="item.subCode">
:key="item.subCode"></el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="commonContent" v-loading="loading"> <div class="commonContent" v-loading="loading">
<ul class="_content"> <ul class="_content">
<li v-for="item in dataList" :key="item.subCode" :data-id='item.ID'> <li v-for="item in dataList" :key="item.subCode" :data-id='item.ID'>
<div class="_left"> <div class="_left">
<div> <div>
<p class="quoListName" @click="getJourney(item.ID,item.Title)"> <p class="quoListName" >
<el-tooltip popper-class="max-w250" effect="dark" :content="item.ID" placement="top-start">
<span>{{item.ID}}</span>
</el-tooltip>
</p>
</div>
</div>
<div class="_left">
<div>
<p class="quoListName" >
<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>
<span>{{item.LtName}}</span>
</p>
</div>
</div>
<div class="_left">
<div>
<p class="quoListName" >
<el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start"> <el-tooltip popper-class="max-w250" effect="dark" :content="item.Title" placement="top-start">
<span>{{item.Title}}</span> <span>{{item.Title}}</span>
</el-tooltip> </el-tooltip>
</p> </p>
<p class="Quo_Content"><i v-if="item.ProductRecommend" class="iconfont icon-richeng"></i> <p class="Quo_Content"><i v-if="item.CustomerName" class="iconfont icon-richeng"></i>
<span>{{item.ProductRecommend}}</span> <span>{{item.CustomerName}}</span>
</p> </p>
</div> </div>
</div> </div>
<div class="_cent"> <div class="_cent">
<div class="stayDays">{{item.DayNum}}天{{item.NightNum}}晚</div> <div class="stayDays">{{item.DayNum}}天</div>
<div class=""> <div class="">
销售定价 销售定价
<el-popover <el-popover popper-class="salsSetPrice" trigger="click">
popper-class="salsSetPrice"
trigger="click">
<div class="priceContentDiv" v-if="item.QuotationPrice!=null"> <div class="priceContentDiv" v-if="item.QuotationPrice!=null">
<div> <div>
<div>成人</div> <div>成人</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">同业会员：￥{{item.QuotationPrice.B2BMemberPrice}}</span> <span class="pLeftPrice">销售价格：￥{{item.QuotationPrice.B2BMemberPrice}}</span>
<span class="pRightPrice">同业：￥{{item.QuotationPrice.B2BPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">直客会员：￥{{item.QuotationPrice.B2CMemberPrice}}</span>
<span class="pRightPrice">直客：￥{{item.QuotationPrice.B2CPrice}}</span>
</div> </div>
</div> </div>
<div>小孩</div> <div>小孩</div>
...@@ -115,9 +120,6 @@ ...@@ -115,9 +120,6 @@
<span class="pLeftPrice">签证：￥{{item.QuotationPrice.VisaPrice}}</span> <span class="pLeftPrice">签证：￥{{item.QuotationPrice.VisaPrice}}</span>
<span class="pRightPrice">单房差：￥{{item.QuotationPrice.SingleRoomPrice}}</span> <span class="pRightPrice">单房差：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
</div> </div>
<div class="priceDivCon">
<span class="pLeftPrice">杂费：￥{{item.QuotationPrice.OtherPrice}}</span>
</div>
</div> </div>
<div>单项报价</div> <div>单项报价</div>
<div class="priceList"> <div class="priceList">
...@@ -125,18 +127,11 @@ ...@@ -125,18 +127,11 @@
<span class="pLeftPrice">单地接：￥{{item.QuotationPrice.SingleDMCPrice}}</span> <span class="pLeftPrice">单地接：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
</div> </div>
</div> </div>
<div>优惠</div>
<div class="priceList">
<div>
<span class="pLeftPrice">同行返佣：￥{{item.QuotationPrice.RebatePrice}}</span>
<span class="pRightPrice">早鸟优惠：￥{{item.QuotationPrice.DiscountPrice}}</span>
</div>
</div>
</div> </div>
</div> </div>
<span slot="reference" class="diPrice" >{{item.SalesPrice}}<span class="qi">起</span></span> <span slot="reference" class="diPrice">{{item.SalesPrice}}<span class="qi">起</span></span>
</el-popover> </el-popover>
<span class="AudiDanTeamDate">有效期：{{item.QuotationLimitStartStr}} 至&nbsp;{{item.QuotationLimitEndStr}}</span>
</div> </div>
</div> </div>
<div class="_rightAudit"> <div class="_rightAudit">
...@@ -156,9 +151,7 @@ ...@@ -156,9 +151,7 @@
</div> </div>
<div v-if="item.TravelState==3"> <div v-if="item.TravelState==3">
<div class="Auditapproved">已通过</div> <div class="Auditapproved">已通过</div>
<el-popover <el-popover popper-class="salsSetPrice" trigger="click">
popper-class="salsSetPrice"
trigger="click">
<div class="priceContentDiv"> <div class="priceContentDiv">
<div> <div>
<span>审批结果</span> <span>审批结果</span>
...@@ -171,9 +164,7 @@ ...@@ -171,9 +164,7 @@
</div> </div>
<div v-if="item.TravelState==4"> <div v-if="item.TravelState==4">
<div class="Auditrejected">已驳回</div> <div class="Auditrejected">已驳回</div>
<el-popover <el-popover popper-class="salsSetPrice" trigger="click">
popper-class="salsSetPrice"
trigger="click">
<div class="priceContentDiv"> <div class="priceContentDiv">
<div> <div>
<span>审批结果</span> <span>审批结果</span>
...@@ -187,23 +178,18 @@ ...@@ -187,23 +178,18 @@
</div> </div>
<div class="AD_Operation"> <div class="AD_Operation">
<span class="openGroup opbd"> <span class="openGroup opbd">
<el-tooltip class="item" effect="dark" content="查看" placement="top-start" <el-tooltip class="item" effect="dark" content="查看" placement="top-start" popper-class="max-w250">
popper-class="max-w250">
<span @click="goUrl('QuotationDetails',item.ID,1)">查</span> <span @click="goUrl('QuotationDetails',item.ID,1)">查</span>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="openGroup opbd" v-if="item.TravelState==2"> <span class="openGroup opbd" v-if="item.TravelState==2">
<el-tooltip class="item" effect="dark" content="审核" placement="top-start" <el-tooltip class="item" effect="dark" content="审核" placement="top-start" popper-class="max-w250">
popper-class="max-w250">
<span @click="goUrl('QuotationDetails',item.ID,2)">审</span> <span @click="goUrl('QuotationDetails',item.ID,2)">审</span>
</el-tooltip> </el-tooltip>
</span> </span>
<span class="openGroup opbd"> <span class="openGroup opbd">
<el-tooltip class="item" effect="dark" content="日志" placement="top-start" <el-tooltip class="item" effect="dark" content="日志" placement="top-start" popper-class="max-w250">
popper-class="max-w250"> <el-popover popper-class="salsSetPrice" trigger="click">
<el-popover
popper-class="salsSetPrice"
trigger="click">
<div class="priceContentDiv"> <div class="priceContentDiv">
<div class="AuditLog">报价单日志</div> <div class="AuditLog">报价单日志</div>
<div class="logContact"> <div class="logContact">
...@@ -213,8 +199,7 @@ ...@@ -213,8 +199,7 @@
<div class="operateName">{{childItem.UserName}}</div> <div class="operateName">{{childItem.UserName}}</div>
<div class="operateDate">{{childItem.hour}}</div> <div class="operateDate">{{childItem.hour}}</div>
</div> </div>
<div>{{childItem.LogContent}}<span class="spread" <div>{{childItem.LogContent}}<span class="spread" v-if="childItem.LogType==2"
v-if="childItem.LogType==2"
@click="expectInfo(logIndex)">{{childItem.expectName}}</span></div> @click="expectInfo(logIndex)">{{childItem.expectName}}</span></div>
<div v-if="childItem.isShow">{{childItem.LogRemark}}</div> <div v-if="childItem.isShow">{{childItem.LogRemark}}</div>
</div> </div>
...@@ -257,11 +242,11 @@ ...@@ -257,11 +242,11 @@
</el-col> </el-col>
</el-form> </el-form>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import commonTeamInfo from "../../commonPage/commonTeamInfo.vue"; import commonTeamInfo from "../../commonPage/commonTeamInfo.vue";
export default { export default {
data() { data() {
return { return {
queryData: { queryData: {
...@@ -278,9 +263,11 @@ export default { ...@@ -278,9 +263,11 @@ export default {
AuditContent: "" AuditContent: ""
}, },
rules: { rules: {
AuditContent: [ AuditContent: [{
{ required: true, message: "请填写审核说明", trigger: "blur" } required: true,
] message: "请填写审核说明",
trigger: "blur"
}]
}, },
loading: true, loading: true,
//默认选中 //默认选中
...@@ -433,7 +420,11 @@ export default { ...@@ -433,7 +420,11 @@ export default {
totalPrice += x.OfferPrice; totalPrice += x.OfferPrice;
} }
}); });
let offerPrice = { day: i, dayOfferPriceList, totalPrice }; let offerPrice = {
day: i,
dayOfferPriceList,
totalPrice
};
offerPriceList.push(offerPrice); offerPriceList.push(offerPrice);
} }
cost["offerPriceList"] = offerPriceList; cost["offerPriceList"] = offerPriceList;
...@@ -445,8 +436,7 @@ export default { ...@@ -445,8 +436,7 @@ export default {
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() { getEmployeeList() {
this.apipost( this.apipost(
"admin_get_GetEmployeeByUserDepartmentId", "admin_get_GetEmployeeByUserDepartmentId", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
...@@ -468,10 +458,15 @@ export default { ...@@ -468,10 +458,15 @@ export default {
if (configId > 0) { if (configId > 0) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { configId: configId, Qtype: qType } query: {
configId: configId,
Qtype: qType
}
}); });
} else { } else {
this.$router.push({ name: path }); this.$router.push({
name: path
});
} }
}, },
submitForm() { submitForm() {
...@@ -518,5 +513,6 @@ export default { ...@@ -518,5 +513,6 @@ export default {
this.getEmployeeList(); this.getEmployeeList();
this.getList(); this.getList();
} }
}; };
</script> </script>
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 41534e2d
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
ReturnArriveCityId: 0, //返回抵达城市 ReturnArriveCityId: 0, //返回抵达城市
CustomerName: "", //客户名称 CustomerName: "", //客户名称
TeamType: 0, //团队类型 TeamType: 0, //团队类型
TravelState:1,//团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
this.$refs["QuotationPrice"].submitForm(type); this.$refs["QuotationPrice"].submitForm(type);
}, },
//保存数据 //保存数据
SaveData() { SaveData(type) {
var currencyNumList = []; var currencyNumList = [];
if (this.CurrencyNumberListExt != null && this.CurrencyNumberListExt.length > 0) { if (this.CurrencyNumberListExt != null && this.CurrencyNumberListExt.length > 0) {
this.CurrencyNumberListExt.forEach((item, index) => { this.CurrencyNumberListExt.forEach((item, index) => {
...@@ -140,6 +141,8 @@ ...@@ -140,6 +141,8 @@
}); });
}); });
} }
this.postData.TravelState=type;
console.log("this.postData",this.postData);
var nObj = { var nObj = {
config: this.postData, config: this.postData,
dayCostPriceList: this.dayCostPriceList, dayCostPriceList: this.dayCostPriceList,
...@@ -192,7 +195,6 @@ ...@@ -192,7 +195,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log("tempData", tempData);
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID; this.postData.ID = tempData.ID;
} }
......
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