PAK新增线路和机票绑定

src/components/TravelManager/TravelTeam/priceGroup.vue

@@ -597,10 +597,11 @@
                 <div class="mb title"><i class="iconfont icon-biaoti1"></i><span>{{$t('objFill.v101.baojixinx')}}</span>
                 </div>
                 <div class="mb"><span>{{item.Title}}</span></div>
+                <div class="mb"><span>{{item.LineName}}</span></div>
                 <div class="bold"><span
                     class="item-title">{{$t('hotel.hotel_StarDate')}}：</span><span>{{item.StartDate}}</span></div>
                 <div class="bold"><span
-                    class="item-title">{{$t('visa.v_teaminfo')}}:：</span><span>{{item.TCNUM}}({{item.TCID}})</span>
+                    class="item-title">{{$t('visa.v_teaminfo')}}：</span><span>{{item.TCNUM}}({{item.TCID}})</span>
                 </div>
                 <div class="mb"><span
                     class="item-title">{{$t('scen.sc_cp')}}：</span><span>{{ item.OutBranchName }}</span>
@@ -611,11 +612,6 @@
               <div class="p20">
                 <div class="mb title"><i class="iconfont icon-hangban1"></i><span>{{$t('salesModule.FlighInfo')}}</span>
                 </div>
-                <!-- <div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
-                  <div> {{subItem.Flight_number}}
-                    {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
-                    {{subItem.Arrival_time}}</div>
-                </div> -->
                 <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
                   <table width="100%" border="0" cellspacing="0" cellpadding="0">
                     <tr class="_color_666" style="text-align:center;">
@@ -674,19 +670,6 @@
                         </span>
                       </div>
                     </template>
-                    <!-- <template v-else>
-                        <div v-for="subItem in item.TravelTeamFlightList" slot="reference" :key="subItem.subCode"
-                          class="TCL-flighInfoList">
-                          <span class="travelnowrap">
-                            <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
-                            {{subItem.aName}} {{subItem.Departure_time}}
-                            -
-                            {{subItem.dName}} {{subItem.Arrival_time}}
-                            <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
-                            <span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
-                          </span>
-                        </div>
-                      </template> -->
                   </div>
                 </el-popover>
               </div>
@@ -713,12 +696,6 @@
             </div>
             <div class="el-col w_20">
               <div class="p20">
-                <!-- <div class="mb title"><i class="iconfont icon-jiage"></i><span>{{$t('Operation.Op_PriceInfo')}}</span></div> -->
-                <!-- <div class="mb"><span>{{$t('objFill.v101.zhongxinjia')}}: {{item.B2BMemberPrice}}</span></div>
-                <div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
-                <div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
-                <div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
-
                 <div>
                   <p>
                     <i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -82,17 +82,16 @@
     <div class="TC-MyList">
       <div class="query-box">
         <ul>
-          <!-- <li>
+          <li>
             <span>
               <em>{{$t('system.table_ssLine')}}</em>
-              <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
-                @change="resetQuery">
+              <el-select v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')">
                 <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
                 <el-option v-for="item in queryDataObj.LineList" :label="item.LineName" :value="item.LineID"
                   :key="item.LineID"></el-option>
               </el-select>
             </span>
-          </li> -->
+          </li>
           <li>
             <span>
               <em>{{$t('objFill.v101.yewuminc')}}</em>
@@ -116,27 +115,7 @@
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder clearable></el-date-picker>
             </span>
           </li>
-          <!-- <li>
-            <span>
-              <em>{{$t('system.query_airCompanyName')}}</em>
-              <el-input maxlength="50" v-model="queryMsg.QAirlineCompany" class="permiss-input w150" clearable
-                @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
-            </span>
-          </li>
-          <li>
-            <span>
-              <em>{{$t('system.query_flightNum')}}</em>
-              <el-input maxlength="50" v-model="queryMsg.QFlightNum" class="permiss-input w150" clearable
-                @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
-            </span>
-          </li> -->
-          <!-- <li>
-            <span>
-              <em>{{$t('objFill.v101.hezuohuoban')}}:</em>
-              <el-input maxlength="50" v-model="queryMsg.QCustomerName" class="permiss-input w150" clearable
-                @keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
-            </span>
-          </li> -->
+
           <li>
             <span>
               <em>{{$t('sm.chufadi')}}</em>
@@ -145,8 +124,8 @@
             </span>
           </li>
           <li>
-            <button class="hollowFixedBtn" @click="editTeam(null)">{{$t('pub.addBtn')}}</button>
             <button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button>
+            <button class="hollowFixedBtn" @click="editTeam(null)">{{$t('pub.addBtn')}}</button>
           </li>
         </ul>
       </div>
@@ -163,6 +142,7 @@
                   <div class="mb title"><i
                       class="iconfont icon-biaoti1"></i><span>{{$t('objFill.v101.baojixinx')}}</span></div>
                   <div class="mb"><span>{{item.GTeamName}}</span></div>
+                  <div class="mb"><span>{{item.LineName}}</span></div>
                   <div class="mb"><span
                       class="item-title">{{$t('hotel.hotel_StarDate')}}：</span><span>{{item.StartDate}}</span></div>
                   <div class="mb"><span
@@ -258,18 +238,65 @@
                       <font>{{$t("visa.v_houbu")}}:{{item.WatingNum}}</font>
                     </span>
                   </div>
-                  <div class="mb bold"><span class="item-title">{{$t('Airticket.Air_businessClass')}}:</span><span>
-                      {{item.CSeat}} <span
-                        class="item-title ml">{{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusCSeatNum}}</span>
-                  </div>
-                  <div class="mb bold"><span class="item-title">{{$t('Airticket.Air_firstClass')}}:</span><span>
-                      {{item.FSeat}} <span
-                        class="item-title ml">{{$t('hotel.hotel_remainList')}}:</span>{{item.SurplusFSeatNum}}</span>
-                  </div>
+
+
                   <div class="mb bold"><span class="item-title">{{$t('leader.leader_registraNum')}}:</span><span>
                       {{item.OrderGuestNum}} </span></div>
                   <div class="mb bold"><span class="item-title">{{$t('ground.lddaoyou')}}:</span><span>
                       {{item.LeaderNum}} </span></div>
+                  <div class="mb bold" v-if="item.BindNum > 0 && item.TicketList&&item.TicketList.length>0"><span
+                      class="item-title">{{$t('Operation.Op_bindNum')}}:</span><span>
+
+                      <el-popover width="550" trigger="click">
+                        <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+                          <tr>
+                            <th width="90" style="text-align: center">
+                              {{ $t("Operation.Op_bindNum") }}
+                            </th>
+                            <th width="90" style="text-align: center">
+                              {{ $t("op.TicketNum") }}
+                            </th>
+                            <th width="80" style="text-align: center">
+                              {{ $t('Airticket.Air_TicketType') }}
+                            </th>
+                            <th width="80" style="text-align: center">
+                              {{ $t('Airticket.Air_TicketDeadLine') }}
+                            </th>
+                            <th width="100" style="text-align: center">
+                              {{ $t("op.Tickets") }}
+                            </th>
+                          </tr>
+                          <tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
+                            <tr>
+                              <td style="text-align: center">{{ subItem.BindNum }}</td>
+                              <td style="text-align: center">{{ subItem.TicketNum }}</td>
+                              <td style="text-align: center">
+                                <template v-if="subItem.TravelTicketType==1">
+                                  {{$t('objFill.v101.tuanpiao')}}
+                                </template>
+                                <template v-else-if="subItem.TravelTicketType==2">
+                                  {{$t('objFill.v101.shanpiao')}}
+                                </template>
+                                <template v-else-if="subItem.TravelTicketType==3">
+                                  {{$t('objFill.v101.lspiao')}}
+                                </template>
+                              </td>
+                              <td style="text-align: center">{{ subItem.TicketDeadline }}</td>
+                              <td style="text-align: center">
+                                {{ subItem.TicketCreateByName }}
+                              </td>
+                            </tr>
+                            <tr>
+                              <td colspan="6" style="text-align:left;">
+                                对OP备注: {{subItem.TicketOpRemark}}
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <span slot="reference" :title="$t('objFill.dianjickxq')" class="price"
+                          style="cursor: pointer; color: red; text-decoration: underline"> {{ item.BindNum }}</span>
+                      </el-popover>
+                    </span></div>
                 </div>
               </div>
               <div class="el-col w_20">
@@ -583,6 +610,7 @@
           QCustomerName: "", //合作伙伴名称
           StartAddress: "", //出发地
           TCNUM: "", //团队编号
+          LineId: 0,
         },
         queryDataObj: {
           LineList: [], //线路列表