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

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2151,7 +2151,7 @@
             <tr>
               <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
                 <div>
-                  <div><span>备注：</span>
+                  <div><span>备注时间:{{item.rematksTime}} 备注：</span>
                     <p>
                       <span v-if="item.tsIdList.length>0">投诉单号：
                         <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);"
@@ -2160,7 +2160,7 @@
                       <template>
                         <template v-if="item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder">
                           <span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单
-                            {{item.platformOrder}};</span>{{item.remarks}}
+                            {{item.platformOrder}};</span> {{item.remarks}}
                         </template>
                         <!-- <template v-else>
                       <span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>*****

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -122,20 +122,24 @@
   .groupTourOrder_tickets_red {
     color: #FF0000;
     text-decoration: underline;
+    cursor: pointer;
   }
   .groupTourOrder_tickets_blue {
     color: #0000FF;
     text-decoration: underline;
+    cursor: pointer;
   }
 
   .groupTourOrder_tickets_green {
     color: #008000;
     text-decoration: underline;
+    cursor: pointer;
   }
 
   .groupTourOrder_tickets_black {
     color: #000000;
     text-decoration: underline;
+    cursor: pointer;
   }
 
 </style>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1784,6 +1784,8 @@
           <tr>
             <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
               <div class="clearfix RL-MARK">
+                <span class="RL-remarkTitle">备注时间:</span>
+                <p class="RL-redType RL-remarkCon">{{item.RematksTime}}</p>
                 <span class="RL-remarkTitle">备注:</span>
                 <p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
               </div>
@@ -2102,7 +2104,10 @@
             <tr>
               <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
                 <div class="clearfix RL-MARK">
-                  <span class="RL-remarkTitle">备注:</span>
+                  <span class="RL-remarkTitle">备注时间:</span>
+                  <p class="RL-redType RL-remarkCon">{{childItem.RematksTime}}</p>
+
+                  <span class="RL-remarkTitle"> 备注:</span>
                   <p class="RL-redType RL-remarkCon">
                     <span v-if="childItem.TsIdList&&childItem.TsIdList.length>0">投诉单号：
                       <a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
@@ -4706,6 +4711,7 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.OrderDataList = res.data.data;
+              console.log(" this.OrderDataList ", this.OrderDataList )
               this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
             }
           },