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

src/components/Hotel/roomReservationsDetails.vue

@@ -11,8 +11,8 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
       <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
         <tr>
-          <th class="fz14" colspan="10">团队信息(定团号：{{NewCombinationNum}})</th>
-          <th class="fz14" colspan="12">地接操作信息</th>
+          <th class="fz14" colspan="10">团队信息</th>
+          <th class="fz14" colspan="13">地接操作信息</th>
         </tr>
         <tr>
           <th width="120">公司团号</th>
@@ -98,7 +98,10 @@
               <el-select class='w120 sel' v-model='item.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
                 @visible-change='getHotelList(item)' @change='sendValue(item)'>
                 <el-option v-for='itemHotel in item.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
-                  :key='itemHotel.ID'></el-option>
+                  :key='itemHotel.ID'>
+                  <span style="float: left">{{itemHotel.Name}}</span>
+                  <span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
+                </el-option>
               </el-select>
             </div>
           </td>
@@ -278,6 +281,9 @@
                 x.UnitPrice = x.UnitPrice.toString();
                 x.HotelDiscount = x.HotelDiscount.toString();
               })
+              if(item.ReserveNo==''||item.ReserveNo==null){
+                  item.ReserveNo = this.$route.query.NewCombinationNum;
+              } 
             })
           } else {
             this.$message.error(res.data.message)
@@ -359,8 +365,7 @@
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
-      this.NewCombinationNum = this.$route.query.NewCombinationNum;
-      this.getList()
+      this.getList();
     },
   }
 </script>

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -12,7 +12,6 @@
     <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe">
       <tr>
         <th width="120">公司团号</th>
-        <th width="130">定团号</th>
 	   	  <th width="150">用餐时间</th>
 	    	<th width="200">餐厅名称</th>
         <th width="200">修改餐厅</th>
@@ -39,9 +38,6 @@
                 <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
           </div>
         </td>
-        <td :rowspan="list.length" v-if="index==0">
-          <div class="w120" style="margin:0 5px;">{{NewCombinationNum}}</div>
-        </td>
         <td>
           <div class="w120">{{item.UseTimeStr}}</div>
         </td>
@@ -218,7 +214,6 @@ export default {
       TCNUM: "",
       flightTotal: 0,
       GuestNum: 0,
-      NewCombinationNum:'',
     };
   },
   methods: {
@@ -265,6 +260,9 @@ export default {
                   Name:x.NewDiningName,
                   ID:x.NewDiningID
                 })
+                if(x.ReserveNo==''||x.ReserveNo==null){
+                    x.ReserveNo = this.$route.query.NewCombinationNum;
+                } 
               })
             })
           } else {
@@ -331,7 +329,6 @@ export default {
   mounted() {
     this.TCNUM = this.$route.query.TCNUM;
     this.GuestNum= this.$route.query.GuestNum;
-    this.NewCombinationNum = this.$route.query.NewCombinationNum;
     this.getList();
   }
 };