Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/DataAnalysis/components/corporationChart.vue

@@ -6,7 +6,7 @@
         <div style="margin-left: 20px;">
           <el-tag size="small" effect="dark"
           style="margin-right: 5px;cursor: pointer;"
-          :type="Current==item.ID?'danger':'info'" v-for="(item,index) in types"
+          :type="Current==item.ID?'danger':'info'" v-for="(item,index) in types" :key="item.ID"
           @click="Current=item.ID,BranchChart()">{{item.Name}}</el-tag>
 
         </div>

src/components/FinancialModule/DataAnalysis/components/lineChart.vue

@@ -6,7 +6,7 @@
         <div style="margin-left: 20px;">
           <el-tag size="small" effect="dark"
           style="margin-right: 5px;cursor: pointer;"
-          :type="Current==item.ID?'danger':'info'" v-for="(item,index) in types"
+          :type="Current==item.ID?'danger':'info'" v-for="(item,index) in types" :key="item.ID"
           @click="Current=item.ID,LineChart()">{{item.Name}}</el-tag>
 
         </div>
@@ -24,7 +24,7 @@
         <div style="margin-left: 20px;">
           <el-tag size="small" effect="dark"
           style="margin-right: 5px;cursor: pointer;"
-          :type="costCurrent==item.ID?'danger':'info'" v-for="(item,index) in costTypes"
+          :type="costCurrent==item.ID?'danger':'info'" v-for="(item,index) in costTypes" :key="item.ID"
           @click="costCurrent=item.ID,CostChart()">{{item.Name}}</el-tag>
 
         </div>

src/components/Restaurant/RestaurantPackage.vue

@@ -146,9 +146,9 @@
           <p class="Ldata">{{item.HDate}}</p>
         </td>
         <td>
-          <el-tooltip class="item" effect="dark" v-if="item.MealDesc" :content="item.MealDesc" placement="top-start"
+          <el-tooltip class="item" effect="dark" v-if="item.Remark" :content="item.Remark" placement="top-start"
             popper-class="max-w250">
-            <span class="descripTion">{{item.MealDesc}}</span>
+            <span class="descripTion">{{item.Remark}}</span>
           </el-tooltip>
         </td>
         <td>

src/components/Restaurant/RestaurantPrice.vue

@@ -402,6 +402,10 @@
                       <label>{{$t('hotel.hotel_SalesPrice')}}：{{dayobject.SalesPrice}}</label>
                       <label>{{$t('hotel.hotel_B2CPrice')}}：{{dayobject.B2CPrice}}</label>
                     </div>
+                    <div class="popList">
+                      <label>最低价格：{{dayobject.MinPrice}}</label>
+                      <label>最高价格：{{dayobject.MaxPrice}}</label>
+                    </div>
                     <div class="HT_supplier" v-if="IsSelfBook">
                       <label>{{$t('hotel.hotel_Supplier')}}：{{dayobject.SupplierName}}</label>
                     </div>
@@ -431,7 +435,8 @@
             </span>
           </div>
           <div class="resDiv">
-            <el-form-item :label="$t('hotel.hotel_CostPrice')" prop="CostPrice">
+            <!--prop="CostPrice"-->
+            <el-form-item :label="$t('hotel.hotel_CostPrice')">
               <el-input type="text" class="w210" v-model="addMsg.CostPrice"
                 @keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
             </el-form-item>
@@ -652,6 +657,8 @@
                     dayItem.B2BPrice = tableinfo[j].B2BPrice;
                     dayItem.B2CPrice = tableinfo[j].B2CPrice;
                     dayItem.SalesPrice = tableinfo[j].SalesPrice;
+                    dayItem.MinPrice = tableinfo[j].MinPrice;
+                    dayItem.MaxPrice = tableinfo[j].MaxPrice;
                     dayItem.checkState = this.$calendarUtils.checkState.hasValue;
                     dayItem.SupplierName = tableinfo[j].SupplierName;
                     dayItem.ID = tableinfo[j].ID;

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -223,14 +223,13 @@
                       </el-select>
                     </td>
                   </tr>
-
                   <template v-if="subItem.OrderState==1">
                     <tr>
                       <td width="60" style="text-align:right;">
                         确认时间：
                       </td>
                       <td style="text-align:left;">
-                        <el-date-picker class='w135' v-model="subItem.SureTime" type="date" placeholder="选择确认时间"
+                        <el-date-picker class='w135' v-model="subItem.SureTime" type="date" placeholder="确认时间"
                           value-format="yyyy-MM-dd">
                         </el-date-picker>
                       </td>
