Skip to content

S
SuperMan
Commit 97e29c86 authored by 罗超's avatar 罗超
Browse files
Options

1

parent fe11bcce
Hide whitespace changes
Inline Side-by-side
Showing with 610 additions and 198 deletions
src/components/Restaurant/demesticRestaurantInfoManage.vue
View file @ 97e29c86
...@@ -737,7 +737,11 @@ ...@@ -737,7 +737,11 @@
</span> </span>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.table_country')"> <el-form-item label="是否上架" prop="IsShelves">
<el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
</el-form-item>
<!-- <el-form-item :label="$t('system.table_country')">
<el-select <el-select
:placeholder="$t('visaT.qxzguojia')" :placeholder="$t('visaT.qxzguojia')"
filterable filterable
...@@ -762,7 +766,7 @@ ...@@ -762,7 +766,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item :label="$t('hotel.hotel_province')"> <el-form-item :label="$t('hotel.hotel_province')">
<el-select <el-select
:placeholder="$t('pub.pleaseSel')" :placeholder="$t('pub.pleaseSel')"
...@@ -857,103 +861,6 @@ ...@@ -857,103 +861,6 @@
</div> </div>
</div> </div>
<!-- 营业时间 --> <!-- 营业时间 -->
<el-form-item
:label="$t('restaurant.res_BusinessHours') + (index + 1)"
prop="OpeningHours"
v-for="(item, index) in addMsg.OpeningHoursList"
:key="index"
>
<template>
<el-time-select
v-model="item.StartTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45',
maxTime:item.EndTime
}"
placeholder="选择开始时间"
>
</el-time-select>
<el-time-select
v-model="item.EndTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45',
minTime:item.StartTime
}"
placeholder="选择结束时间"
>
</el-time-select>
<el-tooltip
class="item"
effect="dark"
content="新增营业时间"
placement="top-end"
v-if="index === 0"
>
<el-button
@click="addBusinessTime"
icon="el-icon-plus"
circle
size="mini"
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除营业时间"
placement="top-end"
v-if="index > 0"
>
<el-button
@click="delBusinessTime(index)"
type="danger"
icon="el-icon-delete"
circle
size="mini"
></el-button>
</el-tooltip>
</template>
</el-form-item>
<!-- 营业日 -->
<el-form-item label="营业周期" prop="OpeningHours">
<template>
<el-select
v-model="startDay"
filterable
allow-create
placeholder="请选择"
>
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in weekEnumList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option>
</el-select>
<el-select
v-model="endDay"
filterable
allow-create
placeholder="请选择"
>
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in weekEnumList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option>
</el-select>
</template>
</el-form-item>
<el-form-item :label="$t('restaurant.res_ContactNumber')" prop="Tel"> <el-form-item :label="$t('restaurant.res_ContactNumber')" prop="Tel">
<el-input <el-input
type="text" type="text"
...@@ -981,6 +888,106 @@ ...@@ -981,6 +888,106 @@
class="w300" class="w300"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<span class="resource-lititle">开放时间
<el-tooltip
class="item"
effect="dark"
content="添加开放时间"
placement="top-end"
>
<el-button
type="primary"
icon="el-icon-plus"
circle
style="margin-left: 10px"
@click="addOpenTime"
></el-button>
</el-tooltip>
</span>
<div v-for="(item,index) in addMsg.OpeningHoursList" :key="index">
<template v-if="index!=0">
<el-form-item label="操作" prop="StartDay">
<el-tooltip
class="item"
effect="dark"
content="删除开放时间"
placement="top-end"
>
<el-button
type="danger"
icon="el-icon-delete"
circle
size="small"
@click="delOpenTime(index)"
></el-button>
</el-tooltip>
</el-form-item>
</template>
<template>
<el-form-item label="营业开始时间" prop="OpeningHours">
<el-time-select
v-model="item.StartTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45',
maxTime:item.EndTime
}"
placeholder="选择时间">
</el-time-select>
</el-form-item>
<el-form-item label="营业结束时间" prop="OpeningHours">
<el-time-select
v-model="item.EndTime"
:picker-options="{
start: '00:00',
step: '00:15',
end: '23:45',
minTime:item.StartTime
}"
placeholder="选择时间">
</el-time-select>
</el-form-item>
</template>
<template>
<el-form-item label="营业开始周" prop="OpeningHours">
<el-select
v-model="item.BusinessStartWeek"
filterable
allow-create
placeholder="请选择"
>
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in weekEnumList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="营业结束周" prop="OpeningHours">
<el-select
v-model="item.BusinessEndWeek"
filterable
allow-create
placeholder="请选择"
>
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in weekEnumList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
</template>
</div>
<span class="resource-lititle sheshi">{{ <span class="resource-lititle sheshi">{{
$t("restaurant.res_detailInformation") $t("restaurant.res_detailInformation")
}}</span> }}</span>
...@@ -1108,6 +1115,9 @@ ...@@ -1108,6 +1115,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="均价" prop="AveragePrice">
<el-input v-model="addMsg.AveragePrice" type="number" step="0.01" class="multiple_input w300"></el-input>
</el-form-item>
<el-form-item :label="$t('ground.hezuofangshi')"> <el-form-item :label="$t('ground.hezuofangshi')">
<el-select <el-select
v-model="addMsg.CooperationType" v-model="addMsg.CooperationType"
...@@ -1130,7 +1140,7 @@ ...@@ -1130,7 +1140,7 @@
</div> </div>
<div class="resource-imginfo"> <div class="resource-imginfo">
<div class="resourcerightTop"> <div class="resourcerightTop">
<div class="toolOne"> <!-- <div class="toolOne">
<span class="fanbili">{{ <span class="fanbili">{{
$t("restaurant.res_commissionColumn") $t("restaurant.res_commissionColumn")
}}</span> }}</span>
...@@ -1159,7 +1169,7 @@ ...@@ -1159,7 +1169,7 @@
<div class="percentCon">%</div> <div class="percentCon">%</div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="toolOne"> <div class="toolOne">
<span class="toolSpan">{{ $t("scen.sc_fdTag") }}</span> <span class="toolSpan">{{ $t("scen.sc_fdTag") }}</span>
...@@ -1539,8 +1549,7 @@ export default { ...@@ -1539,8 +1549,7 @@ export default {
GeographicTag: "", GeographicTag: "",
// OpeningHours: "", // OpeningHours: "",
OpeningHoursList: [ OpeningHoursList: [
{ StartTime: "", EndTime: "" }, { StartTime: "", EndTime: "",BusinessStartWeek:0,BusinessEndWeek:0 },
{ StartTime: "", EndTime: "" },
], ],
Tel: "", Tel: "",
ParkInfo: "", ParkInfo: "",
...@@ -1557,16 +1566,16 @@ export default { ...@@ -1557,16 +1566,16 @@ export default {
QCountry: "", QCountry: "",
QProvince: "", QProvince: "",
QCity: "", QCity: "",
District: 0, District: 5572,
Address: "", Address: "",
Lng: "", Lng: "",
Lat: "", Lat: "",
PicPath: "", PicPath: "",
IsSelfBook: "", IsSelfBook: "",
Fax: "", Fax: "",
Country: 0, Country: 2,
Province: 0, Province: 261,
City: 0, City: 5571,
DiningImageList: [], //现在的图片 DiningImageList: [], //现在的图片
DeleteImageList: [], //要删除的图片 DeleteImageList: [], //要删除的图片
IsRecommend: 0, //是否推荐 0:否,1:是 IsRecommend: 0, //是否推荐 0:否,1:是
...@@ -1576,6 +1585,7 @@ export default { ...@@ -1576,6 +1585,7 @@ export default {
PayStyle: 0, PayStyle: 0,
FoodType: 0, //美食分类 FoodType: 0, //美食分类
FoodRecommendList: [{ FoodName: "", Sort: 0 }], //推荐菜品 FoodRecommendList: [{ FoodName: "", Sort: 0 }], //推荐菜品
IsShelves:1,
}, },
rules: { rules: {
//表单必填验证 //表单必填验证
...@@ -1647,7 +1657,6 @@ export default { ...@@ -1647,7 +1657,6 @@ export default {
lazy: true, lazy: true,
lazyLoad (node, resolve) { lazyLoad (node, resolve) {
const { level } = node; const { level } = node;
console.log(node)
setTimeout(() => { setTimeout(() => {
const nodes = Array.from({ length: level + 1 }) const nodes = Array.from({ length: level + 1 })
.map(item => ({ .map(item => ({
...@@ -1684,7 +1693,6 @@ export default { ...@@ -1684,7 +1693,6 @@ export default {
this.UploadSelfFileT(path, newArr, (x) => { this.UploadSelfFileT(path, newArr, (x) => {
//统一图片处理 //统一图片处理
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
console.log(obj)
var str = x.data.FilePath; var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath; var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str; obj.Path = str;
...@@ -1765,8 +1773,6 @@ export default { ...@@ -1765,8 +1773,6 @@ export default {
this.endDay=0 this.endDay=0
} }
this.addMsg.BusinessWeek=this.startDay+'-'+this.endDay; this.addMsg.BusinessWeek=this.startDay+'-'+this.endDay;
console.log(1683,this.addMsg)
this.apipost( this.apipost(
"appletsdining_post_AppletsSet", "appletsdining_post_AppletsSet",
this.addMsg, this.addMsg,
...@@ -1831,18 +1837,19 @@ export default { ...@@ -1831,18 +1837,19 @@ export default {
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.addMsg = res.data.data; this.addMsg = res.data.data;
this.addMsg.FoodType=parseInt(res.data.data.FoodType)
if (this.addMsg.OpeningHoursList.length === 0) { if (this.addMsg.OpeningHoursList.length === 0) {
let obj={ let obj={
StartTime: "", StartTime: "",
EndTime: "", EndTime: "",
BusinessStartWeek:0,
BusinessEndWeek:0
} }
this.addMsg.OpeningHoursList.push(obj) this.addMsg.OpeningHoursList.push(obj)
console.log(this.addMsg.OpeningHoursList)
}
if (this.addMsg.Country > 0) {
this.GetSubAreaList(this.addMsg.Country, 1);
this.$forceUpdate
} }
// if (this.addMsg.Country > 0) {
// this.GetSubAreaList(this.addMsg.Country, 1);
// }
if (this.addMsg.Province > 0) { if (this.addMsg.Province > 0) {
this.GetSubAreaList(this.addMsg.Province, 2); this.GetSubAreaList(this.addMsg.Province, 2);
} }
...@@ -1866,17 +1873,17 @@ export default { ...@@ -1866,17 +1873,17 @@ export default {
this.addMsg.Sure = res.data.data.Sure.toString(); this.addMsg.Sure = res.data.data.Sure.toString();
this.isBook = this.addMsg.IsSelfBook; this.isBook = this.addMsg.IsSelfBook;
this.isRecommend = this.addMsg.IsRecommend; this.isRecommend = this.addMsg.IsRecommend;
res.data.data.PicPath.split(",").forEach((x) => { res.data.data.DiningPicList.forEach((x) => {
if (x != "") { if (x != "") {
var obj = this.$DMCUtils.DMCImageObj(); var obj = this.$DMCUtils.DMCImageObj();
obj.ID = res.data.data.ID; obj.ID = x.ID;
obj.Path = x; obj.Path = x.Path;
obj.PicID = 0; obj.PicID = x.Pic;
obj.ShowPath = obj.ShowPath =
this.domainManager().ViittoFileUrl + this.domainManager().ViittoFileUrl +
x + x.Path +
"?x-oss-process=image/resize,l_140"; "?x-oss-process=image/resize,l_140";
obj.TagName="" obj.TagName=x.TagName
this.DiningImageArray.push(obj); this.DiningImageArray.push(obj);
} }
}); });
...@@ -1993,22 +2000,22 @@ export default { ...@@ -1993,22 +2000,22 @@ export default {
this.addMsg.Lat = msg.lat; this.addMsg.Lat = msg.lat;
}, },
//获取国家 //获取国家
GetCounrty() { // GetCounrty() {
this.apipost( // this.apipost(
"dict_post_Destination_GetCountry", // "dict_post_Destination_GetCountry",
{}, // {},
(res) => { // (res) => {
this.CountryList = res.data.data; // this.CountryList = res.data.data;
}, // },
(err) => {} // (err) => {}
); // );
}, // },
//获取省份和城市 //获取省份和城市
GetSubAreaList(ID, type) { GetSubAreaList(ID, type) {
let msg = { let msg = {
Id: ID, Id: ID,
}; };
if (this.addMsg.Country != 0) { // if (this.addMsg.Country != 0) {
this.apipost( this.apipost(
"dict_post_Destination_GetChildList", "dict_post_Destination_GetChildList",
msg, msg,
...@@ -2026,7 +2033,7 @@ export default { ...@@ -2026,7 +2033,7 @@ export default {
}, },
(err) => {} (err) => {}
); );
} // }
}, },
getDMCimg(imgArr) { getDMCimg(imgArr) {
imgArr.forEach((imgItem) => { imgArr.forEach((imgItem) => {
...@@ -2116,9 +2123,6 @@ export default { ...@@ -2116,9 +2123,6 @@ 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) => {}
...@@ -2150,30 +2154,19 @@ export default { ...@@ -2150,30 +2154,19 @@ export default {
); );
}, },
//新增营业时间 //新增营业时间
addBusinessTime(){ addOpenTime(){
let obj={ let obj={
StartTime:"", StartTime:"",
EndTime:"" EndTime:"",
BusinessStartWeek:0,
BusinessEndWeek:0
} }
this.addMsg.OpeningHoursList.push(obj); this.addMsg.OpeningHoursList.push(obj);
}, },
//删除营业时间 //删除营业时间
delBusinessTime(index){ delOpenTime(index){
this.addMsg.OpeningHoursList.splice(index,1); this.addMsg.OpeningHoursList.splice(index,1);
}, },
//图片加标签
// addTag(index){
// this.showaddTag=true;
// this.tagName=""
// this.tagIndex=index
// console.log(index)
// },
//保存标签
// saveTag(){
// this.DiningImageArray[this.tagIndex].tagName=this.tagName
// this.showaddTag=false;
// console.log(this.DiningImageArray)
// }
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -2193,12 +2186,19 @@ export default { ...@@ -2193,12 +2186,19 @@ export default {
this.qMsg = this.$route.query.qMsg; this.qMsg = this.$route.query.qMsg;
this.ID = this.$route.query.id; this.ID = this.$route.query.id;
this.init(); //开放平台 this.init(); //开放平台
this.GetCounrty(); // this.GetCounrty();
if (typeof this.ID != "undefined") { if (typeof this.ID != "undefined") {
this.initHotelData(); this.initHotelData();
} }
this.getFoodTypeList(0); this.getFoodTypeList(0);
this.getweekenum(); this.getweekenum();
this.GetSubAreaList(2,1)
if(this.addMsg.Province>0){
this.GetSubAreaList(this.addMsg.Province, 2, 1);
}
if(this.addMsg.City>0){
this.GetSubAreaList(this.addMsg.City, 3, 1);
}
}, },
}; };
</script> </script>
src/components/Restaurant/demesticRestaurantPackage.vue
View file @ 97e29c86
<style> <style>
.restaurantInfo .resourceImgAdd {
width: 620px;
margin: auto;
}
.RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover { .RestaurantPackage .singeRowTable tr:nth-child(n + 2):hover {
background-color: white; background-color: white;
box-shadow: 0px 0px 14px 0px #adadad; box-shadow: 0px 0px 14px 0px #adadad;
...@@ -90,7 +94,152 @@ ...@@ -90,7 +94,152 @@
text-align: left; text-align: left;
padding-left: 20px; padding-left: 20px;
} }
.RestaurantPackage .resource-imglist img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.RestaurantPackage .add-img {
margin-top: 20px;
}
.RestaurantPackage .reimg-add {
width: 140px;
height: 93px;
background: rgba(236, 236, 236, 1);
border-radius: 10px;
position: relative;
cursor: pointer;
}
.RestaurantPackage .ad-one {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
height: 100%;
border-radius: 10px;
position: absolute;
top: 0;
z-index: 999;
}
.RestaurantPackage .bigAdd {
font-size: 50px;
color: #d1d1d1;
position: absolute;
left: 45px;
top: 50%;
transform: translateY(-50%);
}
.RestaurantPackage .imgzhe {
display: none;
background: rgba(0, 0, 0, 0.4);
width: 100%;
height: 100%;
text-align: center;
line-height: 93px;
border-radius: 10px;
position: absolute;
top: 0;
}
.RestaurantPackage .reimg-add:hover .ad-one {
display: block;
}
.RestaurantPackage .re-img:hover .imgzhe {
display: block;
}
.RestaurantPackage .ad-one div {
width: 32px;
height: 32px;
border-radius: 50%;
line-height: 32px;
text-align: center;
background: gray;
color: #fff;
}
.RestaurantPackage .ad-one div:hover {
background-color: #fff;
color: #e95252;
}
.RestaurantPackage .re-upload {
position: absolute;
top: 30px;
left: 30px;
}
.RestaurantPackage .re-find {
position: absolute;
top: 30px;
right: 30px;
}
.RestaurantPackage .search-imgicon {
padding-right: 20px;
margin-left: -40px;
}
.RestaurantPackage .resAddImg {
width: 520px;
padding-right: 45px;
}
.RestaurantPackage .addimgContent {
height: 290px;
overflow: auto;
margin: 30px 0 30px 25px;
width: 545px;
}
.RestaurantPackage .addimgDiv {
width: 160px;
height: 155px;
float: left;
margin: 0 20px 15px 0;
overflow: hidden;
}
.RestaurantPackage .re-img {
width: 140px;
height: 93px;
border-radius: 10px;
float: left;
/* margin: 0 30px 50px 0; */
position: relative;
}
/* .RestaurantPackage .re-img:first-child {
margin-left: 0;
} */
/* .RestaurantPackage .resource-imglist {
width: 100%;
height: auto;
margin-top: 20px;
} */
.RestaurantPackage .re-img img {
width: 100%;
height: 100%;
border-radius: 10px;
}
.RestaurantPackage .re-delte {
width: 32px;
height: 32px;
/* background: gray; */
/* border-radius: 50%; */
text-align: center;
/* line-height: 32px; */
display: inline-block;
color: #fff;
cursor: pointer;
}
</style> </style>
<template> <template>
<div class='flexOne RestaurantPackage'> <div class='flexOne RestaurantPackage'>
...@@ -115,7 +264,10 @@ ...@@ -115,7 +264,10 @@
<th width="200">{{$t('scen.sc_bjts')}}</th> <th width="200">{{$t('scen.sc_bjts')}}</th>
<th>{{$t('scen.sc_dj')}}</th> <th>{{$t('scen.sc_dj')}}</th>
<th>{{$t('scen.sc_gj')}}</th> <th>{{$t('scen.sc_gj')}}</th>
<th width="300">{{$t('hotel.hotel_remark')}}</th> <th>是否上架</th>
<th>是否节假日可用</th>
<th>提前预约天数</th>
<!-- <th width="300">{{$t('hotel.hotel_remark')}}</th> -->
<th>{{$t('hotel.table_operat')}}</th> <th>{{$t('hotel.table_operat')}}</th>
</tr> </tr>
<tr v-for="item in DataList" :key="item.subCode"> <tr v-for="item in DataList" :key="item.subCode">
...@@ -146,11 +298,23 @@ ...@@ -146,11 +298,23 @@
<p class="Ldata">{{item.HDate}}</p> <p class="Ldata">{{item.HDate}}</p>
</td> </td>
<td> <td>
<span v-if="item.IsShelves===0">上架</span>
<span v-if="item.IsShelves===1">下架</span>
</td>
<td>
<span v-if="item.IsHoliday===1">是</span>
<span v-if="item.IsHoliday===0">否</span>
</td>
<td>
<span v-if="item.MakeDay===0">可预约当天</span>
<span v-if="item.MakeDay!=0">{{item.MakeDay}}天</span>
</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.MealDesc" :content="item.MealDesc" placement="top-start"
popper-class="max-w250"> popper-class="max-w250">
<span class="descripTion">{{item.MealDesc}}</span> <span class="descripTion">{{item.MealDesc}}</span>
</el-tooltip> </el-tooltip>
</td> </td> -->
<td> <td>
<el-button-group> <el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
...@@ -187,16 +351,99 @@ ...@@ -187,16 +351,99 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc"> <el-form-item label="套餐内容" 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-item label="使用时间" prop="UsageTime">
<el-form-item label="使用说明" prop="MealDesc"> <el-select placeholder="请选择" class="w300" multiple v-model="UsageTimeListArr" @change="changearr">
<el-input class="w300" type="text" v-model="addMsg.MealDesc" maxlength="200"></el-input> <el-option v-for="item in weekEnumList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-form-item> </el-option>
</el-select>
</el-form-item>
<el-form-item label="套餐标签" prop="InstructionsList">
<div class="toolOne">
<!-- <span class="toolSpan">{{ $t("scen.sc_fdTag") }}</span> -->
<div class="footabs">
<el-tag
:key="tag"
v-for="tag in tipsList"
closable
:disable-transitions="false"
@close="handleClose(tag)"
>{{ tag }}
</el-tag>
<el-input
class="input-new-tag"
v-if="inputVisible"
v-model="inputValue"
ref="saveTagInput"
size="small"
@keyup.enter.native="handleInputConfirm"
@blur="handleInputConfirm"
>
</el-input>
<el-button
v-else
class="button-new-tag"
size="small"
@click="showInput"
>+ {{ $t("pub.addBtn") }}
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="是否上架" prop="IsShelves">
<el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
</el-form-item>
<el-form-item label="节假日可用" prop="IsHoliday">
<el-radio v-model="addMsg.IsHoliday" :label="1">是</el-radio>
<el-radio v-model="addMsg.IsHoliday" :label="0">否</el-radio>
</el-form-item>
<el-form-item label="提前预约天数" prop="MakeDay">
<el-input class="w300" type="number" v-model="addMsg.MakeDay" maxlength="200"></el-input>
</el-form-item>
<el-form-item label="购买须知" prop="OtherTag">
<!-- <el-input class="w300" type="text" v-model="addMsg.OtherTag" maxlength="200"></el-input> -->
<my-edit v-on:edit-value="addMsg.InstructionsList = arguments[0]" v-bind:editValue="addMsg.OtherTag"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</el-form-item>
<el-form-item label="套餐图片" prop="MealPic">
<div
class="re-img" v-if="showMealImg"
>
<!-- <img v-if="!addMsg.MealPic" src="../../assets/img/bg_c3@3x.png" /> -->
<img :src="addMsg.MealPic" :onerror="defaultImg" />
<div class="imgzhe">
<!-- <div class="re-delte">
<i
@click.stop="showImg(item.ShowPath)"
class="iconfont icon-img_cz"
></i>
</div> -->
<div class="re-delte" @click="delMealImg">
<i class="iconfont icon-xingzhuang"></i>
</div>
</div>
</div>
<div class="add-img" v-if="!showMealImg">
<div class="reimg-add">
<i class="iconfont icon-img_haha bigAdd"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload :http-request="UploadImage"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i>
</el-upload>
</div>
</div>
</div>
</div>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" <button class="hollowFixedBtn"
...@@ -209,10 +456,15 @@ ...@@ -209,10 +456,15 @@
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total"></el-pagination>
</div> </div>
</template> </template>
<script> <script>
import MyEdit from "@/components/EditTemplate.vue";
export default { export default {
components:{
MyEdit
},
data() { data() {
return { return {
msg: { msg: {
...@@ -229,8 +481,16 @@ ...@@ -229,8 +481,16 @@
MealName: "", MealName: "",
MealDesc: "", MealDesc: "",
DiningMealType: "", DiningMealType: "",
UsageTimeList:[] UsageTime:"",
IsShelves:0,
InstructionsList:"",
IsShelves:1,
IsHoliday:1,
MakeDay:0,
OtherTag:"",
MealPic:""
}, },
UsageTimeListArr:"",
loading: true, loading: true,
DiningMealTypeList: [], DiningMealTypeList: [],
outerVisible: false, outerVisible: false,
...@@ -241,18 +501,46 @@ ...@@ -241,18 +501,46 @@
resList: [], resList: [],
rules: { rules: {
//表单必填验证 //表单必填验证
MealName: [{
required: true,
message: "请填写套餐名称"
}],
DiningId: [{ DiningId: [{
required: true, required: true,
message: this.$t('ground.qingxuanzetczy') message: this.$t('ground.qingxuanzetczy')
}], }],
DiningMealType: [{ // DiningMealType: [{
required: true, // required: true,
message: this.$t('ground.qingxztc') // message: this.$t('ground.qingxztc')
}] // }]
} },
weekEnumList:[],
addimg:false,
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
showMealImg:false,
toolbar: {
clean: true,
font: false, //字体
narrative: false, //叙述,
image:false,
bold: true, //加粗
underline: true, //下划线
header1: true, //H1
header2: true, //H2
fontColor: false, //字体颜色
fontBackgroundColor: false, //背景颜色
},
DefaultList: [],
placeholder: "请输入",
tipsList: [],
inputVisible: false,
inputValue: "",
}; };
}, },
methods: { methods: {
changearr(){
console.log(this.UsageTimeListArr)
},
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -283,12 +571,10 @@ ...@@ -283,12 +571,10 @@
}, err => {}) }, err => {})
}, },
saveResource() { saveResource() {
this.DiningMealTypeList.forEach(item => { if(Array.isArray(this.UsageTimeListArr)){
if (this.addMsg.DiningMealType == item.ID) { this.addMsg.UsageTime=this.UsageTimeListArr.toString()
// HK 2020-05-06注释 }
//this.addMsg.MealName = item.Name this.addMsg.InstructionsList=this.tipsList
}
})
this.apipost( this.apipost(
"appletsmeal_post_Set", "appletsmeal_post_Set",
this.addMsg, this.addMsg,
...@@ -313,11 +599,25 @@ ...@@ -313,11 +599,25 @@
"appletsmeal_post_Get", "appletsmeal_post_Get",
msg, msg,
res => { res => {
console.log(res.data)
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.addMsg = res.data.data; this.addMsg = res.data.data;
if(res.data.data.UsageTime){
this.UsageTimeListArr=res.data.data.UsageTime.split(",").map(item=>{
return parseInt(item)
});
}else{
this.UsageTimeListArr=""
}
this.addMsg.DiningId = parseInt(res.data.data.DiningId); this.addMsg.DiningId = parseInt(res.data.data.DiningId);
if(!res.data.data.MealPic){
this.showMealImg=false
}else{
this.showMealImg=true
}
this.tipsList=res.data.data.InstructionsList
} else { } else {
this.Error(res.data.message); this.Error(res.data.data.message);
} }
}, },
null null
...@@ -408,7 +708,60 @@ ...@@ -408,7 +708,60 @@
}, },
resetForm(formName) { resetForm(formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
},
//获取周长枚举
getweekenum() {
this.apipost(
"appletsdining_Post_GetBusinessWeekEnumType",
{},
(res) => {
if (res.data.resultCode == 1) {
this.weekEnumList = res.data.data;
}
},
(err) => {}
);
},
//上传套餐图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, (x) => {
//统一图片处理
var obj = this.$DMCUtils.DMCImageObj();
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
obj.Path = str;
obj.ShowPath = imgUrl;
obj.TagName="";
this.addMsg.MealPic=imgUrl
this.showMealImg=true
});
},
delMealImg(){
this.addMsg.MealPic=""
this.showMealImg=false
},
handleClose(tag) {
this.tipsList.splice(this.tipsList.indexOf(tag), 1);
},
showInput() {
this.inputVisible = true;
this.$nextTick((_) => {
this.$refs.saveTagInput.$refs.input.focus();
});
},
handleInputConfirm() {
let inputValue = this.inputValue;
if (inputValue) {
this.tipsList.push(inputValue);
} }
this.inputVisible = false;
this.inputValue = "";
},
}, },
mounted() { mounted() {
this.initResrestaurant(); this.initResrestaurant();
...@@ -416,6 +769,7 @@ ...@@ -416,6 +769,7 @@
this.msg.DiningId = this.$route.query.id; this.msg.DiningId = this.$route.query.id;
this.getList(); this.getList();
this.GetDiningMealTypeList(); this.GetDiningMealTypeList();
this.getweekenum();
} }
}; };
......
src/components/Restaurant/domesticRestaurantList.vue
View file @ 97e29c86
...@@ -224,7 +224,9 @@ ...@@ -224,7 +224,9 @@
.restaurantList .comCursorUrl { .restaurantList .comCursorUrl {
cursor: pointer; cursor: pointer;
} }
.restaurantList .el-button{
width: 29px;
}
/* 餐厅列表 */ /* 餐厅列表 */
</style> </style>
...@@ -242,10 +244,10 @@ ...@@ -242,10 +244,10 @@
<li> <li>
<span> <span>
<em>{{$t('system.quety_area')}}</em> <em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.QCountry" clearable class="w150" filterable <!-- <el-select v-model="msg.QCountry" clearable class="w150" filterable
@change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')"> @change="getProvinceList(msg.QCountry,1)" :placeholder="$t('hotel.hotel_country')">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select> -->
<el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)" <el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
:placeholder="$t('hotel.hotel_province')"> :placeholder="$t('hotel.hotel_province')">
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
...@@ -314,7 +316,7 @@ ...@@ -314,7 +316,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="hotelResource clearfix" v-loading="loading"> <!-- <div class="hotelResource clearfix" v-loading="loading">
<div class="resourceList" v-for="(item,index) in tableData" :key="index"> <div class="resourceList" v-for="(item,index) in tableData" :key="index">
<div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)"> <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
...@@ -366,7 +368,62 @@ ...@@ -366,7 +368,62 @@
class="hotelBtn">{{$t('restaurant.res_package')}}</button> class="hotelBtn">{{$t('restaurant.res_package')}}</button>
</div> </div>
</div> </div>
</div> </div> -->
<el-table :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" v-loading="loading">
<el-table-column prop="Name" label="餐厅名称">
<template slot-scope="scope">
<div style="display:flex;align-items:center;">
<div>
<img v-if="!scope.row.PicPath" src="../../assets/img/bg_c3@3x.png" style="width:60px;height:45px;">
<img v-else :src="scope.row.PicPath" style="width:60px;height:45px;" />
</div>
<div style="margin-left:5px;">{{scope.row.Name}}</div>
</div>
</template>
</el-table-column>
<el-table-column prop="OpenPlatformList" label="开放平台">
<template slot-scope="scope">
<el-tag v-for="(item,index) in scope.row.OpenPlatformList" v-if="item.Name" size="small" style="margin:0 5px 5px 0;" :key="index">{{item.Name}}</el-tag>
</template>
</el-table-column>
<el-table-column prop="OpenPlatformList" label="是否上架">
<template slot-scope="scope">
<div v-if="scope.row.IsShelves===0">上架</div>
<div v-if="scope.row.IsShelves===1">下架</div>
</template>
</el-table-column>
<el-table-column label="地址">
<template slot-scope="scope">
{{scope.row.ProvinceName}}
<template v-if="scope.row.CityName&&scope.row.CityName!=''">
-{{scope.row.CityName}}
</template>
<template v-if="scope.row.DistrictName&&scope.row.DistrictName!=''">
-{{scope.row.DistrictName}}
</template>
</template>
</el-table-column>
<el-table-column prop="UpdateName" label="修改人">
</el-table-column>
<el-table-column prop="UpdateTimeStr" label="修改时间">
</el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button @click="goSubInfo('demesticRestaurantInfoManage',scope.row.ID)" type="primary" icon="el-icon-edit" circle>
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="套餐" placement="top">
<el-button @click="goUrl('demesticRestaurantPackage',scope.row.ID)" type="success"
icon="iconfont icon-menpiao1" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="isdelete(scope.row.ID)" style="font-size:12px;" type="danger"
icon="iconfont icon-remove" circle></el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
:page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination> :page-size="msg.pageSize" layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div> </div>
...@@ -384,7 +441,7 @@ ...@@ -384,7 +441,7 @@
cityList: "", cityList: "",
district: "", district: "",
Ids: [], Ids: [],
tableData: "", tableData: [],
deleteID: "", deleteID: "",
EmployeeList: [], //员工列表 EmployeeList: [], //员工列表
DiningTypeList: [], DiningTypeList: [],
...@@ -461,7 +518,7 @@ ...@@ -461,7 +518,7 @@
} else if (type == 3) { } else if (type == 3) {
this.msg.QDistrict = ""; this.msg.QDistrict = "";
} }
if (this.msg.QCountry !== "") { // if (this.msg.QCountry !== "") {
this.apipost( this.apipost(
"dict_post_Destination_GetChildList", "dict_post_Destination_GetChildList",
msg, msg,
...@@ -476,18 +533,18 @@ ...@@ -476,18 +533,18 @@
}, },
err => {} err => {}
); );
} // }
}, },
//获取国家 //获取国家
getCountryList() { // getCountryList() {
this.apipost( // this.apipost(
"dict_post_Destination_GetCountry", {}, // "dict_post_Destination_GetCountry", {},
res => { // res => {
this.countryList = res.data.data; // this.countryList = res.data.data;
}, // },
err => {} // err => {}
); // );
}, // },
//获取国内餐厅列表 //获取国内餐厅列表
selectResource() { selectResource() {
this.loading = true; this.loading = true;
...@@ -631,7 +688,8 @@ ...@@ -631,7 +688,8 @@
mounted() { mounted() {
this.getEmployeeList(); this.getEmployeeList();
this.GetHotelPirceStockAuth(); this.GetHotelPirceStockAuth();
this.getCountryList(); // this.getCountryList();
this.getProvinceList(2,1);
this.selectResource(); this.selectResource();
this.GetDiningTypeList(); this.GetDiningTypeList();
this.GetDiningPriceTypeList(); this.GetDiningPriceTypeList();
......
src/components/scenicSpot/domesticTicketManagement.vue
View file @ 97e29c86
...@@ -310,8 +310,8 @@ ...@@ -310,8 +310,8 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否上架" prop="IsShelves"> <el-form-item label="是否上架" prop="IsShelves">
<el-radio v-model="addMsg.IsShelves" :label="1">是</el-radio> <el-radio v-model="addMsg.IsShelves" :label="1">下架</el-radio>
<el-radio v-model="addMsg.IsShelves" :label="0">否</el-radio> <el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
</el-form-item> </el-form-item>
<el-form-item label="是否闪入园" prop="IsSameDayBuy"> <el-form-item label="是否闪入园" prop="IsSameDayBuy">
<el-radio v-model="addMsg.IsSameDayBuy" :label="1">是</el-radio> <el-radio v-model="addMsg.IsSameDayBuy" :label="1">是</el-radio>
......
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