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

src/components/SalesModule/groupTourOrderOne.vue

@@ -1250,9 +1250,6 @@
                 style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
                 class='w150'>{{SOMsg.OrderUnitPrice}}</em>
 
-              <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
-              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->
-
               <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">{{$t('salesModule.AdultPeople')}}</em>
               <el-select :placeholder="$t('pub.pleaseSel')" v-model="SOMsg.UpdateBy">
                 <el-option v-for="(item,index) in SuperiorPeople" :label='(item.EmName)' :value='(item.EmployeeId)'
@@ -1699,9 +1696,11 @@
                     <div class="groupTourOrder_more">
                       <div @click="goUrlT('confirmationOrder',item.orderId)">{{$t('salesModule.QRH')}}{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
                       <div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">{{$t('salesModule.UpdateYWY')}}</div>
-                      <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">{{$t('Operation.Op_teamNotice')}}<span
-                          v-if="item.outNotice==1">(OK)</span><span v-else>({{$t('visa.v_zanding')}})</span></div>
-                      <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">{{$t('Operation.Op_teamNotice')}}{{$t('salesModule.LKMD')}}</div>
+                      <div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">{{$t('Operation.Op_teamNotice')}}
+                        <span v-if="item.outNotice==1">(OK)</span>
+                        <span v-else>({{$t('visa.v_zanding')}})</span>
+                      </div>
+                      <div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">{{$t('salesModule.LKMD')}}</div>
                       <div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')"
                         @click='getHouse(item)'>{{$t('salesModule.UpdateRoom')}}
                       </div>

src/components/SalesconfirmationOrder.vue

@@ -17,7 +17,7 @@
     font-size:12px;
   }
   .timeline-item .Arrayleft{
-      width: 71px;
+      width: 74px;
       height: 25px;
       background-color: #fff;
       margin-right: 20px;
@@ -26,6 +26,7 @@
       padding: 5px 0;
       position: absolute;
       left:-16px;
+      z-index:999;
   }
   .timeline-item .Arrayleft i{
     position: relative;
@@ -280,8 +281,8 @@
             <div class="timeline-box"></div>
             <div v-for="(item,index) in dataList.dayList" :key="index">
               <div class="timeline-item">
-                <div class="left">
-                  <span class="big" style="    font-size: 20px;">行程</span>
+                <div class="left" style="margin-left:0;z-index:999;background-color:#fff;">
+                  <span class="big" style="font-size: 20px;">行程</span>
                 </div>
                 <div class="new_right">
                   <span class="medium">

src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue

@@ -296,7 +296,7 @@
       },
       //到达城市
       GetArrivalList1(query) {
-             this.ArriveList1 = [];
+        this.ArriveList1 = [];
         if (query != "") {
           this.apipost(
             "dict_get_Destination_GetListService", {