Skip to content

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

11

parent 9a1c598a
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 33 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ f8c01d69
...@@ -879,7 +879,7 @@ ...@@ -879,7 +879,7 @@
</template> </template>
<template v-else> <template v-else>
<span class="price" style="color:red;"> <span class="price" style="color:red;">
{{ $t("objFill.v101.dingcheqk") }}(未预定) {{ $t("objFill.v101.dingcheqk") }}(未预定)
</span> </span>
</template> </template>
</p> </p>
...@@ -1658,15 +1658,19 @@ ...@@ -1658,15 +1658,19 @@
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)"> <el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
{{ $t("objFill.v101.xiugaictriqi") }} {{ $t("objFill.v101.xiugaictriqi") }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item,3)">
机票转团
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,1)"> <el-dropdown-item @click.native="ckChangePrice(item,1)">
价格变更 价格变更
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,2)"> <el-dropdown-item @click.native="ckChangePrice(item,2)">
团队类型变更 团队类型变更
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="showTripDialog(item,1)" style="display:none;">
<!-- <el-dropdown-item @click.native="showTripDialog(item,1)" style="display:none;">
团队合并 团队合并
</el-dropdown-item> </el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -1995,13 +1999,18 @@ ...@@ -1995,13 +1999,18 @@
<!--复制行程信息--> <!--复制行程信息-->
<div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="CopyTripAndFeatureMsg.isShowTripFeature"> <div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
<div class="combottomTitle"> <div class="combottomTitle">
{{ <template v-if="CopyTripAndFeatureMsg.updateType == 1">
CopyTripAndFeatureMsg.updateType == 1 {{$t("objFill.v101.fuzhixingc")}}
? $t("objFill.v101.fuzhixingc") </template>
: $t("objFill.v101.xiugaictriqi") <template v-if="CopyTripAndFeatureMsg.updateType == 2">
}} {{$t("objFill.v101.xiugaictriqi")}}
</template>
<template v-if="CopyTripAndFeatureMsg.updateType == 3">
机票转团
</template>
</div> </div>
<el-form label-width="100px"> <el-form label-width="100px">
<!--复制行程-->
<template v-if="CopyTripAndFeatureMsg.updateType == 1"> <template v-if="CopyTripAndFeatureMsg.updateType == 1">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('ios.tuanhao')" prop="Remark"> <el-form-item :label="$t('ios.tuanhao')" prop="Remark">
...@@ -2021,6 +2030,7 @@ ...@@ -2021,6 +2030,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<!--变更出发日期-->
<template v-if="CopyTripAndFeatureMsg.updateType == 2"> <template v-if="CopyTripAndFeatureMsg.updateType == 2">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('sm.chutuandate')" prop="Remark"> <el-form-item :label="$t('sm.chutuandate')" prop="Remark">
...@@ -2029,6 +2039,17 @@ ...@@ -2029,6 +2039,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<!--机票转团-->
<template v-if="CopyTripAndFeatureMsg.updateType == 3">
<el-col :span="4">
<el-form-item :label="$t('ios.tuanhao')">
<el-input v-model="CopyTripAndFeatureMsg.CopyTCNUM" placeholder="KIXMF06240921C"></el-input>
</el-form-item>
</el-col>
<el-col :span="1">
&nbsp;
</el-col>
</template>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false"> <el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false">
...@@ -2305,7 +2326,7 @@ ...@@ -2305,7 +2326,7 @@
VisaAssistId: "", VisaAssistId: "",
}, },
CopyTripAndFeatureMsg: { CopyTripAndFeatureMsg: {
updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面 updateType: 1, //1-复制行程，2-修改出团日期，3-机票转团
isShowTripFeature: false, isShowTripFeature: false,
TCID: 0, TCID: 0,
StartDate: "", //出发日期 StartDate: "", //出发日期
...@@ -3601,6 +3622,14 @@ ...@@ -3601,6 +3622,14 @@
this.CopyTripAndFeatureMsg.StartDate; this.CopyTripAndFeatureMsg.StartDate;
tipMsg += ",变更日期后,请重新同步酒店信息。"; tipMsg += ",变更日期后,请重新同步酒店信息。";
} }
if (this.CopyTripAndFeatureMsg.updateType == 3) {
cmdStr = "travel_post_ChangeAirticket";
tipMsg =
this.$t("objFill.v101.shifouxiiug") +
"【" +
this.CopyTripAndFeatureMsg.CurrentTCNUM +
"】的机位转入【" + this.CopyTripAndFeatureMsg.CopyTCNUM + "】团?";
}
that.Confirm(tipMsg, function () { that.Confirm(tipMsg, function () {
that.saveLoading = true; that.saveLoading = true;
that.apipost( that.apipost(
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ f8c01d69
...@@ -1185,6 +1185,9 @@ ...@@ -1185,6 +1185,9 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}} <el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item,3)">
机票转团
</el-dropdown-item>
<el-dropdown-item @click.native="ckChangePrice(item,1)"> <el-dropdown-item @click.native="ckChangePrice(item,1)">
价格变更 价格变更
</el-dropdown-item> </el-dropdown-item>
...@@ -1450,11 +1453,21 @@ ...@@ -1450,11 +1453,21 @@
</div> </div>
</div> </div>
<!--复制行程信息--> <!--复制行程信息-->
<div class="combottomDiv OPremarkDiv" style="height:150px;" v-show="CopyTripAndFeatureMsg.isShowTripFeature"> <div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
<div class="combottomTitle"> <div class="combottomTitle">
{{CopyTripAndFeatureMsg.updateType==1?$t('objFill.v101.fuzhixingc'):$t('objFill.v101.xiugaictriqi')}}</div> <template v-if="CopyTripAndFeatureMsg.updateType == 1">
{{$t("objFill.v101.fuzhixingc")}}
</template>
<template v-if="CopyTripAndFeatureMsg.updateType == 2">
{{$t("objFill.v101.xiugaictriqi")}}
</template>
<template v-if="CopyTripAndFeatureMsg.updateType == 3">
机票转团
</template>
</div>
<el-form label-width="100px"> <el-form label-width="100px">
<template v-if="CopyTripAndFeatureMsg.updateType==1"> <!--复制行程-->
<template v-if="CopyTripAndFeatureMsg.updateType == 1">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('ios.tuanhao')" prop="Remark"> <el-form-item :label="$t('ios.tuanhao')" prop="Remark">
<el-input v-model="CopyTripAndFeatureMsg.CopyTCNUM" placeholder="KIXMF06240921C"></el-input> <el-input v-model="CopyTripAndFeatureMsg.CopyTCNUM" placeholder="KIXMF06240921C"></el-input>
...@@ -1463,13 +1476,18 @@ ...@@ -1463,13 +1476,18 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="" prop="Remark"> <el-form-item label="" prop="Remark">
<el-checkbox-group v-model="CopyTripAndFeatureMsg.CopyTrip"> <el-checkbox-group v-model="CopyTripAndFeatureMsg.CopyTrip">
<el-checkbox label="1" value="1">{{$t('sm.xianluxingcheng')}}</el-checkbox> <el-checkbox label="1" value="1">{{
<el-checkbox label="2" value="2">{{$t('salesModule.TripSpecial')}}</el-checkbox> $t("sm.xianluxingcheng")
}}</el-checkbox>
<el-checkbox label="2" value="2">{{
$t("salesModule.TripSpecial")
}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<template v-if="CopyTripAndFeatureMsg.updateType==2"> <!--变更出发日期-->
<template v-if="CopyTripAndFeatureMsg.updateType == 2">
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="$t('sm.chutuandate')" prop="Remark"> <el-form-item :label="$t('sm.chutuandate')" prop="Remark">
<el-date-picker class="w150" type="date" v-model="CopyTripAndFeatureMsg.StartDate" <el-date-picker class="w150" type="date" v-model="CopyTripAndFeatureMsg.StartDate"
...@@ -1477,13 +1495,24 @@ ...@@ -1477,13 +1495,24 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</template> </template>
<!--机票转团-->
<template v-if="CopyTripAndFeatureMsg.updateType == 3">
<el-col :span="4">
<el-form-item :label="$t('ios.tuanhao')">
<el-input v-model="CopyTripAndFeatureMsg.CopyTCNUM" placeholder="KIXMF06240921C"></el-input>
</el-form-item>
</el-col>
<el-col :span="1">
&nbsp;
</el-col>
</template>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false"> <el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false">
{{$t('pub.cancelBtn')}} {{ $t("pub.cancelBtn") }}
</el-button> </el-button>
<el-button type="primary" size="small" :loading="saveLoading" @click="SetCopyTripAndFeature"> <el-button type="primary" size="small" :loading="saveLoading" @click="SetCopyTripAndFeature">
{{$t('pub.sureBtn')}} {{ $t("pub.sureBtn") }}
</el-button> </el-button>
</div> </div>
</div> </div>
...@@ -1989,45 +2018,74 @@ ...@@ -1989,45 +2018,74 @@
SetCopyTripAndFeature() { SetCopyTripAndFeature() {
var that = this; var that = this;
var sMsg = ""; var sMsg = "";
this.CopyTripAndFeatureMsg.copyType = ''; this.CopyTripAndFeatureMsg.copyType = "";
if (this.CopyTripAndFeatureMsg.CopyTrip && this.CopyTripAndFeatureMsg.CopyTrip.length > 0) { if (
this.CopyTripAndFeatureMsg.copyType = this.CopyTripAndFeatureMsg.CopyTrip.join(',') this.CopyTripAndFeatureMsg.CopyTrip &&
this.CopyTripAndFeatureMsg.CopyTrip.forEach(item => { this.CopyTripAndFeatureMsg.CopyTrip.length > 0
) {
this.CopyTripAndFeatureMsg.copyType = this.CopyTripAndFeatureMsg.CopyTrip.join(
","
);
this.CopyTripAndFeatureMsg.CopyTrip.forEach((item) => {
if (item == 1) { if (item == 1) {
sMsg += this.$t('sm.xianluxingcheng'); sMsg += this.$t("sm.xianluxingcheng");
} }
if (item == 2) { if (item == 2) {
sMsg += "、" + this.$t('salesModule.TripSpecial'); sMsg += "、" + this.$t("salesModule.TripSpecial");
} }
}); });
} }
var cmdStr = "travel_post_CopyTripAndFeature" var cmdStr = "travel_post_CopyTripAndFeature";
var tipMsg = this.$t('objFill.v101.shifoujian') + '【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】' + this.$t( var tipMsg =
'objFill.v101.di') + sMsg + ',' + this.$t('objFill.v101.fuzhidao') + '【' + this.CopyTripAndFeatureMsg this.$t("objFill.v101.shifoujian") +
.CurrentTCNUM + '】' + this.$t('commonPickUp.Pick_Team') + '?'; "【" +
this.CopyTripAndFeatureMsg.CopyTCNUM +
"】" +
this.$t("objFill.v101.di") +
sMsg +
"," +
this.$t("objFill.v101.fuzhidao") +
"【" +
this.CopyTripAndFeatureMsg.CurrentTCNUM +
"】" +
this.$t("commonPickUp.Pick_Team") +
"?";
if (this.CopyTripAndFeatureMsg.updateType == 2) { if (this.CopyTripAndFeatureMsg.updateType == 2) {
cmdStr = "travel_post_SetTCStartDate"; cmdStr = "travel_post_SetTCStartDate";
tipMsg = this.$t('objFill.v101.shifouxiiug') + "【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】" + this.$t( tipMsg =
'objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate; this.$t("objFill.v101.shifouxiiug") +
"【" +
this.CopyTripAndFeatureMsg.CurrentTCNUM +
"】" +
this.$t("objFill.v101.dictriqiwei") +
this.CopyTripAndFeatureMsg.StartDate;
tipMsg += ",变更日期后,请重新同步酒店信息。"; tipMsg += ",变更日期后,请重新同步酒店信息。";
} }
if (this.CopyTripAndFeatureMsg.updateType == 3) {
cmdStr = "travel_post_ChangeAirticket";
tipMsg =
this.$t("objFill.v101.shifouxiiug") +
"【" +
this.CopyTripAndFeatureMsg.CurrentTCNUM +
"】的机位转入【" + this.CopyTripAndFeatureMsg.CopyTCNUM + "】团?";
}
that.Confirm(tipMsg, function () { that.Confirm(tipMsg, function () {
that.saveLoading = true; that.saveLoading = true;
that.apipost( that.apipost(
cmdStr, cmdStr,
that.CopyTripAndFeatureMsg, that.CopyTripAndFeatureMsg,
res => { (res) => {
that.saveLoading = false; that.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
if (that.CopyTripAndFeatureMsg.updateType == 1) { if (that.CopyTripAndFeatureMsg.updateType == 1) {
that.Success(that.$t('objFill.v101.fuzhixingccg')); that.Success(that.$t("objFill.v101.fuzhixingccg") + res.data.message);
} else { } else {
that.Success(res.data.message); that.Success(res.data.message);
} }
that.CopyTripAndFeatureMsg.isShowTripFeature = false; that.CopyTripAndFeatureMsg.isShowTripFeature = false;
that.CopyTripAndFeatureMsg.CopyTrip = []; that.CopyTripAndFeatureMsg.CopyTrip = [];
that.CopyTripAndFeatureMsg.copyType = ''; that.CopyTripAndFeatureMsg.copyType = "";
that.CopyTripAndFeatureMsg.TCID = 0; that.CopyTripAndFeatureMsg.TCID = 0;
that.CopyTripAndFeatureMsg.CopyTCNUM = ""; that.CopyTripAndFeatureMsg.CopyTCNUM = "";
that.CopyTripAndFeatureMsg.StartDate = ""; that.CopyTripAndFeatureMsg.StartDate = "";
...@@ -2036,7 +2094,7 @@ ...@@ -2036,7 +2094,7 @@
that.Error(res.data.message); that.Error(res.data.message);
} }
}, },
err => {} (err) => {}
); );
}); });
}, },
......
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