Skip to content

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

页面修改

parent 4ffbe48d
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 176 deletions
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 00790bc3
...@@ -2190,7 +2190,7 @@ ...@@ -2190,7 +2190,7 @@
this.$router.push({ this.$router.push({
name: 'QuotationAduit', name: 'QuotationAduit',
query: { query: {
configId: item.ConfigID, offerid: item.Config_OfferId,
Qtype: 1, Qtype: 1,
blank: 'y', blank: 'y',
tab: '报价单查看' tab: '报价单查看'
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 00790bc3
...@@ -1247,9 +1247,11 @@ ...@@ -1247,9 +1247,11 @@
</el-col> </el-col>
</el-form> </el-form>
</div> </div>
<el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情"> <div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
</el-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
</div>
</div> </div>
</template> </template>
<script> <script>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 00790bc3
...@@ -876,8 +876,11 @@ ...@@ -876,8 +876,11 @@
<button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情"> <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 00790bc3
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<template> <template>
<div> <div>
<div class="CostNewPrice clearfix CP_Div" style="width:980px;"> <div class="CostNewPrice clearfix CP_Div" style="width:980px;" :loading="loading">
<el-form> <el-form>
<div class="QuotationFirstDiv1"> <div class="QuotationFirstDiv1">
<table> <table>
...@@ -1138,7 +1138,7 @@ ...@@ -1138,7 +1138,7 @@
<script> <script>
export default { export default {
props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt", props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
"CostCurrencyList", "teamPrice" "CostCurrencyList", "teamPrice","loading"
], ],
data() { data() {
return { return {
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 00790bc3
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
AuditContent: this.postData.AuditContent, AuditContent: this.postData.AuditContent,
TravelState: Type, TravelState: Type,
OfferPayType: this.postData.OfferPayType, OfferPayType: this.postData.OfferPayType,
TeamType:this.postData.TeamType, TeamType: this.postData.TeamType,
}; };
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -178,7 +178,10 @@ ...@@ -178,7 +178,10 @@
}); });
}, },
getPostData() { getPostData() {
let configId = this.$route.query.configId; let configId = 0;
if (this.$route.query.configId) {
configId = this.$route.query.configId;
}
let offerId = 0; let offerId = 0;
if (this.$route.query.offerid) { if (this.$route.query.offerid) {
offerId = this.$route.query.offerid; offerId = this.$route.query.offerid;
...@@ -187,12 +190,12 @@ ...@@ -187,12 +190,12 @@
ID: configId, ID: configId,
offerId: offerId offerId: offerId
}; };
this.loading=true; this.loading = true;
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V3", "travel_get_GetMyTravelInfo_V3",
msg, msg,
res => { res => {
this.loading=false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
......
src/components/TravelManager/TravelNewQuotation/priceDialog.vue
View file @ 00790bc3
...@@ -103,9 +103,11 @@ ...@@ -103,9 +103,11 @@
right: -27px; right: -27px;
top: -18px; top: -18px;
} }
.w875{
width:875px!important; .w875 {
width: 875px !important;
} }
</style> </style>
<template> <template>
...@@ -113,125 +115,12 @@ ...@@ -113,125 +115,12 @@
<el-form label-width="100px" ref="currentOfferFrom"> <el-form label-width="100px" ref="currentOfferFrom">
<div class="switchDiv clearfix" style="width:98%;"> <div class="switchDiv clearfix" style="width:98%;">
<div class="DirectPriceCenter"> <div class="DirectPriceCenter">
<div class="singlePrice clearfix"> <div class="singlePrice clearfix" :loading="loading">
<CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice" <CostNewPrice ref="CostNewPrice" :postConfig="postData" :OtherPrice="OtherPrice"
:dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :dayCostPrice="dayCostPriceList" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :teamPrice="teamPrice"
:teamPrice="teamPrice" :loading="loading">
></CostNewPrice> </CostNewPrice>
</div>
</div>
<div class="DirectRightPrice" style="margin-left:20px; display:none;">
<div class="dingjiaDiv">
<span class="TMTitle"><i></i>定价</span>
&nbsp;&nbsp;&nbsp;&nbsp;
<template v-if="!IsShow">
<span @click="IsShow=true" class="TMTitle" style="color:blue;cursor:pointer;text-decoration:underline;">
显示分项报价
</span>
</template>
<template v-else>
<span @click="IsShow=false" class="TMTitle" style="color:blue;cursor:pointer;text-decoration:underline;">
隐藏分项报价
</span>
</template>
</div>
<div v-show="IsShow">
<div class="Dleftname"></div>
<div class="DrightList">
<el-checkbox style="margin-left:25px;" v-model="teamPrice.IsSupportChildren"
:checked="teamPrice.IsSupportChildren===CheckedVaule" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">不支持儿童出游
</el-checkbox>
<el-form-item label="成本人数" style="margin-left:70px;">
<el-select class='w120' v-model='teamPrice.PeopleNumber'>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
</el-select>
</el-form-item>
</div>
</div>
<div class="clearfix" v-show="IsShow">
<div class="Dleftname">标准</div>
<div class="DrightList">
<el-form-item>
<el-input placeholder="" v-model="teamPrice.B2BMemberPrice"
@keyup.native="checkPrice(teamPrice,'B2BMemberPrice')" class="w200 ComSeat">
<template slot="prepend">成本价格</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.B2BPrice" @keyup.native="checkPrice(teamPrice,'B2BPrice')"
class="w200 ComSeat">
<template slot="prepend">销售价格</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.B2CMemberPrice"
@keyup.native="checkPrice(teamPrice,'B2CMemberPrice')" class="w200 ComSeat">
<template slot="prepend">直客会员</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.B2CPrice" @keyup.native="checkPrice(teamPrice,'B2CPrice')"
class="w200 ComSeat">
<template slot="prepend">直客</template>
</el-input>
</el-form-item>
</div>
</div>
<div class="clearfix" v-show="IsShow">
<div class="Dleftname">增收</div>
<div class="DrightList" style="width:900px;">
<el-form-item>
<el-input placeholder="" v-model="teamPrice.SafeMoney" @keyup.native="checkPrice(teamPrice,'SafeMoney')"
class="w200 ComSeat">
<template slot="prepend">保险</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.OtherPrice"
@keyup.native="checkPrice(teamPrice,'OtherPrice')" class="w200 ComSeat">
<template slot="prepend">杂费</template>
</el-input>
</el-form-item>
</div>
</div>
<div class="clearfix" v-show="IsShow">
<div class="Dleftname">减免</div>
<div class="DrightList">
<el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.RebatePrice"
@keyup.native="checkPrice(teamPrice,'RebatePrice')" class="w200 ComSeat">
<template slot="prepend">同行返佣</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-input placeholder="" v-model="teamPrice.DiscountPrice"
@keyup.native="checkPrice(teamPrice,'DiscountPrice')" class="w200 ComSeat">
<template slot="prepend">早鸟优惠</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input placeholder="" v-model="teamPrice.BackVisaPrice"
@keyup.native="checkPrice(teamPrice,'BackVisaPrice')" class="w200 ComSeat">
<template slot="prepend">退签证费</template>
</el-input>
</el-form-item>
<el-form-item style="display:none">
<el-input placeholder="" v-model="teamPrice.BackSafeMoney"
@keyup.native="checkPrice(teamPrice,'BackSafeMoney')" class="w200 ComSeat">
<template slot="prepend">退保险费</template>
</el-input>
</el-form-item>
</div>
</div>
<div class="clearfix" v-show="IsShow">
<div class="Dleftname">备注</div>
<div class="DrightList">
<el-form-item>
<el-input type="textarea" class="w875" v-model="teamPrice.PriceRemark"></el-input>
</el-form-item>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -240,11 +129,10 @@ ...@@ -240,11 +129,10 @@
</template> </template>
<script> <script>
import CostNewPrice from "../TravelNewQuotation/CostNewPriceCC"; import CostNewPrice from "../TravelNewQuotation/CostNewPriceCC";
export default { export default {
props: ['ConfigId', 'OfferId'], props: ['ConfigId', 'OfferId'],
data() { data() {
return { return {
CheckedVaule: 2, CheckedVaule: 2,
UnCheckedVaule: 1, UnCheckedVaule: 1,
...@@ -284,7 +172,7 @@ ...@@ -284,7 +172,7 @@
OutBranchId: -1, //出团公司 OutBranchId: -1, //出团公司
OutDateTime: "", //出发时间 OutDateTime: "", //出发时间
OfferPayType: 0, //报价单付款方式 OfferPayType: 0, //报价单付款方式
SaleOfferPayType:0,//售价付款方式 SaleOfferPayType: 0, //售价付款方式
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
...@@ -375,10 +263,12 @@ ...@@ -375,10 +263,12 @@
ID: configId, ID: configId,
offerId: offerId offerId: offerId
}; };
this.loading = true;
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V3", "travel_get_GetMyTravelInfo_V3",
msg, msg,
res => { res => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
...@@ -415,51 +305,31 @@ ...@@ -415,51 +305,31 @@
this.postData.OutBranchId = tempData.OutBranchId; this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime; this.postData.OutDateTime = tempData.OutDateTime;
this.postData.OfferPayType = tempData.OfferPayType; this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType=tempData.SaleOfferPayType; this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
this.LineList = tempData.LineList; this.LineList = tempData.LineList;
if(tempData.OfferArray) { if (tempData.OfferArray) {
this.currentData = tempData.OfferArray.find(item => item.IsDefault) this.currentData = tempData.OfferArray.find(item => item.IsDefault);
this.OtherPrice = this.currentData.otherPrice if (this.currentData) {
this.dayCostPriceList = this.currentData.dayCostPriceList if (this.currentData.otherPrice) {
this.CostCurrencyList = this.currentData.CostCurrencyList this.OtherPrice = this.currentData.otherPrice
this.CostNumberList = this.currentData.CostNumberList }
this.queryMsg = this.currentData.queryMsg if (this.currentData.dayCostPriceList) {
this.teamPrice = this.currentData.teamPrice this.dayCostPriceList = this.currentData.dayCostPriceList
}
if (this.currentData.CostCurrencyList) {
this.CostCurrencyList = this.currentData.CostCurrencyList
}
if (this.currentData.CostNumberList) {
this.CostNumberList = this.currentData.CostNumberList
}
if (this.currentData.queryMsg) {
this.queryMsg = this.currentData.queryMsg
}
if (this.currentData.teamPrice) {
this.teamPrice = this.currentData.teamPrice
}
}
} }
// if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
// 0) {
// this.dayCostPriceList = tempData.dayCostPriceList;
// }
// if (tempData.otherPrice) {
// this.otherPrice = tempData.otherPrice;
// }
// if (tempData.teamPrice) {
// this.teamPrice = tempData.teamPrice;
// }
// if (tempData.CostNumberList && tempData.CostNumberList != null && tempData.CostNumberList.length > 0) {
// this.CostNumberList = tempData.CostNumberList;
// }
// if (tempData.CostCurrencyList && tempData.CostCurrencyList != null && tempData.CostCurrencyList.length >
// 0) {
// this.CostCurrencyList = tempData.CostCurrencyList;
// }
// if (tempData.CurrencyNumberListExt && tempData.CurrencyNumberListExt != null && tempData
// .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);
// }
// });
// }
} else { } else {
this.Error(res.data.message); 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