新增团队修改，是否拆分团队

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -685,7 +685,8 @@
                   <p class="travelnowrap">
                     <span>{{ $t("Airticket.Air_StartTime") }}</span>
                     <span class="go_date">{{ item.StartDate }}(<font style="color:red;font-weight:bold;">
-                        {{item.StartDateWeekStr}}</font>)</span>
+                        {{item.StartDateWeekStr}}</font>)
+                    </span>
                     <template v-if="item.RelationPriceList && item.RelationPriceList.length > 0">
                       <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
                         <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
@@ -712,6 +713,32 @@
                         </el-popover>
                       </el-tooltip>
                     </template>
+                    <!-- <template v-if="item.TeamPriceList && item.TeamPriceList.length > 0">
+                      <el-tooltip class="item" effect="dark" content="合并列表">
+                        <el-popover width="350" trigger="click" popper-class="TC_HotelPop">
+                          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                              <td style="width: 100px">
+                                {{ $t("Airticket.Air_StartTime") }}
+                              </td>
+                              <td style="width: 250px">{{ $t("visa.v_tuanhao") }}</td>
+                            </tr>
+                            <tr v-for="(rItem, rIndex) in item.TeamPriceList" :key="`d_`+index+`_t_`+rIndex">
+                              <td>
+                                {{ rItem.StartDate }}
+                              </td>
+                              <td>
+                                ({{ rItem.TCID }}){{ rItem.TCNUM }}[{{ rItem.TCState }}]
+                              </td>
+                            </tr>
+                          </table>
+                          <el-button slot="reference" circle size="mini" type="primary" 
+                            style="width: 20px; height: 20px; padding: 4px" style="">
+                            {{ item.TeamPriceList.length }}
+                          </el-button>
+                        </el-popover>
+                      </el-tooltip>
+                    </template> -->
                   </p>
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee > 0">
                     <span>{{ $t("objFill.handpartscharge") }}</span>
@@ -1895,7 +1922,8 @@
           <el-col :span="4">
             <el-form-item :label="$t('objFill.tuanduilx')" prop="Remark">
               <el-select class="multiple_input" v-model="changePriceMsg.NewB2BPrice">
-                <el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name" :value="item.ID">
+                <el-option v-for='item in teamList' v-if="item.ID!=2" :key="item.ID" :label="item.Name"
+                  :value="item.ID">
                 </el-option>
               </el-select>
             </el-form-item>

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -122,7 +122,7 @@
           @click="submitForm(2)">
           {{$t('fnc.tijiao')}}</div>
         <div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" :loading="saveLoading"
-          @click="submitForm(3)" :title="$t('objFill.v101.myOrdersAllType.lingcwxmb')">{{$t('pub.saveBtn')}}
+          @click="submitForm(3)" >{{$t('pub.saveBtn')}}
         </div>
         <div style="display:none;" v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">
           {{$t('sm.yulan')}}
@@ -231,6 +231,7 @@
           NotQueryCityList: [], //使用系统中的经纬度城市
           FeaturePageType: 0, //1横版 2竖版
           TeamType: 0,
