11

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -879,7 +879,7 @@
                     </template>
                     <template v-else>
                       <span class="price" style="color:red;">
-                       {{ $t("objFill.v101.dingcheqk") }}(未预定)
+                        {{ $t("objFill.v101.dingcheqk") }}(未预定)
                       </span>
                     </template>
                   </p>
@@ -1658,15 +1658,19 @@
                       <el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
                         {{ $t("objFill.v101.xiugaictriqi") }}
                       </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>
                       <el-dropdown-item @click.native="ckChangePrice(item,2)">
                         团队类型变更
                       </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>
                 </div>
@@ -1995,13 +1999,18 @@
     <!--复制行程信息-->
     <div class="combottomDiv OPremarkDiv" style="height: 150px" v-show="CopyTripAndFeatureMsg.isShowTripFeature">
       <div class="combottomTitle">
-        {{
-          CopyTripAndFeatureMsg.updateType == 1
-            ? $t("objFill.v101.fuzhixingc")
-            : $t("objFill.v101.xiugaictriqi")
-        }}
+        <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">
+        <!--复制行程-->
         <template v-if="CopyTripAndFeatureMsg.updateType == 1">
           <el-col :span="4">
             <el-form-item :label="$t('ios.tuanhao')" prop="Remark">
@@ -2021,6 +2030,7 @@
             </el-form-item>
           </el-col>
         </template>
+        <!--变更出发日期-->
         <template v-if="CopyTripAndFeatureMsg.updateType == 2">
           <el-col :span="4">
             <el-form-item :label="$t('sm.chutuandate')" prop="Remark">
@@ -2029,6 +2039,17 @@
             </el-form-item>
           </el-col>
         </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>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false">
@@ -2305,7 +2326,7 @@
           VisaAssistId: "",
         },
         CopyTripAndFeatureMsg: {
-          updateType: 1, //1-复制行程，2-修改出团日期，3-修改行程版面
+          updateType: 1, //1-复制行程，2-修改出团日期，3-机票转团
           isShowTripFeature: false,
           TCID: 0,
           StartDate: "", //出发日期
@@ -3601,6 +3622,14 @@
             this.CopyTripAndFeatureMsg.StartDate;
           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.saveLoading = true;
           that.apipost(

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1185,6 +1185,9 @@
                       </el-dropdown-item>
                       <el-dropdown-item @click.native='CopyTripAndFeature(item,2)'>{{$t('objFill.v101.xiugaictriqi')}}
                       </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>
@@ -1450,11 +1453,21 @@
       </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">
-        {{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">
-        <template v-if="CopyTripAndFeatureMsg.updateType==1">
+        <!--复制行程-->
+        <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>
@@ -1463,13 +1476,18 @@
           <el-col :span="8">
             <el-form-item label="" prop="Remark">
               <el-checkbox-group v-model="CopyTripAndFeatureMsg.CopyTrip">
-                <el-checkbox label="1" value="1">{{$t('sm.xianluxingcheng')}}</el-checkbox>
-                <el-checkbox label="2" value="2">{{$t('salesModule.TripSpecial')}}</el-checkbox>
+                <el-checkbox label="1" value="1">{{
+                  $t("sm.xianluxingcheng")
+                }}</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">
+        <!--变更出发日期-->
+        <template v-if="CopyTripAndFeatureMsg.updateType == 2">
           <el-col :span="4">
             <el-form-item :label="$t('sm.chutuandate')" prop="Remark">
               <el-date-picker class="w150" type="date" v-model="CopyTripAndFeatureMsg.StartDate"
@@ -1477,13 +1495,24 @@
             </el-form-item>
           </el-col>
         </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>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="CopyTripAndFeatureMsg.isShowTripFeature = false">
-          {{$t('pub.cancelBtn')}}
+          {{ $t("pub.cancelBtn") }}
         </el-button>
         <el-button type="primary" size="small" :loading="saveLoading" @click="SetCopyTripAndFeature">
-          {{$t('pub.sureBtn')}}
+          {{ $t("pub.sureBtn") }}
         </el-button>
       </div>
     </div>
@@ -1989,45 +2018,74 @@
       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 => {
+        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 += this.$t('sm.xianluxingcheng');
+              sMsg += this.$t("sm.xianluxingcheng");
             }
             if (item == 2) {
-              sMsg += "、" + this.$t('salesModule.TripSpecial');
+              sMsg += "、" + this.$t("salesModule.TripSpecial");
             }
           });
         }
 
-        var cmdStr = "travel_post_CopyTripAndFeature"
-        var tipMsg = this.$t('objFill.v101.shifoujian') + '【' + this.CopyTripAndFeatureMsg.CopyTCNUM + '】' + this.$t(
-            'objFill.v101.di') + sMsg + ',' + this.$t('objFill.v101.fuzhidao') + '【' + this.CopyTripAndFeatureMsg
-          .CurrentTCNUM + '】' + this.$t('commonPickUp.Pick_Team') + '?';
+        var cmdStr = "travel_post_CopyTripAndFeature";
+        var tipMsg =
+          this.$t("objFill.v101.shifoujian") +
+          "【" +
+          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) {
           cmdStr = "travel_post_SetTCStartDate";
-          tipMsg = this.$t('objFill.v101.shifouxiiug') + "【" + this.CopyTripAndFeatureMsg.CurrentTCNUM + "】" + this.$t(
-            'objFill.v101.dictriqiwei') + this.CopyTripAndFeatureMsg.StartDate;
+          tipMsg =
+            this.$t("objFill.v101.shifouxiiug") +
+            "【" +
+            this.CopyTripAndFeatureMsg.CurrentTCNUM +
+            "】" +
+            this.$t("objFill.v101.dictriqiwei") +
+            this.CopyTripAndFeatureMsg.StartDate;
           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.saveLoading = true;
           that.apipost(
             cmdStr,
             that.CopyTripAndFeatureMsg,
-            res => {
+            (res) => {
               that.saveLoading = false;
               if (res.data.resultCode == 1) {
                 if (that.CopyTripAndFeatureMsg.updateType == 1) {
-                  that.Success(that.$t('objFill.v101.fuzhixingccg'));
+                  that.Success(that.$t("objFill.v101.fuzhixingccg") + res.data.message);
                 } else {
                   that.Success(res.data.message);
                 }
                 that.CopyTripAndFeatureMsg.isShowTripFeature = false;
                 that.CopyTripAndFeatureMsg.CopyTrip = [];
-                that.CopyTripAndFeatureMsg.copyType = '';
+                that.CopyTripAndFeatureMsg.copyType = "";
                 that.CopyTripAndFeatureMsg.TCID = 0;
                 that.CopyTripAndFeatureMsg.CopyTCNUM = "";
                 that.CopyTripAndFeatureMsg.StartDate = "";
@@ -2036,7 +2094,7 @@
                 that.Error(res.data.message);
               }
             },
-            err => {}
+            (err) => {}
           );
         });
       },