@@ -240,8 +239,20 @@
                         预约时间：
                       </td>
                       <td style="text-align:left;">
-                        <el-input class='w135' v-model='subItem.BookTime' @keyup.native="checkTime(subItem,'BookTime')"
-                          type="text"></el-input>
+                        <!--午餐-->
+                        <template v-if="subItem.UseDinnerType==2">
+                          <el-time-select class='w135' placeholder="预约时间" v-model="subItem.BookTime"
+                            :picker-options="{ start: '11:00',step: '00:15',end: '14:00'}"
+                            @keyup.native="checkTime(subItem,'BookTime')">
+                          </el-time-select>
+                        </template>
+                        <!--晚餐-->
+                        <template v-if="subItem.UseDinnerType==3">
+                          <el-time-select class='w135' placeholder="预约时间" v-model="subItem.BookTime"
+                            :picker-options="{ start: '17:00',step: '00:15', end: '20:00'}"
+                            @keyup.native="checkTime(subItem,'BookTime')">
+                          </el-time-select>
+                        </template>
                       </td>
                     </tr>
                   </template>
@@ -271,7 +282,7 @@
                       <el-input type='textarea' rows="6" class='w120' v-model='subItem.Remarks'></el-input>
                     </td>
                   </tr>
-                  <tr style="display:none;">
+                  <tr>
                     <td width="80" style="text-align:right;">
                       {{$t('ground.canpeibz')}}：
                     </td>

src/components/Restaurant/restaurantList.vue

@@ -321,7 +321,8 @@
         <li>
           <button class="hollowFixedBtn" type="button"
             @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button>
-          <button class="normalBtn" type="button"
+          <!--v-if="IsEditDmcSource==1"-->
+          <button class="normalBtn" type="button" 
             @click="$router.push('restaurantInfoManage')">{{$t('pub.addBtn')}}</button>
         </li>
       </ul>
@@ -341,7 +342,8 @@
           </div>
           <div class="starSu">
             <div class="star">
-              <span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="index">{{items}}</span>
+              <span class="foodList">{{item.DiningTypeName}}</span>
+              <!-- <span class="foodList" v-for="(items,index) in item.FoodTagArr" :key="index">{{items}}</span> -->
             </div>
             <span v-if="item.Star==8" class="sushe">{{$t('restaurant.res_homeFacility')}}</span>
             <span v-if="item.Star==9" class="sushe">{{$t('restaurant.res_SpringHotel')}}</span>
@@ -382,7 +384,8 @@
           {{item.UpdateTimeStr}}
         </div>
         <div class="btnList">
-          <button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
+          <!--v-if="IsEditDmcSource==1"-->
+          <button  @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
           <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)"
             class="hotelBtn">{{$t('restaurant.res_package')}}</button>
         </div>
