Skip to content

S
SuperMan
Commit d9ab9126 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 00a731c7
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 48 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ d9ab9126
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
<el-input type="textarea" v-model="postConfig.AuditContent"></el-input> <el-input type="textarea" v-model="postConfig.AuditContent"></el-input>
</td> </td>
</tr> </tr>
<tr> <tr v-if="IsEdit==2">
<td colspan="13" style="text-align:center;"> <td colspan="13" style="text-align:center;">
<input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" /> <input type="button" class="normalBtn" value="同意" @click="SubSaveType(3)" />
<input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" /> <input type="button" class="normalBtn" value="拒绝" @click="SubSaveType(4)" />
...@@ -737,7 +737,7 @@ ...@@ -737,7 +737,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","IsEdit"
], ],
data() { data() {
return { return {
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ d9ab9126
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<CostNewPriceAudit ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice" <CostNewPriceAudit ref="CostNewPrice" :postConfig="postData" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList" :dayCostPrice="dayCostPriceList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt" :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
:teamPrice="teamPrice" :teamPrice="teamPrice" :IsEdit="IsEdit"
></CostNewPriceAudit> ></CostNewPriceAudit>
</div> </div>
</div> </div>
...@@ -132,7 +132,8 @@ ...@@ -132,7 +132,8 @@
TravelState:0,//3审核通过，4拒绝 TravelState:0,//3审核通过，4拒绝
}, },
LineList: [], //线路列表 LineList: [], //线路列表
loading: false loading: false,
IsEdit:0,
}; };
}, },
methods: { methods: {
...@@ -184,7 +185,6 @@ ...@@ -184,7 +185,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("tempData1", tempData);
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID; this.postData.ID = tempData.ID;
} }
...@@ -253,6 +253,9 @@ ...@@ -253,6 +253,9 @@
if (this.$route.query.TeamType) { if (this.$route.query.TeamType) {
this.postData.TeamType = this.$route.query.TeamType; this.postData.TeamType = this.$route.query.TeamType;
} }
if (this.$route.query.Qtype) {
this.IsEdit = this.$route.query.Qtype;
}
this.getPostData(); this.getPostData();
}, },
components: { components: {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ d9ab9126
...@@ -118,65 +118,47 @@ ...@@ -118,65 +118,47 @@
<div class=""> <div class="">
{{$t('op.SalesPrice')}} {{$t('op.SalesPrice')}}
<el-popover popper-class="salsSetPrice" trigger="click"> <el-popover popper-class="salsSetPrice" trigger="click">
<div class="priceContentDiv"> <div class="priceContentDiv" v-if="item.QuotationPrice!=null">
<div v-for="salesItem in SalesPriceList"> <div>
<div>{{$t('salesModule.Adult')}}</div> <div>成人</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">成本价格：￥{{salesItem.B2BMemberPrice}}</span> <span class="pLeftPrice">销售价格：￥{{item.QuotationPrice.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>
</div> </div>
</div> </div>
<div>{{$t('op.Child')}}</div> <div>小孩</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{salesItem.ChildNeedPrice}}</span> <span class="pLeftPrice">占床：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{salesItem.ChildNoNeedPrice}}</span> <span class="pRightPrice">不占床：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
</div> </div>
<div class="priceDivCon"> <div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{salesItem.BabyPrice}}</span> <span class="pLeftPrice">婴儿：￥{{item.QuotationPrice.BabyPrice}}</span>
<span class="pRightPrice">{{$t('op.Surcharge')}}：￥{{salesItem.BabyChargePrice}}</span> <span class="pRightPrice">附加费：￥{{item.QuotationPrice.BabyChargePrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('sm.laoren')}}</div> <div>老人</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{salesItem.OldManChargePrice}}</span> <span class="pLeftPrice">附加费：￥{{item.QuotationPrice.OldManChargePrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('Operation.Op_zafei')}}</div> <div>杂费</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{salesItem.VisaPrice}}</span> <span class="pLeftPrice">签证：￥{{item.QuotationPrice.VisaPrice}}</span>
<span <span class="pRightPrice">单房差：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{salesItem.SingleRoomPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_zafei')}}：￥{{salesItem.OtherPrice}}</span>
</div> </div>
</div> </div>
<div>{{$t('op.SingleQuotes')}}</div> <div>单项报价</div>
<div class="priceList"> <div class="priceList">
<div> <div>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{salesItem.SingleDMCPrice}}</span> <span class="pLeftPrice">单地接：￥{{item.QuotationPrice.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>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<span slot="reference" class="diPrice">{{item.SalesPrice}}<span <span slot="reference" class="diPrice">{{item.SalesPrice}}<span class="qi">起</span></span>
class="qi">{{$t('op.Qi')}}</span></span>
</el-popover> </el-popover>
</div> </div>
...@@ -192,18 +174,18 @@ ...@@ -192,18 +174,18 @@
</div> </div>
</div> </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"> <el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-nav-hangzheng"></i> <i class="iconfont icon-nav-hangzheng"></i>
</el-tooltip> </el-tooltip>
</span> </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" <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i> <i class="iconfont icon-bianji-smal"></i>
</el-tooltip> </el-tooltip>
</span> </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" <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<i class="iconfont icon-shanchu"></i> <i class="iconfont icon-shanchu"></i>
...@@ -542,9 +524,10 @@ ...@@ -542,9 +524,10 @@
name: path, name: path,
query: { query: {
configId: item.ID, configId: item.ID,
openState: item.OpenState, openState: 1,
isOffer: 1, isOffer: 1,
offerId: item.OfferId, offerId: item.OfferId,
blank: 'y' blank: 'y'
} }
}); });
...@@ -594,7 +577,6 @@ ...@@ -594,7 +577,6 @@
} }
}, },
created() { created() {
if (this.$route.query.hasOwnProperty("cache")) { if (this.$route.query.hasOwnProperty("cache")) {
if (this.$store.state.pageCondition != null) { if (this.$store.state.pageCondition != null) {
this.queryData = this.$store.state.pageCondition; this.queryData = this.$store.state.pageCondition;
...@@ -603,5 +585,4 @@ ...@@ -603,5 +585,4 @@
this.getList(); this.getList();
} }
}; };
</script>
</script> \ No newline at end of file
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ d9ab9126
...@@ -150,6 +150,7 @@ ...@@ -150,6 +150,7 @@
IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息 IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
DayNum: 0, //行程天数 DayNum: 0, //行程天数
OfferId: 0, //报价单Id OfferId: 0, //报价单Id
OpenState:2,//1-已开团，2-未开团
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -631,6 +632,9 @@ ...@@ -631,6 +632,9 @@
if (this.$route.query.offerId) { if (this.$route.query.offerId) {
this.PostConfig.OfferId = 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) { if (this.modifyTcid > 0) {
this.modifyType = 2; this.modifyType = 2;
} else { } else {
...@@ -731,9 +735,13 @@ ...@@ -731,9 +735,13 @@
this.PostConfig.IsDirect = tempData.IsDirect; this.PostConfig.IsDirect = tempData.IsDirect;
this.PostConfig.PriceIsDirect = tempData.PriceIsDirect; this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
this.PostConfig.OfferId = tempData.OfferId; this.PostConfig.OfferId = tempData.OfferId;
this.PostConfig.OpenState=tempData.OpenState;
if (this.$route.query.offerId) { if (this.$route.query.offerId) {
this.PostConfig.OfferId = 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; this.IsHaveOffer = tempData.IsHaveOffer;
...@@ -775,7 +783,8 @@ ...@@ -775,7 +783,8 @@
this.UseTypeArray = tempData.UseTypeArray; this.UseTypeArray = tempData.UseTypeArray;
this.AirPickUp = tempData.AirPickUp; this.AirPickUp = tempData.AirPickUp;
this.AirSend = tempData.AirSend; this.AirSend = tempData.AirSend;
this.PostConfig["OpenState"] = this.OpenState; this.PostConfig.OpenState = thtempData.OpenState;
if(this)
this.PostConfig.PDFAlias = tempData.PDFAlias; this.PostConfig.PDFAlias = tempData.PDFAlias;
} 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