Skip to content

S
SuperMan
Commit c10807a5 authored by 王悦's avatar 王悦
Browse files
Options

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

parents b8f7a5ca ac8b0dc9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1846 additions and 769 deletions
src/components/LeaderManagement/leaderManagement.vue
View file @ c10807a5
......@@ -342,8 +342,8 @@
</div>
<div class="clearfix botmInfo" v-if="!item.LeaderGuidClass">
<div class="leftCode">
<barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode>
<!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> -->
</div>
<div class="phoneNum">
<!-- <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} -->
......@@ -382,8 +382,8 @@
</div>
<div class="clearfix botmInfo">
<div class="leftCode">
<barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode>
<!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> -->
</div>
<div class="phoneNum">
<!-- <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} -->
......
src/components/SalesModule/BulkAirTicketOrders.vue 0 → 100644
View file @ c10807a5
This diff is collapsed.
src/components/Ticketing/IndividualTicketOrder.vue
View file @ c10807a5
......@@ -13,6 +13,35 @@
<em>订单号</em><el-input v-model='msg.AirOrderId' class='w150'></el-input>
</span>
</li>
<li>
<span>
<em>报名公司</em>
<el-select class="w200" v-model="msg.RB_Branch_Id" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>人员选择</em>
</span>
<el-select
class="w200"
v-model="msg.EnterID"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<el-option label="不限" value="-1"></el-option>
<el-option
v-for="item in employeeList"
:label="item.name"
:value="item.empId"
:key="item.empId"
></el-option>
</el-select>
</li>
<li>
<span>
<em>状态</em>
......@@ -143,7 +172,9 @@
<div>收款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span>
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
......@@ -155,7 +186,9 @@
<div>付款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span>
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
......@@ -191,10 +224,45 @@ export default {
loading:false,
total:0,
currentPage: 1,
companyList:[],
employeeList:[],
};
},
components: {},
created(){
this.getEmployee();
this.getCompanyList();
},
methods: {
getEmployee() {
this.apipost(
"app_get_company_employee",
this.employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.employeeList = res.data.data;
}
},
err => {}
);
},
getCompanyList() {
let userInfo = this.getLocalStorage();
let RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
}
this.apipost('admin_get_BranchGetList', msg, res => {
if(res.data.resultCode == 1) {
this.companyList=res.data.data;
}
}, err => {})
},
goUrl: function (name, path, id ) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
},
handleCurrentChange (val) {
this.msg.pageIndex = val
this.getList()
......@@ -211,7 +279,7 @@ export default {
res => {
this.loading=false;
if (res.data.resultCode == 1) {
console.log(res);
// console.log(res);
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
} else {
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ c10807a5
......@@ -240,8 +240,8 @@
</div>
<div class="clearfix botmInfo">
<div class="leftCode">
<barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode>
<!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> -->
</div>
<div class="phoneNum">
<i class="iconfont icon-dianhua"></i>{{item.MobilePhone}}
......
src/components/commonPage/payURL.vue
View file @ c10807a5
......@@ -132,17 +132,17 @@
} else if (this.value === '3') {
this.visible=false
let orderObj = {
OrderID:obj.orderId,
OrderSource:8,
OrderID:obj.orderId,//订单号
OrderSource:8,//12
Obj: {},
SourceID:obj.ID,
SourceID:obj.ID,//机票id
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":2,
"companyID":obj.outBranchId,
"companyID":obj.outBranchId,//公司id
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj)
......
src/components/newTravelmanager/travelLineTrip/trifficTrip.vue
View file @ c10807a5
......@@ -13,7 +13,7 @@
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.StartCityId"
@visible-change="GetDepartList1($event)" @change="changeGetDepartList(subTraffic.StartCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in DepartList1" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
<el-option v-for="item in DepartList1" :label="item.Name" :value="item.ID" :key="item.ID+10000"></el-option>
</el-select>
</el-form-item>
</span>
......@@ -36,7 +36,7 @@
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.ArrivalCityId"
@visible-change="GetArrivalList1($event)" @change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in ArriveList1" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
<el-option v-for="item in ArriveList1" :label="item.Name" :value="item.ID" :key="item.ID+1000"></el-option>
</el-select>
</el-form-item>
</span>
......
src/plug/index.js
View file @ c10807a5
......@@ -117,7 +117,7 @@ export default {
let locationName = window.location.hostname;
domainUrl = "http://192.168.2.214:8082"; //214主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://webapi.viitto.com";
domainUrl = "http://reborn.oytour.com";
}
else if (locationName.indexOf('viitto')!==-1) {
domainUrl = "https://test.viitto.com";
......@@ -147,7 +147,7 @@ export default {
UploadUrl: locationName.indexOf('oytour') !== -1||locationName.indexOf('viitto')!==-1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120",
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://imgfile.oytour.com" : 'http://127.0.0.1:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "https://reborn.oytour.com" : "http://192.168.2.215:9000",
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto')!==-1 ? "http://efficient.oytour.com" : "http://192.168.2.215:9000",
};
return obj;
},
......
src/router/config.js
View file @ c10807a5
......@@ -1866,6 +1866,15 @@ export default {
title: '机票订单'
},
},
{ // 销售 散卖机票订单
path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders',
component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
meta: {
title: '散卖机票订单'
},
},
{ // 销售 报名统计
path: '/enrollTotal',
name: 'enrollTotal',
......
static/CurveLine.min.js 0 → 100644
View file @ c10807a5
var BMapLib=window.BMapLib=BMapLib||{};(function(){BMapLib.CurveLine=CurveLine;function CurveLine(points,opts){var self=this;var curvePoints=getCurvePoints(points);var polyline=new BMap.Polyline(curvePoints,opts);polyline.addEventListener("lineupdate",function(){if(this.isEditing){this.enableEditing()}});polyline.cornerPoints=points;polyline.editMarkers=[];polyline.enableEditing=function(){var self=this;if(self.map){self.disableEditing();for(var i=0;i<self.cornerPoints.length;i++){var marker=new BMap.Marker(self.cornerPoints[i],{icon:new BMap.Icon("http://api.map.baidu.com/library/CurveLine/1.5/src/circle.png",new BMap.Size(16,16)),enableDragging:true,raiseOnDrag:true});marker.addEventListener("dragend",function(){self.cornerPoints.length=0;for(var i=0;i<self.editMarkers.length;i++){self.cornerPoints.push(self.editMarkers[i].getPosition())}var curvePoints=getCurvePoints(self.cornerPoints);self.setPath(curvePoints)});marker.index=i;self.editMarkers.push(marker);self.map.addOverlay(marker)}}self.isEditing=true};polyline.disableEditing=function(){this.isEditing=false;for(var i=0;i<this.editMarkers.length;i++){this.map.removeOverlay(this.editMarkers[i]);this.editMarkers[i]=null}this.editMarkers.length=0};polyline.getPath=function(){return curvePoints};return polyline}function extend(child,parent){for(var p in parent){if(parent.hasOwnProperty(p)){child[p]=parent[p]}}return child}function getCurvePoints(points){var curvePoints=[];for(var i=0;i<points.length-1;i++){var p=getCurveByTwoPoints(points[i],points[i+1]);if(p&&p.length>0){curvePoints=curvePoints.concat(p)}}return curvePoints}function getCurveByTwoPoints(obj1,obj2){if(!obj1||!obj2||!(obj1 instanceof BMap.Point)||!(obj2 instanceof BMap.Point)){return null}var B1=function(x){return 1-2*x+x*x};var B2=function(x){return 2*x-2*x*x};var B3=function(x){return x*x};curveCoordinates=[];var count=30;var isFuture=false;var t,h,h2,lat3,lng3,j,t2;var LnArray=[];var i=0;var inc=0;if(typeof(obj2)=="undefined"){if(typeof(curveCoordinates)!="undefined"){curveCoordinates=[]}return}var lat1=parseFloat(obj1.lat);var lat2=parseFloat(obj2.lat);var lng1=parseFloat(obj1.lng);var lng2=parseFloat(obj2.lng);if(lng2>lng1){if(parseFloat(lng2-lng1)>180){if(lng1<0){lng1=parseFloat(180+180+lng1)}}}if(lng1>lng2){if(parseFloat(lng1-lng2)>180){if(lng2<0){lng2=parseFloat(180+180+lng2)}}}j=0;t2=0;if(lat2==lat1){t=0;h=lng1-lng2}else{if(lng2==lng1){t=Math.PI/2;h=lat1-lat2}else{t=Math.atan((lat2-lat1)/(lng2-lng1));h=(lat2-lat1)/Math.sin(t)}}if(t2==0){t2=(t+(Math.PI/5))}h2=h/2;lng3=h2*Math.cos(t2)+lng1;lat3=h2*Math.sin(t2)+lat1;for(i=0;i<count+1;i++){curveCoordinates.push(new BMap.Point((lng1*B1(inc)+lng3*B2(inc))+lng2*B3(inc),(lat1*B1(inc)+lat3*B2(inc)+lat2*B3(inc))));inc=inc+(1/count)}return curveCoordinates}})();
\ No newline at end of file
static/jquery.min.js 0 → 100644
View file @ c10807a5
This diff is collapsed.
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