@@ -397,16 +400,13 @@
   export default {
     data() {
       return {
-        IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
         total: 0,
         currentPage: 1,
         countryList: "",
         provinceList: "",
         cityList: "",
         district: "",
-        Ids: [],
         tableData: "",
-        deleteID: "",
         EmployeeList: [], //员工列表
         DiningTypeList: [],
         DiningPriceTypeList: [],
@@ -420,7 +420,6 @@
             label: this.$t('system.table_delete')
           }
         ],
-        isDeleteNote: true,
         loading: true,
         defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
         msg: {
@@ -439,7 +438,9 @@
           currentPage: 1,
           ID: 0,
           UpdateBy: 0, //操作人
-        }
+        },
+        IsHotelPriceStock: 0, //1-有获取餐厅与报价添加修改权限
+        IsEditDmcSource: 0, //是否有新增修改权限
       };
     },
     methods: {
@@ -592,15 +593,21 @@
       },
       //获取酒店修改与报价添加修改权限
       GetHotelPirceStockAuth() {
-        this.apipost(
-          "hotel_post_GetHotelPriceStockAuthService", {},
-          res => {
-            if (res.data.resultCode == 1) {
-              this.IsHotelPriceStock = res.data.data;
+        let isStock = "IsHotelPriceStock";
+        let editDmcSource = "F_EditDmcSource";
+        this.apipost('userauth_get_CheckUserAuthNewService', '', res => {
+          if (res.data.resultCode == 1) {
+            var tempData = res.data.data;
+            if (tempData && tempData.length > 0) {
+              if (tempData.includes(isStock)) {
+                this.IsHotelPriceStock = 1;
+              }
+              if (tempData.includes(editDmcSource)) {
+                this.IsEditDmcSource = 1;
+              }
             }
-          },
-          err => {}
-        );
+          }
+        });
       },
       //根据当前员工所在部门获取该部门及子部门员工信息
       getEmployeeList() {

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2347,6 +2347,7 @@
                   ">
                   <span v-for="childItem in item.guestList" style="color: blue">
                     {{childItem.userName}}
+                    <span :style="childItem.isBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.isBed==1?'占床':'不占床'}}） </span>
                     <span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
                     <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
                     <span style="cursor:pointer;"

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -124,6 +124,7 @@
               <template v-else>
                 {{item.TeamTypeName}}
               </template>
+              <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
             </div>
 
           </div>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2129,8 +2129,9 @@
               <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
               <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
                 <span style="color: blue !important" v-for="(childItem,childIndex) in item.GuestList" :key="childIndex"
-                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}<span
-                    style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span>
+                  @click="goToPassenger(childItem, 2)">{{ childItem.userName }}
+                  <span :style="childItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{childItem.IsBed==1?'占床':'不占床'}}） </span>
+                  <span style="color:#f56c6c">{{childItem.VisaType==1?'(个签)':''}}</span>
                   <span style="color:#f56c6c">{{childItem.TicketOutTypeStr}}
                   </span>
                 </span>
@@ -2676,6 +2677,7 @@
                   <template v-for="(fourthItem,fourthIndex) in childItem.GuestList">
                     <span style="color: blue !important" :key="fourthIndex"
                       @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
+                      <span :style="fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' ">（{{fourthItem.IsBed==1?'占床':'不占床'}}） </span>
                       <span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}
                       </span>
                       <span v-if="fourthItem.TicketOutType==1" style="color:#409EFF;">{{fourthItem.TicketOutTypeStr}}

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -93,7 +93,7 @@
               <td width="300">
                 {{postConfig.Title}}
               </td>
-              <td width="80" class="txtRightCost">团队类型</td>
+              <td width="80" class="txtRightCost">出团类型</td>
               <td width="300">
                 <template v-if="postConfig.TeamType==1">
                   <span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
@@ -102,9 +102,9 @@
                   {{postConfig.TeamTypeName}}
                 </template>
               </td>
-              <td width="80" class="txtRightCost">行程天数</td>
+              <td width="80" class="txtRightCost">团队类型</td>
               <td>
-                {{postConfig.DayNum}}
+                {{postConfig.PriceTeamTypeName}}
               </td>
             </tr>
             <tr>
@@ -113,9 +113,13 @@
             </tr>
             <tr>
               <td width="80" class="txtRightCost">出团公司</td>
-              <td colspan="3">
+              <td >
                 {{postConfig.OutBranchName}}
               </td>
+              <td width="80" class="txtRightCost">行程天数</td>
+              <td>
+                {{postConfig.DayNum}}
+              </td>
               <td width="80" class="txtRightCost">出发日期</td>
               <td>
                 {{postConfig.OutDateTime}}
@@ -546,7 +550,7 @@
               </template>
             </td>
             <td colspan="3">
-              当前团队类型: <template v-if="postConfig.TeamTypeName=='小包团'">
+              当前出团类型: <template v-if="postConfig.TeamTypeName=='小包团'">
                 <span style="color:red;font-weight:bold;">{{postConfig.TeamTypeName}}</span>
               </template>
               <template v-else>
@@ -554,7 +558,7 @@
               </template>
             </td>
             <td colspan="4">
-              <el-form-item label="更改团队类型">
+              <el-form-item label="更改出团类型">
                 <el-select class="multiple_input" v-model="postConfig.TeamType">
                   <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -458,6 +458,7 @@
               <template v-else>
                 {{postConfig.TeamTypeName}}
               </template>
+              <template v-if="postConfig.PriceTeamTypeName&&postConfig.PriceTeamTypeName.length>0">/{{postConfig.PriceTeamTypeName}}</template>
             </td>
           </tr>
 

src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue

@@ -97,6 +97,18 @@
                   <el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
                 </el-select>
