页面修改

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1849,7 +1849,7 @@
         </tr>
         <tr v-if=" OrderDataList.leadetList != null &&OrderDataList.leadetList.length > 0  ">
           <td colspan="17">
-            {{ $t("active.cl_orderType") }}：<span class="RL-redType">{{ $t("leader.leader_Leader") }}</span>
+            {{ $t("active.cl_orderType") }}：<span class="RL-redType">领队/导游</span>
           </td>
         </tr>
         <tbody v-for="(item, index) in OrderDataList.leadetList" :key="index">
@@ -1876,7 +1876,12 @@
             </td>
             <td>
               <p class="fz12 over_ellipsis" style="width: 90%">
+                <template v-if="item.IsLeaderOrder">
                   {{ $t("ground.lduikongwei") }}
+                </template>
+                <template v-else>
+                   导游
+                </template>
                 <input type="button" class="normalBtn" @click="UpdateLeaderSeat(item)" style="display: none"
                   :value="ConfigData.Config.IsLeaderUseSeat == 0?'占机位' :'取消机位'" />
               </p>

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -702,6 +702,11 @@
                       <template slot="prepend">{{$t('sm.Leadernum')}}</template>
                     </el-input>
                   </el-form-item>
+                  <el-form-item>
+                    <el-input :placeholder="$t('pub.pleaseImport')" class="w260" v-model="priceData.GuideNum">
+                      <template slot="prepend">导游人数(不占团队机位)</template>
+                    </el-input>
+                  </el-form-item>
                   <el-form-item>
                     <el-input :placeholder="$t('op.CanSallTicketNum')" class="w290" v-model="priceData.CanSellTicketNum"
                       maxlength="2" @keyup.native="checkInteger(priceData,'CanSellTicketNum')"
@@ -1376,6 +1381,7 @@
                 BusPriceId: 0, //公司车辆编号
                 EmergencyContact: "", //紧急联系人
                 IsNeedAirportShuttle: 0, //是否需要接送服务
+                GuideNum: 0, //导游人数
               };
             }
             this.returnPriceList.push(objItem);
@@ -1482,7 +1488,7 @@
           CreateBy: createBy,
           AirTicketId: this.priceData.AirTicketId,
           TCID: this.priceData.TCID,
-          LineId:this.PostConfig.LineId
+          LineId: this.PostConfig.LineId
         };
 
         let that = this;
@@ -2088,4 +2094,5 @@
       TravelPriceFlightListSelf: TravelPriceFlightList_Self,
     }
   };
+
 </script>

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -1386,6 +1386,7 @@
                 BusPriceId: 0, //公司车辆编号
                 EmergencyContact: "", //紧急联系人
                 IsNeedAirportShuttle: 0, //是否需要接送服务
+                GuideNum:0,//导游人数
               };
             }
             this.returnPriceList.push(objItem);

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -1171,8 +1171,16 @@
                 ChooseHotelArray: [],
                 //非中国大陆护照报价
                 ForeignPassportPrice: 0,
-                //OP备注
-                OPRemark: "",
+                UseFlightType: this.CurrentUserInfo.UseFlightType,
+                SupplierId: 0, //供应商编号
+                PriceTeamType: 1, //团队类型
+                PriceOfferUrl: '', //报价单地址
+                PriceOfferName: "", //报价单名称
+                IsUseCompanyBus: 0, //是否使用公司车辆
+                BusPriceId: 0, //公司车辆编号
+                EmergencyContact: "", //紧急联系人
+                IsNeedAirportShuttle: 0, //是否需要接送服务
+                GuideNum:0,//导游人数
               };
             }
             this.returnPriceList.push(objItem);

src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue

 <style>
   @import "../../../assets/css/newTravelManager.css";
+
   .choosed span {
     background-color: #1bc594 !important;
   }
@@ -634,8 +635,8 @@
                       <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
                       </el-option>
                     </el-select>
-                    <span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;" v-if="standardCurrencyName"
-                    :class="{'TCneibu':standardCurrencyName=='人民币','TCb2b':standardCurrencyName=='日元',
+                    <span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;"
+                      v-if="standardCurrencyName" :class="{'TCneibu':standardCurrencyName=='人民币','TCb2b':standardCurrencyName=='日元',
                     'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
                     'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
                   </el-form-item>
@@ -1059,9 +1060,14 @@
           SaleBranchIdArray: [],
           OutGroupType: 0
         },
-        OutGroupTypeList: [
-          {Name: '常规', Id: 0},
-          {Name: '落地团', Id: 1},
+        OutGroupTypeList: [{
+            Name: '常规',
+            Id: 0
+          },
+          {
+            Name: '落地团',
+            Id: 1
+          },
         ],
         returnPriceList: this.priceList,
         //酒店列表
@@ -1264,7 +1270,17 @@
                 ScenicBackList: [],
                 TipAmount: 0, //人头小费金额
                 //非中国大陆护照报价
-                ForeignPassportPrice: 0
+                ForeignPassportPrice: 0,
+                UseFlightType: this.CurrentUserInfo.UseFlightType,
+                SupplierId: 0, //供应商编号
+                PriceTeamType: 1, //团队类型
+                PriceOfferUrl: '', //报价单地址
+                PriceOfferName: "", //报价单名称
+                IsUseCompanyBus: 0, //是否使用公司车辆
+                BusPriceId: 0, //公司车辆编号
+                EmergencyContact: "", //紧急联系人
+                IsNeedAirportShuttle: 0, //是否需要接送服务
+                GuideNum: 0, //导游人数
               };
             }
             this.returnPriceList.push(objItem);
@@ -1389,7 +1405,7 @@
                 that.priceData.AirticketBindList.forEach(x => {
                   that.selectFilghtList.forEach(y => {
                     //&& x.BindNum > 0 HK 2023-06-06 去掉条件
-                    if (x.PurchaseId == y.Id ) {
+                    if (x.PurchaseId == y.Id) {
                       y.IsSelected = true;
                       y.BindNum = x.BindNum;
                       that.FinfoList.push({
@@ -1579,15 +1595,15 @@
         });
         return isExit;
       },
-      getstandardCurrencyName(){
+      getstandardCurrencyName() {
         let isShow = true
-        this.companyList.forEach(x=>{
-          if(x.id==this.priceData.OutBranchId&&x.standardCurrencyId>0){
+        this.companyList.forEach(x => {
+          if (x.id == this.priceData.OutBranchId && x.standardCurrencyId > 0) {
             this.standardCurrencyName = x.standardCurrencyName
             isShow = false
           }
         })
-        if(isShow){
+        if (isShow) {
           this.standardCurrencyName = ''
         }
       },
@@ -1906,7 +1922,7 @@
         //深度监听，可监听到对象、数组的变化
         handler: function (val, oldVal) {
           this.initShowPriceList();
-          this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
+          this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupType);
         },
         deep: true
       },
@@ -1914,7 +1930,7 @@
         //深度监听，可监听到对象的变化
         handler: function (val, oldVal) {
           this.initShowPriceList();
-          this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
+          this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupType);
         },
         deep: true
       },