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

src/assets/common/lang/en.js

@@ -2170,6 +2170,7 @@ export const salesModule = {
   Nomore60: 'Less than 60%',
   Nomore40: 'Less than 40%',
   GoFlight: 'goflight',
+  updateGoFlight:'Modify flight information',
   THQW: 'Peer clear time',
   Hour: 'Hour',
   XSQW: 'Sales clearance time',

src/assets/common/lang/jp.js

@@ -2081,6 +2081,7 @@ export const salesModule={
   Nomore60:'60%未満',
   Nomore40:'40%未満',
   GoFlight:'往路便',
+  updateGoFlight:'フライト情報の変更',
   THQW:'同行時間',
   Hour:'時間',
   XSQW:'営業時間',

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

@@ -2155,6 +2155,7 @@ export const salesModule={
   Nomore60:'不足60%',
   Nomore40:'不足40%',
   GoFlight:'去程班機',
+  updateGoFlight:'修改班機資訊',
   THQW:'同行清比特時間',
   Hour:'小時',
   XSQW:'銷售清比特時間',

src/assets/common/lang/zh.js

@@ -2173,6 +2173,7 @@ export const salesModule={
   Nomore60:'不足60%',
   Nomore40:'不足40%',
   GoFlight:'去程航班',
+  updateGoFlight:'修改航班信息',
   THQW:'同行清位时间',
   Hour:'小时',
   XSQW:'销售清位时间',

src/components/SalesModule/groupTourOrder.vue

@@ -3852,11 +3852,12 @@
              this.PriceFight = res.data.data;
                if(this.addMsg.AirTicketIds.length>0){
                 this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number); // ["1", "2", "3"]
-              }else{
-                if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
-                this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
-              }
               }
+              // else{
+              //   if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
+              //   this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
+              // }
+              //}
             }
           }
         );

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -4532,11 +4532,12 @@
               this.PriceFight = res.data.data;
              if(this.addMsg.AirTicketIds.length>0){
                 this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number); // ["1", "2", "3"]
-              }else{
-                if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
-                this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
-              }
               }
+              // else{
+              //   if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
+              //   this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
+              // }
+              // }
               }
             }
           );

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1755,7 +1755,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" >
-          <el-form-item :label="$t('salesModule.GoFlight')" prop="PlatformOrder">
+          <el-form-item :label="$t('salesModule.GoFlight')" >
            <el-select v-model="AirTicketIdList" multiple clearable  collapse-tags placeholder="请选择">
             <el-option
               v-for="item in PriceFight"
@@ -2185,6 +2185,9 @@
                 <el-tooltip effect="dark" :content="$t('pub.more')" placement="top-start" style="float: left">
                   <el-popover width="100" trigger="hover">
                     <div class="groupTourOrder_more">
+                        <div @click="EditGoFlight(item)">
+                        {{$t('salesModule.updateGoFlight')}}
+                      </div>
                       <div @click="goToPassenger(item)">
                         {{ $t("salesModule.LKMD") }}
                       </div>
@@ -2238,6 +2241,7 @@
                       " icon="iconfont icon-more"></el-button>
                   </el-popover>
                 </el-tooltip>
+                
               </el-button-group>
             </td>
           </tr>
@@ -3791,6 +3795,30 @@
         </button>
       </div>
     </el-dialog>
+
+     <el-dialog custom-class="w350" :title="$t('salesModule.FlighInfo')" :visible.sync="showGoFlight" center>
+      <!--zhaunMsg.TCNUM-->
+      <el-form label-width="110px">
+        <el-form-item :label="$t('salesModule.GoFlight')" class="w280">
+          <el-select v-model="AirTicketIdList" multiple clearable  collapse-tags placeholder="请选择">
+            <el-option
+              v-for="item in PriceFight"
+              :key="item.AirLineTicketId"
+              :label="item.FlightStr"
+              :value="item.AirLineTicketId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button class="normalBtn" type="primary" @click="SaveGoFlight()">
+          {{ $t("pub.saveBtn") }}
+        </button>
+        <button class="hollowFixedBtn" @click="closeGoFlightDiv()">
+          {{ $t("pub.cancelBtn") }}
+        </button>
+      </div>
+    </el-dialog>
     <!-- 联运返佣弹窗 -->
     <el-dialog custom-class="w350" :title="$t('ground.lyfyong')" :visible.sync="FyongLoading" center>
       <!--zhaunMsg.TCNUM-->
