页面修改

src/components/SalesModule/groupInquiry.vue

@@ -362,7 +362,7 @@
                       <div>
                           <div class="el-col" style="width:280px">
                               <div>
-                                  <div class="TCL-TCNUM">{{item.TCNUM}}</div>
+                                  <div class="TCL-TCNUM">{{item.TCNUM}}({{item.TCID}})</div>
                                   <div class="d12" style="float:none;margin:3px auto;">
                                       <p><i class="iconfont icon-biaoti1"></i>{{item.LineName}}</p>
                                       <p class="d12p">{{item.Title}}</p>
@@ -528,7 +528,7 @@
                       <div class="TC_remarkContent">
                           <div class="clearfix TCL-redType">
                               <div class="TCL_remarkTitle">地接备注团号：</div>
-                              <div class="TCL_Content"> {{item.CombinationNum}}</div>
+                              <div class="TCL_Content"> {{item.DMCNum}}</div>
                           </div>
                           <div class="clearfix TCL-redType">
                               <div class="TCL_remarkTitle">OP对外备注：</div>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -383,8 +383,12 @@
             </div>
             <div>
               <div class="el-col" style="position:relative;width:200px">
-                <div v-if="item.IsWarning===1" title="紧急团" class="travel_warning"></div>
-                <!-- <div v-else title="地接团" class="travel_warningDi"></div> -->
+                <template v-if="item.TeamType==3">
+                   <div  title="地接团" class="travel_warningDi"></div>
+                </template>
+                <template v-else>
+                  <div v-if="item.IsWarning===1" title="紧急团" class="travel_warning"></div>
+                </template>
                 <div>
                   <div class="TC_teamType">
                     <span v-if="item.IsB2B==0" title="内部团">{{$t('Operation.Op_nei')}}</span>