+          IsSplitTeam:0,//当团修改是否拆分团队(1-拆分)
         },
         //行程
         FeatureData: {
@@ -565,7 +566,8 @@
         }
 
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
-        basicData.MapUrl = this.PostConfig.MapUrl
+        basicData.MapUrl = this.PostConfig.MapUrl;
+        basicData.IsSplitTeam=this.PostConfig.IsSplitTeam;
         console.log("travel_post_SetTravelConfigInfo", basicData);
         this.isSubmit = false;
         this.apipost(

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -18,6 +18,7 @@
 
   .TP_rightDate {
     margin-left: 50px;
+    padding-bottom: 10px;
   }
 
   .TPDateContent .currentInput {
@@ -419,21 +420,39 @@
         </div>
         <div class="TP_rightDate">
           <div class="TP_dateContent">
-            <span class="TP_toLeft" @click="priceLeftMove">
-              <i class="iconfont icon-previewleft"></i>
-            </span>
-            <div class="TP_childContent">
-              <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
-                v-for="(item,index) in showPriceList" :key="index">
-                {{item.StartDate}}
-                <span class="TP_cancel" @click.stop="delDateList(item)">
-                  <i class="iconfont icon-quxiao"></i>
+            <el-row v-if="modifyTcid>0">
+              <el-col>
+                <el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
+                  <el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
+                    :false-label="UnCheckedLessPrice">
+                    <font style="color:red;font-weight:bold;">拆分团队</font>
+                  </el-checkbox>
+                </el-tooltip>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <span class="TP_toLeft" @click="priceLeftMove">
+                  <i class="iconfont icon-previewleft"></i>
                 </span>
-              </span>
-            </div>
-            <span class="TP_Right" @click="priceRightMove">
-              <i class="iconfont icon-arrow-right"></i>
-            </span>
+              </el-col>
+              <el-col>
+                <div class="TP_childContent">
+                  <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
+                    v-for="(item,index) in showPriceList" :key="index">
+                    {{item.StartDate}}
+                    <span class="TP_cancel" @click.stop="delDateList(item)">
+                      <i class="iconfont icon-quxiao"></i>
+                    </span>
+                  </span>
+                </div>
+              </el-col>
+              <el-col>
+                <span class="TP_Right" @click="priceRightMove">
+                  <i class="iconfont icon-arrow-right"></i>
+                </span>
+              </el-col>
+            </el-row>
           </div>
           <div class="TP_DateList"></div>
         </div>
@@ -868,7 +887,7 @@
                                 {{$t('system.query_flightNum')}}/{{$t('system.query_airCompanyName')}}/{{$t('Airticket.Air_segment')}}
                               </td>
                               <td class="_color_666">{{$t('adm.adm_time')}}/PNR</td>
-                              
+
                               <td class="_color_666">{{$t('visa.v_xcdays')}}</td>
                               <td class="_color_666">{{$t('op.TicketNum')}}/{{$t('hotel.table_UseAmount')}}</td>
                               <td class="_color_666">{{$t('op.BindTicket')}}</td>
@@ -886,7 +905,7 @@
                                 {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
                               </td>
                               <td>{{fitem.FlightDate}} {{fitem.Departure_time}}
-                                <br/>
+                                <br />
                                 {{fitem.PNR}}
                               </td>
                               <td>{{fitem.DayNum}}</td>

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -416,23 +416,41 @@
           <span class="TPNotice">（{{$t('sm.tipscompanyyuj')}}）</span>
           <span class="TPLine"></span>
         </div>
-        <div class="TP_rightDate">
+         <div class="TP_rightDate">
           <div class="TP_dateContent">
-            <span class="TP_toLeft" @click="priceLeftMove">
-              <i class="iconfont icon-previewleft"></i>
-            </span>
-            <div class="TP_childContent">
-              <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
-                v-for="(item,index) in showPriceList" :key="index">
-                {{item.StartDate}}
-                <span class="TP_cancel" @click.stop="delDateList(item)">
-                  <i class="iconfont icon-quxiao"></i>
+            <el-row v-if="modifyTcid>0">
+              <el-col>
+                <el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
+                  <el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
+                    :false-label="UnCheckedLessPrice">
+                    <font style="color:red;font-weight:bold;">拆分团队</font>
+                  </el-checkbox>
+                </el-tooltip>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <span class="TP_toLeft" @click="priceLeftMove">
+                  <i class="iconfont icon-previewleft"></i>
                 </span>
-              </span>
-            </div>
-            <span class="TP_Right" @click="priceRightMove">
-              <i class="iconfont icon-arrow-right"></i>
-            </span>
+              </el-col>
+              <el-col>
+                <div class="TP_childContent">
+                  <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
+                    v-for="(item,index) in showPriceList" :key="index">
+                    {{item.StartDate}}
+                    <span class="TP_cancel" @click.stop="delDateList(item)">
+                      <i class="iconfont icon-quxiao"></i>
+                    </span>
+                  </span>
+                </div>
+              </el-col>
+              <el-col>
+                <span class="TP_Right" @click="priceRightMove">
+                  <i class="iconfont icon-arrow-right"></i>
+                </span>
+              </el-col>
+            </el-row>
           </div>
           <div class="TP_DateList"></div>
         </div>

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -404,21 +404,39 @@
         </div>
         <div class="TP_rightDate">
           <div class="TP_dateContent">
-            <span class="TP_toLeft" @click="priceLeftMove">
-              <i class="iconfont icon-previewleft"></i>
-            </span>
-            <div class="TP_childContent">
-              <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
-                v-for="(item,index) in showPriceList" :key="index">
-                {{item.StartDate}}
-                <span class="TP_cancel" @click.stop="delDateList(item)">
-                  <i class="iconfont icon-quxiao"></i>
+            <el-row v-if="modifyTcid>0">
+              <el-col>
+                <el-tooltip class="item" effect="dark" content="勾选此项将会调整为独立团期" placement="top-start">
+                  <el-checkbox v-model="PostConfig.IsSplitTeam" :true-label="CheckedVaule"
+                    :false-label="UnCheckedLessPrice">
+                    <font style="color:red;font-weight:bold;">拆分团队</font>
+                  </el-checkbox>
+                </el-tooltip>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col>
+                <span class="TP_toLeft" @click="priceLeftMove">
+                  <i class="iconfont icon-previewleft"></i>
                 </span>
-              </span>
-            </div>
-            <span class="TP_Right" @click="priceRightMove">
-              <i class="iconfont icon-arrow-right"></i>
-            </span>
+              </el-col>
+              <el-col>
+                <div class="TP_childContent">
+                  <span class="TP_tips" :class="{'ckedSpan':item.Checked}" @click="getDateInfo(item)"
+                    v-for="(item,index) in showPriceList" :key="index">
+                    {{item.StartDate}}
+                    <span class="TP_cancel" @click.stop="delDateList(item)">
+                      <i class="iconfont icon-quxiao"></i>
+                    </span>
+                  </span>
+                </div>
+              </el-col>
+              <el-col>
+                <span class="TP_Right" @click="priceRightMove">
+                  <i class="iconfont icon-arrow-right"></i>
+                </span>
+              </el-col>
+            </el-row>
           </div>
           <div class="TP_DateList"></div>
         </div>
@@ -1187,7 +1205,7 @@
                 IsNeedAirportShuttle: 0, //是否需要接送服务
                 GuideNum: 0, //导游人数
                 IsNewArrival: 0, //是否新品
-                TeamId:0,//团队分组编号
+                TeamId: 0, //团队分组编号
               };
             }
             this.returnPriceList.push(objItem);