Skip to content

S
SuperMan
Commit 72ef2902 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents be775761 ef0763e8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3381 additions and 1444 deletions
src/components/Hotel/GnHotelInfo.vue
View file @ 72ef2902
This diff is collapsed.
src/components/Hotel/GnHotelManagement.vue
View file @ 72ef2902
...@@ -227,14 +227,15 @@ ...@@ -227,14 +227,15 @@
<span> <span>
<em>{{$t('system.quety_area')}}</em> <em>{{$t('system.quety_area')}}</em>
<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')" clearable>
<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>
</el-select> </el-select>
<el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)" <el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)"
:placeholder="$t('hotel.hotel_city')"> :placeholder="$t('hotel.hotel_city')" clearable>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')"> <el-select v-model="msg.QDistrict" class="w150" style="display:none;" filterable clearable
:placeholder="$t('hotel.hotel_area')">
<el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
...@@ -248,7 +249,7 @@ ...@@ -248,7 +249,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li style="display:none;">>
<span> <span>
<em>{{$t('ground.jiudianleixing')}}</em> <em>{{$t('ground.jiudianleixing')}}</em>
<el-select v-model="msg.HotelType" class="w210" :placeholder="$t('pub.unlimitedSel')"> <el-select v-model="msg.HotelType" class="w210" :placeholder="$t('pub.unlimitedSel')">
...@@ -257,7 +258,7 @@ ...@@ -257,7 +258,7 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li style="display:none;">
<span> <span>
<em>{{$t('Operation.Op_price')}}</em> <em>{{$t('Operation.Op_price')}}</em>
<el-select v-model="msg.HotelPirceType" class="w210" :placeholder="$t('pub.unlimitedSel')"> <el-select v-model="msg.HotelPirceType" class="w210" :placeholder="$t('pub.unlimitedSel')">
...@@ -269,7 +270,7 @@ ...@@ -269,7 +270,7 @@
</li> </li>
<li> <li>
<span><em>{{$t('visa.v_czuser')}}</em></span> <span><em>{{$t('visa.v_czuser')}}</em></span>
<el-select class="w150" v-model="msg.UpdateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"> <el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option> </el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId" <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
...@@ -286,13 +287,13 @@ ...@@ -286,13 +287,13 @@
</ul> </ul>
</div> </div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;" <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%;min-height:450px;"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange" v-loading="loading">
<el-table-column type="selection" width="50px"> <el-table-column type="selection" width="50px">
</el-table-column> </el-table-column>
<el-table-column prop="Name" label="酒店名称"> <el-table-column prop="Name" label="酒店名称">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display:flex;align-items:center;"> <div style="display:flex;align-items:center;">
<div><img :src="scope.row.PicPath" style="width:50px;" /></div> <div><img :src="scope.row.PicPath" style="width:60px;height:45px;" /></div>
<div style="margin-left:5px;">{{scope.row.Name}}</div> <div style="margin-left:5px;">{{scope.row.Name}}</div>
</div> </div>
</template> </template>
...@@ -306,36 +307,48 @@ ...@@ -306,36 +307,48 @@
</el-table-column> --> </el-table-column> -->
<el-table-column prop="TagList" label="标签"> <el-table-column prop="TagList" label="标签">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-for="(item,index) in scope.row.TagList" size="small" style="margin-right:5px;" :key="index">{{item}}</el-tag> <el-tag v-for="(item,index) in scope.row.TagList" size="small" style="margin-right:5px;" :key="index">{{item}}
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="Tel" label="电话">
<el-table-column prop="UpdateName" label="修改人"> </el-table-column> -->
</el-table-column>
<el-table-column prop="UpdateTimeStr" label="修改时间">
</el-table-column>
<el-table-column prop="Address" label="地址"> <el-table-column prop="Address" label="地址">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.ProvinceName}}-{{scope.row.CityName}} {{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> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Tel" label="电话">
</el-table-column>
<el-table-column prop="HotelStatus" label="状态"> <el-table-column prop="HotelStatus" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.HotelStatus==1" style="color:green;">上架</span> <span v-if="scope.row.HotelStatus==1" style="color:green;">上架</span>
<span v-if="scope.row.HotelStatus==2" style="color:red;">下架</span> <span v-if="scope.row.HotelStatus==2" style="color:red;">下架</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="100"> <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"> <template slot-scope="scope">
<!-- <button @click="goSubInfo('GnHotelInfo',scope.row.ID)" class="hotelBtnMan">修改</button> --> <!-- <button @click="goSubInfo('GnHotelInfo',scope.row.ID)" class="hotelBtnMan">修改</button> -->
<!-- <button @click="goUrl('HotelProductManage',item)" class="hotelBtnMan">报价与库存</button> --> <!-- <button @click="goUrl('HotelProductManage',item)" class="hotelBtnMan">报价与库存</button> -->
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button @click="goSubInfo('GnHotelInfo',scope.row.ID)" type="primary" icon="el-icon-edit" circle></el-button> <el-button @click="goSubInfo('GnHotelInfo',scope.row.ID)" type="primary" icon="el-icon-edit" circle>
</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="房型" placement="top"> <el-tooltip class="item" effect="dark" content="房型" placement="top">
<el-button @click="goUrl('HotelProductManage',scope.row)" style="font-size:12px;" type="primary" icon="iconfont icon-shouye1-copy" circle></el-button> <el-button @click="goUrl('HotelProductManage',scope.row)" style="font-size:12px;" type="primary"
icon="iconfont icon-shouye1-copy" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="delHotelInfo(scope.row.ID)" style="font-size:12px;" type="danger"
icon="iconfont icon-remove" circle></el-button>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
...@@ -386,29 +399,49 @@ ...@@ -386,29 +399,49 @@
total: 0, total: 0,
currentPage: 1, currentPage: 1,
ID: 0, ID: 0,
UpdateBy: 0, //操作人 CreateBy: 0, //操作人
ProductType: 2, ProductType: 2,
}, },
multipleSelection: [], multipleSelection: [],
shelveMsg:{ shelveMsg: {
HotelStatus:1, //1上架 2下架 HotelStatus: 1, //1上架 2下架
HotelIds:'' HotelIds: ''
} }
}; };
}, },
methods: { methods: {
//删除酒店
delHotelInfo(ID) {
var that = this;
that.Confirm(this.$t("tips.shifoushanchu"), function () {
var msg = {
hotelID: ID
};
that.apipost(
"hotel_post_Remove",
msg,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.selectResource();
}
},
null
);
});
},
//批量上下架 //批量上下架
goShelves(type){ goShelves(type) {
if(this.multipleSelection.length==0){ if (this.multipleSelection.length == 0) {
this.Error('请选择酒店'); this.Error('请选择酒店');
return return
} }
this.shelveMsg.HotelStatus=type; this.shelveMsg.HotelStatus = type;
let Ids = []; let Ids = [];
this.multipleSelection.forEach(x=>{ this.multipleSelection.forEach(x => {
Ids.push(x.ID); Ids.push(x.ID);
}) })
this.shelveMsg.HotelIds=Ids.toString(); this.shelveMsg.HotelIds = Ids.toString();
this.apipost("hotel_post_SetHotelStatus", this.apipost("hotel_post_SetHotelStatus",
this.shelveMsg, this.shelveMsg,
res => { res => {
...@@ -419,7 +452,7 @@ ...@@ -419,7 +452,7 @@
null null
); );
}, },
handleSelectionChange(val){ handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -509,26 +542,12 @@ ...@@ -509,26 +542,12 @@
path: path, path: path,
query: { query: {
id: item.ID, id: item.ID,
Country: item.Country,
IsSelfBook: item.IsSelfBook,
blank: 'y',
tab: '报价详情'
}
});
},
//调整到房型列表
goproduct(path, item) {
this.$router.push({
path: path,
query: {
id: item.ID,
Country: item.Country,
IsSelfBook: item.IsSelfBook,
blank: 'y', blank: 'y',
tab: '房型列表' tab: '房型列表'
} }
}); });
}, },
goSubInfo(path, id) { goSubInfo(path, id) {
this.$store.commit("pageConditionUpdate", this.msg); this.$store.commit("pageConditionUpdate", this.msg);
this.$router.push({ this.$router.push({
......
src/components/Hotel/HotelPrice.vue
View file @ 72ef2902
This diff is collapsed.
src/components/Hotel/HotelProductManage.vue
View file @ 72ef2902
This diff is collapsed.
src/components/Restaurant/demesticRestaurantInfoManage.vue
View file @ 72ef2902
...@@ -1059,7 +1059,7 @@ ...@@ -1059,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')"
...@@ -1073,8 +1073,8 @@ ...@@ -1073,8 +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-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
...@@ -1326,7 +1326,7 @@ ...@@ -1326,7 +1326,7 @@
<div class="imgtag resTypeList"> <div class="imgtag resTypeList">
<el-input v-model="item.TagName" <el-input v-model="item.TagName"
><div slot="prepend">标签</div></el-input> ><div slot="prepend">标签</div></el-input>
</div> </div>
<div class="imgzhe"> <div class="imgzhe">
......
src/components/commonPage/comImgList.vue
View file @ 72ef2902
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<div class="el-scrollbar" style="height: 450px; width: 100%;overflow-y:auto;"> <div class="el-scrollbar" style="height: 450px; width: 100%;overflow-y:auto;">
<div style="margin-bottom: -8px; margin-right: -8px;"> <div style="margin-bottom: -8px; margin-right: -8px;">
<div class="el-scrollbar__view"> <div class="el-scrollbar__view">
<li class="el-menu-item" :class="commonIndex==-1?'selectActive' : ''" <li class="el-menu-item" :class="commonIndex==-1?'selectActive' : ''" @click="getImgList(-1)"
@click="getImgList(-1,saveObj)" style="padding-left: 10px;padding-right: 10px;"> style="padding-left: 10px;padding-right: 10px;">
<div flex="dir:left box:last"> <div flex="dir:left box:last">
<el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;"> <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
<i class="el-icon-tickets"></i> <i class="el-icon-tickets"></i>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
</li> </li>
<li class="el-menu-item" v-for="(item,index) in saveObj" :class="commonIndex==index?'selectActive' : ''" <li class="el-menu-item" v-for="(item,index) in saveObj" :class="commonIndex==index?'selectActive' : ''"
@click="getImgList(index,saveObj)" :key="index" style="padding-left: 10px;padding-right: 10px;"> @click="getImgList(index)" :key="index" style="padding-left: 10px;padding-right: 10px;">
<div flex="dir:left box:last"> <div flex="dir:left box:last">
<el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;"> <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
<i class="el-icon-tickets"></i> <i class="el-icon-tickets"></i>
...@@ -46,9 +46,8 @@ ...@@ -46,9 +46,8 @@
</div> </div>
<div style="display:inline-block;margin-left:9px;position:relative" v-for="(item,index) in comImgArr" <div style="display:inline-block;margin-left:9px;position:relative" v-for="(item,index) in comImgArr"
:key="index"> :key="index">
<!-- {{item}} --> <img :src="getIconLink(item.Path)" class="app-attachment-img"
<img :src="item.AllPath" class="app-attachment-img" style="width: 100px; height: 100px;"> style="width: 100px; height: 100px;">
<!-- <img :src="item.Path" class="app-attachment-img" style="width: 100px; height: 100px;"> -->
<i class="iconfont icon-bumenguanli-shanchu hotel_DelIcon" @click="delHotelImg(item,index)"></i> <i class="iconfont icon-bumenguanli-shanchu hotel_DelIcon" @click="delHotelImg(item,index)"></i>
</div> </div>
</div> </div>
...@@ -172,7 +171,7 @@ ...@@ -172,7 +171,7 @@
}); });
}, },
//点击获取图片arr //点击获取图片arr
getImgList(index, obj) { getImgList(index) {
this.commonIndex = index; this.commonIndex = index;
if (index == -1) { if (index == -1) {
this.comImgArr = []; this.comImgArr = [];
...@@ -195,14 +194,18 @@ ...@@ -195,14 +194,18 @@
var path = "/Upload/DMC/"; var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath; var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
var obj = { var obj = {
MappingId: 0, MappingId: 0,
PicId: 0, PicId: 0,
AllPath: imgUrl,
Path: x.data.FilePath Path: x.data.FilePath
} }
this.saveObj[this.commonIndex].ImgList.push(obj); if (this.commonIndex == -1) {
this.saveObj[0].ImgList.push(obj);
this.getImgList(-1)
} else {
this.saveObj[this.commonIndex].ImgList.push(obj);
this.getImgList(this.commonIndex)
}
}); });
}, },
}, },
......
src/components/scenicSpot/TicketClassification.vue 0 → 100644
View file @ 72ef2902
<style>
.foodClassification .query_box {
font-size: 12px;
padding: 29px 0;
padding-right: 30px;
display: flex;
justify-content: space-between;
}
.foodClassification .query_box label {
display: inline-block;
margin-right: 25px;
width: 80px;
text-align: right;
}
.foodClassification .addCompany {
width: 440px;
max-height: 600px;
}
.foodClassification .addCompany .el-dialog__body {
padding-bottom: 0;
}
.foodClassification .el-switch.is-checked .el-switch__core {
border-color: #4bca81;
background-color: #4bca81;
}
.noData {
text-align: center;
padding: 20px;
}
.foodClassification .city_box {
width: 100%;
display: flex;
justify-content: center;
}
.foodClassification .city_box .el-input {
width: 88%;
}
.foodClassification .city_box .el-input input {
width: 100%;
}
.foodClassification .query_box li label {
display: inline-block;
min-width: 80px;
text-align: right;
font-style: normal;
margin: 0 20px 0 0;
}
</style>
<template>
<div class="flexOne foodClassification">
<div class="query-box">
<ul>
<li>
<span>
<em>名称</em>
<el-input v-model="msg.Name" :placeholder="$t('system.ph_in')" @keyup.enter.native="getList" class="w210"></el-input>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="新增" @click="outerVisible = true,dialogTitle='新增'" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="">编号</th>
<th width="">名称</th>
<th>父级名称</th>
<th>排序</th>
<th>操作人</th>
<th width="200">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.ID}}</td>
<td>{{item.Name}}</td>
<td>{{item.ParentName?item.ParentName:'无'}}</td>
<td>{{item.Sort}}</td>
<td>{{item.UpdateName}}</td>
<td style="position: relative;">
<el-row>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="updateData(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" icon="el-icon-delete" circle @click="deleteFoodClass(item.ID)"></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px" >
<el-form-item label="分类名称" prop="Name">
<el-input type="text" v-model="addMsg.Name" placeholder="请填写分类名称" class="w210"></el-input>
</el-form-item>
<el-form-item label="父级" prop="ParentID">
<el-select v-model="addMsg.ParentID" filterable placeholder="请选择父级" class="w210">
<el-option label="不限" :value="0"></el-option>
<el-option v-for='item in ParentList'
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="排序" prop="Sort">
<el-input type="number" v-model.number="addMsg.Sort" class="w210" placeholder="请填写排序"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
ParentList: [],
msg: {
pageIndex: 1,
pageSize: 15,
Name: "",
Status: "0",
ClassType:1
},
addMsg: {
Name:"",
ParentID:0,
Sort:0,
ID:0,
ClassType:1
},
DataList: [],
loading: true,
total: 0,
currentPage: 1,
outerVisible: false,
noData: false,
dialogTitle: "",
rules: {
Name: [
{ required: true, message: "请填写分类名称", trigger: "change" }
],
ParentID: [
{ required: true, message: "请选择父级", trigger: "change" }
],
Sort: [
{ required: true, message: "请填写排序", trigger: "change" }
],
}
};
},
methods: {
getList() {
//获取数据分页
this.loading = true;
this.apipost(
"foodtype_post_GetList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.noData = !this.total > 0;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//获取父级下拉列表
getParentList() {
let msg = {
ParentID:this.addMsg.ParentID,
ClassType:1
};
this.apipost(
"foodtype_post_GetDropDownFoodType",
msg,
res => {
this.ParentList = res.data.data;
},
err => {}
);
},
updateData(row) {
if(row){
this.addMsg={
Name:row.Name,
ParentID:row.ParentID,
Sort:row.Sort,
ID:row.ID
}
}
this.outerVisible = true
this.dialogTitle='修改'
},
//新增/修改
saveSet(){
this.apipost(
"foodtype_post_Set",
this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.outerVisible = false;
this.getList();
this.Success(res.data.message);
}else{
this.Error(res.data.message)
}
},
err => {}
);
},
//删除
deleteFoodClass(ID) {
var that = this;
this.Confirm("是否删除?", function() {
var msg = {
ID: ID
};
that.apipost(
"foodtype_post_Remove",
msg,
res => {
if (res.data.resultCode == 1) {
that.Success("删除成功");
that.getList();
}else{
that.Error(res.data.message)
}
},
null
);
});
},
handleCurrentChange(val) {
//翻页功能按钮
this.msg.pageIndex = val;
this.getList();
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
that.$refs[addMsg].validate(valid => {
if (valid) {
that.saveSet();
} else {
return false;
}
});
},
initAddMsg() {
//初始化查询数据
let newMsg = {
Name:"",
ParentID:0,
Sort:0,
ID:0,
};
this.addMsg = newMsg;
},
resetPageIndex() {
//查询初始化页码
this.msg.pageIndex = 1;
this.currentPage = 1;
},
closeChangeMachie(done) {
done();
this.resetForm("addMsg");
this.getParentList();
},
resetForm(formName) {
this.initAddMsg();
this.$refs[formName].resetFields();
}
},
mounted() {
this.getList();
this.getParentList();
}
};
</script>
src/components/scenicSpot/domesticScenicSpotPackagePrice.vue 0 → 100644
View file @ 72ef2902
This diff is collapsed.
src/plug/index.js
View file @ 72ef2902
...@@ -118,6 +118,7 @@ export default { ...@@ -118,6 +118,7 @@ export default {
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://127.0.0.1"; // domainUrl = "http://127.0.0.1";
domainUrl="http://192.168.20.17:8015"; domainUrl="http://192.168.20.17:8015";
// domainUrl = "http://192.168.20.24";
let javaUrldo = ""; let javaUrldo = "";
javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000"; javaUrldo = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
//商城API //商城API
...@@ -847,6 +848,18 @@ export default { ...@@ -847,6 +848,18 @@ export default {
}); });
} }
}, },
//公用判断图片地址 判断是否包含http
Vue.prototype.getIconLink = function (url) {
let str = ''
if (url && url != '') {
if (url.indexOf('http') != -1) {
str = url
} else {
str = this.domainManager().ViittoFileUrl + url;
}
return str;
}
},
//上传文件到本地服务器 //上传文件到本地服务器
Vue.prototype.UploadSelfFileT = function (path, files, successCall, ocr) { Vue.prototype.UploadSelfFileT = function (path, files, successCall, ocr) {
if (files && files.length > 0) { if (files && files.length > 0) {
......
src/router/config.js
View file @ 72ef2902
...@@ -1584,14 +1584,6 @@ export default { ...@@ -1584,14 +1584,6 @@ export default {
title: '国内景区列表' title: '国内景区列表'
}, },
}, },
{
path: '/domesticScenicSpotList', //国内景区列表
name: 'domesticScenicSpotList',
component: resolve => require(['@/components/scenicSpot/domesticScenicSpotList'], resolve),
meta: {
title: '国内景区列表'
},
},
{ {
path: '/domesticScenicSpotInfoManage', //新增修改国内景区 path: '/domesticScenicSpotInfoManage', //新增修改国内景区
name: 'domesticScenicSpotInfoManage', name: 'domesticScenicSpotInfoManage',
...@@ -1600,6 +1592,22 @@ export default { ...@@ -1600,6 +1592,22 @@ export default {
title: '新增修改国内景区' title: '新增修改国内景区'
}, },
}, },
{
path: '/domesticScenicSpotPackagePrice', //国内景区报价管理
name: 'domesticScenicSpotPackagePrice',
component: resolve => require(['@/components/scenicSpot/domesticScenicSpotPackagePrice'], resolve),
meta: {
title: '国内景区报价管理'
},
},
{
path: '/TicketClassification', //门票分类
name: 'TicketClassification',
component: resolve => require(['@/components/scenicSpot/TicketClassification'], resolve),
meta: {
title: '国内景区报价管理'
},
},
{ {
path: '/TicketManager', //机票列表 path: '/TicketManager', //机票列表
name: 'TicketManager', name: 'TicketManager',
......
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