团控列表新增查询条件

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -626,7 +626,8 @@
                                </td>
                              </tr>
                            </table>
-                           <el-button slot="reference" circle size="mini" type="primary" style="width:20px;height:20px;padding:4px;">
+                           <el-button slot="reference" circle size="mini" type="primary"
+                             style="width:20px;height:20px;padding:4px;">
                              {{item.RelationPriceList.length}}
                            </el-button>
                          </el-popover>
@@ -1595,7 +1596,6 @@
            AirlineList: [],
            //员工列表
            EmployeeList: [],
-
            //公司数据
            BranchList: [],
            //是否为分公司

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -67,12 +67,17 @@
   .AuditGreenType {
     color: green;
   }
+
+  .comSearchDiv .el-checkbox {
+    margin-right: 0;
+  }
 </style>
 <template>
   <div>
     <div class="TC_Content TC-MyList">
       <div class="query-box">
-        <div class="TC_companyList" v-if="queryCommonData.IsParentCompany==1">
+        <!--v-if="queryCommonData.IsParentCompany==1"-->
+        <div class="TC_companyList">
           <span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
             @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
           <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@@ -83,13 +88,24 @@
             <span>
               <em>{{$t('system.table_ssLine')}}</em>
               <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
-                @change="getLineTeamList()">
+                @change="getLinePlaceList()">
                 <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
                 <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
                   :key="item.LineID"></el-option>
               </el-select>
             </span>
           </li>
+          <li>
+            <span>
+              <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+              <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
+                @change="getLineTeamList()">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
+                  :key="item.LtID"></el-option>
+              </el-select>
+            </span>
+          </li>
           <li>
             <span>
               <em>{{$t('active.ad_xlmc')}}</em>
@@ -124,11 +140,15 @@
                 :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input>
             </span>
           </li>
+          <li>
+            <span>
+              <em>{{$t('Operation.Op_TeamName')}}</em>
+              <el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
+            </span>
+          </li>
           <li>
             <span>
               <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>
               <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
@@ -488,28 +508,29 @@
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
                     {{item.StartDate}}
                     <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">
-                           <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.RelationPriceList">
-                               <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;">
-                             {{item.RelationPriceList.length}}
-                           </el-button>
-                         </el-popover>
-                       </el-tooltip>
-                     </template>
+                      <el-tooltip class="item" effect="dark" :content="$t('objFill.xilietdate')">
+                        <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.RelationPriceList">
+                              <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;">
+                            {{item.RelationPriceList.length}}
+                          </el-button>
+                        </el-popover>
+                      </el-tooltip>
+                    </template>
                   </p>
                   <p class="travelnowrap">
                     <span>{{$t('objFill.jietuanriqi')}}</span>
@@ -1229,6 +1250,8 @@
         queryCommonData: {
           //线路列表
           LineList: [],
+          //目的地
+          PlaceList: [],
           //系列列表
           LineTeamList: [],
           //下拉框默认值
@@ -1294,6 +1317,7 @@
           pageIndex: 1,
           pageSize: 10,
           LineId: 0,
+          PlaceID: 0,
           LineIdList: [],
           LineteamId: 0,
           TCNUM: "",
@@ -1329,7 +1353,8 @@
           //是否显示联运
           IsShowUnion: -1,
           //团控状态
-          FreePlanType: -1
+          FreePlanType: -1,
+          Title: "", //团名
         },
         CurrentUserInfo: {},
         showHotelObj: {
@@ -1750,6 +1775,20 @@
           }
         });
       },
+      //获取目的地列表
+      getLinePlaceList() {
+        this.queryMsg.PlaceID = 0;
+        this.queryMsg.LineteamId = 0;
+        let msg = {
+          lineID: this.queryMsg.LineId
+        };
+        this.apipost("team_post_GetLinePlace", msg, res => {
+          if (res.data.resultCode == 1) {
+            this.queryCommonData.PlaceList = res.data.data;
+            this.queryCommonData.LineTeamList = [];
+          }
+        });
+      },
       //获取系列列表
       getLineTeamList() {
         this.queryMsg.LineteamId = 0;
@@ -2452,9 +2491,8 @@
           myDate.getDate();
         this.queryMsg.StartGroupDate = nowDate;
       }
-
       if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
-        userInfo.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252) {
+        userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253) {
         this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
       }
       //默认查询全部团队状态

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -139,6 +139,12 @@
                 @keyup.native="checkInteger(queryMsg,'TCID')" maxlength="6"></el-input>
             </span>
           </li>
+          <li>
+             <span>
+               <em>{{$t('Operation.Op_TeamName')}}</em>
+               <el-input v-model="queryMsg.Title" class="w150" clearable></el-input>
+             </span>
+           </li>
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
@@ -1172,6 +1178,7 @@
           TeamType: 2, //一日游的团
           IsShowUnion: -1,
           TCID: '',
+          Title:"",//团名
         },
         remarkMsg: {
           TCID: 0,