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

src/components/Hotel/roomReservations.vue

@@ -360,6 +360,8 @@
             'flightTotal': obj.TotalSeat,
             'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
             'NewCombinationNum': outItem.NewCombinationNum,
+            'LeaderName':obj.LeaderName,
+            'GuideName':obj.GuideName,
             blank: 'y',
             tab: title
           }

src/components/Hotel/roomReservationsDetails.vue

@@ -22,7 +22,8 @@
       <ul>
         <li>
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
-          <span v-else style="color:red;font-size:14px;">已制单，不能在修改!</span>
+          <input style="display:none;"  type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
+          <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
         </li>
       </ul>
     </div>
@@ -30,7 +31,7 @@
       class="ownScrollbarStyle" ref="ownScrollbarStyle">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
         <tr>
-          <th class="fz14" colspan="8">团队信息</th>
+          <th class="fz14" colspan="8">团队信息&nbsp;&nbsp;领队:{{LeaderName}} &nbsp;&nbsp;导游:{{GuideName}}.</th>
           <th class="fz14" colspan="16">地接操作信息</th>
         </tr>
         <tr>
@@ -116,7 +117,7 @@
               </td>
               <!-- 房间类型 -->
               <td>
-                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeName}}
+                {{subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeNameExt}}
                 <template v-if="childIndex==4">
                   <template v-if="subItem.DriverGuideIsRebate==1">
                     <br /><span style="color:green">返佣</span>
@@ -452,6 +453,8 @@
         IsEditHotel: 0,
         //0-可以操作，1-已制单，不能操作
         IsOperation: 1,
+        LeaderName:"",//领队名称
+        GuideName:"",//导游名称
       }
     },
     components: {
@@ -865,6 +868,8 @@
       },
     },
     mounted() {
+      this.LeaderName=this.$route.query.LeaderName;
+      this.GuideName=this.$route.query.GuideName;
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;

src/components/dmc/manager/dmcTotalTable.vue

@@ -771,6 +771,8 @@
             'flightTotal': obj.TotalSeat,
             'GuestNum': obj.OrderGuestNum,
             'NewCombinationNum': outItem.NewCombinationNum,
+            'LeaderName':obj.LeaderName,
+            'GuideName':obj.GuideName,
             blank: 'y',
             tab: title
           }