团控列表和详情酒店查询修改

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -555,6 +555,7 @@
                           <tr>
                             <th width="100">日期</th>
                             <th style="border-right:1px solid #E5E5E5">酒店情况</th>
+                            <th style="border-right:1px solid #E5E5E5">占房时间</th>
                           </tr>
                       </table>
                       <div>
@@ -567,7 +568,7 @@
                               <template v-if="subItem.SubList">
                                 <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
                                   {{subItem.SubList[0].HotelName}}
-                                  <a style="color:green">【OK】</a>
+                                  <a style="color:green">{{subItem.SubList[0].RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
                                   【<a
                                     style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
                                     {{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
@@ -576,6 +577,16 @@
                                 </template>
                               </template>
                             </td>
+                            <td>
+                              <template v-if="subItem.SubList">
+                                <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
+                                   {{subItem.SubList[0].CreateDateStr}}
+                                 </div>
+                                <template v-else v-for="childItem in subItem.SubList">
+                                  <div></div>
+                                </template>
+                              </template> 
+                            </td>
                           </tr>
                         </table>
                       </div>
@@ -1131,7 +1142,6 @@
 
       //新获取列表数据
       getControlList() {
-
         var msg = JSON.parse(JSON.stringify(this.queryMsg))
         if (msg.TeamMinNum == '') {
           msg.TeamMinNum = -1

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -794,9 +794,14 @@
           <td>
             <div class="tp_divList" v-for="(subItem,index) in item.SubList">
               <div>
-                {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;<span v-if="subItem.UseCount>0 && item.SubList.length==1">
-                  【<span style="color:green">本团使用库存：{{subItem.UseCount}} {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】</span>【<span
-                  style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
+                {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;
+                <span v-if="subItem.UseCount>0 && item.SubList.length==1">
+                   <a style="color:green">{{subItem.RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
+                  【<span style="color:green">本团使用库存：{{subItem.UseCount}} {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】</span>
+                  【<span
+                  style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}} <template v-if="subItem.CreateDateStr">占房时间:{{subItem.CreateDateStr}}</template>
+                </span>】
+                  &nbsp;&nbsp;
                 <el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
                   @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
               </div>