@@ -4202,6 +4230,7 @@
         isShowLayerRemarks: false,
         //显示修改业务员
         showChangeSales: false,
+        showGoFlight:false,
         comSelect: -1,
         loading: true,
         loadingSet: false,
@@ -5518,14 +5547,14 @@
             (res) => {
               if (res.data.resultCode == 1) {
               this.PriceFight = res.data.data;
-               if(this.addMsg.AirTicketIds.length>0){
+               if(this.addMsg.AirTicketIds!=null&&this.addMsg.AirTicketIds.length>0){
                 this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number);
                 }
-                else{
-                  if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
-                  this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
-                }
-              }
+              //   else{
+              //     if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
+              //     this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
+              //   }
+              // }
               }
             }
           );
@@ -7036,6 +7065,40 @@
       //关闭修改业务员
       closeSalseDiv() {
         this.showChangeSales = false;
+      },
+       //点击修改航班信息
+      EditGoFlight(item) {
+        this.addMsg.AirTicketIds = item.AirTicketIds;
+        this.addMsg.OrderId = item.OrderId;
+        this.showGoFlight = true;
+        this.getPriceBindflight(item.TCID);
+      },
+      //关闭修改航班信息
+      closeGoFlightDiv() {
+        this.showGoFlight = false;
+        this.addMsg.AirTicketIds = "";
+        this.AirTicketIdList=[];
+        this.PriceFight=[];
+        this.addMsg.OrderId = 0;
+      },
+      SaveGoFlight(){
+         if(this.AirTicketIdList!=null&&this.AirTicketIdList.length>0){
+          this.addMsg.AirTicketIds =this.AirTicketIdList.map(String).join(',');
+        }
+         this.apipost(
+          "sellorder_get_SetOrderAirTicketIds",
+          {AirTicketIds:this.addMsg.AirTicketIds,OrderId:this.addMsg.OrderId},
+          (res) => {
+            if (res.data.resultCode == 1) {
+              this.Success(res.data.message);
+              this.closeGoFlightDiv();
+              this.getList();
+            } else {
+              this.Error(res.data.message);
+            }
+          },
+          (err) => {}
+        );
       },
       //清位
       clearSeat(item, type) {

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -514,7 +514,7 @@
                   </el-form-item> -->
                   <el-form-item prop="B2BPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
-                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
                     </el-input>
                   </el-form-item>
@@ -526,7 +526,7 @@
                   </el-form-item> -->
                   <el-form-item prop="B2CPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
-                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">
                         {{$t('Operation.Op_direct')}}
                       </template>

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -512,7 +512,7 @@
                   </el-form-item> -->
                   <el-form-item prop="B2BPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
-                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
                     </el-input>
                   </el-form-item>
@@ -524,7 +524,7 @@
                   </el-form-item> -->
                   <el-form-item prop="B2CPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
-                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_direct')}}</template>
                     </el-input>
                     <!--印象票务-->

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -473,7 +473,7 @@
                   </el-form-item> -->
                   <el-form-item prop="B2BPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2BPrice"
-                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2BPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_fellow')}}</template>
                     </el-input>
                   </el-form-item>
@@ -485,7 +485,7 @@
                   </el-form-item> -->
                   <el-form-item prop="B2CPrice">
                     <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.B2CPrice"
-                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="priceData.TCID>0">
+                      @keyup.native="checkPrice(priceData,'B2CPrice')" :disabled="CurrentUserInfo.RB_Group_id==2&&priceData.TCID>0">
                       <template slot="prepend">{{$t('Operation.Op_direct')}}</template>
                     </el-input>
                     <!--印象票务-->