+              
+              </td>
+              <td width="80" class="txtRightCost">团队类型</td>
+              <td>
+                
+                  <el-select class="multiple_input" v-model="postConfig.PriceTeamType">
+                  <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
+                  <template v-for="item in TeamListArr">
+                    <el-option v-if="item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9" :key="item.Id" :label="item.Name" :value="item.Id">
+                          </el-option>
+                        </template>
+                </el-select>
               </td>
               <td width="80" class="txtRightCost">线路</td>
               <td>
@@ -107,34 +119,24 @@
                   </el-option>
                 </el-select>
               </td>
-              <td width="60" class="txtRightCost">系列</td>
-              <td>
-                <el-select class="w300" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
-                  <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
-                  <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
-                  </el-option>
-                </el-select>
-              </td>
             </tr>
             <tr>
               <td colspan="6" style="height:20px;">
               </td>
             </tr>
             <tr>
-              <td width="80" class="txtRightCost">团队标题</td>
+              
+              <td width="80" class="txtRightCost">系列</td>
               <td colspan="3">
-                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
-                  placeholder="请填写团队标题" maxlength="200"></el-input>
+                <el-select style="width:100%;" v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
+                  <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
+                  <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
+                  </el-option>
+                </el-select>
               </td>
-              <td width="80" class="txtRightCost">行程天数</td>
+               <td width="80" class="txtRightCost">客户名称</td>
               <td>
-                <el-input class="w240 LowNum" v-model="postConfig.DayNum"
-                  @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
-                  <template slot="append">天</template>
-                </el-input>
-                <el-input class="w120 LowNum" v-model="postConfig.NightNum" style="display:none;"
-                  @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
-                  <template slot="append">晚</template>
+                <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
                 </el-input>
               </td>
             </tr>
@@ -142,6 +144,8 @@
               <td colspan="6" style="height:20px;">
               </td>
             </tr>
+           
+           
             <tr>
               <td width="80" class="txtRightCost">出团公司</td>
               <td>
@@ -155,12 +159,30 @@
                 <el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder>
                 </el-date-picker>
               </td>
-              <td width="80" class="txtRightCost">客户名称</td>
+              <td width="80" class="txtRightCost">行程天数</td>
               <td>
-                <el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200">
+                <el-input class="w240 LowNum" v-model="postConfig.DayNum"
+                  @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
+                  <template slot="append">天</template>
+                </el-input>
+                <el-input class="w120 LowNum" v-model="postConfig.NightNum" style="display:none;"
+                  @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
+                  <template slot="append">晚</template>
                 </el-input>
               </td>
             </tr>
+            <tr>
+              <td colspan="6" style="height:20px;">
+              </td>
+            </tr>
+            <tr>
+              <td width="80" class="txtRightCost">团队标题</td>
+              <td colspan="5">
+                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
+                  placeholder="请填写团队标题" maxlength="200"></el-input>
+              </td>
+             
+            </tr>
           </table>
         </div>
         <br />
@@ -205,7 +227,8 @@
           },
           OtherPrice: {},
           teamPrice: {},
-          CostNumberList: []
+          CostNumberList: [],
+          TeamListArr:[]
         },
         orderList: [],
         queryMsg: {
@@ -329,6 +352,16 @@
           }
         });
       },
