Commit 69568692 authored by 罗超's avatar 罗超

1

parent 8c9c1b69
...@@ -595,7 +595,6 @@ ...@@ -595,7 +595,6 @@
if(this.defaultAccount==undefined){ if(this.defaultAccount==undefined){
this.defaultA=true; this.defaultA=true;
}else{ }else{
this.defaultA=this.defaultAccount; this.defaultA=this.defaultAccount;
} }
this.myToolbar = "toolbar_" + this.guid(); this.myToolbar = "toolbar_" + this.guid();
......
...@@ -854,9 +854,10 @@ ...@@ -854,9 +854,10 @@
<el-time-select <el-time-select
v-model="item.StartTime" v-model="item.StartTime"
:picker-options="{ :picker-options="{
start: '08:30', start: '00:00',
step: '00:15', step: '00:15',
end: '18:30', end: '23:45',
maxTime:item.EndTime
}" }"
placeholder="选择开始时间" placeholder="选择开始时间"
> >
...@@ -864,9 +865,10 @@ ...@@ -864,9 +865,10 @@
<el-time-select <el-time-select
v-model="item.EndTime" v-model="item.EndTime"
:picker-options="{ :picker-options="{
start: '08:30', start: '00:00',
step: '00:15', step: '00:15',
end: '18:30', end: '23:45',
minTime:item.StartTime
}" }"
placeholder="选择结束时间" placeholder="选择结束时间"
> >
...@@ -1057,7 +1059,7 @@ ...@@ -1057,7 +1059,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="美食分类"> <el-form-item label="美食分类">
<el-select <!-- <el-select
v-model="addMsg.FoodType" v-model="addMsg.FoodType"
class="multiple_input w300" class="multiple_input w300"
:placeholder="$t('pub.pleaseSel')" :placeholder="$t('pub.pleaseSel')"
...@@ -1071,7 +1073,8 @@ ...@@ -1071,7 +1073,8 @@
:value="item.ID" :value="item.ID"
> >
</el-option> </el-option>
</el-select> </el-select> -->
<el-cascader :options="FoodTypeList" v-model="addMsg.FoodType" :props="FoodTypeProps"></el-cascader>
</el-form-item> </el-form-item>
<el-form-item :label="$t('Operation.Op_price')"> <el-form-item :label="$t('Operation.Op_price')">
<el-select <el-select
...@@ -1622,7 +1625,26 @@ export default { ...@@ -1622,7 +1625,26 @@ export default {
endDay: "", //结束日 endDay: "", //结束日
showaddTag:false, showaddTag:false,
tagName:"", 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: { components: {
...@@ -1839,7 +1861,8 @@ export default { ...@@ -1839,7 +1861,8 @@ export default {
} else { } else {
this.tips(res.data.message, "error"); 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 null
); );
...@@ -2071,6 +2094,9 @@ export default { ...@@ -2071,6 +2094,9 @@ export default {
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.FoodTypeList = res.data.data; this.FoodTypeList = res.data.data;
this.FoodTypeList.forEach(item=>{
item.children=[]
})
} }
}, },
(err) => {} (err) => {}
...@@ -2088,6 +2114,7 @@ export default { ...@@ -2088,6 +2114,7 @@ export default {
delFood(index) { delFood(index) {
this.addMsg.FoodRecommendList.splice(index, 1); this.addMsg.FoodRecommendList.splice(index, 1);
}, },
//获取周长枚举
getweekenum() { getweekenum() {
this.apipost( this.apipost(
"appletsdining_Post_GetBusinessWeekEnumType", "appletsdining_Post_GetBusinessWeekEnumType",
......
...@@ -180,17 +180,24 @@ ...@@ -180,17 +180,24 @@
<el-form-item :label="$t('restaurant.res_packageName')" prop="MealName"> <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-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
</el-form-item> </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-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 v-for='item in DiningMealTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </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-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-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"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" <button class="hollowFixedBtn"
@click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp; @click="resetForm('addMsg'),outerVisible = false">{{$t('pub.cancelBtn')}}</button> &nbsp;
...@@ -222,6 +229,7 @@ ...@@ -222,6 +229,7 @@
MealName: "", MealName: "",
MealDesc: "", MealDesc: "",
DiningMealType: "", DiningMealType: "",
UsageTimeList:[]
}, },
loading: true, loading: true,
DiningMealTypeList: [], DiningMealTypeList: [],
......
...@@ -438,7 +438,7 @@ ...@@ -438,7 +438,7 @@
<el-input type="text" class="w210" v-model="addMsg.CostPrice" <el-input type="text" class="w210" v-model="addMsg.CostPrice"
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input> @keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
</el-form-item> </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" <el-input type="text" class="w210" v-model="addMsg.SalesPrice"
@keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input> @keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
</el-form-item> </el-form-item>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -1532,6 +1532,14 @@ export default { ...@@ -1532,6 +1532,14 @@ export default {
meta: { meta: {
title: '景区门票管理' title: '景区门票管理'
}, },
},
{
path: '/domesticTicketManagement', //国内景区门票管理
name: 'domesticTicketManagement',
component: resolve => require(['@/components/scenicSpot/domesticTicketManagement'], resolve),
meta: {
title: '国内景区门票管理'
},
}, { }, {
path: '/scenicSpotOrder', //景区门票订单管理 path: '/scenicSpotOrder', //景区门票订单管理
name: 'scenicSpotOrder', name: 'scenicSpotOrder',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment