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

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -343,6 +343,15 @@
                   <div class="TC_teamType">
                     <span v-if="item.IsB2B==0" :title="$t('sm.neiBuTuan')">{{$t('Airticket.Air_nei')}}</span>
                     <span v-if="item.FreePlan==1" :title="$t('sm.PlanFa')">{{$t('sm.Fang')}}</span>
+                    <span v-if="item.IsUnion==1&&item.UnionTypeStr==1" title="主"
+                      class="MainTeam">{{$t('Operation.Op_zhu')}}</span>
+                    <span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span>
+                    <span v-if="item.Status==2" title="结团">{{$t('Operation.Op_jietuan')}}</span>
+                    <span v-if="item.Status==5" title="结团审核中" style="background: rgb(0 128 255);">审核中</span>
+                    <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
+                    <span v-if="item.GroupRecommendType==1" title="精品">精</span>
+                    <label
+                      style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
                   </div>
                   <div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.OutBranchName}}</div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -281,6 +281,11 @@
     methods: {
       //线路切换
       changeLine() {
+        var line = this.LineList.find(xItem => xItem.LineID == this.postConfig.LineId);
+        this.postConfig.IsDirect = 0;
+        if (line) {
+          this.postConfig.IsDirect = line.IsDirect;
+        }
         this.getLineTeamList(this.postConfig.LineId, 1);
       },
       getData() {
@@ -294,7 +299,7 @@
         this.changeTabs()
       },
       handleClose(index) {
-        if(this.orderList.length <= 1) {
+        if (this.orderList.length <= 1) {
           return
         }
         if (this.tabsActive === index) {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -159,6 +159,12 @@
           return currencyNumList
         }
         this.postData.TravelState = type;
+        // console.log('this.postData', this.postData, this.postData.LineId)
+        // 线路必填
+        if(!this.postData.LineId) {
+          this.$message.error('请选择线路')
+          return
+        }
         data.forEach(item => {
           item.IsDefault = item.queryMsg.IsDefault ? 1 : 0
           item.otherPrice = item.OtherPrice

src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue

@@ -39,10 +39,6 @@
     height: 26px;
   }
 
-  .newDayContent .el-input .el-input__inner {
-    height: 100%;
-  }
-
   .TC-newTop {
     margin-top: 40px !important;
   }