Skip to content

S
SuperMan
Commit 250dc8a7 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents fde696b0 979e3470
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 62 deletions
src/components/Supplier/AddSupplierComplaints.vue
View file @ 250dc8a7
......@@ -13,7 +13,7 @@
margin-bottom: 20px;
}
.Supplier_AC_contDetail > p {
.Supplier_AC_contDetail>p {
background: #ccc;
color: #333;
padding: 5px;
......@@ -83,7 +83,7 @@
border: 1px #d81e06 solid;
}
.Supplier_AC_contDetail > a {
.Supplier_AC_contDetail>a {
color: #3980c8 !important;
}
......@@ -129,12 +129,13 @@
</li>
</ul>
</div>
<el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent" placeholder="具体问题描述，以及投诉人的姓名、联系方式"></el-input>
<el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent"
placeholder="具体问题描述，以及投诉人的姓名、联系方式"></el-input>
</div>
<p style="text-align: center; margin: 10px 0 15px 0;">
<input type="button" class="normalBtn" value="保存" @click="SaveData()"/>
<input type="button" class="normalBtn" value="取消"/>
<input type="button" class="normalBtn" value="保存" @click="SaveData()" />
<input type="button" class="normalBtn" value="取消" />
</p>
</div>
</template>
......@@ -148,11 +149,11 @@
themeCked: [],
//添加修改投诉
EditMsg: {
Id: 0,//编号
SupplierId:0,//供应商编号
TCID: 0,//团队编号
ComplainContentrs: '',//投诉内容
ComplainContent: '',//问题描述
Id: 0, //编号
SupplierId: 0, //供应商编号
TCID: 0, //团队编号
ComplainContentrs: '', //投诉内容
ComplainContent: '', //问题描述
},
//查询参数
QMsg: {
......@@ -164,8 +165,7 @@
ExitCount: 0
};
},
mounted() {
},
mounted() {},
methods: {
//选取主题内容
getTheme(item) {
......@@ -192,8 +192,7 @@
} else {
this.Error(res.data.message)
}
}, err => {
});
}, err => {});
},
//保存数据
SaveData(status) {
......@@ -201,7 +200,6 @@
this.Error("请选择主题内容");
return false;
}
//数据组装
this.EditMsg.ComplainContentrs = "";
let contentrArr = [];
......@@ -213,7 +211,6 @@
if (contentrArr.length > 0) {
this.EditMsg.ComplainContentrs = contentrArr.join(",")
}
this.ApiPost2('supplierComplain_Post_SetSupplierComplain', this.EditMsg, res => {
if (res.data.resultCode == 1) {
this.Success("添加成功");
......@@ -224,8 +221,7 @@
} else {
this.Error(res.data.message);
}
}, err => {
});
}, err => {});
},
//获取投诉枚举集合
getEnumeration() {
......@@ -241,12 +237,43 @@
}
});
},
GetData() {
this.ApiPost2('supplierComplain_Get_GetSupplierComplain', {
Id: this.EditMsg.Id
}, res => {
if (res.data.resultCode == 1) {
this.EditMsg = res.data.data;
if (this.EditMsg.ComplainContentrs && this.EditMsg.ComplainContentrs != '') {
var array = this.EditMsg.ComplainContentrs.split(',');
if (array != null && array.length > 0) {
array.forEach(subItem => {
this.themeList.forEach(x => {
if (subItem==x.Name) {
x.isCheck=true;
this.themeCked.push(x.Id)
}
});
});
}
}
} else {
this.Error(res.data.message);
}
}, err => {});
}
},
created() {
this.EditMsg.Id = this.$route.query.id;
this.EditMsg.Id = this.$route.query.Id;
this.QMsg.TCID = this.$route.query.TCID;
},
mounted() {
this.getEnumeration();
if (this.QMsg.TCID) {
this.CheckTCID();
}
if (this.EditMsg.Id && this.EditMsg.Id > 0) {
this.GetData();
}
}
};
......
src/components/Supplier/HotelInfo.vue
View file @ 250dc8a7
<style>
@import "../../assets/css/DMC.css";
.title{width: 100%;display: -webkit-box;margin-top: 20px }
.tu_img{width: 100%;display: -webkit-box;padding: 20px 50px}
</style>
<template>
<div class="flexOne changInfo">
<div class="resource-content clearfix">
<el-form :model="addMsg" :rules="rules" ref="addMsg">
<div class="resource-content clearfix" :style="{height:(orderHight-90) + 'px'}">
<el-form :model="addMsg" :rules="rules" ref="addMsg">
<div class="resource-baseinfo">
<span class="resource-lititle">{{$t('hotel.hotel_baseinfo')}}</span>
<el-form-item :label="$t('hotel.hotel_name')" prop="Name">
......@@ -72,8 +74,8 @@
</el-select>
</span>
</div>
<span class="resource-lititle sheshi">酒店优惠 <el-button icon="el-icon-plus" circle @click="addAir"></el-button>
</span>
<!-- <span class="resource-lititle sheshi">酒店优惠 <el-button icon="el-icon-plus" circle @click="addAir"></el-button>-->
<!-- </span>-->
<div class="jiudianyouhuiDiv">
<el-row v-for="(list,index) in addMsg.DiscountList" :key="index">
......@@ -116,7 +118,7 @@
</el-form-item>
</el-col>
<el-col :span="6" style='padding-top: 5px;'>
</el-col>
</el-row> -->
</div>
......@@ -215,42 +217,54 @@
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</div>
<span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
<div class="resource-list">
<div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<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="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
</div>
<div class="title">
<span class="resource-lititle" style="margin-left: 30px">{{$t('hotel.hotel_imgintroduce')}}</span>
</div>
<div class="tu_img">
<div class="resource-list">
<div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in HotelImageArray" :key="item.subCode">
<img :src="item.ShowPath" />
<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="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
</div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=HotelImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i>
</div> -->
</div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=HotelImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i>
</div> -->
</div>
</div>
</div>
<div class="add-img">
<div class="reimg-add">
<i class="iconfont icon-img_haha"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload class="upload-demo" :http-request="UploadImage" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<i class="iconfont icon-img_bdsc"></i>
</el-upload>
<div class="add-img">
<div class="reimg-add">
<i class="iconfont icon-img_haha"></i>
<div class="ad-one">
<div class="re-upload">
<el-upload class="upload-demo" :http-request="UploadImage" :multiple="true"
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 class="re-find" @click="addImgOpen"><i class="iconfont icon-img_cz"></i></div>
</div>
<div class="re-find" @click="addImgOpen"><i class="iconfont icon-img_cz"></i></div>
</div>
</div>
</div>
</div>
</div>
</el-form>
<div class="btn-list" style="width: 350px;position: fixed;right: 20px;top:50px">
<span class="common-lefttit"></span>
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
</div>
<el-dialog custom-class="resourceImgAdd" title="选择图片" center :visible.sync="addimg">
<DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="1">
</DMCchooseImg>
......@@ -258,11 +272,7 @@
<el-dialog custom-class="mapList" title="地图选址" center :visible.sync="selectAddress">
<googleMap @refList="googleMap" v-bind:address="addMsg.Address" @headCallBack="headCall"></googleMap>
</el-dialog>
<div class="btn-list">
<span class="common-lefttit"></span>
<button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
......@@ -399,7 +409,8 @@
pattern: this.$commonUtils.Regex.el_isInteger,
message: "请输入正确的数字"
}]
}
},
orderHight:1000,
};
},
components: {
......@@ -853,6 +864,9 @@
},
mounted() {
var orderHight = document.body.clientHeight
console.log(orderHight);
this.orderHight = orderHight;
let userInfo = this.getLocalStorage()
//有权限操作的部门
if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
......
src/components/Supplier/roomQuery.vue
View file @ 250dc8a7
......@@ -114,7 +114,7 @@
<th width="100">操作</th>
</tr>
<tr v-if="dataList.length==0">
<td colspan="8">暂无数据</td>
<td colspan="9">暂无数据</td>
</tr>
<template v-for="(item,index) in dataList">
<template v-for="(subItem,subIndex) in item.subList">
......@@ -148,8 +148,13 @@
</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
<a @click="AddSupplierComplain(subItem.TCNUMS)">添加投诉</a>
<a @click="">删除</a>
<a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑</template>
<template v-else>添加</template>
</a>
<a style="text-decoration:underline;color:red;cursor:pointer" v-if="subItem.Complain_Extend.Id>0"
@click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
</td>
</tr>
</template>
......@@ -177,7 +182,6 @@
HotelId: 0,
//日期
DateStr: "",
//出团公司
OutBranchIds: [],
LineId: 14,
......@@ -227,6 +231,26 @@
}
},
methods: {
//删除投诉
DeleteSupplierComplain(Id) {
if (Id > 0) {
var that = this;
this.Confirm("是否此投诉信息删除?", function () {
var msg = {
Id: Id
};
that.ApiPost2("supplierComplain_Post_RemoveSupplierComplain", msg,
res => {
if (res.data.resultCode == 1) {
that.Success('删除成功！');
that.getList();
} else {
that.Error(res.data.data);
}
}, null);
});
}
},
getLineList() {
this.ApiPost2("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
......@@ -250,11 +274,12 @@
}
);
},
AddSupplierComplain(id) {
AddSupplierComplain(id, tcid) {
this.$router.push({
name: 'AddSupplierComplaints',
query: {
"ID": id,
Id: id,
TCID: tcid,
blank: 'y',
tab: '供应商投诉'
}
......
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