Skip to content

S
SuperMan
Commit 3e0df9a5 authored by youjie's avatar youjie
Browse files
Options

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

parents 3a72112c c91ace87
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 536 additions and 160 deletions
src/assets/common/lang/en.js
View file @ 3e0df9a5
......@@ -2694,6 +2694,7 @@ export const op = {
fgszjl: 'Branch General Manager',
opszje: 'OP set the amount',
fgszjdb: 'New Japanese impression',
IsSelfGuidedTour:'Is it a free trip',
}
import invoicesManager from './EN/invoicesManager'
......
src/assets/common/lang/jp.js
View file @ 3e0df9a5
......@@ -2646,6 +2646,7 @@ export const op={
fgszjl:'支社長',
opszje:'OP設定金額',
fgszjdb:'日本印象を新たにする',
IsSelfGuidedTour:'行を自由にするかどうか',
}
import invoicesManager from './Japan/invoicesManager'
......
src/assets/common/lang/zh-tw.js
View file @ 3e0df9a5
......@@ -2676,7 +2676,7 @@ export const op={
fgszjl:'分公司總經理',
opszje:'OP設定金額',
fgszjdb:'新增日本印象',
IsSelfGuidedTour:'是否自由行',
}
import invoicesManager from './zhTW/invoicesManager'
......
src/assets/common/lang/zh.js
View file @ 3e0df9a5
......@@ -2699,6 +2699,7 @@ export const op={
opszje:'OP设置金额',
fgszjdb:'新增日本印象',
yuankeyong: '元可用',
IsSelfGuidedTour:'是否自由行',
}
import invoicesManager from './zhCN/invoicesManager'
......
src/assets/common/lang/zhCN/fill.js
View file @ 3e0df9a5
......@@ -6450,7 +6450,7 @@ export const obj = {
zongrenssyrs: '总人数（剩余人数）',
qingshursjia: '请输入售价',
qingshurgjia: '请输入国家',
shifouremen: '是否热门"',
shifouremen: '是否热门',
guojiatub: '国家图标',
beijintup: '背景图片',
qingshangcgjtup: '请上传国家图片！',
......
src/components/FinancialModule/DataAnalysis/index.vue
View file @ 3e0df9a5
<template>
<div style="height: 100%;">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.xianlujyqk')" name="1"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.gongsjyqk')" name="2"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.ribenxborcg')" name="3"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=2" :label="$t('objFill.v101.FinancialModule.gouwuyjqk')" name="4"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.xianlujyqk')" name="1"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.gongsjyqk')" name="2"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.ribenxborcg')" name="3"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=2&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.gouwuyjqk')" name="4"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.yushiduibiqk')" name="5"></el-tab-pane>
</el-tabs>
<div class="query-box">
......@@ -196,7 +196,7 @@ export default {
coinGetShow: false,
loading: false,
activeName: '1',
PermissionState: '0',//权限状态 1管理员级 2各公司负责人 3地接OP查询佣金
PermissionState: '0',//权限状态 1管理员级 2各公司负责人 3地接OP查询佣金 4操作OP
msg:{
startDate: '',
endDate: '',
......@@ -277,6 +277,10 @@ export default {
this.PermissionState=3;//地接OP
this.activeName='4';
}
if(userInfo.RB_Post_Id==270||userInfo.RB_Post_Id==263||userInfo.RB_Post_Id==9||userInfo.RB_Post_Id==271||userInfo.RB_Post_Id==103){
this.PermissionState=4;//操作OP
this.activeName='5';
}
}
else{
//分公司的 看各自公司的数据 佣金暂时不开
......
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ 3e0df9a5
......@@ -385,7 +385,7 @@ export default {
this.IsAdvanceFinance=this.GetDetail.IsAdvanceFinance;
this.ECommerceGoodsModel=this.GetDetail.ECommerceGoodsModel;
this.details=this.GetDetail;
if(this.OtherType==7||this.details.MatchFrId>0){
if(this.OtherType==7||this.OtherType==65||this.details.MatchFrId>0){
this.getDetails()
if(this.OtherType==81){
this.getMatchTransferList()
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 3e0df9a5
......@@ -530,7 +530,7 @@
</div>
<table class="Receipt_table" border="1" bordercolor="#106BAF" style="border-collapse:collapse;">
<tr>
<th rowspan="2" width="150">{{$t('fnc.fyshuoming')}}111</th>
<th rowspan="2" width="150">{{$t('fnc.fyshuoming')}}</th>
<th rowspan="2">{{$t('restaurant.res_Number')}}</th>
<th rowspan="2">{{$t('fnc.danjia')}}</th>
<th rowspan="2" width="100">{{$t('hotel.hotel_Currency')}}</th>
......@@ -2074,7 +2074,26 @@
});
} else {
this.resultCode = res.data.resultCode;
if(res.data.resultCode==11020){//超预算提醒
this.$confirm(res.data.message, this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data,
'Qtype':3,
'blank': 'y',
}
});
}).catch(() => {
});
}else{
this.$message.error(res.data.message);
}
}
this.loading = false;
}, err => {})
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 3e0df9a5
......@@ -52,7 +52,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('MarketingActi.car')}}
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(5,2)" />
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(5,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -257,7 +257,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('hotel.hotel')}}
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" />
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -569,7 +569,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('ground.canshi')}}
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(2,2)" />
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(2,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -721,7 +721,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('scen.sc_piao')}}
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(3,2)" />
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(3,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -891,7 +891,7 @@
<p class="teamRevenueExpenditureTitle">
{{$t('objFill.qita')}}
<span class="fr" style="margin-top: -8px;">
<input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(8,2)" />
<!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(8,2)" /> -->
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -1061,7 +1061,7 @@
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
@click="goDiJieZhiDan(item,0,leadr,cur)" />
@click="goDiJieZhiDanValidate(item,0,leadr,cur)" />
</el-tooltip>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]">
......@@ -1081,11 +1081,11 @@
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<input type="button" v-if="item.TeamType == 1 && index2==0" :value="$t('objFill.ridang')"
class="normalBtn" @click="goDiJieZhiDan(item, 2)" />
class="normalBtn" @click="goDiJieZhiDanValidate(item, 2)" />
<template v-if="item.hideZDBtn ">
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
@click="goDiJieZhiDan(item,0,leadr,cur)" />
@click="goDiJieZhiDanValidate(item,0,leadr,cur)" />
</el-tooltip>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1"> <!-- -->
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]" >
......@@ -1389,7 +1389,7 @@
}],
},
allCurrencyList: [],
OtherLoading: false,
OtherLoading: false
};
},
components: {
......@@ -1757,26 +1757,52 @@
);
},
ZhuiJiaTuanKuan(item) {
let TCIDARR = [item.TCIDS]; // [this.$route.query.id]
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
TravelReplenish: this.$route.query.id,
OtherType: 1
};
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: item.companyID,
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj)
this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: item.TCIDS
}, res => {
if (res.data.resultCode == 1) {
if(res.data.data.State==1){
this.$confirm(res.data.data.Msg, this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data.OfferId,
'Qtype':3,
'blank': 'y',
}
});
}).catch(() => {
});
}else {
let TCIDARR = [item.TCIDS]; // [this.$route.query.id]
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
TravelReplenish: this.$route.query.id,
OtherType: 1
};
this.$router.push({
name: "ChoiceAddFinancialDocuments",
query: {
Type: 2,
companyID: item.companyID,
path: "",
blank: "y",
orderObj: JSON.stringify(orderObj)
}
});
}
}
});
}, err => {})
},
getzhuijiaList() {
this.apipost(
......@@ -1855,6 +1881,34 @@
}
});
},
goDiJieZhiDanValidate: function(obj, num, leadr, cur){
this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: obj.TCIDS
}, res => {
if (res.data.resultCode == 1) {
if(res.data.data.State==1){
this.$confirm(res.data.data.Msg, this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':res.data.data.OfferId,
'Qtype':3,
'blank': 'y',
}
});
}).catch(() => {
});
}else{
this.goDiJieZhiDan(obj, num, leadr, cur);
}
}
}, err => {})
},
goDiJieZhiDan: function (obj, num, leadr, cur) {
let totailMoney = (Number(leadr.LeaderGetPriceT) + Number(cur.yiLing)).toFixed(2);
let leadrPlanPrice = 0;
......@@ -2011,7 +2065,6 @@
var D = (nowStartDate.getDate() < 10 ? '0' + (nowStartDate.getDate()) : nowStartDate.getDate());
this.TeamStartDateList.push(Y + M + D);
this.UseTotalPrice = leadr.LeaderGetPriceT;
console.log("CompanyAlipayTCID222", this.CompanyAlipayTCID);
},
addOtherList(index, id) {
this.list.OtherOrderReportList.OtherList.push({
......@@ -2466,8 +2519,7 @@
})
arrList(data.OtherOrderReportList) //其它
this.list = data;
console.log("this.list",this.list);
this.list = data;
var lineArray = [168]; //新欧洲线只显示标准间
var lineId = 0;
//转成数字类型
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 3e0df9a5
......@@ -143,7 +143,7 @@
<li>
<span>
<em>{{$t('Operation.Op_TeamName')}}</em>
<el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
<el-input v-model="queryMsg.Title" @keyup.native.enter="getControlList" class="w150" clearable></el-input>
</span>
</li>
<li>
......@@ -306,7 +306,7 @@
</span>
</div>
<button class="normalBtn TC_SearchBtn"
@click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button>
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button>
</div>
<span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}
<i class="iconfont icon-xiaotuziCduan_1"></i>
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 3e0df9a5
......@@ -84,10 +84,30 @@
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('objFill.v101.baojiadanh')}}</em>
<el-input type="text" class="w200" v-model="queryData.OfferId" clearable></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<el-input type="text" class="w200" v-model="queryData.TCNUMS" clearable></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('hotel.hotel_StarDate')}}</em>
<el-date-picker class="w150" type="date" v-model="queryData.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryData.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
<li>
<span>
<em>{{$t('objFill.v101.dmc.kaituanzt')}}</em>
<el-select v-model="queryData.OpenState" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model="queryData.OpenState" filterable :placeholder="$t('pub.pleaseSel')" class='w200'>
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option v-for='item in OpenStateList' :key="item.Id" :label="item.label" :value="item.Id">
</el-option>
......@@ -96,11 +116,10 @@
</li>
<li>
<span>
<span>{{$t('visa.v_czuser')}}</span>
<el-select class="w150" v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"
<em>{{$t('visa.v_czuser')}}</em>
<el-select v-model="queryData.CreateBy" filterable :placeholder="$t('pub.pleaseSel')" class='w200'
clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="index"></el-option>
</el-select>
......@@ -542,6 +561,26 @@
total: 0,
currentPage: 1,
TeamType: 0, //0常规,1-小包团,2-一日游,3-地接团
OfferId: "", //报价单号
TCNUMS: "", //团号
StartGroupDate: "", //开始时间
EndGroupDate: "", //结束时间
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.queryData.EndGroupDate == null) {
return false;
} else {
let endTime = new Date(this.queryData.EndGroupDate);
return endTime.getTime() < time.getTime();
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.queryData.StartGroupDate);
return startTime.getTime() >= time.getTime();
}
},
loading: true,
//开团状态
......
src/components/WebSet/classification.vue
View file @ 3e0df9a5
This diff is collapsed.
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @ 3e0df9a5
......@@ -392,6 +392,9 @@
ticketPay: 0,
busPay: 0,
otherPay: 0,
IsPrerealContrast: false,
PrerealContrastMsg:'',
PrerealContrastOfferId:0
}
},
methods: {
......@@ -518,6 +521,26 @@
this.picIsShow = true;
},
goUrl(_orderSource, _type,Offset) {
if(this.IsPrerealContrast){
this.$confirm(this.PrerealContrastMsg, this.$t('tips.tips'), {
confirmButtonText: this.$t('objFill.ckbjd'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid':this.PrerealContrastOfferId,
'Qtype':3,
'blank': 'y',
}
});
}).catch(() => {
});
return;
}
let TCIDARR = []
let id = [];
if(this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.LineId){
......@@ -632,6 +655,19 @@
this.Error(res.data.message)
}
}, err => {})
},
getTravelPrerealContrast(){
this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
if(res.data.data.State==1){
this.IsPrerealContrast=true;
this.PrerealContrastMsg = res.data.data.Msg;
this.PrerealContrastOfferId = res.data.data.OfferId;
}
} else {}
}, err => {})
}
},
mounted() {
......@@ -642,6 +678,10 @@
this.getList(5)
this.getList(14)
this.getTuanMsg()
let userInfo = this.getLocalStorage();
if(userInfo.RB_Group_id==2 && this.LineId==14){
this.getTravelPrerealContrast();
}
}
}
......
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