Skip to content

S
SuperMan
Commit 4ee23e52 authored by 黄奎's avatar 黄奎
Browse files
Options

新增修改出发日期

parent 2f626730
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 51 deletions
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 4ee23e52
......@@ -130,7 +130,8 @@
<em>{{$t('scen.sc_ftTime')}}</em>
<!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate"
:EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
......@@ -374,7 +375,8 @@
<span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span>
<span v-if="item.Status==2"
:title="'结团时间'+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==5" :title="$t('objFill.jietuanshz')" style="background: rgb(0 128 255);">{{$t('fnc.a_shezhong')}}</span>
<span v-if="item.Status==5" :title="$t('objFill.jietuanshz')"
style="background: rgb(0 128 255);">{{$t('fnc.a_shezhong')}}</span>
<span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
<span v-if="item.GroupRecommendType==1" title="精品">精</span>
<label style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">
......@@ -651,7 +653,8 @@
<span>{{$t('visa.v_yibaoru')}}</span>
<i>
{{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
<span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
</i>
</p>
<p>
......@@ -935,6 +938,10 @@
</el-dropdown-item>
<el-dropdown-item @click.native='ckOPInfo(item)'>签证OP设置
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,1)'>复制行程
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>修改出团日期
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1083,6 +1090,43 @@
<button class="normalBtn" type="primary" @click="SetVisaOPInfo">{{$t('pub.sureBtn')}}</button>
</div>
</div>
<!--复制行程信息-->
<div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
<div class="combottomTitle">{{CopyTripAndFeatureMsg.updateType==1?"复制行程":"修改出团日期"}}</div>
<el-form label-width="100px">
<template v-if="CopyTripAndFeatureMsg.updateType==1">
<el-col :span="4">
<el-form-item :label="$t('ios.tuanhao')" prop="Remark">
<el-input v-model="CopyTripAndFeatureMsg.CopyTCNUM" placeholder="KIXMF06240921C"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="Remark">
<el-checkbox-group v-model="CopyTripAndFeatureMsg.CopyTrip">
<el-checkbox label="1" value="1">线路行程</el-checkbox>
<el-checkbox label="2" value="2">{{$t('salesModule.TripSpecial')}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</template>
<template v-if="CopyTripAndFeatureMsg.updateType==2">
<el-col :span="4">
<el-form-item label="出团日期" prop="Remark">
<el-date-picker class="w150" type="date" v-model="CopyTripAndFeatureMsg.StartDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
</el-col>
</template>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false">
{{$t('pub.cancelBtn')}}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetCopyTripAndFeature">
{{$t('pub.sureBtn')}}
</el-button>
</div>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<div v-if="dialog.show">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
......@@ -1283,6 +1327,17 @@
Checked: false
}
],
CopyTripAndFeatureMsg: {
updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面
isShowTripFeature: false,
TCID: 0,
StartDate: "", //出发日期
CopyTCNUM: "",
CopyTrip: [],
copyType: "",
CurrentTCNUM: "",
},
saveLoading: false, //保存loading防止重复提交
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.queryMsg.EndGroupDate);
......@@ -1397,6 +1452,70 @@
(err) => {}
);
},
//弹窗选择复制的团期信息
CopyTripAndFeature(item, type) {
this.CopyTripAndFeatureMsg.updateType = type;
this.CopyTripAndFeatureMsg.isShowTripFeature = true;
this.CopyTripAndFeatureMsg.CopyTrip = [];
this.CopyTripAndFeatureMsg.copyType = '';
this.CopyTripAndFeatureMsg.TCID = item.TCID;
this.CopyTripAndFeatureMsg.CurrentTCNUM = item.TCNUM;
this.CopyTripAndFeatureMsg.CopyTCNUM = "";
this.CopyTripAndFeatureMsg.StartDate = item.StartDateStr;
this.getVisaEmployeeList();
},
//保存复制的行程信息
SetCopyTripAndFeature() {
var that = this;
var sMsg = "";
this.CopyTripAndFeatureMsg.copyType = '';
if (this.CopyTripAndFeatureMsg.CopyTrip && this.CopyTripAndFeatureMsg.CopyTrip.length > 0) {
this.CopyTripAndFeatureMsg.copyType = this.CopyTripAndFeatureMsg.CopyTrip.join(',')
this.CopyTripAndFeatureMsg.CopyTrip.forEach(item => {
if (item == 1) {
sMsg += "线路行程";
}
if (item == 2) {
sMsg += "、行程特色";
}
});
}
var cmdStr = "travel_post_CopyTripAndFeature"
var tipMsg = '是否将【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】的' + sMsg + ',复制到【' + this.CopyTripAndFeatureMsg
.CurrentTCNUM + '】团?';
if (this.CopyTripAndFeatureMsg.updateType == 2) {
cmdStr = "travel_post_SetTCStartDate";
tipMsg = "是否修改【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】的出团日期为" + this.CopyTripAndFeatureMsg.StartDate;
}
that.Confirm(tipMsg, function () {
that.saveLoading = true;
that.apipost(
cmdStr,
that.CopyTripAndFeatureMsg,
res => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
if (that.CopyTripAndFeatureMsg.updateType == 1) {
that.Success("复制行程成功");
} else {
that.Success(res.data.message);
}
that.CopyTripAndFeatureMsg.isShowTripFeature = false;
that.CopyTripAndFeatureMsg.CopyTrip = [];
that.CopyTripAndFeatureMsg.copyType = '';
that.CopyTripAndFeatureMsg.TCID = 0;
that.CopyTripAndFeatureMsg.CopyTCNUM = "";
that.CopyTripAndFeatureMsg.StartDate = "";
that.getControlList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
},
//签证op设置
ckOPInfo(item) {
this.VisaOPMsg.VisaShow = true;
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 4ee23e52
......@@ -145,8 +145,9 @@
<em>{{$t('scen.sc_ftTime')}}</em>
<!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate"
:EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
......@@ -396,7 +397,8 @@
:title="'结团时间'+item.OutGroupAuditDate">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span>
<span v-if="item.OutGroupType==1" title="落地团" style="background: #ff9c00;">落</span>
<span v-if="item.Status==5" title="结团审核" style="background: #2aaef2;">{{$t('objFill.v101.FinancialModule.shen')}}</span>
<span v-if="item.Status==5" title="结团审核"
style="background: #2aaef2;">{{$t('objFill.v101.FinancialModule.shen')}}</span>
</div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div>
<div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>
......@@ -644,7 +646,8 @@
<span>{{$t('visa.v_yibaoru')}}</span>
<i>
{{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
<span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('hotel.hotel_people')}}
</i>
</p>
<p>
......@@ -802,6 +805,10 @@
<el-dropdown-item>
<div @click='GoToleaderReimbursement(item)' style="color:red">地接成本支出 </div>
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,1)'>复制行程
</el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>修改出团日期
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -929,6 +936,43 @@
</el-col>
</el-form>
</div>
<!--复制行程信息-->
<div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
<div class="combottomTitle">{{CopyTripAndFeatureMsg.updateType==1?"复制行程":"修改出团日期"}}</div>
<el-form label-width="100px">
<template v-if="CopyTripAndFeatureMsg.updateType==1">
<el-col :span="4">
<el-form-item :label="$t('ios.tuanhao')" prop="Remark">
<el-input v-model="CopyTripAndFeatureMsg.CopyTCNUM" placeholder="KIXMF06240921C"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="Remark">
<el-checkbox-group v-model="CopyTripAndFeatureMsg.CopyTrip">
<el-checkbox label="1" value="1">线路行程</el-checkbox>
<el-checkbox label="2" value="2">{{$t('salesModule.TripSpecial')}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
</template>
<template v-if="CopyTripAndFeatureMsg.updateType==2">
<el-col :span="4">
<el-form-item label="出团日期" prop="Remark">
<el-date-picker class="w150" type="date" v-model="CopyTripAndFeatureMsg.StartDate"
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</el-form-item>
</el-col>
</template>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false">
{{$t('pub.cancelBtn')}}
</el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetCopyTripAndFeature">
{{$t('pub.sureBtn')}}
</el-button>
</div>
</div>
<el-dialog :visible.sync="dialog.show" width="1400px" :title="$t('objFill.baojiaxiangqing')">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
......@@ -1126,6 +1170,17 @@
showCaozuoTime: true, //操作时间
colspanLength: 5 //跨行
},
CopyTripAndFeatureMsg: {
updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面
isShowTripFeature: false,
TCID: 0,
StartDate: "", //出发日期
CopyTCNUM: "",
CopyTrip: [],
copyType: "",
CurrentTCNUM: "",
},
saveLoading: false, //保存loading防止重复提交
//当前登录用户信息
CurrentUserInfo: {},
pickerBeginDateBefore: {
......@@ -1224,6 +1279,70 @@
}
});
},
//弹窗选择复制的团期信息
CopyTripAndFeature(item, type) {
this.CopyTripAndFeatureMsg.updateType = type;
this.CopyTripAndFeatureMsg.isShowTripFeature = true;
this.CopyTripAndFeatureMsg.CopyTrip = [];
this.CopyTripAndFeatureMsg.copyType = '';
this.CopyTripAndFeatureMsg.TCID = item.TCID;
this.CopyTripAndFeatureMsg.CurrentTCNUM = item.TCNUM;
this.CopyTripAndFeatureMsg.CopyTCNUM = "";
this.CopyTripAndFeatureMsg.StartDate = item.StartDateStr;
this.getVisaEmployeeList();
},
//保存复制的行程信息
SetCopyTripAndFeature() {
var that = this;
var sMsg = "";
this.CopyTripAndFeatureMsg.copyType = '';
if (this.CopyTripAndFeatureMsg.CopyTrip && this.CopyTripAndFeatureMsg.CopyTrip.length > 0) {
this.CopyTripAndFeatureMsg.copyType = this.CopyTripAndFeatureMsg.CopyTrip.join(',')
this.CopyTripAndFeatureMsg.CopyTrip.forEach(item => {
if (item == 1) {
sMsg += "线路行程";
}
if (item == 2) {
sMsg += "、行程特色";
}
});
}
var cmdStr = "travel_post_CopyTripAndFeature"
var tipMsg = '是否将【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】的' + sMsg + ',复制到【' + this.CopyTripAndFeatureMsg
.CurrentTCNUM + '】团?';
if (this.CopyTripAndFeatureMsg.updateType == 2) {
cmdStr = "travel_post_SetTCStartDate";
tipMsg = "是否修改【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】的出团日期为" + this.CopyTripAndFeatureMsg.StartDate;
}
that.Confirm(tipMsg, function () {
that.saveLoading = true;
that.apipost(
cmdStr,
that.CopyTripAndFeatureMsg,
res => {
that.saveLoading = false;
if (res.data.resultCode == 1) {
if (that.CopyTripAndFeatureMsg.updateType == 1) {
that.Success("复制行程成功");
} else {
that.Success(res.data.message);
}
that.CopyTripAndFeatureMsg.isShowTripFeature = false;
that.CopyTripAndFeatureMsg.CopyTrip = [];
that.CopyTripAndFeatureMsg.copyType = '';
that.CopyTripAndFeatureMsg.TCID = 0;
that.CopyTripAndFeatureMsg.CopyTCNUM = "";
that.CopyTripAndFeatureMsg.StartDate = "";
that.getControlList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
});
},
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
let resultStr = '';
......@@ -1475,33 +1594,33 @@
)
},
getDiningDetailsList() {
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
let Ids = [];
this.queryCommonData.dataList.forEach((item, index) => {
if ((item.LineID == 14 || item.LineID == 90 || item.LineID == 168 || item.LineID == 118)) {
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.DiningList = y.OrderList
}
if (Ids && Ids.length > 0) {
let msg = [...new Set(Ids)]
this.apipost(
"dmcstatistics_get_GetDiningStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.DiningList = y.OrderList
}
})
})
})
this.$forceUpdate()
this.$forceUpdate()
}
}
}
)
)
}
},
getDetailsOfRoyalty() {
......@@ -2005,33 +2124,33 @@
this.queryCommonData.UploadItem = item
},
getPriceHotelResultStatisticsList() {
let Ids=[];
this.queryCommonData.dataList.forEach((item,index) => {
if((item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118)){
let Ids = [];
this.queryCommonData.dataList.forEach((item, index) => {
if ((item.LineID == 14 || item.LineID == 90 || item.LineID == 168 || item.LineID == 118)) {
Ids.push(item.TCID)
}
});
if(Ids&&Ids.length>0){
let msg = [...new Set(Ids)]
this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.HotelOrderListReports = y.HotelOrderListReports
}
if (Ids && Ids.length > 0) {
let msg = [...new Set(Ids)]
this.apipost(
"travel_get_GetPriceHotelResultStatisticsList", {
tcids: msg.join(',')
},
res => {
if (res.data.resultCode == 1) {
let DiningStatisticsList = []
DiningStatisticsList = res.data.data
this.queryCommonData.dataList.forEach(x => {
DiningStatisticsList.forEach(y => {
if (x.TCID == y.TCID) {
x.HotelOrderListReports = y.HotelOrderListReports
}
})
})
})
this.$forceUpdate()
this.$forceUpdate()
}
}
}
)
)
}
},
//保存WORD路劲
......
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