页面修改

src/components/Supplier/roomQuery2.vue

@@ -10,7 +10,7 @@
           </span>
         </li>
         <li style="position:absolute;right:10px;top:0;">
-          <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
+          <input type="button" class="normalBtn" value="查询" @click="getList()" />
           <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
         </li>
       </ul>
@@ -25,10 +25,13 @@
       </div><br />
       <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
         <tr>
-          <th width="100">序号</th>
+          <th width="100">订团号</th>
           <th width="100">公司团号</th>
+          <th width="100">航班</th>
           <th width="120">机位总数</th>
           <th width="100">当前人数</th>
+          <th width="100">导游</th>
+          <th width="100">领队</th>
           <th width="150">酒店详情</th>
         </tr>
         <tbody v-for="(item,index) in dataList">
@@ -37,7 +40,13 @@
               {{item.NewCombinationNum}}
             </td>
             <td>
-                {{item.TCNUMS}}
+              {{item.TCNUMS}}({{item.TCID}})
+            </td>
+            <td>
+              <template v-for="(subItem,subIndex) in item.FlightList2">
+                {{subItem.Flight_number}} {{subItem.TicketDepartureTime}} {{subItem.DepartureName}}({{subItem.DIATA}})
+                {{subItem.TicketArrivalTime}} {{subItem.ArrivalCityName}}({{subItem.AIATA}}) <br />
+              </template>
             </td>
             <td>
               {{item.TotalSeat}}
@@ -46,10 +55,72 @@
               {{item.RealNum}}
             </td>
             <td>
-                <a style="color:blue;text-decoration:underline;">酒店使用情况</a>
+              {{item.GuideName}} <template v-if="item.GuideTel">(电话: {{item.GuideTel}})</template>
+            </td>
+            <td>
+              {{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
+            </td>
+            <td>
+              <el-tooltip class="item" effect="dark" content="酒店信息" placement="top-start">
+                <el-popover placement="bottom" width="900" trigger="click">
+                  <table>
+                    <tr>
+                      <th width="100">
+                        时间
+                      </th>
+                      <th width="150">
+                        酒店
+                      </th>
+                      <th width="150">
+                        更换名称
+                      </th>
+                      <th width="300">
+                        价格
+                      </th>
+                      <th width="150">
+                        备注
+                      </th>
+                    </tr>
+                    <template v-for="(subItem,subIndex) in HotelList">
+                       <tbody>
+                          <tr v-for="(childItem,childIndex) in subItem.HotelOrderList">
+                             <td v-if="childIndex==0" :rowspan="subItem.HotelOrderList.length">
+                               第{{subIndex+1}}天<br/>
+                               {{subItem.UseTimeStr}}
+                             </td>
+                             <td>
+                                {{childItem.HotelName}}
+                             </td>
+                               <td>
+                                {{childItem.NewHotelName}}
+                             </td>
+                             <td>
+                                 <template v-for="(detailsItem,detailsIndex) in childItem.OrderDetailsList" v-if="detailsItem.HouseTypeCount>0" >
+                                    <template v-if="detailsItem.HouseType==1">单间</template>
+                                    <template v-if="detailsItem.HouseType==2">标准双人间</template>
+                                    <template v-if="detailsItem.HouseType==3">大床房</template>
+                                    <template v-if="detailsItem.HouseType==4">三人间</template>
+                                    <template v-if="detailsItem.HouseType==4">司导间</template>
+                                    {{detailsItem.HouseTypeCount}} 间
+                                    价格: {{detailsItem.UnitPrice}} 
+                                    税入/税别
+                                    返佣: {{detailsItem.RebateRatio}}
+                                    <br/>
+                                 </template>
+                             </td>
+                             <td>
+                               {{childItem.Remarks}}
                              </td>
                           </tr>
-            <tr >
+                       </tbody>
+                    </template>
+                  </table>
+                  <a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum)">酒店使用情况</a>
+                </el-popover>
+              </el-tooltip>
+            </td>
+          </tr>
+          <tr>
             <td colspan="5" style="text-align:left;padding-left:5px;">
               注意事项: {{item.SupplierRemarks}}
             </td>
@@ -65,6 +136,7 @@
     data() {
       return {
         loading: false,
+        hotelLoading:false,
         total: 0,
         msg: {
           pageIndex: 1,
@@ -89,15 +161,9 @@
           CombinationNum: '',
           Month: "" //月份字符串
         },
-        UserInfo: {},
-        //分公司类表
-        companyList: [],
-        //酒店列表
-        HotelList: [],
-        LineList: [],
-        LineTeamList: [],
-        thLengthTitle: [],
-        dataList: [],
+        UserInfo: {}, //用户信息
+        dataList: [], //数据列表
+        HotelList: [], //酒店列表
         //日志信息
         LogsList: [],
         queryLogMsg: {
@@ -108,19 +174,6 @@
           HotelId: 0,
           TCID: 0
         },
-        queryCommonData: {
-          //公司数据
-          BranchList: [],
-          //国家
-          PlaceList: [],
-          LineList: [],
-          LineTeamList: [],
-          AirlineList: [],
-          EmployeeList: [],
-        },
-        //当前酒店列表
-        CurrentHotelList: [],
-
       }
     },
     methods: {
@@ -142,12 +195,27 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.dataList = res.data.data;
-            console.log("this.dataList ", this.dataList);
           } else {
             this.$message.error(res.data.message)
           }
         }, err => {})
       },
+      //获取日志
+      getHotelList(TCID, NewCombinationNum) {
+        this.hotelLoading=true;
+        this.HotelList = [];
+        var qMsg = {
+          TCID: TCID,
+          NewCombinationNum: NewCombinationNum
+        };
+        this.ApiPost2('dmcstatistics_post_GetSupplierHotelListService', qMsg, res => {
+          this.hotelLoading=false;
+          if (res.data.resultCode == 1) {
+            this.HotelList = res.data.data;
+             console.log("this.HotelList",this.HotelList);
+          }
+        }, err => {})
+      },
       //下载Excel
       DownLoadHotel() {
         this.loading = true;
@@ -172,8 +240,7 @@
         parseInt(myDate.getMonth() + 1) +
         "-" +
         myDate.getDate();
-      this.msg.Month=  myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1);
- 
+      this.msg.Month = myDate.getFullYear() + "-" + parseInt(myDate.getMonth() + 1);
       this.getList();
     },
   }
@@ -247,4 +314,10 @@
     background-color: red;
   }
 
+  .roomQuery .hotelLink {
+    color: blue;
+    text-decoration: underline;
+    cursor: pointer;
+  }
+
 </style>