页面修改

src/components/Hotel/roomQuery.vue

@@ -381,7 +381,6 @@
               });
             }
             this.dataList = sourceData;
-            console.log("this.dataList",this.dataList)
           } else {
             this.$message.error(res.data.message)
           }

src/components/Restaurant/bookDinnerStatistics.vue

@@ -22,6 +22,14 @@
             <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
           </span>
         </li>
+        <li><span><em>餐厅</em>
+            <el-select v-model="msg.QDiningID" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option label="不限" :value='0'></el-option>
+              <el-option v-for="item in DiningList" :label='item.Name' :value='item.ID' :key='item.ID'>
+              </el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
         </li>
@@ -175,7 +183,10 @@
           EndDate: '',
           currentPage: 1,
           total: 0,
+          QDiningID: 0, //餐厅编号
         },
+        //餐厅列表
+        DiningList: [],
         LineList: [],
         LineTeamList: [],
         thLengthTitle: [],
@@ -292,6 +303,20 @@
           }
         }, err => {})
       },
+      //获取餐厅列表
+      GetDinnerList() {
+        this.DiningList = [];
+        this.apipost(
+          "dining_post_GetList", {
+            QCountry: 651,
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              this.DiningList = res.data.data;
+            }
+          }
+        );
+      }
     },
     mounted() {
       let myDate = new Date();
@@ -306,7 +331,8 @@
       let height = window.innerHeight - 65 - 164;
       this.boxHeight = height;
       this.offsetwidth = width;
-      this.getList()
+      this.GetDinnerList();
+      this.getList();
     },
   }
 

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -489,9 +489,13 @@
                       :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
                   </p>
                   <p class="travelnowrap" v-if="item.ClearOrderHour>0">
-                    <span>已设定清位</span>
+                    <span>同行清位时间</span>
                     <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
                   </p>
+                  <p class="travelnowrap" v-if="item.SaleClearOrderHour>0">
+                    <span>销售清位时间</span>
+                    <span class="TCL-greenType">{{item.SaleClearOrderHour}}小时</span>
+                  </p>
                   <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"

src/components/dmc/manager/dmcTotalTable.vue

@@ -151,7 +151,7 @@
       <table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
         <tr>
           <th colspan="11">公司通用信息</th>
-          <th colspan="5">团队需求表</th>
+          <th colspan="6">团队需求表</th>
           <th colspan="10">地接op操作</th>
         </tr>
         <tr>
@@ -168,6 +168,7 @@
           <th width="60">导游</th>
           <th width="60">已开票</th>
           <th width="60">分房表</th>
+          <th width="60">旅客名单</th>
           <th width="60">出团<br />通知书</th>
           <th width="60">导游<br />计划表</th>
           <th width="60">领队<br />交接表</th>
@@ -277,6 +278,9 @@
                   <span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
                 </div>
               </td>
+              <td>
+                <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadGuestList(item)">旅客名单</a>
+              </td>
               <td>
                 <div class="fz16 fbold linkspan">
                   <span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span>
@@ -340,8 +344,10 @@
                   <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
               </td>
-              <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' >
-                <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')" v-if="outItem.PriceCommonList.length > 1">
+              <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
+                <div class="fz16 fbold linkspan"
+                  @click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
+                  v-if="outItem.PriceCommonList.length > 1">
                   <span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
                   <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
                 </div>
@@ -476,23 +482,23 @@
                             <tr>
                               <th>团号/时间</th>
                               <template v-for="(hItem,hIndex) in TeamHotelList">
-                                  <th>
-                                    {{hItem.TCNUM}}<br/>({{hItem.TCID}})
-                                  </th>
+                                <th>
+                                  {{hItem.TCNUM}}<br />({{hItem.TCID}})
+                                </th>
                               </template>
                             </tr>
                           </template>
                           <template v-for="(hItem,hIndex) in TeamHotelList">
-                           <template v-for="(hSubItem,hSubIndex) in hItem.dayList">
-                            <tr>
-                              <td>{{hSubItem.UseTime}}</td>
+                            <template v-for="(hSubItem,hSubIndex) in hItem.dayList">
+                              <tr>
+                                <td>{{hSubItem.UseTime}}</td>
                                 <td>
                                   <template v-if="hSubItem.subList&&hSubItem.subList.length>0">
                                     {{hSubItem.subList[0].NewHotelName}}
                                   </template>
                                 </td>
-                               </tr>
-                              </template>
+                              </tr>
+                            </template>
                           </template>
                         </table>
                         <el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference"
@@ -505,7 +511,7 @@
               </td>
             </tr>
             <tr>
-              <td colspan="21" style="text-align: left!important;padding:0 20px;">
+              <td colspan="22" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
                   <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
@@ -843,8 +849,8 @@
             'NewCombinationNum': outItem.NewCombinationNum,
             'LeaderName': obj.LeaderName,
             'GuideName': obj.GuideName,
-            'IsCombine':outItem.PriceCommonList.length>1, 
-            'NewTCIDs':outItem.TCIDS,
+            'IsCombine': outItem.PriceCommonList.length > 1,
+            'NewTCIDs': outItem.TCIDS,
             blank: 'y',
             tab: title
           }
@@ -1017,6 +1023,23 @@
           }
         }, err => {})
       },
+      //下载旅客名单
+      DownLoadGuestList(item) {
+        this.loading = true;
+        //导出报表
+        let msg = {
+          TCID: item.TCID
+        };
+        var fileName = "旅客名单.xls";
+        if (item.TCNUMS != null) {
+          fileName =
+            "【" + item.TCNUMS + "】旅客名单.xls";
+        }
+        this.GetLocalFile("travel_get_GetTravelGuestExport_V2", msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      }
     },
     mounted() {
       let myDate = new Date();