Skip to content

S
SuperMan
Commit 6ebae474 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 336ffbd8 eb80ab64
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 2517 deletions
src/assets/common/lang/EN/fill.js
View file @ 6ebae474
......@@ -7592,6 +7592,7 @@ export const obj = {
cibaojdan: 'This quotation sheet? ',
qingxzxuyscdwj: 'Please select the file you want to upload! ',
qingshurzop: 'Please select main OP',
qingxzcfrq: 'Please select the departure date',
zhulopbnhzopcx: 'Assistant OP cannot include main OP, please re-select! ',
xianluxltmin: 'Line. Series. Group name ',
tianshbshijsyrs: 'Number of days. Flight times. Number of people applicable ',
......
src/assets/common/lang/Japan/fill.js
View file @ 6ebae474
......@@ -7592,6 +7592,7 @@ export const obj = {
cibaojdan: 'この見積書？',
qingxzxuyscdwj: 'アップロードするファイルを選択してください！',
qingshurzop: 'メインOPを選択してください',
qingxzcfrq: '出発日を選択してください',
zhulopbnhzopcx: 'アシスタントOPにメインOPを含めることはできません。もう一度選択してください！',
xianluxltmin: '線路シリーズ団名',
tianshbshijsyrs: '日数フライト時間適用人数',
......
src/assets/common/lang/en.js
View file @ 6ebae474
......@@ -456,6 +456,7 @@ export const hotel = {
hotel_GroupStates: 'Group status',
hotel_OrderStates: 'Order status',
hotel_StarDate: 'Departure date',
hotel_choostDate:'Selected date',
hotel_haveSignUp: 'Signed up',
hotel_Inthe: 'in',
hotel_expect: 'expect',
......
src/assets/common/lang/jp.js
View file @ 6ebae474
......@@ -407,7 +407,8 @@ hotel_TravelExpenses:'通行料',
hotel_ClickOnAdd:'クリックして添加',　　　　　　　　　　
hotel_GroupStates:'団体の状態',　　　　　　　　　　
hotel_OrderStates:'オーダー状態',　　　　　　　　　　
hotel_StarDate:'出発日',　　　　　　　　　　　　
hotel_StarDate:'出発日',
hotel_choostDate:'選択した日付',　　　　　　　　　　
hotel_haveSignUp:'申し込み済み',　　　　　　　　　　　　
hotel_Inthe:'中',　　　　　　　　　　　　　　　　　　　
hotel_expect:'予定',　　　　　　　　　　　　　　　　　
......
src/assets/common/lang/zh-tw.js
View file @ 6ebae474
......@@ -453,6 +453,7 @@ export const admin={ //行政
hotel_GroupStates:'團的狀態',
hotel_OrderStates:'訂單狀態',
hotel_StarDate:'出發日期',
hotel_choostDate:'已選日期',
hotel_haveSignUp:'已報名',
hotel_Inthe:'中',
hotel_expect:'預計',
......
src/assets/common/lang/zh.js
View file @ 6ebae474
......@@ -455,6 +455,7 @@ export const admin={ //行政
hotel_GroupStates:'团的状态',
hotel_OrderStates:'订单状态',
hotel_StarDate:'出发日期',
hotel_choostDate:'已选日期',
hotel_haveSignUp:'已报名',
hotel_Inthe:'中',
hotel_expect:'预计',
......
src/assets/common/lang/zhCN/fill.js
View file @ 6ebae474
......@@ -7592,6 +7592,7 @@ export const obj = {
cibaojdan: '此报价单?',
qingxzxuyscdwj: '请选择需要上传的文件!',
qingshurzop: '请选择主OP',
qingxzcfrq: '请选择出发日期',
zhulopbnhzopcx: '助理OP不能包含主OP,请重新选择!',
xianluxltmin: '线路.系列.团名',
tianshbshijsyrs: '天数.航班时间.适用人数',
......
src/assets/common/lang/zhTW/fill.js
View file @ 6ebae474
......@@ -7592,6 +7592,7 @@ export const obj = {
cibaojdan: '此報價單?',
qingxzxuyscdwj: '請選擇需要上傳的文件!',
qingshurzop: '請選擇主OP',
qingxzcfrq: '請選擇出發日期',
zhulopbnhzopcx: '助理OP不能包含主OP,請重新選擇!',
xianluxltmin: '線路.系列.團名',
tianshbshijsyrs: '天數.航班時間.適用人數',
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 6ebae474
......@@ -651,6 +651,7 @@ tr._item_list td:last-child {
<el-option value="1" :label="$t('objFill.changguit')"></el-option>
<el-option value="2" :label="$t('objFill.xiaobaot')"></el-option>
<el-option value="3" :label="$t('MarketingActi.local')"></el-option>
<el-option value="6" label="切位团"></el-option>
</el-select>
</el-form-item>
</el-col>
......
src/components/LeaderManagement/leaderManagement.vue
View file @ 6ebae474
......@@ -585,7 +585,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<el-button type="primary" class="normalBtn" @click="submitForm('addMsg')" :loading="saveLoading">
{{$t('pub.saveBtn')}}</el-button> &nbsp;
<button class="hollowFixedBtn"
@click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</div>
......@@ -849,7 +850,8 @@
message: this.$t('admin.admin_lnLoginPwd'),
trigger: "blur"
}],
}
},
saveLoading: false,
};
},
methods: {
......@@ -1013,10 +1015,12 @@
//添加
addGroupGuide() {
var that = this;
this.saveLoading = true;
this.apipost(
"leader_post_Set",
that.addMsg,
res => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
that.Success(that.$t('tips.saveYes'));
that.getList();
......@@ -1030,7 +1034,9 @@
that.Error(res.data.message);
}
},
err => {}
err => {
that.saveLoading = false;
}
);
},
submitForm(addMsg) {
......@@ -1145,8 +1151,8 @@
},
//弹出框取消 初始化谈框内表单
resetForm(formName) {
// this.$refs[formName].resetFields();
this.initAddMsg();
// this.$refs[formName].resetFields();
this.initAddMsg();
this.LanguageIdS = [];
}
},
......
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @ 6ebae474
......@@ -139,6 +139,32 @@
</p>
<p class="Quo_Content" style="padding-right:20px;width:100%;">
<span> {{$t('hotel.hotel_StarDate')}}:{{item.OutDateTime}}</span>
<template v-if="item.OfferList && item.OfferList.length > 1">
<el-tooltip class="item" effect="dark" :content="$t('hotel.hotel_StarDate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width: 100px">
{{ $t('objFill.v101.baojiadanh') }}
</td>
<td style="width: 250px">{{ $t("hotel.hotel_StarDate") }}</td>
</tr>
<tr v-for="(rItem, rIndex) in item.OfferList" :key="`d_`+index+`_r_`+rIndex">
<td>
{{ rItem.OfferId }}
</td>
<td>
{{rItem.OutDateTime}}
</td>
</tr>
</table>
<el-button slot="reference" circle size="mini" type="primary"
style="width: 20px; height: 20px; padding: 4px">
{{ item.OfferList.length }}
</el-button>
</el-popover>
</el-tooltip>
</template>
</p>
</div>
</div>
......@@ -519,7 +545,7 @@
getList() {
this.loading = true;
this.apipost(
"travel_get_GetTravelOfferAuditPageList_V2",
"travel_get_GetNewTravelOfferAuditPage",
this.queryData,
res => {
this.loading = false;
......@@ -555,10 +581,12 @@
newQType = 3;
}
}
//NewQuotationAduit
//QuotationAduit
this.$router.push({
name: 'QuotationAduit',
query: {
offerid: item.OfferId,
BatchNum:item.BatchNum,
Qtype: newQType,
blank: 'y',
tab: '报价单审核'
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ 6ebae474
......@@ -363,7 +363,7 @@
targetConfigId: configId
};
that.queryCommonData.loading = true;
that.queryCommonData.loadingText = this.$t('sm.fuzhiing');
that.queryCommonData.loadingText = that.$t('sm.fuzhiing');
that.apipost(
"travel_post_CopyTravelConfigInfo",
msg,
......@@ -377,7 +377,6 @@
err => {}
);
});
}
},
//根据当前员工所在部门获取该部门及子部门员工信息
......
src/components/TravelManager/TravelList/SaleTripList.vue
View file @ 6ebae474
......@@ -314,7 +314,6 @@
err => {}
);
});
}
},
//根据当前员工所在部门获取该部门及子部门员工信息
......
src/components/TravelManager/TravelList/oneDayTripList.vue
View file @ 6ebae474
......@@ -312,7 +312,7 @@
targetConfigId: configId
};
that.queryCommonData.loading = true;
that.queryCommonData.loadingText = this.$t('sm.fuzhiing');
that.queryCommonData.loadingText = that.$t('sm.fuzhiing');
that.apipost(
"travel_post_CopyTravelConfigInfo",
msg,
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 6ebae474
......@@ -65,10 +65,9 @@
<template v-else>
{{postConfig.TeamTypeName}}
</template>
</td>
<td width="80" class="txtRightCost">{{$t('objFill.tuanduilx')}}</td>
<td>
{{postConfig.PriceTeamTypeName}}
<template v-if="postConfig.PriceTeamTypeName&&postConfig.PriceTeamTypeName!=''">
({{postConfig.PriceTeamTypeName}})
</template>
</td>
<td width="80" class="txtRightCost">{{$t('advmanager.v_line')}}</td>
<td width="300">
......@@ -80,7 +79,7 @@
</td>
</tr>
<tr>
<td colspan="8" style="height:20px;">
<td colspan="6" style="height:20px;">
</td>
</tr>
<tr>
......@@ -88,13 +87,9 @@
<td>
{{postConfig.OutBranchName}}
</td>
<td width="80" class="txtRightCost">{{$t('hotel.hotel_StarDate')}}</td>
<td>
{{postConfig.OutDateTime}}
</td>
<td width="80" class="txtRightCost">{{$t('visa.v_xcdays')}}</td>
<td>
{{postConfig.DayNum}}
{{postConfig.DayNum}}{{$t('hotel.hotel_day')}}{{postConfig.NightNum}}{{$t('Operation.Op_night')}}
</td>
<td width="80" class="txtRightCost">{{$t('fnc.khmingcheng')}}</td>
<td>
......@@ -102,23 +97,32 @@
</td>
</tr>
<tr>
<td colspan="8" style="height:20px;">
<td colspan="6" style="height:20px;">
</td>
</tr>
<tr>
<td width="80" class="txtRightCost">{{$t('sm.tuanduibiaoti')}}</td>
<td width="300" colspan="7">
<td width="300" colspan="5">
{{postConfig.Title}}
</td>
</tr>
<tr>
<td colspan="6" style="height:20px;">
</td>
</tr>
<tr>
<td width="80" class="txtRightCost">{{$t('hotel.hotel_StarDate')}}</td>
<td colspan="5">
<template v-if="postConfig.OutDateTimeList&&postConfig.OutDateTimeList.length>0">
<el-tag v-for="(item,oIndex) in postConfig.OutDateTimeList" :key="oIndex" style="margin-right:5px;">
{{item}}
</el-tag>
</template>
</td>
</tr>
</table>
</div>
<br />
<!-- <el-tag v-for="(item, index) in orderList" :key="index"
style="margin-right: 10px;margin-bottom: 10px; cursor: pointer;" :type="index ===tabsActive ? '':'info'"
@click="selectTag(index)" :disable-transitions="false">
{{`报价单${index + 1}${item.IsDefault ? '(默认)' : ''}`}}
</el-tag> -->
<table class="CostPriceTable CostNewTable">
<thead>
<tr>
......
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @ 6ebae474
......@@ -7,6 +7,7 @@
padding: 0 20px 20px 20px;
border-radius: 4px;
}
</style>
<template>
<div class="DirectQuotation clearfix" v-loading="loading">
......@@ -64,6 +65,7 @@
OutBranchId: -1, //出团公司
OutBranchName: "", //出团公司名称
OutDateTime: "", //出发时间
OutDateTimeList: [], //出发时间
OfferPayType: 0, //报价单付款方式()
SaleOfferPayType: 0, //售价付款方式
AuditContent: "", //审核备注
......@@ -79,6 +81,10 @@
PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型,
},
pMsg: {
offerId: 0,
// BatchNum: "",
},
isSubmit: true,
loading: false,
IsEdit: 0,
......@@ -88,7 +94,7 @@
//保存数据
SaveData(Type) {
var nObj = {
offerid: this.$route.query.offerid,
offerid:this.pMsg.offerId,
};
this.loading = true;
this.apipost(
......@@ -117,22 +123,14 @@
this.getPostData();
},
getPostData() {
let offerId = 0;
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
}
let msg = {
offerId: offerId
};
this.OfferArray = [];
this.haveData = false;
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V4",
msg,
"travel_get_GetMyTravelInfo_V5",
this.pMsg,
res => {
this.loading = false;
console.log("travel_get_GetMyTravelInfo_V4_OfferChange",res.data);
if (res.data.resultCode == 1) {
var tempData = res.data.data;
if (tempData.ID && tempData.ID > 0) {
......@@ -213,6 +211,9 @@
this.postData.CustomerName = tempData.CustomerName;
this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime;
if (tempData.OutDateTimeList) {
this.postData.OutDateTimeList = tempData.OutDateTimeList;
}
this.postData.LineName = tempData.LineName;
this.postData.LtName = tempData.LtName;
this.postData.OutBranchName = tempData.OutBranchName;
......@@ -238,10 +239,17 @@
if (this.$route.query.Qtype) {
this.IsEdit = this.$route.query.Qtype;
}
if (this.$route.query.offerid) {
this.pMsg.offerId = this.$route.query.offerid;
}
// if (this.$route.query.BatchNum) {
// this.pMsg.BatchNum = this.$route.query.BatchNum;
// }
this.getPostData();
},
components: {
CostNewPriceAudit: CostNewPriceAudit
}
};
</script>
\ No newline at end of file
</script>
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 6ebae474
......@@ -61,6 +61,7 @@
OutBranchId: -1, //出团公司
OutBranchName: "", //出团公司名称
OutDateTime: "", //出发时间
OutDateTimeList: [],
OfferPayType: 0, //报价单付款方式()
SaleOfferPayType: 0, //售价付款方式
AuditContent: "", //审核备注
......@@ -97,6 +98,7 @@
SaveData(Type) {
var nObj = {
ID: this.$route.query.offerid,
BatchNum:this.$route.query.BatchNum,
AuditContent: this.postData.CRemarks,
TravelState: Type,
OfferPayType: this.postData.OfferPayType,
......@@ -129,16 +131,16 @@
});
},
getPostData() {
let offerId = 0;
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
let BatchNum = "";
if (this.$route.query.BatchNum) {
BatchNum = this.$route.query.BatchNum;
}
let msg = {
offerId: offerId
BatchNum: BatchNum
};
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V4",
"travel_get_GetMyTravelInfo_V5",
msg,
res => {
this.loading = false;
......@@ -251,6 +253,7 @@
this.postData.CustomerName = tempData.CustomerName;
this.postData.OutBranchId = tempData.OutBranchId;
this.postData.OutDateTime = tempData.OutDateTime;
this.postData.OutDateTimeList = tempData.OutDateTimeList;
this.postData.LineName = tempData.LineName;
this.postData.LtName = tempData.LtName;
this.postData.OutBranchName = tempData.OutBranchName;
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 6ebae474
......@@ -79,7 +79,7 @@
<th>
{{$t('objFill.v101.kaituants')}}
</th>
<th colspan="7" style="text-align:left;line-height:40px;">
<th colspan="5" style="text-align:left;line-height:40px;">
<p style="color:red;font-weight:bold;">
1.{{$t('objFill.v101.changuitdyshnp')}}&nbsp;&nbsp;
2.{{$t('objFill.v101.xiaobtcgbjd')}}&nbsp;&nbsp;
......@@ -90,18 +90,14 @@
<tr>
<td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
<td>
<el-select class="multiple_input" v-model="postData.TeamType" @change="changeTeamType()">
<el-select class="multiple_input" v-model="postData.TeamType" @change="changeTeamType()"
style="width:100px;">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</td>
<td width="80" class="txtRightCost">
<template v-if="postData.TeamType==0||postData.TeamType==1">{{$t('objFill.tuanduilx')}}
</template>
</td>
<td>
<template v-if="postData.TeamType==0||postData.TeamType==1">
<el-select class="multiple_input" v-model="postData.PriceTeamType">
{{$t('objFill.tuanduilx')}}
<el-select class="multiple_input" v-model="postData.PriceTeamType" style="width:100px;">
<template v-for="item in TeamListArr">
<template v-if="postData.TeamType==0">
<el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==9" :key="item.Id"
......@@ -142,23 +138,18 @@
<tr>
<td width="80" class="txtRightCost">{{$t('scen.sc_cp')}}</td>
<td>
<el-select class="multiple_input" v-model="postData.OutBranchId" filterable>
<el-select class="multiple_input" v-model="postData.OutBranchId" filterable style="width:265px;">
<el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
</td>
<td width="80" class="txtRightCost">{{$t('Airticket.Air_StartTime')}}</td>
<td>
<el-date-picker type="date" v-model="postData.OutDateTime" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
</td>
<td width="80" class="txtRightCost">{{$t('visa.v_xcdays')}}</td>
<td>
<el-input class="w240 LowNum" v-model="postData.DayNum"
@keyup.native="checkInteger(postData,'DayNum');createDayTripPrice()" maxlength="2">
<template slot="append">{{$t('hotel.hotel_day')}}</template>
</el-input>
<el-input class="w120 LowNum" v-model="postData.NightNum" style="display:none;"
<el-input class="w120 LowNum" v-model="postData.NightNum"
@keyup.native="checkInteger(postData,'NightNum')" maxlength="2">
<template slot="append">{{$t('Operation.Op_night')}}</template>
</el-input>
......@@ -171,15 +162,35 @@
</td>
</tr>
<tr>
<td colspan="8" style="height:20px;">
<td colspan="6" style="height:20px;">
</td>
</tr>
<tr>
<td width="80" class="txtRightCost">{{$t('sm.tuanduibiaoti')}}</td>
<td colspan="7">
<td colspan="3">
<el-input v-model="postData.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
:placeholder="$t('objFill.v101.qingtxtdbti')" maxlength="200"></el-input>
</td>
<td width="80" class="txtRightCost">{{$t('hotel.hotel_StarDate')}}</td>
<td>
<el-date-picker type="dates" v-model="postData.OutDateTimeList" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
</td>
</tr>
<tr>
<td colspan="8" style="height:20px;">
</td>
</tr>
<tr>
<td width="80" class="txtRightCost">{{$t('hotel.hotel_choostDate')}}</td>
<td colspan="5">
<template v-if="postData.OutDateTimeList&&postData.OutDateTimeList.length>0">
<el-tag v-for="(item,oIndex) in postData.OutDateTimeList" :key="item" closable
style="margin-right:5px;" @close="handleClose(item,oIndex)">
{{item}}
</el-tag>
</template>
</td>
</tr>
</table>
</div>
......@@ -232,6 +243,7 @@
haveData: false,
//基本配置
postData: {
BatchNum: "",
ID: 0,
TCID: 0,
OfferId: 0,
......@@ -266,6 +278,7 @@
TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
OutBranchId: "", //出团公司
OutDateTime: "", //出发时间
OutDateTimeList: [], //出发时间
OfferPayType: 0, //报价单付款方式
SaleOfferPayType: 0, //售价付款方式
OPId: "", //主OP
......@@ -357,10 +370,33 @@
TeamListArr: [], //团队子类型
companyList: [], //出团公司列表
AllCurrencyList: [], //币种列表
loading: false
loading: false,
rParams: {
OfferId: 0,
TCID: 0,
BatchNum: ""
},
};
},
methods: {
//删除日期
handleClose(item, index) {
if (this.postData.BatchNum && this.postData.BatchNum != '') {
var postMsg = {
BatchNum: this.postData.BatchNum,
Date: item
}
this.apipost(
"travel_post_RemoveTravelOffer", postMsg,
res => {
if (res.data.resultCode == 1) {
this.postData.OutDateTimeList.splice(index, 1);
}
});
} else {
this.postData.OutDateTimeList.splice(index, 1);
}
},
changeTeamType() {
this.postData.LineId = 0;
this.postData.LineteamId = 0;
......@@ -495,6 +531,11 @@
this.$message.error(this.$t('objFill.v101.qingshurzop'))
return;
}
if(this.postData.OutDateTimeList.length<1)
{
this.$message.error(this.$t('objFill.v101.qingxzcfrq'))
return;
}
this.postData.AssistantId = "";
var flag = false;
if (this.postData.AssistantList && this.postData.AssistantList.length > 0) {
......@@ -515,7 +556,7 @@
};
this.loading = true;
this.apipost(
"travel_post_SetConfigOffer_V4", postMsg,
"travel_post_SetConfigOffer_V3", postMsg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
......@@ -543,17 +584,23 @@
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
}
let BatchNum = "";
if (this.$route.query.BatchNum) {
BatchNum = this.$route.query.BatchNum;
}
let msg = {
offerId: offerId,
TCID: 0,
BatchNum: BatchNum
};
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
msg.TCID = this.$route.query.TCID
}
this.loading = true;
this.apipost(
"travel_get_GetMyTravelInfo_V4", msg,
"travel_get_GetMyTravelInfo_V5", msg,
res => {
console.log("travel_get_GetMyTravelInfo_V5", res);
this.loading = false;
if (res.data.resultCode == 1) {
var tempData = res.data.data;
......@@ -593,6 +640,9 @@
if (tempData.OutDateTime) {
this.postData.OutDateTime = tempData.OutDateTime;
}
if (tempData.OutDateTimeList) {
this.postData.OutDateTimeList = tempData.OutDateTimeList;
}
if (tempData.OutBranchName && tempData.OutBranchName != '') {
this.postData.OutBranchId = Number(tempData.OutBranchId);
}
......@@ -638,10 +688,16 @@
created() {
if (this.$route.query.offerid && this.$route.query.offerid > 0) {
this.postData.OfferId = this.$route.query.offerid;
this.rParams.OfferId = this.$route.query.offerid
}
if (this.$route.query.BatchNum) {
this.postData.BatchNum = this.$route.query.BatchNum;
this.rParams.BatchNum = this.$route.query.BatchNum;
}
//从团控列表跳转信息
if (this.$route.query.TCID && this.$route.query.TCID > 0) {
this.postData.TCID = this.$route.query.TCID
this.postData.TCID = this.$route.query.TCID;
this.rParams.TCID = this.$route.query.TCID;
}
//团控列表跳转参数结束
this.getCompanyList();
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 6ebae474
......@@ -105,15 +105,6 @@
<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')" 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>
</el-select>
</span>
</li>
<li>
<span>
......@@ -128,8 +119,9 @@
</li>
<li>
<button class="hollowFixedBtn" @click="getList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">{{$t('pub.addBtn')}}</button>
<button class="hollowFixedBtn" @click="ShowImportOffer()" style="">{{$t('objFill.v101.daorubjiad')}}</button>
<button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',null,0)">{{$t('pub.addBtn')}}</button>
<button class="hollowFixedBtn" @click="ShowImportOffer()"
style="display:none;">{{$t('objFill.v101.daorubjiad')}}</button>
</li>
</ul>
</div>
......@@ -162,7 +154,35 @@
<span>{{$t('system.query_lineName')}}:{{item.LineName}}</span>
</p>
<span>{{$t('active.ad_xlmc')}}:{{item.LtName}}</span>
<div> {{$t('hotel.hotel_StarDate')}}：{{item.OutDateTime}}</div>
<div> {{$t('hotel.hotel_StarDate')}}：
{{item.OutDateTime}}
<template v-if="item.OfferList && item.OfferList.length > 1">
<el-tooltip class="item" effect="dark" :content="$t('hotel.hotel_StarDate')">
<el-popover width="350" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="width: 100px">
{{ $t('objFill.v101.baojiadanh') }}
</td>
<td style="width: 250px">{{ $t("hotel.hotel_StarDate") }}</td>
</tr>
<tr v-for="(rItem, rIndex) in item.OfferList" :key="`d_`+item.OfferId+`_r_`+rIndex">
<td>
{{ rItem.OfferId }}
</td>
<td>
{{rItem.OutDateTime}}
</td>
</tr>
</table>
<el-button slot="reference" circle size="mini" type="primary"
style="width: 20px; height: 20px; padding: 4px">
{{ item.OfferList.length }}
</el-button>
</el-popover>
</el-tooltip>
</template>
</div>
</div>
</div>
<div class="_left" style="padding-left:10px">
......@@ -367,20 +387,22 @@
</template>
</div>
<div style="width:134px;">
<span class="openGroup opbd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&& item.OpenState==2">
<el-tooltip class="item" effect="dark" :content="$t('sm.kaituan')" placement="top-start"
popper-class="max-w250">
</el-tooltip>
{{$t('op.Kai')}}
</span>
<span class="bianji newAopbdd"
v-if="item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
@click="goMakeQuo('QuotationNewPrice',item.OfferId)">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i>
</el-tooltip>
</span>
<template v-if="item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5">
<template v-if="item.OfferList&&item.OfferList.length>1">
<span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item,0)">
<el-tooltip class="item" effect="dark" content="系列修改" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-bianji"></i>
</el-tooltip>
</span>
</template>
<span class="bianji newAopbdd" @click="goMakeQuo('QuotationNewPrice',item,item.OfferId)">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
popper-class="max-w250">
<i class="iconfont icon-bianji-smal"></i>
</el-tooltip>
</span>
</template>
<span class="QT-delete newAopbdd" @click="delQuotation(item)"
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"
......@@ -795,14 +817,25 @@
);
},
goUrl(path, item, qType) {
this.$router.push({
name: path,
query: {
var queryMsg = {};
if (path == 'QuotationAduit') {
queryMsg = {
BatchNum: item.BatchNum,
Qtype: qType,
blank: 'y',
tab: '报价单查看'
}
} else {
queryMsg = {
offerid: item.OfferId,
Qtype: qType,
blank: 'y',
tab: '报价单查看'
}
}
this.$router.push({
name: path,
query: queryMsg
});
},
handleCurrentChange(val) {
......@@ -854,7 +887,7 @@
//初始化表格数据
getList() {
this.loading = true;
this.apipost("travel_get_GetTravelOfferPageList_V3", this.queryData, res => {
this.apipost("travel_get_GetTravelOfferPageList", this.queryData, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.queryData.total = res.data.data.count;
......@@ -886,45 +919,24 @@
});
},
//报价单跳转
goMakeQuo(path, OfferId) {
goMakeQuo(path, item, offerId) {
var BatchNum = '';
if (item) {
BatchNum = item.BatchNum;
}
this.$router.push({
path: path,
query: {
offerid: OfferId,
BatchNum: BatchNum,
offerid: offerId,
blank: 'y',
tab: '报价单'
}
});
},
//开团或修改
goToOpenTravel(item) {
// TeamType 0常规,1-小包团,2-当地游,3-地接团
var routeName = this.$route.name;
var path = 'TravelManager';
if (item.TeamType === 0) {
path = 'TravelManager'
} else if (item.TeamType === 1) {
path = 'TravelManager3'
} else if (item.TeamType === 2) {
path = 'TravelManager5'
}
if (item.ID > 0) {
this.$router.push({
name: path,
query: {
configId: item.ID,
openState: 1,
isOffer: 1,
offerId: item.OfferId,
blank: 'y'
}
});
} else {
this.$router.push({
name: path
});
}
},
//显示下载弹窗
showDownLoad(item) {
this.downLoadMsg.ID = item.ID;
......
src/router/config.js
View file @ 6ebae474
......@@ -3796,14 +3796,7 @@ export default {
title: '制作报价单'
},
},
{ //新版制作报价单
path: '/EditOffer',
name: 'EditOffer',
component: resolve => require(['@/components/TravelManager/TravelNewQuotation/EditOffer'], resolve),
meta: {
title: '制作报价单'
},
},
{ //报价单变更
path: '/OfferChange',
name: 'OfferChange',
......@@ -3836,14 +3829,6 @@ export default {
title: '报价单审核'
},
},
{ //新版报价单审核
path: '/NewQuotationAduit',
name: 'NewQuotationAduit',
component: resolve => require(['@/components/TravelManager/TravelNewQuotation/NewQuotationAduit'], resolve),
meta: {
title: '报价单审核'
},
},
{ //团控-我的机票
path: '/TravelMyTicket',
name: 'TravelMyTicket',
......
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