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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -101,7 +101,7 @@
               </el-select>
             </span>
           </li>
-          <li>
+          <li style="display:none;">
             <span>
               <em>{{$t('sm.tuankongType')}}</em>
               <el-select class="w150" v-model="queryMsg.FreePlanType" filterable :placeholder="$t('pub.pleaseSel')">
@@ -118,6 +118,13 @@
                 @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
+          <li>
+            <span>
+              <em>{{$t('hotel.hotel_SerialNumber')}}</em>
+              <el-input maxlength="6" v-model="queryMsg.TCID" class="permiss-input w150"
+                :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input>
+            </span>
+          </li>
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
@@ -214,7 +221,7 @@
                     </el-checkbox-group>
                   </span>
                 </div>
-                <!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
+           
                 <div class="comSearchDiv">
                   <span>{{$t('Airticket.Air_salesPlatform')}}</span>
                   <span>
@@ -885,6 +892,7 @@
           LineIdList: [],
           LineteamId: 0,
           TCNUM: "",
+          TCID:"",
           StartGroupDate: "",
           EndGroupDate: "",
           OutBranchId: -1,

src/components/systemManagement/transportCostsManagement.vue

@@ -54,7 +54,7 @@
           <td>{{item.HeadofficePrice}}</td>
           <td>{{item.BranchofficePrice}}</td>
           <td>{{item.AffiliatePrice}}</td>
-          <td>{{item.ProfitAffiliation}}</td>
+          <td>{{item.ProfitAffiliation==1?'总公司':'当地公司'}}</td>
           <td>{{item.LocalHeadofficePrice}}</td>
           <td>{{item.LocalBranchofficePrice}}</td>
           <td>{{item.LocalAffiliatePrice}}</td>