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

src/assets/common/lang/en.js

@@ -2171,6 +2171,7 @@ export const salesModule = {
   ChildBed: 'Baby in bed',
   ChildNoBed: 'Children dont occupy the bed',
   SingleJ: 'single ground connection',
+  SingleAirticket:'Single Ticket',
   OtherPrice: 'other price',
   VisaBack: 'Visa Fee (return fee)',
   PeoPle: 'People',

src/assets/common/lang/jp.js

@@ -2082,6 +2082,7 @@ export const salesModule={
   ChildBed:'子どもがベッドをとる',
   ChildNoBed:'子供はベッドを取らない',
   SingleJ:'単接地',
+  SingleAirticket:'シングル航空券',
   OtherPrice:'その他価格',
   VisaBack:'査証料(さいりょうりょう)',
   PeoPle:'人',

src/assets/common/lang/zh-tw.js

@@ -2156,6 +2156,7 @@ export const salesModule={
   ChildBed:'小孩占床',
   ChildNoBed:'小孩不占床',
   SingleJ:'單地接',
+  SingleAirticket:'單機票',
   OtherPrice:'其他價格',
   VisaBack:'簽證費（退簽證費）',
   PeoPle:'人',

src/assets/common/lang/zh.js

@@ -2171,6 +2171,7 @@ export const salesModule={
   ChildBed:'小孩占床',
   ChildNoBed:'小孩不占床',
   SingleJ:'单地接',
+  SingleAirticket:'单机票',
   OtherPrice:'其他价格',
   VisaBack:'签证费（退签证费）',
   PeoPle:'人',

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -743,8 +743,12 @@
                           <td>
                             <b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b>
                           </td>
+                          <td class="TC_cusTitle">{{$t('salesModule.SingleAirticket')}}</td>
+                          <td>
+                            <b>{{item.AirticketMoney|priceFormat(item.AirticketMoney)}}</b>
+                          </td>
                           <td class="TC_cusTitle">{{$t('op.RTXF')}}</td>
-                          <td colspan="3">
+                          <td>
                             <b>{{item.TipAmount|priceFormat(item.TipAmount)}}</b>
                           </td>
                         </tr>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -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/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -457,7 +457,8 @@
                       :false-label="UnCheckedLessPrice">{{$t('op.CanLessPrice')}}
                     </el-checkbox>
                     <el-checkbox v-model="priceData.IsNeedAirportShuttle" @change="IsNeedAirportShuttleChange"
-                      :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">{{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
+                      :true-label="CheckedVaule" :false-label="UnCheckedLessPrice">
+                      {{$t('objFill.v101.myOrdersAllType.shifouxyst')}}
                     </el-checkbox>
                     <template v-if="CurrentUserInfo.RB_Group_id==2">
                       <input type="button" class="normalBtn" :value="$t('op.HotelUse')" @click="outerVisible=true"
@@ -519,6 +520,12 @@
                       <template slot="prepend">{{$t('salesModule.SingleJ')}}</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
+                      v-model="priceData.AirticketMoney" @keyup.native="checkPrice(priceData,'AirticketMoney')">
+                      <template slot="prepend">{{$t('salesModule.SingleAirticket')}}</template>
+                    </el-input>
+                  </el-form-item>
                   <el-form-item>
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.TipAmount"
                       @keyup.native="checkPrice(priceData,'TipAmount')">
@@ -704,7 +711,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item>
-                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span>
+                    <span class="TP_Sendprepend"
+                      style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}</span>
                     <el-select class="w180" v-model="priceData.IsLeaderDaiTuan">
                       <template v-for="item in DaiTuanList">
                         <el-option :key="item.Id" :label="item.name" :value="item.Id">
@@ -718,7 +726,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item>
-                    <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.daoydtbdt')}}</span>
+                    <span class="TP_Sendprepend"
+                      style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.daoydtbdt')}}</span>
                     <el-select class="w180" v-model="priceData.IsGuideDaiTuan">
                       <template v-for="item in DaiTuanList">
                         <el-option :key="item.Id" :label="item.name" :value="item.Id">
@@ -757,8 +766,8 @@
                     </el-input>
                   </el-form-item>
                   <el-form-item prop="SendPersion">
-                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle" :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')"
-                      v-model="priceData.SendPersion">
+                    <el-input class="w260" :disabled="!priceData.IsNeedAirportShuttle"
+                      :placeholder="$t('objFill.v101.myOrdersAllType.qingsrstr')" v-model="priceData.SendPersion">
                       <template slot="prepend">{{$t('objFill.v101.myOrdersAllType.shongtuanr')}}</template>
                     </el-input>
                   </el-form-item>
@@ -907,7 +916,8 @@
                       </el-select>
                     </el-form-item>
                     <el-form-item style="margin-top:1px;">
-                      <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
+                      <span class="TP_Sendprepend"
+                        style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
                       <el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
                         :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
                         <el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button>
@@ -1814,7 +1824,8 @@
           parseInt(this.priceData.FSeat);
         if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
           fitem.BindNum = 0;
-          this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
+          this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
+            .OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
         }
         this.selectFilghtList.forEach((x, index) => {
           if (x.IsSelected) {
@@ -1920,9 +1931,9 @@
             that.$emit("saveMsg");
           }
           if (type == 2) {
-            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd')+'...';
+            that.btnTongBu = this.$t('objFill.v101.myOrdersAllType.tongbujd') + '...';
           } else {
-            that.btnText = this.$t('pub.saveBtn')+'...';
+            that.btnText = this.$t('pub.saveBtn') + '...';
           }
         });
       },

src/components/orderCommon/productOrderList.vue

@@ -592,7 +592,8 @@
             <p>
               <span>{{ $t("scen.sc_cp") }}</span>{{ item.OutBranchName }}
               <span class="TC_neibu" style="float: inherit;color: #ffffff;margin-left: 5px;"
-                v-if="item.StandardCurrencyName" :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
+                v-if="item.StandardCurrencyName"
+                :class="{'TCneibu':item.StandardCurrencyName=='人民币','TCb2b':item.StandardCurrencyName=='日元',
                 'TCb2c':item.StandardCurrencyName=='新台币','AppPlat':item.StandardCurrencyName=='',
                 'otherPlat':item.StandardCurrencyName=='',}">{{item.StandardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
             </p>
@@ -729,6 +730,14 @@
                         }}
                       </td>
                     </tr>
+                    <tr>
+                      <td>{{ $t("salesModule.SingleAirticket") }}</td>
+                      <td colspan="5">
+                        {{
+                          item.AirticketMoney | priceFormat(item.AirticketMoney)
+                        }}
+                      </td>
+                    </tr>
                     <tr>
                       <td>{{ $t("Operation.Op_baby") }}</td>
                       <td colspan="5">
@@ -959,7 +968,8 @@
                       " icon="iconfont icon-erweima"></el-button>
                 </el-popover>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" :content="$t('objFill.guangaosl') + item.AdvertCount" placement="top-start">
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.guangaosl') + item.AdvertCount"
+                placement="top-start">
                 <el-button type="primary" style="background-color: #e95252 !important; border-color: #e95252 !important"
                   v-if="!TCIDList" icon="iconfont icon-guanggao" @click="goUrlX(item)"></el-button>
               </el-tooltip>
@@ -997,7 +1007,8 @@
       <commonTeamInfo ref="comTeam"></commonTeamInfo>
     </el-dialog>
     <!-- 行程下载 -->
-    <el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center>
+    <el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
+      center>
       <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
       </tripDownLoadCommon>
     </el-dialog>