Skip to content

S
SuperMan
Commit dd2db4ec authored by zhengke's avatar zhengke
Browse files
Options

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

parents 4a2f4d21 4b02c949
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 26 deletions
index.html
View file @ dd2db4ec
......@@ -11,6 +11,7 @@
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script src="http://code.jquery.com/jquery-2.1.1.min.js"></script>
<title>四川和平国际旅行社</title>
</head>
<body>
......
src/components/Complaints/ComplaintsDetail.vue
View file @ dd2db4ec
......@@ -236,14 +236,19 @@
</li>
<li
v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
<span>单据详情：</span>
<span>赔偿列表：</span>
<span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
@click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
</li>
<li
v-if="ComplainInfo.DisposeStatus===4&&getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy">
</li>
<li>{{ComplainInfo.Description}}</li>
<li></li>
</ul>
<ul>
<li style="height:auto;line-height: 20px;padding:5px 0;">
<p>{{ComplainInfo.Description}}</p>
</li>
</ul>
</div>
<div class="CD_Conditions">
......
src/components/SalesModule/groupTourOrder.vue
View file @ dd2db4ec
......@@ -1595,7 +1595,7 @@
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span>
<p><span
<p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span
v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}
</p></div>
<div>
......@@ -1962,6 +1962,18 @@
}
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
getItem (obj) {
this.checkedObj = obj
},
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ dd2db4ec
......@@ -1046,20 +1046,20 @@
</el-form-item>
</el-col>
<el-col :span="4">
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item> -->
<el-form-item label="成交单价" prop="Unit_Price">
</el-form-item>
<!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item> -->
<el-form-item> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
</el-form-item>
</el-col>
</el-row>
......@@ -1616,7 +1616,7 @@
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div><span>备注：</span><p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
......@@ -2305,6 +2305,18 @@ export default {
}
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......
src/components/SalesModule/productQuery.vue
View file @ dd2db4ec
......@@ -933,7 +933,7 @@
CommissionShareMoney: '0',
OrderForm: '1',
SonControlID: '-1',
IsShowMessagesMoney: '1'
IsShowMessagesMoney: '2'
},
employeeMsg: {
BranchId: '-1',
......@@ -1704,7 +1704,7 @@
this.ScenicRefundMoney = 0;
this.addMsg.CommissionSharePeople = '-1'
this.addMsg.CommissionShareMoney = '0'
this.addMsg.IsShowMessagesMoney = '1'
this.addMsg.IsShowMessagesMoney = '2'
this.remarkMsg = {
zc: '',
bzc: '',
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ dd2db4ec
......@@ -1091,17 +1091,17 @@
</el-col>
<el-col :span="5">
<el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price'
<!-- <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-select> -->
<el-input v-model='addMsg.Unit_Price' :disabled="isChecked" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
</el-form-item>
</el-col>
</el-row>
......@@ -1707,6 +1707,7 @@
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon">
<span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a> ;</span>
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
{{childItem.PlatformOrder}};</span>
{{childItem.Remarks}}
......@@ -2488,6 +2489,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan
},
methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
......
src/components/confirmationOrderDownLoad.vue
View file @ dd2db4ec
......@@ -8,7 +8,7 @@
<div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" class="travelControlTripBtn" value="下载PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input style="display:none;" type="button" class="travelControlTripBtn" value="下载WORD" @click="ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input style="display:none" type="button" class="travelControlTripBtn" value="下载WORD" @click="gernalFeature()" /><!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<div id="pdfNode">
......@@ -218,7 +218,7 @@
<div class="short-line"></div>
<div class="english-title">Trip characteristics</div>
</div>
<div v-html="feature.featureHtml"></div>
<div v-html="feature.featureHtml" id="gernalCanvas"></div>
</div>
<div id="teamacitvy"> </div>
</div>
......@@ -641,6 +641,58 @@
}, 2000)
},
methods: {
gernalFeature(){
let tcid = this.$route.query.tcid;
document.querySelector("#gernalCanvas").querySelectorAll('img').forEach(x => {
if(x.src.indexOf('http')!=-1){
x.setAttribute('crossOrigin','anonymous')
}
});
let cName=''
if(this.showType==4){
cName='.feature-box'
}else if(this.showType==5){
cName='.travle_page'
}
if(cName!=''){
document.querySelectorAll(cName).forEach(x => {
html2Canvas(x,{
useCORS:true,
scale:0.7,
backgroundColor:'#FFFFFF'
}).then((canvas) => {
if(canvas){
var context = canvas.getContext('2d')
context.mozImageSmoothingEnabled = false
context.webkitImageSmoothingEnabled = false
context.msImageSmoothingEnabled = false
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
$.ajax({
url: 'http://127.0.0.1:8120/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID',
type: "POST",
data: {myfile: image.src},
datatype:"jsonP",
success: function (data) {
console.log("上传成功",data);
},
error: function () {
console.log("上传失败");
}
});
// this.uploadImg(tcid,msg, res=>{
// //console.log(res)
// }, err=>{
// console.log("GHJK",err);
// })
}
});
});
}
},
//保存基础数据
submitForm: function () {
this.editForm.travelOrderFlightList.forEach(x => {
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ dd2db4ec
......@@ -1354,7 +1354,7 @@
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = deleteDataList==="" ? this.deleteArray : deleteDataList;
console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) ){
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.FeatureData.FeatureType !== 4 || this.FeatureData.FeatureType !== 5) ){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
let hotelObj = travelFeatureTwo.HotelInit(i, dataList.DayList) // 酒店
......
src/plug/index.js
View file @ dd2db4ec
......@@ -115,13 +115,14 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl = "http://127.0.0.1"; //214主域名
// 127.0.0.12
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl = "http://192.168.2.106:8082"; //罗超主域名
// domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) {
......@@ -147,7 +148,8 @@ export default {
//google地图Url
GoogleMapUrl: "http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&sensor=false&language=zh-CN",
//google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com"
GoogleMapImageUrl: "http://super.oytour.com",
Upload: "http://127.0.0.1:8120"
};
return obj;
},
......@@ -213,6 +215,17 @@ export default {
window.open('http://' + URL, '_blank');
}
}
Vue.prototype.uploadImg = function (tcID, msg, successCall, faildCall) {
var apiurl = this.domainManager().Upload + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID' + tcID;
this.$http.post(apiurl, msg, {
headers: {
}
}).then(res => {
successCall(res);
}, faildCall)
}
//HTTP提交数据
Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") {
......
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