1

src/components/EditTemplate.vue

@@ -595,7 +595,6 @@
       if(this.defaultAccount==undefined){
         this.defaultA=true;
       }else{
-        
         this.defaultA=this.defaultAccount;
       }
       this.myToolbar = "toolbar_" + this.guid();

src/components/Restaurant/demesticRestaurantInfoManage.vue

@@ -854,9 +854,10 @@
               <el-time-select
                 v-model="item.StartTime"
                 :picker-options="{
-                  start: '08:30',
+                  start: '00:00',
                   step: '00:15',
-                  end: '18:30',
+                  end: '23:45',
+                  maxTime:item.EndTime
                 }"
                 placeholder="选择开始时间"
               >
@@ -864,9 +865,10 @@
               <el-time-select
                 v-model="item.EndTime"
                 :picker-options="{
-                  start: '08:30',
+                  start: '00:00',
                   step: '00:15',
-                  end: '18:30',
+                  end: '23:45',
+                  minTime:item.StartTime
                 }"
                 placeholder="选择结束时间"
               >
@@ -1057,7 +1059,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="美食分类">
-            <el-select
+            <!-- <el-select
               v-model="addMsg.FoodType"
               class="multiple_input w300"
               :placeholder="$t('pub.pleaseSel')"
@@ -1071,7 +1073,8 @@
                 :value="item.ID"
               >
               </el-option>
-            </el-select>
+            </el-select> -->
+            <el-cascader :options="FoodTypeList" v-model="addMsg.FoodType" :props="FoodTypeProps"></el-cascader>
           </el-form-item>
           <el-form-item :label="$t('Operation.Op_price')">
             <el-select
@@ -1622,7 +1625,26 @@ export default {
       endDay: "", //结束日
       showaddTag:false,
       tagName:"",
-      tagIndex:0
+      tagIndex:0,
+      FoodTypeProps:{
+          label:'Name',
+          value:"ID",
+          lazy: true,
+          lazyLoad (node, resolve) {
+            const { level } = node;
+            console.log(node)
+            setTimeout(() => {
+              const nodes = Array.from({ length: level + 1 })
+                .map(item => ({
+                  value: ++id,
+                  label: `选项${id}`,
+                  leaf: level >= 2
+                }));
+
+              resolve(nodes);
+            }, 1000);
+          }
+        }
     };
   },
   components: {
@@ -1839,7 +1861,8 @@ export default {
           } else {
             this.tips(res.data.message, "error");
           }
-          console.log("图片",this.DiningImageArray);
+          this.startDay=parseInt(res.data.data.BusinessWeek.slice(0,1))
+          this.endDay=parseInt(res.data.data.BusinessWeek.slice(-1))
         },
         null
       );
@@ -2071,6 +2094,9 @@ export default {
         (res) => {
           if (res.data.resultCode == 1) {
             this.FoodTypeList = res.data.data;
+            this.FoodTypeList.forEach(item=>{
+              item.children=[]
+            })
           }
         },
         (err) => {}
@@ -2088,6 +2114,7 @@ export default {
     delFood(index) {
       this.addMsg.FoodRecommendList.splice(index, 1);
     },
+    //获取周长枚举
     getweekenum() {
       this.apipost(
         "appletsdining_Post_GetBusinessWeekEnumType",

src/components/Restaurant/demesticRestaurantPackage.vue

@@ -180,17 +180,24 @@
         <el-form-item :label="$t('restaurant.res_packageName')" prop="MealName">
           <el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('restaurant.res_package_type_Name')" prop="DiningMealType">
+        <!-- <el-form-item :label="$t('restaurant.res_package_type_Name')" prop="DiningMealType">
           <el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')" class="w300">
             <el-option v-for='item in DiningMealTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       
-        <el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc">
+        <!-- <el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc">
           <el-input class="w300" type="textarea" v-model="addMsg.MealDesc" maxlength="200"></el-input>
+        </el-form-item> -->
+        <el-form-item label="使用时间" prop="MealDesc">
+          <el-input class="w300" type="text" v-model="addMsg.MealDesc" maxlength="200"></el-input>
         </el-form-item>
-      </el-form>
+     
+       <el-form-item label="使用说明" prop="MealDesc">
+          <el-input class="w300" type="text" v-model="addMsg.MealDesc" maxlength="200"></el-input>
+          </el-form-item>
+       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="hollowFixedBtn"
           @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
@@ -222,6 +229,7 @@
           MealName: "",
           MealDesc: "",
           DiningMealType: "",
+          UsageTimeList:[]
         },
         loading: true,
         DiningMealTypeList: [],

src/components/Restaurant/demesticRestaurantPrice.vue

@@ -438,7 +438,7 @@
               <el-input type="text" class="w210" v-model="addMsg.CostPrice"
                         @keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
             </el-form-item>
-            <el-form-item :label="$t('hotel.hotel_SalesPrice')" prop="SalesPrice">
+            <el-form-item label="原价" prop="SalesPrice">
               <el-input type="text" class="w210" v-model="addMsg.SalesPrice"
                         @keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
             </el-form-item>

src/router/config.js

@@ -1532,6 +1532,14 @@ export default {
               meta: {
                 title: '景区门票管理'
               },
+            },
+            {
+              path: '/domesticTicketManagement', //国内景区门票管理
+              name: 'domesticTicketManagement',
+              component: resolve => require(['@/components/scenicSpot/domesticTicketManagement'], resolve),
+              meta: {
+                title: '国内景区门票管理'
+              },
             }, {
               path: '/scenicSpotOrder', //景区门票订单管理
               name: 'scenicSpotOrder',