11

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -329,8 +329,8 @@
     <table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th width="50">{{$t('hotel.order_Number')}}</th>
-        <th width="100">{{$t('salesModule.ThirdOrderNum')}}</th>
-        <th width="190">{{$t('visa.v_tuanhao')}}</th>
+        <th width="105">{{$t('salesModule.ThirdOrderNum')}}</th>
+        <th width="100">{{$t('visa.v_tuanhao')}}</th>
         <th>{{$t('hotel.hotel_roomnumber')}}</th>
         <th>{{$t('hotel.hotel_Currency')}}</th>
         <th>{{$t('sm.zonge')}}</th>
@@ -340,24 +340,29 @@
         <th>{{$t('Operation.Op_daishou')}}</th>
         <th>{{$t('hotel.hotel_OrderStates')}}</th>
         <th>{{$t('fnc.cjshijian')}}</th>
-        <th>{{$t('op.RZLDR')}}</th>
+        <th>预定信息</th>
         <th>{{$t('salesModule.CancelFee')}}</th>
-        <th width="220">{{$t('fnc.khxinxi')}}</th>
+        <th width="110">{{$t('fnc.khxinxi')}}</th>
         <th>{{$t('active.cl_addPp')}}</th>
         <!-- <th>{{$t('MarketingActi.endTime')}}</th> -->
         <th width="180">{{$t('system.table_operation')}}</th>
       </tr>
       <tbody v-for="(item,index) in dataList" :key="`d_`+index">
-        <tr >
+        <tr>
           <td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}
             <div>
-              <el-tooltip class="item" effect="dark" :content="$t('objFill.xiaochengxdd')" placement="top">
-                <img v-if="item.OrderSource == 5||item.OrderSource == 7" src="../../../assets/img/userman/wx.png"
+              <el-tooltip class="item" effect="dark" content="旅小友订单" placement="top">
+                <img v-if="item.OrderSource == 5" src="../../../assets/img/userman/wx.png"
+                  style="width:24px;height: 24px;position:relative;top:5px;" alt="" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="国旅优选订单" placement="top">
+                <img v-if="item.OrderSource == 7" src="../../../assets/img/userman/wx.png"
                   style="width:24px;height: 24px;position:relative;top:5px;" alt="" />
               </el-tooltip>
             </div>
           </td>
           <td>{{item.ThirdOrderNo}}</td>
+
           <td><span class="cursorpointer text-decoration" @click="GotoUrl(item.TCNUM)"
               v-if="item.TCID">{{item.TCNUM}}({{item.TCID}})</span></td>
           <td>{{item.Number}}</td>
@@ -371,9 +376,63 @@
             <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
           </td>
           <td>{{item.CreateDateStr}}</td>
-          <td>{{item.CheckInStr}}-{{item.CheckOutStr}}</td>
+          <td style="text-align:left;padding:3px;">
+            {{item.HotelName}}({{item.HotelCode}}) <br />
+            {{item.CheckInStr}}(入住)-{{item.CheckOutStr}}(离开)
+            <template v-if="item.ContractInfo&&item.ContractInfo.guestLastName&&item.ContractInfo.guestFirstName">
+              <br />
+              联系人:{{item.ContractInfo.guestLastName}} {{item.ContractInfo.guestFirstName}}
+            </template>
+            <template v-if="item.ContractInfo&&item.ContractInfo.guestPhoneNumber ">
+              <br />
+              联系电话:{{item.ContractInfo.guestPhoneNumber}}
+            </template>
+            <template v-if="item.ContractInfo&&item.ContractInfo.guestEmail ">
+              <br />
+              邮箱:{{item.ContractInfo.guestEmail}} {{item.ContractInfo.guestEmail}}
+            </template>
+            <template v-if="item.ContractInfo&&item.ContractInfo.GuestList&&item.ContractInfo.GuestList.length>0">
+              <br />
+              <el-popover placement="right" width="300" trigger="click">
+                <div>
+                  <table>
+                    <tr>
+                      <th width="100">
+                        房间
+                      </th>
+                      <th width="280">
+                        入住人员
+                      </th>
+                    </tr>
+                    <tr v-for="(subItem,subIndex) in item.ContractInfo.GuestList">
+                      <td>
+                        房间{{subIndex+1}}
+                      </td>
+                      <td>
+                        <template v-for="(thirdItem,thirdIndex) in subItem.GuestInfo">
+                          <template v-if="thirdIndex!=0">
+                            <br />
+                          </template>
+                          <font style="padding-left:3px;">{{thirdItem.LastName}} {{thirdItem.FirstName}}
+                            <template v-if="thirdItem.IsAdult==0">
+                              (儿童)
+                            </template>
+                          </font>
+                          <template v-if="thirdIndex!=subItem.GuestInfo.length-1">
+                            ，
+                          </template>
+                        </template>
+                      </td>
+                    </tr>
+                  </table>
+                </div>
+                <font slot="reference" style="color:blue;cursor:pointer;">入住信息</font>
+              </el-popover>
+
+            </template>
+          </td>
           <td>{{item.CancelFee}}</td>
-          <td>{{item.CustomerName}}/{{item.CustomerPhone}}</td>
+          <td>{{item.CustomerName}}<br />{{item.CustomerPhone}}</td>
           <td>{{item.CreateByStr}}</td>
           <!-- <td>{{item.EndTime}}</td> -->
           <td>
@@ -431,13 +490,17 @@
               <div>
                 <span v-for="(subItem,subIndex) in item.FinanceList" :key="`d_`+index+`s_`+subIndex">
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                 </span>
                 <span v-if="item.FinanceList==0">{{$t('system.content_noData')}}</span>
               </div>
@@ -447,13 +510,17 @@
               <div>
                 <span v-for="(subItem,subIndex) in item.RefundFinanceList" :key="`d1_`+index+`s1_`+subIndex">
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                   <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
-                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black" style="margin-right:8px;">{{subItem.FrID}}</span>
+                    v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black"
+                    style="margin-right:8px;">{{subItem.FrID}}</span>
                 </span>
                 <span v-if="item.RefundFinanceList==0">{{$t('system.content_noData')}}</span>
               </div>