Skip to content

S
SuperMan
Commit a0fbe901 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

冲突了

parent 609176c9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 662 additions and 6388 deletions
index.html
View file @ a0fbe901
......@@ -10,7 +10,6 @@
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script src="static/jquery.min.js"></script>
<title>四川和平国际旅行社</title>
</head>
<body>
......
src/assets/common/lang/jp.js deleted 100644 → 0
View file @ 609176c9
This diff is collapsed.
src/assets/common/lang/zh-tw.js deleted 100644 → 0
View file @ 609176c9
This diff is collapsed.
src/assets/common/lang/zh.js deleted 100644 → 0
View file @ 609176c9
This diff is collapsed.
src/components/BusExport.vue
View file @ a0fbe901
......@@ -70,7 +70,7 @@
<tbody v-for="item in dataList">
<tr v-for="subItem in item.RBobj">
<td class="txLeft">{{subItem.BranchName}}</td>
<td class="txLeft">{{subItem.TCNUM}}</td>
<td class="txLeft">{{subItem.TCNUM}}({{subItem.TCID}})</td>
<td class="txRight">{{subItem.FrID}}</td>
<td class="txRight">{{subItem.CarDistribution}}</td>
<td class="txRight">{{subItem.sMoney}}</td>
......@@ -123,7 +123,7 @@
</tr>
<tr v-for="subItem in item.RBobj">
<td class="txLeft">{{subItem.BranchName}}</td>
<td class="txLeft">{{subItem.TCNUM}}</td>
<td class="txLeft">{{subItem.TCNUM}}({{subItem.TCID}})</td>
<td class="txRight">{{subItem.FrID}}</td>
<td class="txRight">{{subItem.CarDistribution}}</td>
<td class="txRight">{{subItem.sMoney}}</td>
......
src/components/Contract/TravelContract.vue
View file @ a0fbe901
......@@ -1265,7 +1265,8 @@
}
var msg = {
configId: 0,
tcid: nTCID
tcid: nTCID,
isClick:1//不算统计
};
if (id !== undefined) {
//根据ID 获取行程内容
......
src/components/SalesModule/enrollTotal.vue
View file @ a0fbe901
This diff is collapsed.
src/components/SalesconfirmationOrder.vue
View file @ a0fbe901
......@@ -766,22 +766,6 @@
context.imageSmoothingEnabled = false
var image = new Image();
image.src = canvas.toDataURL("image/png");
$.ajax({
url: UploadUrl +
'/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
data: {
myfile: image.src,
fileIndex: index
},
datatype: "jsonP",
success: function (data) {
},
error: function () {
}
});
if (allNum !== document.querySelectorAll(cName).length) {
allNum += 1
} else {
......@@ -1045,7 +1029,8 @@
configId: this.$route.query.configId,
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId
orderId: this.$route.query.orderId,
isClick:1//不算统计
}, res => {
if (res.data.resultCode == 1) {
let data = (res.data.data);
......
src/components/TravelContractDetail.vue
View file @ a0fbe901
......@@ -1022,7 +1022,8 @@
}
var msg = {
configId: 0,
tcid: nTCID
tcid: nTCID,
isClick:1//不算统计
};
if (id !== undefined) {
//根据ID 获取行程内容
......
src/components/TravelContractNew.vue
View file @ a0fbe901
......@@ -1885,7 +1885,8 @@
}
var msg = {
configId: 0,
tcid: nTCID
tcid: nTCID,
isClick:1//不算统计
};
if (id !== undefined) {
//根据ID 获取行程内容
......
src/components/TravelControlTrip.vue
View file @ a0fbe901
......@@ -553,7 +553,8 @@
configId: this.$route.query.id,
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId
orderId: this.$route.query.orderId,
isClick:1//不算统计
}, res => {
if (res.data.resultCode == 1) {
let data = (res.data.data);
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ a0fbe901
......@@ -371,6 +371,7 @@
vshowL: false,
vshowM: false,
vshowTCNUM: true,
isClick:1,//不计算点击
}
})
window.open(routeData.href, '_blank')
......
src/components/TravelManager/TravelList/RegistrationStatistics_Sale.vue
View file @ a0fbe901
......@@ -43,8 +43,8 @@
<ul>
<li>
<span>
<em>公司</em>
<el-select class="w150" filterable placeholder="公司" v-model="queryMsg.OutBranchId">
<em>{{$t('system.table_company')}}</em>
<el-select class="w150" filterable :placeholder="$t('system.table_company')" v-model="queryMsg.OutBranchId">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option>
<el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id">
</el-option>
......@@ -53,7 +53,7 @@
</li>
<li>
<span>
<em>线路</em>
<em>{{$t('advmanager.v_line')}}</em>
<el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
......@@ -63,7 +63,7 @@
</li>
<li>
<span>
<em>系列</em>
<em>{{$t('advmanager.v_xilie')}}</em>
<el-select class='w150' v-model="queryMsg.ltID" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
......@@ -73,7 +73,7 @@
</li>
<li>
<span>
<em>团期</em>
<em>{{$t('fnc.tuanqi')}}</em>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QStartDate">
</el-date-picker>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QEndDate">
......@@ -81,26 +81,26 @@
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">下载</button>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
<tr>
<th width="50">序</th>
<th width="80">出团</th>
<th width='200'>团名</th>
<th width="80">团期</th>
<th width="80">进出点</th>
<th width="100">抵离时间</th>
<th width="50">价格</th>
<th width="100">机位</th>
<th width="80">报名</th>
<th width="80">收订人数</th>
<th width="100">领队</th>
<th width="100">导游</th>
<th>备注</th>
<th width="50">{{$t('salesModule.Xu')}}</th>
<th width="80">{{$t('Operation.Op_chutuan')}}</th>
<th width='200'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">{{$t('Operation.Op_price')}}</th>
<th width="100">{{$t('Airticket.Air_reservation')}}</th>
<th width="80">{{$t('Operation.Op_signUp')}}</th>
<th width="80">{{$t('Operation.Op_orderNum')}}</th>
<th width="100">{{$t('leader.leader_Leader')}}</th>
<th width="100">{{$t('leader.leader_Guide')}}</th>
<th>{{$t('pub.pubRemark')}}</th>
</tr>
<tbody v-for="item in DataList">
<tr>
......@@ -127,7 +127,7 @@
</tbody>
</table>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div class="noDataNotice" v-if="DataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
<div v-if="DataList.length>0">
<el-pagination
background
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a0fbe901
......@@ -860,7 +860,7 @@
<div class="TCL_Content">{{item.DMCNum}}</div>
</div>
<div class="clearfix TCL-redType"
v-if="item.DmcRemarkLast || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
<div class="TCL_remarkTitle">{{$t('Operation.Op_dijieRemark')}}：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
......@@ -1547,6 +1547,7 @@
vshowL: false,
vshowM: false,
vshowTCNUM: true,
isClick:1,//不计算点击
}
})
window.open(routeData.href, '_blank')
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ a0fbe901
......@@ -1112,6 +1112,7 @@
vshowL: false,
vshowM: false,
vshowTCNUM: true,
isClick:1,//不计算点击
}
})
window.open(routeData.href, '_blank')
......
src/components/administrative/ClausesOrder.vue
View file @ a0fbe901
......@@ -7,13 +7,13 @@
</style>
<template>
<div class="flexOne">
<!-- <div class="query-box">
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
<input type="button" class="normalBtn" value="订单信息下载" @click="exportExcel()">
</li>
</ul>
</div> -->
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>订单号</th>
......@@ -78,6 +78,14 @@
}
});
},
exportExcel() {
//导出报表
let msgexport = {
StartDate:this.$route.query.StartDate
};
var fileName = "【" + this.$route.query.StartDate + "订单信息.xls";
this.GetLocalFile("OPCommission_GetCommissionOrderExport", msgexport, fileName);
},
//获取数据
getList() {
this.loading = true;
......
src/components/administrative/empBankAccount.vue
View file @ a0fbe901
......@@ -89,7 +89,7 @@
<br/>{{item.AccountHolder}}</td>
<td>
<span v-if='item.Status!=0' style="color: #E95252;">{{$t('pub.fressSel')}}</span>
<span v-if='item.Status==0' style="color: #09D49D;">{{$t(pub.normalSel)}}</span>
<span v-if='item.Status==0' style="color: #09D49D;">{{$t('pub.normalSel')}}</span>
</td>
<td style="color: #FF9C00;">￥{{moneyFormat(item.PayMoney)}}</td>
<td class="empBankAccountIcon">
......
src/components/clientConfirm.vue
View file @ a0fbe901
......@@ -1678,7 +1678,8 @@
}
var msg = {
configId: 0,
tcid: nTCID
tcid: nTCID,
isClick:1//不算统计
};
if (id !== undefined) {
//根据ID 获取行程内容
......
src/components/commonPage/commonTeamInfo.vue
View file @ a0fbe901
......@@ -67,7 +67,8 @@
}
var msg = {
configId: id,
tcid: nTCID
tcid: nTCID,
isClick:1//不算统计
};
if (id !== undefined) {
//根据ID 获取行程内容
......
src/components/confirmationOrderDownLoad - 副本.vue
View file @ a0fbe901
......@@ -699,22 +699,6 @@
})
return
$.ajax({
url: UploadUrl +
'/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Feature/' + tcid,
type: "POST",
data: {
myfile: image.src,
fileIndex: index
},
datatype: "jsonP",
success: function (data) {
},
error: function () {
}
});
if (allNum !== document.querySelectorAll(cName).length) {
allNum += 1
} else {
......@@ -971,7 +955,8 @@
configId: this.$route.query.configId,
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId
orderId: this.$route.query.orderId,
isClick:1//不算统计
}, res => {
if (res.data.resultCode == 1) {
let data = (res.data.data);
......
src/components/confirmationOrderDownLoad.vue
View file @ a0fbe901
......@@ -40,6 +40,7 @@
<el-option label="邂逅北海道的雪" :value="-4"></el-option>
<el-option label="日本趣味滑雪乐" :value="-5"></el-option>
<el-option label="湄公之畔，悠哉老挝" :value="-6"></el-option>
<el-option label="印象日本·严选酒店<舒适体验·品质服务>" :value="-7"></el-option>
<el-option
v-for="item in titleList"
:key="item.subCode"
......@@ -712,6 +713,7 @@
orderTripdiff: {},
title: '',
isDirect: 1, //是否是直采 0：否，1：是
isClick: this.$route.query.isClick === undefined ? 0 : 1//不算统计
}
},
mounted() {
......@@ -746,6 +748,10 @@
if(this.Typevalue==-6){
title+="湄公之畔，悠哉老挝"
}
if(this.Typevalue==-7){
title+="印象日本·严选酒店<舒适体验·品质服务>"
}
if(this.Typevalue>0){
this.titleList.forEach(item=>{
if(item.id==this.Typevalue){
......@@ -802,6 +808,9 @@
else if(this.Typevalue==-6){
window.open("http://www.oytour.com/#/Laowo");
}
else if(this.Typevalue==-7){
window.open("http://www.oytour.com/#/JapanHotel");
}
else{
window.open("http://www.oytour.com/#/JuanDetails?id="+this.Typevalue);
}
......@@ -1222,7 +1231,8 @@
configId: this.$route.query.configId,
cityId: this.$route.query.cityId,
tcid: this.$route.query.tcid,
orderId: this.$route.query.orderId
orderId: this.$route.query.orderId,
isClick:this.isClick//不算统计
}, res => {
if (res.data.resultCode == 1) {
let data = (res.data.data);
......
src/components/dmc/manager/tripsManager.vue
View file @ a0fbe901
......@@ -470,7 +470,7 @@
</li>
</ul>
</div>
<table class="TravelControlListTable TravelQueryList">
<table class="TravelControlListTable TravelQueryList" v-loading="loading">
<tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i">
<template v-for="(item,index) in outItem.TravelPriceList">
<tr height="40">
......@@ -624,6 +624,7 @@
//分公司列表
BranchList: [],
},
loading: false,
//查询参数
queryMsg: {
pageIndex: 1,
......@@ -752,10 +753,13 @@
},
//新获取列表数据
getControlList() {
this.loading = true;
this.queryCommonData.dataList = [];
this.apipost(
"travel_get_GetUniteDmcPageList",
this.queryMsg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
......
src/plug/index.js
View file @ a0fbe901
......@@ -112,7 +112,7 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.65:8025"; // 吴春
// domainUrl = "http://192.168.2.65:8025"; // 吴春
let locationName = window.location.hostname;
let javaUrldo="";
......
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