+       //获取团队类型
+    getPriceTeamList() {
+      this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
+        if (res.data.resultCode == 1) {
+          this.TeamListArr = res.data.data;
+        } else {
+          this.Error(res.data.message);
+        }
+      }, err => {});
+    },
       createDayTripPrice() {
         for (let i = 0; i < this.orderList.length; i++) {
           this.orderList[i].dayCostPrice = this.createDayTripPriceItem([...this.orderList[i].dayCostPrice]);
@@ -455,6 +488,7 @@
       this.getAllCurrency();
       this.getCompanyList();
       this.getTeamList();
+      this.getPriceTeamList();
       this.getLineTeamList();
       if (!this.OfferArray.length) {
         this.createOrderList();

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -75,6 +75,8 @@
           ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
           OPName: "", //主OP
           AssistantList: [], //助理OP
+          PriceTeamType: 0, //团队类型,
+          PriceTeamTypeName: "", //团队类型,
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -286,6 +288,8 @@
               this.postData.OutBranchName = tempData.OutBranchName;
               this.postData.TeamTypeName = tempData.TeamTypeName;
               this.postData.TeamType = tempData.TeamType;
+              this.postData.PriceTeamTypeName = tempData.PriceTeamTypeName;
+              this.postData.PriceTeamType = tempData.PriceTeamType;
               if (tempData.OfferArray) {
                 tempData.OfferArray.forEach(item => {
                   this.OfferArray.push(item)

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -56,7 +56,8 @@
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
           CustomerName: "", //客户名称
-          TeamType: 0, //团队类型
+          TeamType: 0, //出团类型
+          PriceTeamType:0,//团队类型
           TravelState: 1, //团控状态(1-草稿，2-待审核,3-审核通过,4-审核拒绝,5已撤销)
           OutBranchId: "", //出团公司
           OutDateTime: "", //出发时间
@@ -205,6 +206,7 @@
           item.currencyNumberList = item.CostCurrencyList;
           item.OtherPrice.CurrencyNumberList = item.CostCurrencyList;
           item.TeamType = this.postData.TeamType;
+          item.PriceTeamType = this.postData.PriceTeamType;
           item.OutBranchId = this.postData.OutBranchId;
           item.TravelState = this.postData.TravelState;
           item.OutDateTime = this.postData.OutDateTime;
@@ -305,6 +307,7 @@
                 this.postData.OutBranchId = Number(tempData.OutBranchId);
               }
               this.postData.TeamType = tempData.TeamType;
+              this.postData.PriceTeamType = tempData.PriceTeamType;
               this.postData.TravelState = tempData.TravelState;
               this.LineList = tempData.LineList;
               if (tempData.OfferArray && tempData.OfferArray.length > 0) {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -130,8 +130,9 @@
                   <i style="color:red;font-weight:bold;">{{item.TeamTypeName}}</i>
                 </template>
                 <template v-else>
-                  {{item.TeamTypeName}}
+                  {{item.TeamTypeName}} 
                 </template>
+                <template v-if="item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0">/{{item.PriceTeamTypeName}}</template>
               </div>
             </div>
           </div>

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -182,6 +182,8 @@
           ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
           OPName: "", //主OP
           AssistantList: [], //助理OP
+          PriceTeamType: 0, //团队类型,
+          PriceTeamTypeName: "", //团队类型,
         },
         dayCostPriceList: [], //报价列表
 
@@ -312,6 +314,8 @@
               this.postData.OutBranchId = tempData.OutBranchId;
               this.postData.OutDateTime = tempData.OutDateTime;
               this.postData.TeamTypeName = tempData.TeamTypeName;
+              this.postData. PriceTeamType=tempData.PriceTeamType, //团队类型,
+              this.postData. PriceTeamTypeName=tempData.PriceTeamTypeName, //团队类型,
               this.LineList = tempData.LineList;
               if (tempData.OfferArray && tempData.OfferArray.length > 0) {
                 var offerObj = tempData.OfferArray[0];

src/components/commonPage/commonDinnerInfo.vue

@@ -54,21 +54,21 @@
         <template v-if=" DiningObj&& DiningObj.length>0">
           <tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj">
             <td>
-              {{hotelSubItem.UseTime}}
+              {{hotelSubItem.UseTime}}（{{getDayByDate(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>
+
+              <el-link style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.OldDiningID ) "><template v-if="hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName && hotelSubItem.NewDinnerRealName!=''">
+                <span style="text-decoration:line-through;"> {{hotelSubItem.DinnerRealName}}</span>
               </template>
               <template v-else>
-                {{hotelSubItem.DinnerName}}
-              </template>
+                {{hotelSubItem.DinnerRealName}}
+              </template></el-link>
+            
             </td>
             <td style="text-align:left;padding-left:3px;color:red">
-              {{hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName?""+hotelSubItem.NewDinnerName:""}}
+              <el-link style="font-size:12px;"  @click="goDinnerDetails('restaurantInfoManage',  hotelSubItem.NewDiningID ) ">   {{hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName?""+hotelSubItem.NewDinnerRealName:""}} </el-link>
             </td>
-           
-           
             <td >
               <template v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0">
                 <span v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex"   >
@@ -140,7 +140,19 @@
           date = new Date(dateArray[0], parseInt(dateArray[1] - 1), dateArray[2]);
           return "日一二三四五六".charAt(date.getDay());
         }
-      }
+      },
+
+       // 跳转餐厅详情页  restaurantInfoManage  ///#/restaurantInfoManage?id=4688&blank=y&cache=true 
+       goDinnerDetails: function (path, id) {
+        this.$router.push({
+          name: path,
+          query: {
+            id: id,
+            blank: "y",
+            cache:true,
+          },
+        });
+      },
     },
     mounted() {}
   };