Skip to content

S
SuperMan
Commit 165ce769 authored by youjie's avatar youjie
Browse files
Options

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

parents d8d8bade aed82b12
Show whitespace changes
Inline Side-by-side
Showing with 143 additions and 87 deletions
src/assets/common/lang/en.js
View file @ 165ce769
......@@ -248,6 +248,9 @@ export const system = {
btn_bindCtrl: 'Bind information',
btn_addCoin: 'Add a coin',
label_netName: 'Web group name',
payTime:'time of payment',
payTotalMoney:'Total payment amount (CNY)',
payType:'Bill type',
}
......
src/assets/common/lang/jp.js
View file @ 165ce769
......@@ -211,6 +211,9 @@ export const system = {
btn_bindCtrl:'情報バインデイング',
btn_addCoin:'通貨添加',
label_netName:'ホームページ団体名',
payTime:'支払い時間',
payTotalMoney:'支払総額（CNY）',
payType:'請求書タイプ',
}
......
src/assets/common/lang/zh-tw.js
View file @ 165ce769
......@@ -246,6 +246,9 @@ export const system = {
btn_bindCtrl:'綁定資訊',
btn_addCoin:'添加幣種',
label_netName:'網頁團名',
payTime:'支付時間',
payTotalMoney:'支付總金額（元）',
payType:'帳單類型',
}
......
src/assets/common/lang/zh.js
View file @ 165ce769
......@@ -247,6 +247,9 @@ export const system = {
btn_bindCtrl:'绑定信息',
btn_addCoin:'添加币种',
label_netName:'网页团名',
payTime:'支付时间',
payTotalMoney:'支付总金额（元）',
payType:'账单类型',
}
......
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ 165ce769
......@@ -80,7 +80,7 @@
<li>
<span>
<em>报价单号</em>
<el-input type="text" class="multiple_input" v-model="queryData.OfferId" clearable ></el-input>
<el-input type="text" class="multiple_input" v-model="queryData.OfferId" clearable></el-input>
</span>
</li>
<li>
......@@ -124,7 +124,8 @@
<template v-else>
{{item.TeamTypeName}}
</template>
<template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
<template
v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
</div>
</div>
......@@ -174,7 +175,8 @@
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
<span
class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span>
......@@ -184,25 +186,35 @@
<div>{{$t('sm.laoren')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
<span
class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
</div>
</div>
<div>{{$t('Operation.Op_zafei')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
<span
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
</div>
</div>
<div>{{$t('op.SingleQuotes')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
<span
class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
</div>
</div>
</div>
</div>
<span slot="reference" class="diPrice">{{item.JPYSalePrice}}<span class="qi">{{$t('op.Qi')}}</span></span>
<span slot="reference" class="diPrice">
<template v-if="item.OutBranchId==1222||item.OutBranchId==1218">
{{item.JPYSalePrice}}
</template>
<template>
{{item.SalesPrice}}
</template>
<span class="qi">{{$t('op.Qi')}}</span></span>
</el-popover>
</div>
</div>
......@@ -219,7 +231,15 @@
</div>
<div class="AuditStatus">
<div v-if="item.TravelState==2">
<div>{{$t('objFill.dsh')}}</div>
<div>
<template v-if="item.ManagerAduitDate==''&&item.ManagerId>0">
{{item.ManagerAduitName}}
</template>
<template v-else>
{{item.AuditByName}}
</template>
{{$t('fnc.shenhe')}}
</div>
</div>
<div v-if="item.TravelState==3">
<div class="Auditapproved">{{$t('fnc.ytongguo')}}</div>
......@@ -227,10 +247,9 @@
<div v-if="item.TravelState==4">
<div class="Auditrejected">{{$t('objFill.yibohui')}}</div>
</div>
<template
v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
<template v-if="(item.ManagerAduitDate&&item.ManagerAduitDate!='')||(item.AuditDate&&item.AuditDate!='')">
<el-popover popper-class="salsSetPrice" trigger="click">
<template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''">
<template v-if="item.ManagerAduitDate&&item.ManagerAduitDate!=''">
<div class="priceContentDiv" style="margin-bottom:5px;">
<div>
<span>审批结果</span>
......@@ -266,12 +285,14 @@
</div>
<div class="AD_Operation">
<span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"
popper-class="max-w250">
<span @click="offerAudit(item,1)">查</span>
</el-tooltip>
</span>
<span class="openGroup opbdList" v-if="item.TravelState==2">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top-start"
popper-class="max-w250">
<span @click="offerAudit(item,2)">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</el-tooltip>
</span>
......@@ -281,7 +302,8 @@
</el-tooltip>
</span>
<span class="openGroup opbdList">
<el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('fnc.rizhi')" placement="top-start"
popper-class="max-w250">
<el-popover popper-class="salsSetPrice" trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">报价单日志</div>
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 165ce769
......@@ -132,7 +132,8 @@
<template v-else>
{{item.TeamTypeName}}
</template>
<template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
<template
v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
</div>
</div>
</div>
......@@ -174,7 +175,8 @@
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('op.TakeBed')}}：￥{{item.QuotationPrice.ChildNeedPrice}}</span>
<span class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
<span
class="pRightPrice">{{$t('op.NoneedBed')}}：￥{{item.QuotationPrice.ChildNoNeedPrice}}</span>
</div>
<div class="priceDivCon">
<span class="pLeftPrice">{{$t('Operation.Op_baby')}}：￥{{item.QuotationPrice.BabyPrice}}</span>
......@@ -184,20 +186,23 @@
<div>{{$t('sm.laoren')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
<span
class="pLeftPrice">{{$t('op.Surcharge')}}：￥{{item.QuotationPrice.OldManChargePrice}}</span>
</div>
</div>
<div>{{$t('Operation.Op_zafei')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('active.cl_qianzheng')}}：￥{{item.QuotationPrice.VisaPrice}}</span>
<span class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
<span
class="pRightPrice">{{$t('Operation.Op_singleRoomcha')}}：￥{{item.QuotationPrice.SingleRoomPrice}}</span>
</div>
</div>
<div>{{$t('op.SingleQuotes')}}</div>
<div class="priceList">
<div>
<span class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
<span
class="pLeftPrice">{{$t('salesModule.SingleJ')}}：￥{{item.QuotationPrice.SingleDMCPrice}}</span>
</div>
</div>
</div>
......@@ -225,7 +230,14 @@
</div>
<div class="AuditStatus" style="width:80px;">
<div v-if="item.TravelState==2">
<div>{{$t('objFill.dsh')}}</div>
<div> <template v-if="item.ManagerAduitDate==''&&item.ManagerId>0">
{{item.ManagerAduitName}}
</template>
<template v-else>
{{item.AuditByName}}
</template>
{{$t('fnc.shenhe')}}
</div>
</div>
<div v-if="item.TravelState==3">
<div class="Auditapproved">{{$t('fnc.ytongguo')}}</div>
......@@ -233,10 +245,9 @@
<div v-if="item.TravelState==4">
<div class="Auditrejected">{{$t('objFill.yibohui')}}</div>
</div>
<template
v-if="(item.AuditByName&&item.AuditByName!='')||(item.ManagerAduitName&&item.ManagerAduitName!='')">
<template v-if="(item.ManagerAduitDate&&item.ManagerAduitDate!='')||(item.AuditDate&&item.AuditDate!='')">
<el-popover popper-class="salsSetPrice" trigger="click">
<template v-if="item.ManagerAduitName&&item.ManagerAduitName!=''">
<template v-if="item.ManagerAduitDate&&item.ManagerAduitDate!=''">
<div class="priceContentDiv" style="margin-bottom:5px;">
<div>
<span>审批结果</span>
......@@ -292,17 +303,20 @@
</el-tooltip>
</span>
<span style="background:#85ce61; " class="newAopbdd">
<el-tooltip class="item" effect="dark" w450:content="$t('fnc.chakan')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" w450:content="$t('fnc.chakan')" placement="top-start"
popper-class="max-w250">
<i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>
</el-tooltip>
</span>
<span style="background:#85ce61; " class="newAopbdd" @click="copyOffer(item)">
<el-tooltip class="item" effect="dark" :content="$t('objFill.copy')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('objFill.copy')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-copy"></i>
</el-tooltip>
</span>
<span style="background:#85ce61;" class="newAopbdd" @click="downLoadOffer(item)">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-bb-xiazai"></i>
</el-tooltip>
</span>
......@@ -448,7 +462,8 @@
<td colspan="2" style="text-align:center;">
<el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">保存
</el-button>
<input type="button" class="normalBtn" :value="$t('pub.closeSel')" @click="isShowImportOffer=false,clearMsg()" />
<input type="button" class="normalBtn" :value="$t('pub.closeSel')"
@click="isShowImportOffer=false,clearMsg()" />
</td>
</tr>
</table>
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_DirectThree.vue
View file @ 165ce769
<style>
@import url("../../../assets/css/tripIndexNew2.css");
.dayPage-box {
margin-left: 20px;
position: relative;
......@@ -22,16 +23,20 @@
left: -8px;
top: 17px;
}
.TravelDayContentThree .el-textarea__inner{
.TravelDayContentThree .el-textarea__inner {
/* width: ; */
}
.TravelDayContentThree .days-box .leftDayLine{
.TravelDayContentThree .days-box .leftDayLine {
flex-shrink: 0;
}
.dayPage-form{
.dayPage-form {
width: 500px;
padding: 10px 0;
}
.TravelDaysTrip .el-form-item {
display: inline-block;
}
......@@ -77,7 +82,8 @@
.TC-newTop {
margin-top: 40px !important;
}
.BlowUpTravelDays{
.BlowUpTravelDays {
position: absolute;
right: 10px;
top: -19px;
......@@ -91,10 +97,12 @@
cursor: pointer;
font-size: 15px;
}
.BlowUpTravelDays:hover{
.BlowUpTravelDays:hover {
color: #fff;
}
.BlowUpTravelDaysBox{
.BlowUpTravelDaysBox {
position: fixed;
top: 0;
left: 0;
......@@ -103,11 +111,12 @@
z-index: 10000;
padding: 0 10px;
overflow-y: scroll;
background: rgba(23,23,23,0.5);
background: rgba(23, 23, 23, 0.5);
display: flex;
justify-content: center;
}
.BlowUpTravelDaysClose{
.BlowUpTravelDaysClose {
position: fixed;
width: 40px;
right: 50px;
......@@ -136,6 +145,7 @@
<span class="TDInputspan">
<el-form-item prop="DayNum">
<el-input class="w100 LowNum" v-model="subConfig.DayNum" maxlength="2"
:disabled="dataAll&&dataAll.OfferId&&dataAll.OfferId>0"
@keyup.native="checkInteger(subConfig,'DayNum');createLineTrip()">
<template slot="append">{{$t('hotel.hotel_day')}}</template>
</el-input>
......@@ -180,13 +190,12 @@
</el-form-item>
</span> -->
<template v-if="true">
<span class="TDTextspan" :class="{'showOther':TeamType==3}">{{$t('objFill.v101.myOrdersAllType.banxing')}}</span>
<span class="TDTextspan"
:class="{'showOther':TeamType==3}">{{$t('objFill.v101.myOrdersAllType.banxing')}}</span>
<span :class="{'showOther':TeamType==3}">
<el-form-item prop="FeaturePageType">
<el-select class="w90" :placeholder="$t('objFill.v101.myOrdersAllType.qingxuanzbx')"
:disabled="isTemplate"
v-model="dataAll.FeaturePageType"
@change="PromptTemplate()" @focus="">
:disabled="isTemplate" v-model="dataAll.FeaturePageType" @change="PromptTemplate()">
<el-option :label="$t('objFill.v101.myOrdersAllType.hengban')" :value="1"></el-option>
<el-option :label="$t('objFill.v101.myOrdersAllType.shuban')" :value="2"></el-option>
</el-select>
......@@ -205,7 +214,8 @@
<div class="dayPage-box row">
<div class="dayPage-form relative" v-if="!item.isHide">
<template v-if="isTemplate">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.myOrdersAllType.fangdaxingc')" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.myOrdersAllType.fangdaxingc')"
placement="top">
<span class="el-icon-full-screen absolute BlowUpTravelDays"
@click="clickBlowUpTravelDays(item)"></span>
</el-tooltip>
......@@ -226,8 +236,7 @@
</template>
<span v-else style="color: red;">{{$t('objFill.v101.myOrdersAllType.qingxuanzbx')}}</span>
</div>
<div class="newDayContent"
:style="{'width':!item.isHide?'520px':'1020px'}">
<div class="newDayContent" :style="{'width':!item.isHide?'520px':'1020px'}">
<travelDaysTrip :dataAll="dataAll" v-bind:dayObj="item" v-bind:CurrentIndex="index"
v-bind:TotalCount="subConfig.DayList.length" v-bind:isOpenGroup="isOpenGroup"
v-bind:AllCityList="AllCityList" v-bind:StartCity="StartCity" v-bind:UseTypeArray="UseTypeArray"
......@@ -278,7 +287,7 @@
travelDaysHV
},
methods: {
PromptTemplate(){
PromptTemplate() {
let _this = this
this.$confirm(this.$t('objFill.v101.myOrdersAllType.yidanxzbkgg'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
......@@ -295,33 +304,32 @@
});
},
getFeaturePageType(){
this.subConfig.DayList.forEach(x=>{
getFeaturePageType() {
this.subConfig.DayList.forEach(x => {
x.IsBlowUp = false
x.ScenicArray.forEach(y=>{
x.ScenicArray.forEach(y => {
y.ScenicJson = {
x: 0,
y:0
y: 0
}
})
if(this.dataAll.FeaturePageType==1){
if (this.dataAll.FeaturePageType == 1) {
x.zoom = 0.285
}
if(this.dataAll.FeaturePageType==2){
if (this.dataAll.FeaturePageType == 2) {
x.zoom = 0.40
}
})
this.$forceUpdate()
},
clickBlowUpTravelDays(item){
item.IsBlowUp=!item.IsBlowUp
if(item.IsBlowUp) {
if(this.dataAll.FeaturePageType==1) item.zoom = 0.68
if(this.dataAll.FeaturePageType==2) item.zoom = 1
}
else{
if(this.dataAll.FeaturePageType==1) item.zoom = 0.285
if(this.dataAll.FeaturePageType==2) item.zoom = 0.40
clickBlowUpTravelDays(item) {
item.IsBlowUp = !item.IsBlowUp
if (item.IsBlowUp) {
if (this.dataAll.FeaturePageType == 1) item.zoom = 0.68
if (this.dataAll.FeaturePageType == 2) item.zoom = 1
} else {
if (this.dataAll.FeaturePageType == 1) item.zoom = 0.285
if (this.dataAll.FeaturePageType == 2) item.zoom = 0.40
}
this.$forceUpdate()
},
......@@ -368,10 +376,10 @@
dayItem.isRead = false;
dayItem.IsBlowUp = false
dayItem.zoom = 1
if(this.dataAll.FeaturePageType==1){
if (this.dataAll.FeaturePageType == 1) {
dayItem.zoom = 0.285
}
if(this.dataAll.FeaturePageType==2){
if (this.dataAll.FeaturePageType == 2) {
dayItem.zoom = 0.40
}
var hotelObj = this.$tripUtils.hotelObj();
......@@ -499,7 +507,7 @@
TrafficList: TrafficList,
WarmTipList: WarmTipList,
TitleList: TitleList,
IsUpdateTrip:this.subConfig.IsUpdateTrip,
IsUpdateTrip: this.subConfig.IsUpdateTrip,
FeaturePageType: this.dataAll.FeaturePageType
};
this.HotelList = HotelList;
......@@ -528,9 +536,9 @@
deep: true,
immediate: true,
handler: function (newVal, oldVal) {
if(!this.dataAll.FeaturePageType){
if (!this.dataAll.FeaturePageType) {
this.isTemplate = false
}else this.isTemplate = true
} else this.isTemplate = true
}
},
'subConfig.DayList': {
......@@ -544,8 +552,7 @@
this.createLineTrip();
},
//监听直采和非直采的编号
getLineId(newValue, oldValue) {
},
getLineId(newValue, oldValue) {},
subConfig: {
handler: function (newValue, oldValue) {
this.emitData();
......
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