Skip to content

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

解决冲突

parents a2aa8386 c0003006
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 129 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ efe9a3da
...@@ -988,7 +988,7 @@ ...@@ -988,7 +988,7 @@
<span class="TCL-redType"> {{item.VisaOPName}}</span> <span class="TCL-redType"> {{item.VisaOPName}}</span>
</p> </p>
<template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0"> <template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0">
<p > <p>
<span> 签证助理OP</span> <span> 签证助理OP</span>
<template v-for="(subItem,subIndex) in item.VisaAssistantList"> <template v-for="(subItem,subIndex) in item.VisaAssistantList">
<span :key="subIndex" style="padding-right:3px;">{{subItem}}</span> <span :key="subIndex" style="padding-right:3px;">{{subItem}}</span>
...@@ -1369,32 +1369,36 @@ ...@@ -1369,32 +1369,36 @@
</el-col> </el-col>
</el-form> </el-form>
</div> </div>
<!--修改op信息--> <!--修改op信息-->
<div class="combottomDiv OPremarkDiv" v-show="VisaOPMsg.VisaShow"> <div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="VisaOPMsg.VisaShow">
<div class="combottomTitle">签证OP设置</div> <div class="combottomTitle">签证OP设置</div>
<el-form label-width="100px"> <el-form label-width="100px">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="签证OP" prop="Remark"> <el-form-item label="签证OP" prop="Remark">
<el-select filterable style="width: 80%" clearable v-model="VisaOPMsg.VisaId" :placeholder="$t('pub.pleaseSel')"> <el-select filterable style="width: 80%" clearable v-model="VisaOPMsg.VisaId"
<el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId"> :placeholder="$t('pub.pleaseSel')">
</el-option> <el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId"
</el-select> :key="item.EmployeeId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="签证助手" prop="Remark"> <el-form-item label="签证助手" prop="Remark">
<el-select multiple filterable style="width: 80%;height:auto;" clearable v-model="VisaOPMsg.VisaAssistIds" :placeholder="$t('pub.pleaseSel')"> <el-select multiple filterable style="width: 80%;height:auto;" clearable v-model="VisaOPMsg.VisaAssistIds"
<el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId"> :placeholder="$t('pub.pleaseSel')">
</el-option> <el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId"
</el-select> :key="item.EmployeeId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="VisaOPMsg.VisaShow = false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="VisaOPMsg.VisaShow = false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SetVisaOPInfo">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SetVisaOPInfo">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<div v-if="dialog.show"> <div v-if="dialog.show">
...@@ -1459,7 +1463,7 @@ ...@@ -1459,7 +1463,7 @@
FenFangBiaoXiaZai: false, //分房表下载 FenFangBiaoXiaZai: false, //分房表下载
LookOPCommission: false, //查看OP提成 LookOPCommission: false, //查看OP提成
IsSanKeTicket: false, //是否有散客票权限 IsSanKeTicket: false, //是否有散客票权限
VisaEmployeeList:[], VisaEmployeeList: [],
//查询数据列表 //查询数据列表
queryCommonData: { queryCommonData: {
//线路列表 //线路列表
...@@ -1476,7 +1480,7 @@ ...@@ -1476,7 +1480,7 @@
AirlineList: [], AirlineList: [],
//员工列表 //员工列表
EmployeeList: [], EmployeeList: [],
//公司数据 //公司数据
BranchList: [], BranchList: [],
//是否为分公司 //是否为分公司
...@@ -1597,11 +1601,11 @@ ...@@ -1597,11 +1601,11 @@
ProductRecommend: "" ProductRecommend: ""
}, },
VisaOPMsg: { VisaOPMsg: {
VisaShow:false, VisaShow: false,
TCID: 0, TCID: 0,
VisaId: "", VisaId: "",
VisaAssistIds: [], VisaAssistIds: [],
VisaAssistId:"", VisaAssistId: "",
}, },
flightStatus: [{ flightStatus: [{
Id: 0, Id: 0,
...@@ -2187,43 +2191,43 @@ ...@@ -2187,43 +2191,43 @@
) )
}, },
getDiningDetailsList() { getDiningDetailsList() {
let Ids=[]; let Ids = [];
this.queryCommonData.dataList.forEach((item,index) => { this.queryCommonData.dataList.forEach((item, index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){ if ((item.LineID == 14 || item.LineID == 90 || item.LineID == 168 || item.LineID == 118)) {
Ids.push(item.TCID) Ids.push(item.TCID)
} }
}); });
if(Ids&&Ids.length>0){ if (Ids && Ids.length > 0) {
let msg = [...new Set(Ids)] let msg = [...new Set(Ids)]
this.apipost( this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", { "dmcstatistics_get_GetDiningStatisticsList", {
tcids: msg.join(',') tcids: msg.join(',')
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let DiningStatisticsList = [] let DiningStatisticsList = []
DiningStatisticsList = res.data.data DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => { this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => { DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) { if (x.TCID == y.TCID) {
x.DiningList = y.OrderList x.DiningList = y.OrderList
} }
})
}) })
}) this.$forceUpdate()
this.$forceUpdate() }
} }
} )
)
} }
}, },
getPriceHotelResultStatisticsList() { getPriceHotelResultStatisticsList() {
let Ids=[]; let Ids = [];
this.queryCommonData.dataList.forEach((item,index) => { this.queryCommonData.dataList.forEach((item, index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){ if ((item.LineID == 14 || item.LineID == 90 || item.LineID == 168 || item.LineID == 118)) {
Ids.push(item.TCID) Ids.push(item.TCID)
} }
}); });
if(Ids&&Ids.length>0){ if (Ids && Ids.length > 0) {
let msg = [...new Set(Ids)] let msg = [...new Set(Ids)]
this.apipost( this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", { "travel_get_GetPriceHotelResultStatisticsList", {
...@@ -2243,7 +2247,7 @@ ...@@ -2243,7 +2247,7 @@
this.$forceUpdate() this.$forceUpdate()
} }
} }
) )
} }
}, },
getTravelAccountStatus() { getTravelAccountStatus() {
...@@ -2686,21 +2690,22 @@ ...@@ -2686,21 +2690,22 @@
err => {} err => {}
); );
}, },
//签证op设置 //签证op设置
ckOPInfo(item) { ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true; this.VisaOPMsg.VisaShow = true;
this.VisaOPMsg.VisaId = item.VisaOPId==0?'':item.VisaOPId; this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId;
this.VisaOPMsg.VisaAssistId =''; this.VisaOPMsg.VisaAssistId = '';
// this.VisaOPMsg.VisaAssistId = item.VisaAssistantId; // this.VisaOPMsg.VisaAssistId = item.VisaAssistantId;
this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId&&item.VisaAssistantId.length>0)? item.VisaAssistantId.split(",").map((item) => Number(item)):[]; this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId
.split(",").map((item) => Number(item)) : [];
this.VisaOPMsg.TCID = item.TCID; this.VisaOPMsg.TCID = item.TCID;
this.getVisaEmployeeList(); this.getVisaEmployeeList();
}, },
//签证op设置 //签证op设置
SetVisaOPInfo() { SetVisaOPInfo() {
this.VisaOPMsg.VisaAssistId =''; this.VisaOPMsg.VisaAssistId = '';
console.log(" this.VisaOPMsg", this.VisaOPMsg); console.log(" this.VisaOPMsg", this.VisaOPMsg);
if(this.VisaOPMsg.VisaAssistIds&&this.VisaOPMsg.VisaAssistIds.length>0){ if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) {
this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',') this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',')
} }
this.apipost( this.apipost(
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ efe9a3da
...@@ -511,7 +511,7 @@ ...@@ -511,7 +511,7 @@
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看餐厅预订详情" placement="top-start"> <el-tooltip class="item" effect="dark" content="点击查看餐厅预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo> :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
...@@ -773,7 +773,7 @@ ...@@ -773,7 +773,7 @@
<span class="TCL-redType"> {{item.VisaOPName}}</span> <span class="TCL-redType"> {{item.VisaOPName}}</span>
</p> </p>
<template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0"> <template v-if="item.VisaAssistantList&&item.VisaAssistantList.length>0">
<p > <p>
<span> 签证助理OP</span> <span> 签证助理OP</span>
<template v-for="(subItem,subIndex) in item.VisaAssistantList"> <template v-for="(subItem,subIndex) in item.VisaAssistantList">
<span :key="subIndex" style="padding-right:3px;">{{subItem}}</span> <span :key="subIndex" style="padding-right:3px;">{{subItem}}</span>
...@@ -1048,32 +1048,36 @@ ...@@ -1048,32 +1048,36 @@
<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>
<!--修改op信息--> <!--修改op信息-->
<div class="combottomDiv OPremarkDiv" v-show="VisaOPMsg.VisaShow"> <div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="VisaOPMsg.VisaShow">
<div class="combottomTitle">签证OP设置</div> <div class="combottomTitle">签证OP设置</div>
<el-form label-width="100px"> <el-form label-width="100px">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="签证OP" prop="Remark"> <el-form-item label="签证OP" prop="Remark">
<el-select filterable style="width: 80%" clearable v-model="VisaOPMsg.VisaId" :placeholder="$t('pub.pleaseSel')"> <el-select filterable style="width: 80%" clearable v-model="VisaOPMsg.VisaId"
<el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId"> :placeholder="$t('pub.pleaseSel')">
</el-option> <el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId"
</el-select> :key="item.EmployeeId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="签证助手" prop="Remark"> <el-form-item label="签证助手" prop="Remark">
<el-select multiple filterable style="width: 80%" clearable v-model="VisaOPMsg.VisaAssistIds" :placeholder="$t('pub.pleaseSel')"> <el-select multiple filterable style="width: 80%" clearable v-model="VisaOPMsg.VisaAssistIds"
<el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId"> :placeholder="$t('pub.pleaseSel')">
</el-option> <el-option v-for="item in VisaEmployeeList" :label="item.EmName" :value="item.EmployeeId"
</el-select> :key="item.EmployeeId">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="VisaOPMsg.VisaShow = false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="VisaOPMsg.VisaShow = false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SetVisaOPInfo">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SetVisaOPInfo">{{$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="报价详情">
<div v-if="dialog.show"> <div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
...@@ -1122,13 +1126,13 @@ ...@@ -1122,13 +1126,13 @@
}, },
], ],
VisaOPMsg: { VisaOPMsg: {
VisaShow:false, VisaShow: false,
TCID: 0, TCID: 0,
VisaId: "", VisaId: "",
VisaAssistIds: [], VisaAssistIds: [],
VisaAssistId:"", VisaAssistId: "",
}, },
VisaEmployeeList:[], VisaEmployeeList: [],
//查询数据列表 //查询数据列表
queryCommonData: { queryCommonData: {
//线路列表 //线路列表
...@@ -1386,21 +1390,22 @@ ...@@ -1386,21 +1390,22 @@
(err) => {} (err) => {}
); );
}, },
//签证op设置 //签证op设置
ckOPInfo(item) { ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true; this.VisaOPMsg.VisaShow = true;
this.VisaOPMsg.VisaId = item.VisaOPId==0?'':item.VisaOPId; this.VisaOPMsg.VisaId = item.VisaOPId == 0 ? '' : item.VisaOPId;
this.VisaOPMsg.VisaAssistId =''; this.VisaOPMsg.VisaAssistId = '';
// this.VisaOPMsg.VisaAssistId = item.VisaAssistantId; // this.VisaOPMsg.VisaAssistId = item.VisaAssistantId;
this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId&&item.VisaAssistantId.length>0)? item.VisaAssistantId.split(",").map((item) => Number(item)):[]; this.VisaOPMsg.VisaAssistIds = (item.VisaAssistantId && item.VisaAssistantId.length > 0) ? item.VisaAssistantId
.split(",").map((item) => Number(item)) : [];
this.VisaOPMsg.TCID = item.TCID; this.VisaOPMsg.TCID = item.TCID;
this.getVisaEmployeeList(); this.getVisaEmployeeList();
}, },
//签证op设置 //签证op设置
SetVisaOPInfo() { SetVisaOPInfo() {
this.VisaOPMsg.VisaAssistId =''; this.VisaOPMsg.VisaAssistId = '';
console.log(" this.VisaOPMsg", this.VisaOPMsg); console.log(" this.VisaOPMsg", this.VisaOPMsg);
if(this.VisaOPMsg.VisaAssistIds&&this.VisaOPMsg.VisaAssistIds.length>0){ if (this.VisaOPMsg.VisaAssistIds && this.VisaOPMsg.VisaAssistIds.length > 0) {
this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',') this.VisaOPMsg.VisaAssistId = this.VisaOPMsg.VisaAssistIds.join(',')
} }
this.apipost( this.apipost(
...@@ -1664,63 +1669,63 @@ ...@@ -1664,63 +1669,63 @@
); );
}, },
getPriceHotelResultStatisticsList() { getPriceHotelResultStatisticsList() {
let Ids=[]; let Ids = [];
this.queryCommonData.dataList.forEach((item,index) => { this.queryCommonData.dataList.forEach((item, index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){ if ((item.LineID == 14 || item.LineID == 90 || item.LineID == 168 || item.LineID == 118)) {
Ids.push(item.TCID) Ids.push(item.TCID)
} }
}); });
if(Ids&&Ids.length>0){ if (Ids && Ids.length > 0) {
let msg = [...new Set(Ids)] let msg = [...new Set(Ids)]
this.apipost( this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", { "travel_get_GetPriceHotelResultStatisticsList", {
tcids: msg.join(',') tcids: msg.join(',')
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let DiningStatisticsList = [] let DiningStatisticsList = []
DiningStatisticsList = res.data.data DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => { this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => { DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) { if (x.TCID == y.TCID) {
x.HotelOrderListReports = y.HotelOrderListReports x.HotelOrderListReports = y.HotelOrderListReports
} }
})
}) })
}) this.$forceUpdate()
this.$forceUpdate() }
} }
} )
)
} }
}, },
getDiningDetailsList() { getDiningDetailsList() {
let Ids=[]; let Ids = [];
this.queryCommonData.dataList.forEach((item,index) => { this.queryCommonData.dataList.forEach((item, index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){ if ((item.LineID == 14 || item.LineID == 90 || item.LineID == 168 || item.LineID == 118)) {
Ids.push(item.TCID) Ids.push(item.TCID)
} }
}); });
if(Ids&&Ids.length>0){ if (Ids && Ids.length > 0) {
let msg = [...new Set(Ids)] let msg = [...new Set(Ids)]
this.apipost( this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", { "dmcstatistics_get_GetDiningStatisticsList", {
tcids: msg.join(',') tcids: msg.join(',')
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let DiningStatisticsList = [] let DiningStatisticsList = []
DiningStatisticsList = res.data.data DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => { this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => { DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) { if (x.TCID == y.TCID) {
x.DiningList = y.OrderList x.DiningList = y.OrderList
} }
})
}) })
}) this.$forceUpdate()
this.$forceUpdate() }
} }
} )
)
} }
}, },
getDetailsOfRoyalty() { getDetailsOfRoyalty() {
......
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