1

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -653,7 +653,7 @@
                     <span>{{$t('salesModule.XSQW')}}</span>
                     <span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span>
                   </p>
-                  <p
+                  <p class="travelnowrap"
                     v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
@@ -667,6 +667,16 @@
                       </div>
                     </el-popover>
                   </p>
+                  <p class="travelnowrap" v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
+                    <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
+                  <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj"
+                        :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
+                        <div slot="reference"> 
+                           <span  class="price"   style="cursor:pointer;text-decoration:underline;">餐厅预定情况</span>
+                        </div>
+                </el-popover>
+
+                  </p>
                   <p v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 ">
                     <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
                       <commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
@@ -1354,6 +1364,7 @@
 </template>
 <script>
   import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
+  import commonDinnerInfo from "../../commonPage/commonDinnerInfo.vue";
   import commonBusInfo from "../../commonPage/commonBusInfo.vue";
   import priceDialog from '../TravelNewQuotation/priceDialog.vue';
   import EditLeaveGroup from './components/EditLeaveGroup.vue';
@@ -1361,6 +1372,7 @@
     components: {
       commonBusInfo,
       commonHotelInfo,
+      commonDinnerInfo,
       priceDialog,
       EditLeaveGroup
     },
@@ -2087,6 +2099,7 @@
               if (!this.isCommissionDetails) return
               this.getDetailsOfRoyalty()
               this.getTravelAccountStatus()
+              this.getDiningDetailsList()
             }
           },
           err => {}
@@ -2117,6 +2130,31 @@
           }
         )
       },
+      getDiningDetailsList() {
+        let Ids = this.queryCommonData.dataList.map(x => {
+          return x.TCID
+        })
+        let msg = [...new Set(Ids)]
+        this.apipost(
+          "dmcstatistics_get_GetDiningStatisticsList", {
+            tcids: msg.join(',')
+          },
+          res => {
+            if (res.data.resultCode == 1) {
+              let DiningStatisticsList = []
+              DiningStatisticsList = res.data.data
+              this.queryCommonData.dataList.forEach(x => {
+                DiningStatisticsList.forEach(y => {
+                  if (x.TCID == y.TCID) {
+                    x.DiningList = y.OrderList
+                  }
+                })
+              })
+              this.$forceUpdate()
+            }
+          }
+        )
+      },
       getTravelAccountStatus(){
         let Ids = this.queryCommonData.dataList.map(x => {
           return x.TCID

src/components/commonPage/commonDinnerInfo.vue

+<style>
+  .comHotelOperation {
+    margin-top: 10px;
+  }
+
+  .comHotelOperation tr td {
+    text-align: left;
+    width: 50%;
+    padding: 5px 0;
+  }
+
+  .comHotelOperation .tdRight {
+    text-align: right;
+    width: 20%;
+  }
+
+  .comHotelOperation .tdLeft {
+    text-align: left;
+    padding-left: 5px;
+    width: 30%;
+  }
+
+</style>
+
+<template>
+  <div>
+    <div>
+      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
+        <tr v-if="showHotelObj.showPrice">
+          <td>
+            {{$t('salesModule.CompanyNum')}}
+          </td>
+          <td colspan="4" style="text-align:left;">
+            <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
+          </td>
+          <td>
+            {{$t('salesModule.DJNum')}}
+          </td>
+          <td :colspan="showHotelObj.colspanLength" style="text-align:left;">
+            <span style="padding-left:5px;">{{DMCNum}}</span>
+          </td>
+        </tr>
+        <tr>
+          <th width="120">{{$t('pub.date')}}</th>
+          <th width="150">餐厅名称</th>
+          <th width="150">更换餐厅</th>
+          <th width="120">餐厅状态</th>
+          <th width="120">{{$t('salesModule.DJstatus')}}</th>
+          <th width="150" v-if="showHotelObj.showPrice">
+            {{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th>
+            <th width="150" v-if="showHotelObj.showPrice">
+              <el-tooltip class="item" effect="dark" content="（用餐人数-免人数）× 价格" placement="top">
+                <span>总价</span>   
+    </el-tooltip>
+           </th>
+          <th width="100" v-if="showHotelObj.showZhan">预约时间</th>
+          <th width="100" v-if="showHotelObj.showZhan">确认时间</th> 
+          <!-- <th width="80" v-if="showHotelObj.caiwu">{{$t('pub.yes')}}{{$t('pub.no')}}<br />{{$t('fnc.fukuan')}}</th>
+          <th width="180" v-if="showHotelObj.caiwu">{{$t('salesModule.DJNUM')}}{{$t('hotel.hotel_corrlelatition')}}</th> -->
+        </tr>
+        <template v-if=" DiningObj&& DiningObj.length>0" >
+          <tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj">
+            <td >
+            {{hotelSubItem.UseTime}}
+            </td>
+            <td style="text-align:left;padding-left:3px;">
+              <template v-if="hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName && hotelSubItem.NewDinnerName!=''">
+                <span style="text-decoration:line-through"> {{hotelSubItem.DinnerName}}</span>
+              </template>
+              <template v-else>
+                {{hotelSubItem.DinnerName}}
+              </template>
+            </td>
+            <td style="text-align:left;padding-left:3px;color:red">
+              {{hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName?""+hotelSubItem.NewDinnerName:""}}
+            </td>
+            <td>
+              <span >
+                <template v-if="hotelSubItem.DiningChangeState==1">
+                  <a style="color:green">待审核</a>
+                </template>
+              </span>
+            </td>
+            <td>
+              <span >
+                <template v-if="hotelSubItem.OrderState==1">
+                  <a style="color:green">确定</a>
+                </template>
+                <template v-else-if="hotelSubItem.OrderState==-1">
+                  <a style="color:red"></a>
+                </template>
+                <template v-else-if="hotelSubItem.OrderState==2">
+                  <a style="color:red">暂定</a>
+                </template>
+              </span>
+            </td>
+            <td v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0">
+          <div v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList">
+            <template v-if="priceSubItem.DiningNum>0">
+              {{priceSubItem.GuestType==1?"大人：":(priceSubItem.GuestType==2?"中人：":(priceSubItem.GuestType==3?"小人：":""))}} 
+<template v-if="priceSubItem.DiningDiscount>0">
+({{priceSubItem.DiningNum}}-{{priceSubItem.DiningDiscount}}) ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
+</template> 
+<template v-else>
+{{priceSubItem.DiningNum}} ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
+</template> 
+            </template>
+           
+                  
+                          <br />
+                       
+          </div>
+            
+            </td>
+            <td>
+              <template v-if="hotelSubItem.TotalMoney>0">{{ hotelSubItem.TotalMoney }} （{{hotelSubItem.CurrencyName}}）</template>
+            </td>
+            <td >
+              {{hotelSubItem.DiningTypeName}} </br> {{hotelSubItem.BookTime}} 
+            </td>
+
+            <td >
+              
+                {{hotelSubItem.SureTime}}
+             
+            </td>
+           
+           
+          </tr>
+        </template>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+ 
+  export default {
+    props: ["DiningObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"],
+    data() {
+      return {
+        loading: false,
+      };
+    },
+    components: {
+      //日志组件
+     
+    },
+    methods: {
+      
+      goUrl(name, path, id, tcmun) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            tcmun: tcmun,
+            blank: "y",
+            tab: name,
+          },
+        });
+      },
+      //根据日期返回星期几
+      getDayByDate(dateString) {
+        if (dateString) {
+          var date;
+          var dateArray = dateString.split("-");
+          date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
+          return "日一二三四五六".charAt(date.getDay());
+        }
+      }
+    },
+    mounted() {}
+  };
+
+</script>