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

src/components/Restaurant/restaurantList.vue

@@ -338,7 +338,7 @@
         </div>
         <div class="btnList">
           <button @click="goSubInfo('restaurantInfoManage',item.ID)" class="hotelBtn">{{$t('pub.updateMsg')}}</button>
-          <button @click="goUrl('RestaurantPackage',item.ID)" class="hotelBtn">{{$t('restaurant.res_package')}}</button>
+          <button v-if="IsHotelPriceStock==1" @click="goUrl('RestaurantPackage',item.ID)" class="hotelBtn">{{$t('restaurant.res_package')}}</button>
         </div>
       </div>
     </div>
@@ -351,6 +351,7 @@
   export default {
     data() {
       return {
+        IsHotelPriceStock:0,//1-有获取餐厅与报价添加修改权限
         total: 0,
         currentPage: 1,
         countryList: "",
@@ -543,6 +544,18 @@
         err => {}
       );
     },
+         //获取酒店修改与报价添加修改权限
+      GetHotelPirceStockAuth() {
+        this.apipost(
+          "hotel_post_GetHotelPriceStockAuthService", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.IsHotelPriceStock = res.data.data;
+            }
+          },
+          err => {}
+        );
+      }
     },
     created() {
       if (this.$route.query.hasOwnProperty("cache")) {
@@ -556,6 +569,7 @@
       }
     },
     mounted() {
+      this.GetHotelPirceStockAuth();
       this.getCountryList();
       this.selectResource();
        this.GetDiningTypeList();

src/components/TravelContractDetail.vue

@@ -527,7 +527,7 @@
                             <span v-if="dataList.payType==2">转账</span>
                             <span v-if="dataList.payType==3">支票</span>。
                         </p>
-                        <p>旅游费用支付时间：<span>{{getDate(dataList.payDate)}}</span>。</p>
+                        <p>旅游费用支付时间：<span v-if="dataList.payDate">{{getDate(dataList.payDate)}}</span>。</p>
                         <h3>第二十二条  人身意外伤害保险</h3>
                         <p>1.出境社提示旅游者购买人身意外伤害保险；</p>
                         <p> 

src/router/config.js

@@ -1084,6 +1084,14 @@ export default {
                                 title: '未认款管理'
                             },
                         },
+                        {
+                            path: '/RoomMealImport', //房餐批量制单
+                            name: 'RoomMealImport',
+                            component: resolve => require(['@/components/systemManagement/RoomMealImport'], resolve),
+                            meta: {
+                                title: '房餐批量制单'
+                            },
+                        },
                         {
                             path: '/Maninfo', //未认款信息
                             name: 'Maninfo',