1

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -293,11 +293,9 @@
               </span>
               <span style="background:#85ce61; " class="newAopbdd">
                 <el-tooltip class="item" effect="dark" w450content="查看" placement="top-start" popper-class="max-w250">
-<<<<<<< HEAD
-                  <i @click="goUrl('QuotationAduit',item,1)" class="iconfont icon-view"></i>"></i>
-=======
+
                   <i @click="goUrl('QuotationAduit',item.ID,1)" class="iconfont icon-view"></i>"></i>
->>>>>>> 3e8f9c2987e45c27bbea14ae5827ce25f6eeea3e
+
                 </el-tooltip>
               </span>
               <!-- <span style="background:#85ce61; " class="newAopbdd" @click="showDownLoad(item)">
@@ -536,11 +534,6 @@
         else if (this.postConfig.TeamType == 1) {
           chooseLineList = this.LineList.filter(qItem => qItem.Is_PacketGroup == 1);
         }
-<<<<<<< HEAD
-        //当地游
-=======
-        //当地游 
->>>>>>> 3e8f9c2987e45c27bbea14ae5827ce25f6eeea3e
         else if (this.postConfig.TeamType == 2) {
           chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 3);
         }