Skip to content

S
SuperMan
Commit 63da3d1b authored by 罗超's avatar 罗超
Browse files
Options

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

parents 69568692 34cd5887
Show whitespace changes
Inline Side-by-side
Showing with 1214 additions and 35 deletions
src/components/Hotel/GnHotelInfo.vue
View file @ 63da3d1b
...@@ -9,30 +9,37 @@ ...@@ -9,30 +9,37 @@
.changInfo .el-textarea__inner { .changInfo .el-textarea__inner {
height: auto; height: auto;
} }
.delTrafic{
.delTrafic {
position: absolute; position: absolute;
right:165px; right: 165px;
top:-11px; top: -11px;
} }
.Ghotel_baseinfo{
.Ghotel_baseinfo {
height: auto; height: auto;
width: 100%; width: 100%;
} }
.Gnhotel_Right{
.Gnhotel_Right {
float: left; float: left;
} }
.InnerHotelDiv{
.InnerHotelDiv {
display: flex; display: flex;
} }
.InnerHoImgDiv{
width:100px; .InnerHoImgDiv {
height:100px; width: 100px;
margin-right:5px; height: 100px;
margin-right: 5px;
} }
.InnerHoImgDiv img{
width:100%; .InnerHoImgDiv img {
height:100%; width: 100%;
height: 100%;
} }
</style> </style>
<template> <template>
<div class="flexOne changInfo"> <div class="flexOne changInfo">
...@@ -62,7 +69,8 @@ ...@@ -62,7 +69,8 @@
<el-form-item :label="$t('hotel.hotel_starlevel')"> <el-form-item :label="$t('hotel.hotel_starlevel')">
<el-select class="w300" :placeholder="$t('pub.unlimitedSel')" v-model="addMsg.Star"> <el-select class="w300" :placeholder="$t('pub.unlimitedSel')" v-model="addMsg.Star">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in dropdownObj.starslevel" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in dropdownObj.starslevel" :key="item.ID" :label="item.Name"
:value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -120,7 +128,7 @@ ...@@ -120,7 +128,7 @@
<div class="Gnhotel_Right"> <div class="Gnhotel_Right">
<span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span> <span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
<div class="resource-list"> <div class="resource-list">
<div class="resource-imglist clearfix"> <!-- <div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode"> <div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" /> <img :src="item.ShowPath" />
<div class="imgzhe"> <div class="imgzhe">
...@@ -136,17 +144,18 @@ ...@@ -136,17 +144,18 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
<div class="add-img"> <div class="add-img">
<el-button type="primary" @click="isShowHotelImg=true" icon="el-icon-plus" circle></el-button> <el-button type="primary" @click="isShowHotelImg=true" icon="el-icon-plus" circle></el-button>
</div> </div>
</div> </div>
<div> <div>
<el-tabs> <el-tabs>
<el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex" :label="subItem.Label==''?'默认':subItem.Label"> <el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex"
:label="subItem.Label==''?'默认':subItem.Label">
<div class="InnerHotelDiv"> <div class="InnerHotelDiv">
<div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex"> <div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex">
<img :src="sItem.Path" /> <img :src="sItem.AllPath" @click="showImg(sItem.AllPath)" />
</div> </div>
</div> </div>
</el-tab-pane> </el-tab-pane>
...@@ -213,13 +222,17 @@ ...@@ -213,13 +222,17 @@
</template> </template>
<template v-if="activeName==4"> <template v-if="activeName==4">
<div style="width:600px;"> <div style="width:600px;">
<el-button type="primary" @click="addTraffic()" style="float:right;margin:-53px 165px 50px 0" icon="el-icon-plus" circle></el-button> <el-button type="primary" @click="addTraffic()" style="float:right;margin:-53px 165px 50px 0"
icon="el-icon-plus" circle></el-button>
<div style="margin-top:60px;"> <div style="margin-top:60px;">
<div v-for="(item,index) in addMsg.TrafficInfo" :key="index" style="position:relative;margin-bottom:20px;"> <div v-for="(item,index) in addMsg.TrafficInfo" :key="index"
<el-input type="text" v-model="item.TTitle" class="w400" style="margin-bottom:10px;" placeholder="地点名称"> style="position:relative;margin-bottom:20px;">
<el-input type="text" v-model="item.TTitle" class="w400" style="margin-bottom:10px;"
placeholder="地点名称">
</el-input> </el-input>
<el-input type="text" v-model="item.TSubTitle" class="w400" placeholder="地点介绍"></el-input> <el-input type="text" v-model="item.TSubTitle" class="w400" placeholder="地点介绍"></el-input>
<el-button type="danger" class="delTrafic" @click="delTraffic(index)" icon="el-icon-delete" circle></el-button> <el-button type="danger" class="delTrafic" @click="delTraffic(index)" icon="el-icon-delete" circle>
</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -359,7 +372,7 @@ ...@@ -359,7 +372,7 @@
DecorationTime: "", //装修时间 DecorationTime: "", //装修时间
Into: "", //酒店介绍 Into: "", //酒店介绍
}, },
AddressDes:'' //地址说明 AddressDes: '' //地址说明
}, },
//酒店图片 //酒店图片
HotelImgArr: [], HotelImgArr: [],
...@@ -394,7 +407,7 @@ ...@@ -394,7 +407,7 @@
serviceCked: [], serviceCked: [],
isShowHotelImg: false, isShowHotelImg: false,
checkedRoom: [], checkedRoom: [],
HotelActive:1, // HotelActive: 1, //
}; };
}, },
components: { components: {
...@@ -404,9 +417,9 @@ ...@@ -404,9 +417,9 @@
}, },
methods: { methods: {
//获取子组件新增分类和图片 //获取子组件新增分类和图片
getHotelImg(data){ getHotelImg(data) {
this.addMsg.InnerHotelImaList = data; this.addMsg.InnerHotelImaList = data;
this.isShowHotelImg=false; this.isShowHotelImg = false;
}, },
changeBooking(val) { changeBooking(val) {
this.chooseObj.Bookings = []; this.chooseObj.Bookings = [];
...@@ -427,8 +440,8 @@ ...@@ -427,8 +440,8 @@
this.addMsg.TrafficInfo.push(obj); this.addMsg.TrafficInfo.push(obj);
}, },
//删除交通 //删除交通
delTraffic(index){ delTraffic(index) {
this.addMsg.TrafficInfo.splice(index,1); this.addMsg.TrafficInfo.splice(index, 1);
}, },
showInput() { showInput() {
this.inputVisible = true; this.inputVisible = true;
...@@ -577,13 +590,13 @@ ...@@ -577,13 +590,13 @@
if (tempMsg.OpenPlatformList && tempMsg.OpenPlatformList.length > 0) { if (tempMsg.OpenPlatformList && tempMsg.OpenPlatformList.length > 0) {
this.chooseObj.openplatString = tempMsg.OpenPlatformList; this.chooseObj.openplatString = tempMsg.OpenPlatformList;
} }
if(tempMsg.BookingList && tempMsg.BookingList.length>0){ if (tempMsg.BookingList && tempMsg.BookingList.length > 0) {
this.checkedRoom = tempMsg.BookingList; this.checkedRoom = tempMsg.BookingList;
} }
if(tempMsg.BookList && tempMsg.BookList.length>0){ if (tempMsg.BookList && tempMsg.BookList.length > 0) {
this.chooseObj.Bookings = tempMsg.BookList; this.chooseObj.Bookings = tempMsg.BookList;
} }
if(tempMsg.InnerHotelImaList && tempMsg.InnerHotelImaList.length>0){ if (tempMsg.InnerHotelImaList && tempMsg.InnerHotelImaList.length > 0) {
this.HotelImgArr = tempMsg.InnerHotelImaList; this.HotelImgArr = tempMsg.InnerHotelImaList;
this.addMsg.InnerHotelImaList = tempMsg.InnerHotelImaList; this.addMsg.InnerHotelImaList = tempMsg.InnerHotelImaList;
} }
......
src/components/TravelManager/customizedcar/carmanageList.vue 0 → 100644
View file @ 63da3d1b
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li><span><em>车辆类型</em><el-select filterable v-model='msg.CarType' >
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in companyList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span></li>
<li><span><em>车辆名称</em><el-input v-model='msg.CarName' class="permiss-input"></el-input></span></li>
<li><span><em>车辆品牌</em><el-input v-model='msg.BrandName' class="permiss-input"></el-input></span></li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="新增" @click="CommonJump('dzaddcar')" />
</li>
</ul>
</div>
<el-table :data="dataList" stripe style="width: 100%" max-height="700" v-loading='loading'>
<el-table-column fixed prop="Id" label="Id" width="80"> </el-table-column>
<el-table-column prop="CarName" label="名称">
<template slot-scope="scope">
<div style="display: flex;align-items: center;">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.CarLogo + ')',backgroundSize:'cover'}"></div>
<div flex="dir:left cross:center">
{{scope.row.CarName}}
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="CarTypeName" label="类型"> </el-table-column>
<el-table-column prop="CarModel" label="型号"> </el-table-column>
<el-table-column prop="CarColor" label="颜色"> </el-table-column>
<el-table-column prop="BrandName" label="品牌"> </el-table-column>
<el-table-column prop="CarNo" label="车牌号"> </el-table-column>
<el-table-column prop="GuestNum" label="荷载人数"> </el-table-column>
<el-table-column prop="ImageList" label="图片列表">
<template slot-scope="scope">
<div style="display: flex;align-items: center;">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.ImageList[0] + ')',backgroundSize:'cover'}"></div>
<div v-if='scope.row.ImageList.length>2' @click='lookgd(scope.row)' style="cursor:pointer;color:#409EFF">查看更多</div>
</div>
</template>
</el-table-column>
<el-table-column prop="UpdateByName" label="创建人">
<template slot-scope="scope">
<div flex="dir:left cross:center">
{{scope.row.UpdateByName}}
</div>
<div flex="dir:left cross:center">
{{scope.row.UpdateDate}}
</div>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120" >
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top" >
<img src="../../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
<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 title="图片列表" :visible.sync="changeState" width="1240px">
<div style="display: flex;flex-direction: row;flex-wrap: wrap;">
<img v-for="(x, index) in CarPic" :key="index" style="width:200px;height:200px;margin: 10px" :src="x" alt="">
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
loading:true,
//分页
total: 0,
pageSize: '',
currentPage: 1,
changeState:false,
//请求数据
msg: {
pageIndex: 1,
pageSize: 15,
CarType: '0',
CarName: '',
BrandName: '',
},
//返回数据
dataList: [],
companyList: [],
CarPic:[]
}
},
methods: {
getCompany() {
this.apipost('car_get_GetCarCustomTypeEnumList', {}, res => {
if(res.data.resultCode == 1) {
this.companyList = res.data.data;
}
}, err => {})
},
lookgd(row){
this.changeState = true;
this.CarPic = row.ImageList
},
getList() {
this.loading=true
this.apipost('car_get_GetCarInfoPageList', this.msg, res => {
if(res.data.resultCode == 1) {
this.loading=false
this.$nextTick(() => {
this.dataList = res.data.data.pageData;
});
this.total = res.data.data.count;
}
}, err => {})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1
},
Edit(row){
console.log(row)
this.$router.push("/dzaddcar?obj="+encodeURIComponent(JSON.stringify(row)))
},
delete_b(row){
let that=this;
that.Confirm("是否删除", function () {
that.apipost('car_post_DelCarInfo', {CarId:row.Id}, res => {
if(res.data.resultCode == 1) {
that.$message.success(res.data.message)
that.getList()
} else {
that.$message.error(res.data.message)
}
}, err => {})
});
},
},
mounted() {
this.getList()
this.getCompany()
}
}
</script>
<style>
.el-table .el-table__row {
font-size: 12px!important;
}
.el-table__row td {
padding: 5px 0;
}
.has-gutter tr th,.el-table th.is-leaf{background:#EAEAEA!important;}
.app-image{
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
float: left;
margin-right: 8px;
}
</style>
\ No newline at end of file
src/components/TravelManager/customizedcar/dzaddcar.vue 0 → 100644
View file @ 63da3d1b
<template>
<div v-loading="loading" class="addGuide">
<div class="head-title">
<span @click="CommonJump('carmanageList')" class="blue point">车辆管理</span> / 编辑车辆管理
</div>
<div class="content">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width:50%">
<el-form-item label="车辆名称" prop="CarName" class="is-required">
<el-input v-model="addMsg.CarName" size="small" placeholder="请输入站点名称" />
</el-form-item>
<el-form-item label="车辆类型" prop="CarType" class="is-required">
<el-select class="w120" v-model="addMsg.CarType" size="small"
placeholder="请选择">
<el-option v-for="item in companyList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="logo" size="small" >
<el-upload class="avatar-uploader" action="" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" :http-request="UploadImage">
<el-tooltip class="item" effect="dark" content="建议尺寸100*100" placement="top">
<el-button >选择文件</el-button>
</el-tooltip>
</el-upload>
<div class="app-gallery-item" style="position: relative;width: 100px;margin-top: 10px;">
<img v-if="!addMsg.CarLogo || addMsg.CarLogo==''"
src="../../../assets/img/default.png" style="width:80px;height:80px" alt="">
<img v-else style="width:80px;height:80px" :src="addMsg.CarLogo"
alt="">
</div>
</el-form-item>
<el-form-item label="车辆型号" prop="CarModel" class="is-required" size="small">
<el-input v-model="addMsg.CarModel" placeholder="请输入车辆型号">
</el-input>
</el-form-item>
<el-form-item label="车辆颜色" prop="CarColor" class="is-required" size="small">
<el-input v-model="addMsg.CarColor" placeholder="请输入车辆颜色" t/>
</el-form-item>
<el-form-item label="车辆品牌" prop="BrandName" class="is-required" size="small">
<el-input v-model="addMsg.BrandName" placeholder="请输入车辆品牌" />
</el-form-item>
<el-form-item label="车牌号" size="small">
<el-input v-model="addMsg.CarNo" placeholder="请输入车牌号" />
</el-form-item>
<el-form-item label="荷载人数" prop="GuestNum" class="is-required" size="small">
<el-input v-model="addMsg.GuestNum" placeholder="请输入荷载人数" type='Number'>
<template slot="append">人</template>
</el-input>
</el-form-item>
<el-form-item label="图片列表" size="small">
<div class="nav_Main">
<div class="nav_IconContent">
<draggable v-model="addMsg.ImageList">
<div v-for="(item, index) in addMsg.ImageList" :key="index+'2'"
style="margin-right: 20px; position: relative; ">
<div class="colapp-image" :style="{
backgroundImage: 'url(' + item + ')'
}"></div>
<el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close"
circle></el-button>
</div>
</draggable>
</div>
<el-upload class="avatar-uploader" action="" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" :http-request="openChangeDig1" multiple>
<div
class="add-image-btn 2222">
+ 添加图片
</div>
</el-upload>
</div>
</el-form-item>
</el-form>
</div>
<div style="margin-top:20px">
<el-button size="small" type="primary" @click="Save('addMsg')">保存</el-button>
</div>
<!-- 选择文件 -->
<el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
<ChooseImg @SelectId="SelectId"></ChooseImg>
</el-dialog>
</div>
</template>
<script>
// import ChooseImg from "@/components/global/ChooseImg.vue";
// import UE from "@/components/global/UE.vue";
import draggable from "vuedraggable";
export default {
components: {
// ChooseImg,
// UE,
draggable
},
data() {
return {
addMsg: {
Id: 0,
CarName:'',
CarType:'',
CarLogo:'',
CarModel:'',
CarColor:'',
BrandName:'',
CarNo:'',
GuestNum:'',
ImageList:[],
},
rules: {
CarName: [{
required: true,
message: '请输入车辆名称',
trigger: 'blur'
}],
CarType: [{
required: true,
message: '请选择车辆类型',
trigger: 'blur'
}],
CarModel: [{
required: true,
message: '请输入车辆型号',
trigger: 'blur'
}],
CarColor: [{
required: true,
message: '请输入车辆颜色',
trigger: 'blur'
}],
BrandName: [{
required: true,
message: '请输入车辆品牌',
trigger: 'blur'
}],
GuestNum: [{
required: true,
message: '请输入荷载人数',
trigger: 'blur'
}],
},
loading: false,
CarSiteList:[],
changeState:false,
imgType:0,
companyList:[],
};
},
created() {
this.getCompany()
if(this.$route.query.obj){
var list = decodeURIComponent(this.$route.query.obj);
let data = JSON.parse(list)
console.log(data)
this.addMsg.Id = data.Id;
this.addMsg.CarName = data.CarName;
this.addMsg.CarType = data.CarType;
this.addMsg.CarLogo = data.CarLogo;
this.addMsg.CarModel = data.CarModel;
this.addMsg.CarColor = data.CarColor;
this.addMsg.BrandName = data.BrandName;
this.addMsg.CarNo = data.CarNo;
this.addMsg.GuestNum = data.GuestNum;
this.addMsg.ImageList = data.ImageList;
// this.getData(this.$route.query.ID)
}
},
methods: {
getCompany() {
this.apipost('car_get_GetCarCustomTypeEnumList', {}, res => {
if(res.data.resultCode == 1) {
this.companyList = res.data.data;
}
}, err => {})
},
SelectId(msg){
if(this.imgType==1){
let url = this.getIconLink(msg.url)
this.addMsg.CarLogo = url
}
},
openChangeDig1(file){
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.ImageList.push(imgUrl)
});
},
ClearCarouse(index) {
this.addMsg.ImageList.splice(index, 1);
},
openChangeDig(num) {
this.changeState = true;
this.imgType=num;
},
Save(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('car_post_SetCarInfo', this.addMsg, res => {
if(res.data.resultCode == 1) {
this.CommonJump('carmanageList');
this.Success(res.data.message);
}
}, err => {})
} else {
return false;
}
});
},
getData(ID) {
this.loading = true;
this.lxymallapipost("/api/GuideCar/GetGuideCarGuideModel", {
ID: ID
}, res => {
this.loading = false;
this.addMsg = res.data.data;
// if (this.addMsg.Introduction && this.addMsg.Introduction != "") {
// this.defaultMsg = this.addMsg.Introduction;
// }
})
},
//图片上传
UploadImage(file) {
console.log(file)
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.CarLogo = imgUrl
});
},
},
mounted() {
}
};
</script>
<style>
@import '../Lxy/css/index.css';
.app-add-cat .el-checkbox-group {
font-size: 14px !important;
}
.app-add-cat .ql-toolbar span{
line-height: 24px;
}
.app-add-cat .el-checkbox {
margin-right: 0;
}
.app-add-cat .el-dialog__body {
padding: 10px 20px !important;
}
.app-add-cat .tag-box .tag-item {
margin-right: 5px;
}
.app-add-cat .tag-box {
margin: 20px 0;
}
.app-add-cat .app-goods-cat-list .active {
background: #FAFAFA;
}
.app-add-cat .app-goods-cat-list .cat-item {
cursor: pointer;
padding: 5px 10px;
}
.app-add-cat .app-goods-cat-list {
border: 1px solid #E8EAEE;
border-radius: 5px;
margin-top: -5px;
padding: 10px 0;
overflow: scroll;
height: 400px;
}
.addGuide .tip {
margin-left: 10px;
display: inline-block;
height: 30px;
line-height: 30px;
color: #ff4544;
background-color: #FEF0F0;
padding: 0 20px;
border-radius: 5px;
}
.addGuide .app-image {
background-size: cover;
background-position: center center;
width: 80px;
height: 80px;
border-radius: 0%;
}
.addGuide .setTable .el-table__body .cell {
display: flex;
align-items: center;
}
.addGuide .commonLabel .el-form-item__label {
margin-top: -4px;
}
.addGuide .discount .el-form-item__label {
padding-right: 30px;
margin-top: -4px;
}
.addGuide .el-form-item .elzk {
position: absolute;
left: -25px;
top: 8px;
}
.addGuide .el-form-item {
position: relative;
}
.addGuide .blue {
color: #409EFF;
}
.addGuide .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
.addGuide .gez_list{
width: 650px;
margin-bottom: 12px;
padding: 20px;
border: 1px solid #EBEEF5;
background-color: #FFF;
color: #303133;
display: flex;
flex-direction: row;
justify-content: space-between;
}
.addGuide .quyu{
background-color: #f4f4f5;
color: #909399;
padding: 10px;
line-height: 30px;
height: 30px;
font-size: 12px;
border-radius: 4px;
white-space: nowrap;
margin: 5px;
}
.addGuide .imgstyle{
width: 32px;
height: 32px;
margin: 0 5px;
}
.addGuide .ql-toolbar.ql-snow .ql-formats {
margin-right: 5px;
line-height: 24px;
}
.addGuide .nav_Main {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
}
.addGuide .nav_IconContent {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
}
.addGuide .nav_IconContent div>div {
display: inline-block;
}
.addGuide .colapp-image {
background-size: cover;
background-position: center center;
width: 100px;
height: 100px;
border-radius: 0%;
}
.addGuide .delBtn {
position: absolute;
right: -8px;
top: -8px;
padding: 4px 4px !important;
}
.addGuide .add-image-btn {
width: 100px;
height: 100px;
line-height: 100px;
color: #419efb;
border: 1px solid #e2e2e2;
cursor: pointer;
text-align: center;
}
</style>
\ No newline at end of file
src/components/TravelManager/customizedcar/dzlineList.vue 0 → 100644
View file @ 63da3d1b
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li><span><em>车辆类型</em><el-select filterable v-model='msg.CarType' >
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in companyList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span></li>
<li><span><em>车辆名称</em><el-input v-model='msg.CarName' class="permiss-input"></el-input></span></li>
<li><span><em>车辆品牌</em><el-input v-model='msg.BrandName' class="permiss-input"></el-input></span></li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" class="normalBtn" value="新增" @click="CommonJump('dzaddcar')" />
</li>
</ul>
</div>
<el-table :data="dataList" stripe style="width: 100%" max-height="700" v-loading='loading'>
<el-table-column fixed prop="Id" label="Id" width="80"> </el-table-column>
<el-table-column prop="CarName" label="名称">
<template slot-scope="scope">
<div style="display: flex;align-items: center;">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.CarLogo + ')',backgroundSize:'cover'}"></div>
<div flex="dir:left cross:center">
{{scope.row.CarName}}
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="CarTypeName" label="类型"> </el-table-column>
<el-table-column prop="CarModel" label="型号"> </el-table-column>
<el-table-column prop="CarColor" label="颜色"> </el-table-column>
<el-table-column prop="BrandName" label="品牌"> </el-table-column>
<el-table-column prop="CarNo" label="车牌号"> </el-table-column>
<el-table-column prop="GuestNum" label="荷载人数"> </el-table-column>
<el-table-column prop="ImageList" label="图片列表">
<template slot-scope="scope">
<div style="display: flex;align-items: center;">
<div class="app-image" :style="{backgroundImage:'url(' + scope.row.ImageList[0] + ')',backgroundSize:'cover'}"></div>
<div v-if='scope.row.ImageList.length>2' @click='lookgd(scope.row)' style="cursor:pointer;color:#409EFF">查看更多</div>
</div>
</template>
</el-table-column>
<el-table-column prop="UpdateByName" label="创建人">
<template slot-scope="scope">
<div flex="dir:left cross:center">
{{scope.row.UpdateByName}}
</div>
<div flex="dir:left cross:center">
{{scope.row.UpdateDate}}
</div>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120" >
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top" >
<img src="../../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
<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 title="图片列表" :visible.sync="changeState" width="1240px">
<div style="display: flex;flex-direction: row;flex-wrap: wrap;">
<img v-for="(x, index) in CarPic" :key="index" style="width:200px;height:200px;margin: 10px" :src="x" alt="">
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
loading:true,
//分页
total: 0,
pageSize: '',
currentPage: 1,
changeState:false,
//请求数据
msg: {
pageIndex: 1,
pageSize: 15,
CarType: '0',
CarName: '',
BrandName: '',
},
//返回数据
dataList: [],
companyList: [],
CarPic:[]
}
},
methods: {
getCompany() {
this.apipost('car_get_GetCarCustomTypeEnumList', {}, res => {
if(res.data.resultCode == 1) {
this.companyList = res.data.data;
}
}, err => {})
},
lookgd(row){
this.changeState = true;
this.CarPic = row.ImageList
},
getList() {
this.loading=true
this.apipost('car_get_GetCarInfoPageList', this.msg, res => {
if(res.data.resultCode == 1) {
this.loading=false
this.$nextTick(() => {
this.dataList = res.data.data.pageData;
});
this.total = res.data.data.count;
}
}, err => {})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1
},
Edit(row){
console.log(row)
this.$router.push("/dzaddcar?obj="+encodeURIComponent(JSON.stringify(row)))
},
delete_b(row){
let that=this;
that.Confirm("是否删除", function () {
that.apipost('car_post_DelCarInfo', {CarId:row.Id}, res => {
if(res.data.resultCode == 1) {
that.$message.success(res.data.message)
that.getList()
} else {
that.$message.error(res.data.message)
}
}, err => {})
});
},
},
mounted() {
this.getList()
this.getCompany()
}
}
</script>
<style>
.el-table .el-table__row {
font-size: 12px!important;
}
.el-table__row td {
padding: 5px 0;
}
.has-gutter tr th,.el-table th.is-leaf{background:#EAEAEA!important;}
.app-image{
background-position: center center;
width: 50px;
height: 50px;
border-radius:0%;
float: left;
margin-right: 8px;
}
</style>
\ No newline at end of file
src/components/TravelManager/customizedcar/dzscenicspotList.vue 0 → 100644
View file @ 63da3d1b
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<span><em>景点名称：</em><el-input v-model='msg.Name' class="permiss-input"></el-input></span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<input type="button" @click="outerVisible = true,dialogTitle='新增景点'" class="normalBtn" :value="$t('pub.addBtn')" />
</li>
</ul>
</div>
<div >
<el-table
:data="DataList"
header-cell-class-name="headClass"
style="width: 100%"
border
>
<el-table-column prop="Id" label="ID" width="100"></el-table-column>
<el-table-column prop="Name" label="景点名称" ></el-table-column>
<el-table-column prop="ProvinceName" label="景点地址">
<template slot-scope="scope">
<span>{{scope.row.ProvinceName}}、{{scope.row.CityName}}、{{scope.row.DistrictName}}</span>
</template>
</el-table-column>
<el-table-column prop="UpdateByName" label="操作人" ></el-table-column>
<el-table-column prop="UpdateDate" label="操作时间" ></el-table-column>
<el-table-column fixed="right" label="操作" width="180" >
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="编辑" placement="top" >
<img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top" >
<img src="../../../assets/img/setup/del.png" alt="" class="imgstyle" @click="delete_b(scope.row)">
</el-tooltip>
</template>
</el-table-column>
</el-table>
</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='w800' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px" >
<table class="layerNoIcon">
<el-form-item label="景点名称" prop="Name">
<el-input class='w600' type="text" v-model="addMsg.Name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="景点地址">
<el-select v-model="addMsg.ProvinceId" class="w150" filterable @change="getProvinceList(addMsg.ProvinceId,2)" :placeholder="$t('hotel.hotel_province')">
<el-option v-for='item in provinceList'
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
<el-select v-model="addMsg.CityId" class="w150" filterable @change="getProvinceList(addMsg.CityId,3)" :placeholder="$t('hotel.hotel_city')">
<el-option v-for='item in cityList'
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
<el-select v-model="addMsg.DistrictId" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
<el-option v-for='item in district'
:key="item.ID"
:label="item.Name"
:value="item.ID">
</el-option>
</el-select>
</el-form-item>
</table>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
&nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg',1)" v-if="dialogTitle=='新增景点'">新增</button>
<button class="normalBtn" type="primary" @click="submitForm('addMsg',2)" v-if="dialogTitle=='修改景点'">修改</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
loading:true,
//分页
total: 0,
pageSize: '',
currentPage: 1,
//弹窗
outerVisible: false,
isRight: true,
dialogTitle: '',
//请求参数
msg: {
pageIndex: 1,
pageSize: 15,
Name: '',
},
addMsg:{
Id:'-1',
Name:'',
DistrictId:'',
CityId:'',
ProvinceId:''
},
rules:{
Name: [{
required: true,
message: '景点名称',
trigger: 'blur'
}],
Content: [{
required: true,
message: this.$t('adm.adm_qsrgbneirong'),
trigger: 'blur'
}],
},
//返回结果
DataList: [],
detailMessage:[],
downLoadList:[],
provinceList: "",
cityList: "",
district: "",
}
},
mounted() {
let userInfo=this.getLocalStorage();
this.addMsg.RB_Group_Id=userInfo.RB_Group_id
this.getList();
this.getProvinceList(2,1)
},
methods: {
getProvinceList(ID,type) {
//根据省份获取城市
let msg = { Id: ID };
if (type == 1) {
this.addMsg.ProvinceId = "";
this.addMsg.CityId = "";
this.addMsg.DistrictId = "";
} else if (type == 2) {
this.addMsg.CityId = "";
this.addMsg.DistrictId = "";
} else if (type == 3) {
this.addMsg.DistrictId = "";
}
if (this.addMsg.Country != "" || this.msg.CountryStr != "") {
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
} else if (type == 3) {
this.district = res.data.data;
}
},
err => {}
);
}
},
getList() { //景点列表
this.loading=true;
this.apipost('car_get_GetScenicPageList', this.msg, res => {
if(res.data.resultCode == 1) {
this.loading=false;
this.DataList = res.data.data.pageData;
this.total = res.data.data.count;
}
}, err => {})
},
Edit(row){
this.outerVisible=true;
this.dialogTitle='修改景点'
this.addMsg.Name = row.Name;
this.addMsg.Id = row.Id;
this.addMsg.ProvinceId = row.ProvinceId;
this.addMsg.CityId = row.CityId;
this.addMsg.DistrictId = row.DistrictId;
},
addNotice(_status){
this.apipost('car_post_SetScenicInfo', this.addMsg, res => {
if(res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.outerVisible=false;
this.getList()
this.resetForm('addMsg');
} else {
this.$message.error(res.data.message)
}
}, err => {})
},
delete_b(row){
let that=this;
that.Confirm("是否删除此景点?", function () {
that.apipost('car_post_DelScenicInfo', {ScenicId:row.Id}, res => {
if(res.data.resultCode == 1) {
that.$message.success(res.data.message)
that.getList()
} else {
that.$message.error(res.data.message)
}
}, err => {})
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
},
submitForm(addMsg,_type) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if(valid) {
if(this.addMsg.ProvinceId=='' || this.addMsg.CityId == ''){
this.$message.error('请选择地址')
return
}
this.addNotice(_type)
} else {
return false;
}
});
},
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
done();
this.resetForm('addMsg');
},
resetForm(formName) { //弹出框取消 初始化谈框内表单
if (formName) {
this.$refs[formName].resetFields();
}
this.addMsg.Id='-1'
}
}
}
</script>
<style>
.ann_detail_title{line-height: 24px; font-size: 15px; font-weight: bold; text-align: center;}
.ann_textarea textarea{height:400px!important;}
.AnnfileList{padding: 5px 0;}
.AnnfileList li{height: 30px; line-height: 30px; padding: 0 10px;}
.AnnfileList li:hover{background: #f1f1f1;}
.AnnfileList li>i{float: right; margin-top:8px;}
.AnnfileList li:hover,.AnnFileListPMeta:hover{text-decoration: underline; color: #E95252; cursor: pointer;}
.AnnFileListPMeta{
color: blue
}
.AnnFileListPMeta .iconfon{
font-size: 12px;
}
.el-table .el-table__row {
font-size: 12px!important;
}
.el-table__row td {
padding: 5px 0;
}
</style>
\ No newline at end of file
src/components/commonPage/comImgList.vue
View file @ 63da3d1b
...@@ -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==index?'selectActive' : ''" <li class="el-menu-item" :class="commonIndex==-1?'selectActive' : ''"
@click="getImgList(-1,saveObj)" :key="index" style="padding-left: 10px;padding-right: 10px;"> @click="getImgList(-1,saveObj)" 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,7 +46,9 @@ ...@@ -46,7 +46,9 @@
</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">
<img :src="item.Path" class="app-attachment-img" style="width: 100px; height: 100px;"> <!-- {{item}} -->
<img :src="item.AllPath" class="app-attachment-img" 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>
...@@ -197,7 +199,8 @@ ...@@ -197,7 +199,8 @@
var obj = { var obj = {
MappingId: 0, MappingId: 0,
PicId: 0, PicId: 0,
Path: imgUrl AllPath: imgUrl,
Path: x.data.FilePath
} }
this.saveObj[this.commonIndex].ImgList.push(obj); this.saveObj[this.commonIndex].ImgList.push(obj);
}); });
......
src/router/config.js
View file @ 63da3d1b
...@@ -2619,6 +2619,42 @@ export default { ...@@ -2619,6 +2619,42 @@ export default {
title: '车辆品牌管理' title: '车辆品牌管理'
}, },
}, },
{
path: '/dzscenicspotList', //定制包车=>景点管理
name: 'dzscenicspotList',
component: resolve => require(['@/components/TravelManager/customizedcar/dzscenicspotList'], resolve),
meta: {
title: '景点管理'
},
},
{
path: '/carmanageList', //定制包车=>车辆管理
name: 'carmanageList',
component: resolve => require(['@/components/TravelManager/customizedcar/carmanageList'], resolve),
meta: {
title: '车辆管理'
},
},
{
path: '/dzaddcar', //定制包车=>车辆管理
name: 'dzaddcar',
component: resolve => require(['@/components/TravelManager/customizedcar/dzaddcar'], resolve),
meta: {
title: '车辆管理'
},
},
{
path: '/dzlineList', //定制包车=>线路管理
name: 'dzlineList',
component: resolve => require(['@/components/TravelManager/customizedcar/dzlineList'], resolve),
meta: {
title: '线路管理'
},
},
{ {
path: '/newQuotation_SWT', path: '/newQuotation_SWT',
......
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