1

src/components/dmc/manager/dmcTotalTable.vue

@@ -197,8 +197,14 @@
           <template v-for="(item,index) in outItem.PriceCommonList">
             <tr :key="index">
               <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
+                <el-tooltip v-if="item.IsSetOut==1" class="item" effect="dark" content="已取消发团" placement="top-start">
+                  <font style="color:red">
                     {{outItem.NewCombinationNum}}
-                <el-tooltip class="item" effect="dark" content="地接操作" placement="top-start" v-if="item.LineId==14 ">
+                  </font>
+                </el-tooltip>
+                <font v-else>{{outItem.NewCombinationNum}}</font>
+                <el-tooltip class="item" effect="dark" content="地接操作" placement="top-start"
+                  v-if="item.LineId==14&&item.IsSetOut==0">
                   <el-popover placement="bottom" width="300" trigger="click" v-model="item.isShowPop">
                     <table class="dmcSetTable">
                       <tr>
@@ -707,7 +713,7 @@
           caiwu: true, //操作时间
           showCaozuoTime: true, //操作时间
           colspanLength: 6, //跨行
-          showSureHotel:true, 
+          showSureHotel: true,
         },
         pickerBeginDateBefore: {
           disabledDate: time => {