Skip to content

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

1

parent 2f84a951
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 557 additions and 291 deletions
src/components/BusExport.vue
View file @ e1935009
<style>
.BusExportTitle{
width:800px;
width:1000px;
margin:0 auto;
text-align: center;
font-weight: bold;
......@@ -11,9 +11,10 @@
width:100%;
height:auto;
margin:auto;
position: absolute;
}
.Bus_detailTable {
width: 800px;
width: 1000px;
font-size: 12px;
color: #333;
margin: 10px auto;
......@@ -24,7 +25,8 @@
.Bus_detailTable td {
border: 1px solid #d1d1d1;
padding: 3px 10px;
padding:0 10px;
height:32px;
font-size:16px;
}
......@@ -33,6 +35,7 @@
border: 1px solid #d1d1d1;
font-size:16px;
font-weight:bold;
height:32px;
}
.txLeft{
text-align: left;
......@@ -46,9 +49,6 @@
.totalTabal td{
height:33px;
}
/* body{
min-width: 100%!important;
} */
</style>
<template>
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue deleted 100644 → 0
View file @ 2f84a951
<style scoped>
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
._nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
._conten li{display: flex;padding:10px 30px;margin-top: 20px;border: 1px solid #ebebeb;}
._left{display: flex;flex: 6;align-items: center;border-right: 1px dashed #DCDFE6;padding-right: 20px !important;}
._left>div{padding-left: 14px}
._Icon{width: 50px;height: 50px;line-height: 50px;text-align: center;color: white;font-weight: bold;background-color: #2AAEF2;border-radius: 50%;font-size: 22px}
._t{color: #333333;font-size: 14px;padding-bottom: 7px;font-weight: bold}
._s{color: #666666;font-size: 12px;}
._right{flex: 1;align-items: center;display: flex;padding-left: 20px !important;border-left: 1px dashed #DCDFE6;justify-content: center;}
._right i{width: 30px;height: 30px;display: inline-block;color: white !important;border-radius: 50%;text-align: center;line-height: 30px;margin-right: 10px;cursor: pointer;outline: none;}
._right i.icon-liucheng{background-color: #00C6FF}
._right i.icon-liucheng:hover{background-color: #83d7ef}
._right i.icon-liucheng:active{background-color: #038cb3}
._right i.el-icon-circle-plus-outline{background-color: #47BF8C}
._right i.el-icon-circle-plus-outline:hover{background-color: #47BF8C}
._right i.el-icon-circle-plus-outline:active{background-color: #10a063}
._log_t{padding: 10px;}
</style>
<template>
<div>
<ul class="_nav clearfix" v-if="showTab==0">
<li :class="active==1?'_active':''" @click="active=1,tabData(1)">收款单</li>
<li :class="active==2?'_active':''" @click="active=2,tabData(2)">付款单</li>
</ul>
<ul class="_nav clearfix" v-else>
<li :class="active==1?'_active':''" v-if="showTab==1">收款单</li>
<li :class="active==2?'_active':''" v-if="showTab==2">付款单</li>
</ul>
<ul class="_conten">
<li v-for="(item,index) in GetList">
<div class="_left">
<span class="_Icon">{{item.Name.substring(0,1)}}</span>
<div>
<p class="_t">{{item.Name}}</p>
<p class="_s">{{item.DescribeInfo}}</p>
</div>
</div>
<div class="_right">
<el-tooltip popper-class="item _process" effect="dark" content="流程" placement="top">
<el-popover
popper-class="detailsIT_Journal"
width="580"
trigger="click">
<div class="InfoChangeLog" >
<div class="changLog">
<p class="_log_t">收款流程</p>
<my-FlowChartModule :data="AuditListData"></my-FlowChartModule>
</div>
</div>
<i slot="reference" class="iconfont icon-liucheng" @click="getFlowChart(item.Id)"></i>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="新增" placement="top">
<i class="edit el-icon-circle-plus-outline" @click="goUrl('addFinancialDocuments',item.Id,item.Name+'单',item.Type,item.IsUploadPic)"></i>
</el-tooltip>
</div>
</li>
</ul>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
</div>
</template>
<script>
import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
export default {
data(){
return{
GetList:[],
active:1,
AuditListData:{
AuditList:[]
},
collectList:[],
payList:[],
total:0,
currentPage:1,
noData:false,
lastID:-1,
orderObj:null,
showTab:0,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
if(this.active==1){
this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
}else{
this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}
},
getFlowChart(id){ //获取流程图
if(this.lastID==id)return
this.apipost('FinancialFlowTemplate_post_GetProcessList',{ID:id,WorkFlowID:0,TemplateType:0},res=>{
if(res.data.resultCode==1){
this.lastID = id
res.data.data.forEach(y=>{
y.contentTips = y.AuditDescription+(y.AuditWay=="2"?'（会签）':'（或签）')
});
this.AuditListData.AuditList = res.data.data
}else{}
},err=>{})
},
tabData(t){ //切换
if(t==1){
this.GetList = this.collectList;
}else{
this.GetList = this.payList;
}
if(this.GetList.length<1){
this.noData = true;
}else{
this.noData = false;
}
},
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
if(res.data.resultCode==1){
let data = res.data.data;
if(data){
data.forEach(x => {
if(x.Type==1){
this.collectList.push(x);
}else{
this.payList.push(x);
}
});
}
this.GetList = this.collectList;
if(this.GetList.length<1){
this.noData = true;
}
if(this.$route.query.Type){
this.tabData(this.$route.query.Type);
}
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
},mounted(){
this.Financial_post_GetList();
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){
this.GetList = this.collectList;
}else{
this.GetList = this.payList;
}
this.active = parseInt(this.$route.query.Type)?parseInt(this.$route.query.Type):1;
this.orderObj = this.$route.query.orderObj;
},components: {
"my-FlowChartModule": myFlowChartModule
}
}
</script>
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ e1935009
......@@ -496,6 +496,16 @@ tr._item_list td:last-child {
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="数据类别：">
<el-select v-model="msg.DataType" filterable class="w150">
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="1" label="团队营收"></el-option>
<el-option key="1" value="2" label="机票"></el-option>
<el-option key="2" value="3" label="签证"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
......@@ -570,7 +580,13 @@ import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
import { setTimeout } from "timers";
Vue.component("TCIDJump", {
// 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>`,
template: `
<div >
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
</div>
`,
props: {
rowData: {
type: Object
......@@ -588,7 +604,12 @@ Vue.component("TCIDJump", {
path: "/" + path,
query: { id: id, blank: "y" }
});
}
},goUrlVisa(path, id) {
this.$router.push({
path: "/" + path,
query: { VisaID: id, blank: "y" }
});
},
}
});
Vue.component("TCNUMJump", {
......@@ -662,6 +683,7 @@ export default {
endDate: "",
Type: 1,
QueryCondition:"-1",
DataType:"-1"
},
getCompanyMsg: {
// 公司
......@@ -730,7 +752,7 @@ export default {
{
field: "LineName",
title: "线路",
width: 80,
width: 120,
titleAlign: "left",
columnAlign: "left",
isResize: true,
......
src/components/Hotel/HotelProductCalendar.vue
View file @ e1935009
......@@ -35,8 +35,8 @@
<div :class="stockColor(item.data.InventoryType)" v-if="item.data&&item.month===calendar.data.date">
<p><span @click="goUrlA('2', item)" class="text_underLine">价格：{{item.data.CostPrice}}（{{item.data.CurrencyName}}）</span></p>
<p><span class="text_underLine" @click="goUrlB(item)">总库存：{{item.data.Inventory}}（间）</span></p>
<!-- <p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
<p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
<p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
<!-- <p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已使用库存：{{item.data.UseAmount}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory">欠房数量：{{item.data.OweAmount}}（间）</span></p>
<p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已确定：{{item.data.SureAmount}}（间）</span></p>
......
src/components/Hotel/HotelsTeam.vue
View file @ e1935009
......@@ -215,7 +215,8 @@
})
this.apipost('dmcstatistics_post_SetNewHotelOrder',item.CommonReport.HotelList[0],res=>{
if(res.data.resultCode==1){
this.Success(res.data.message)
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message)
}
......
src/components/LeaderManagement/leaderManagement.vue
View file @ e1935009
......@@ -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
View file @ e1935009
......@@ -83,7 +83,7 @@
<span v-if="item.RefundStatus==2">退款中</span>
<span v-if="item.RefundStatus==3">已退款</span>
</p>
<p else>
<p v-else>
<span v-if="item.Status==1">正常</span>
<span v-if="item.Status==2">取消</span>
<span v-if="item.Status==3">待付款</span>
......@@ -92,7 +92,7 @@
</td>
<td>
<p v-if="item.RefundStatus==1">
<p v-if="item.RefundStatus==2 && item.Status==1 && item.RefundFinanceList.length==0">
<el-tooltip class="item" effect="dark" content="退款" placement="top-end">
<el-button @click="RefundPay(item)" type="danger" icon="el-icon-star-off" circle></el-button>
</el-tooltip>
......@@ -160,9 +160,12 @@
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.FrID}}</span>
</span>
<span v-if="item.FinanceList==0">
<span v-if="item.FinanceList.length==0">
暂无数据
</span>
</span>
......@@ -174,9 +177,13 @@
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.FrID}}</span>
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span v-if="item.RefundFinanceList==0">
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ e1935009
......@@ -94,12 +94,16 @@
<tbody v-for="(item,index) in dataList" :key="index">
<tr>
<td>{{item.Id}} </td>
<td>{{item.Id}} </td><!-- 机票编码 -->
<td>
<span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span>
</td><!-- 机票编码 -->
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
<!-- <p class="fz12">123456</p> -->
</td>
<td>{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</td>
<td>
<span class="guest_num">{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</span>
</td>
<td class="fz12">{{item.TC_Price}}</td>
<td class="fz12">{{item.Unit_Price}}</td>
<td style="color:#E95252">{{item.PreferPrice}}</td>
......@@ -107,9 +111,15 @@
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>
<span v-if="item.Status==1">正常</span>
<span v-if="item.Status==2">取消</span>
<span v-if="item.Status==3">待付款</span>
<p v-if="item.RefundStatus!=1">
<span v-if="item.RefundStatus==2">退款中</span>
<span v-if="item.RefundStatus==3">已退款</span>
</p>
<p v-else>
<span v-if="item.Status==1">正常</span>
<span v-if="item.Status==2">取消</span>
<span v-if="item.Status==3">待付款</span>
</p>
</td>
</tr>
......@@ -170,26 +180,33 @@
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div>
<div>收款单据：</div>
<div>
<span style="cursor: default;">
<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">
<div style="cursor: pointer;">
<span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black">{{item2.FrID}}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span>
<span v-if="item.FinanceList.length==0">
暂无数据
</span>
</span>
</div>
</div>
<div>
<div>付款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
<span style="cursor: pointer;">
<span v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.FrID}}</span>
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span v-if="item.RefundFinanceList==0">
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
......@@ -279,7 +296,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 {
......@@ -304,6 +321,14 @@ export default {
</script>
<style scoped>
@import "../../assets/css/newTravelManager.css";
.guest_num:hover{
font-weight: bold;
}
.guest_num{
text-decoration: underline;
cursor: pointer;
color: rgb(26, 168, 107);
}
.tickets_green {
color: #008000;
text-decoration: underline;
......
src/components/Ticketing/IndividualTicketOrderDetails.vue
View file @ e1935009
......@@ -113,11 +113,15 @@
<div>
<div>收款单据：</div>
<div>
<span style="cursor: default;">
<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 style="cursor: pointer;">
<span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black">{{item2.FrID}}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span>
<span v-if="item.FinanceList.length==0">
暂无数据
</span>
</span>
......@@ -127,14 +131,18 @@
<div>
<div>付款单据：</div>
<div>
<span style="cursor: default;">
<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>
</span>
<span style="cursor: pointer;">
<span v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.FrID}}</span>
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
</div>
</div>
</td>
......
src/components/Ticketing/individualTicket.vue
View file @ e1935009
......@@ -286,6 +286,7 @@
<span>
<em>状态</em>
<el-select v-model="msg.FlyState" :placeholder="$t('system.ph_in')">
<el-option label="不限" :value='-1'></el-option>
<el-option label="未起飞" :value='0'></el-option>
<el-option label="已起飞" :value='1'></el-option>
</el-select>
......@@ -493,6 +494,7 @@
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
......@@ -500,14 +502,14 @@
pageIndex: 1,
pageSize: 6,
ID: 0,
QFlightDateStart:'',
QFlightDateStart:moment().format("YYYY-MM-DD"),
QFlightDateEnd: "",
Flight_number:'',
AirLineID: 0,
TicketType: 2, //定金类型(1定，2定等)
LineId: 0, //线路编号
IsPayOrder:0,
FlyState: 0,
FlyState: -1,
CreateBy: 0, //操作人
},
//员工列表
......@@ -544,6 +546,11 @@
},
};
},
created(){
if(this.$route.query.id){
this.msg.Flight_number=this.$route.query.id;
}
},
methods: {
goUrl(path, item) {
// console.log(item);
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ e1935009
......@@ -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/TravelManager/TravelList/TeamBalancePayment.vue
View file @ e1935009
......@@ -117,12 +117,12 @@
</style>
<template>
<div class="flexOne TeamBalancePayment" v-if="isShow" v-loading="loading">
<div class="flexOne TeamBalancePayment" v-loading="loading">
<div id="print">
<div class="Team_Details">
<div class="TB_comtitle">团队收支明细</div>
<div class="Team_Content">
<el-row :gutter="12">
<div class="Team_Content" v-loading="loading">
<el-row :gutter="12" v-if="DataList&&DataList.TeamBalance">
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">收客情况</div>
......@@ -189,7 +189,7 @@
</el-row>
</div>
</div>
<div class="Team_collection">
<div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddIncomeDetail" />
......@@ -459,7 +459,7 @@
</template>
</table>
</div>
<div class="Team_collection">
<div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
......@@ -573,7 +573,8 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if='item.OrderSource===4'>
<!-- <tr v-if='item.OrderSource===4 || isExists(item.CostTypeList,'国际段机票')'> -->
<tr v-if="isExists(item.CostTypeList,'国际段机票') || item.OrderSource===4">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -793,6 +794,53 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">赔偿</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="item.OrderSource===11 || isExists(item.CostTypeList,'赔偿')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div>
</div>
......@@ -808,7 +856,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4">
<tr v-if="NotExists(item.CostTypeList,'签证费') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -841,8 +889,7 @@
</template>
</table>
</div>
<div class="Team_collection">
<div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
......@@ -942,17 +989,15 @@
</template>
</table>
</div>
</div>
<div class="Team_BtnList">
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
<input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus" :value="DataList.TeamBalance.BrakeAccountStatus === 0 ? '关闭收支操作' : '开启收支操作'"
<input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus" :value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'"
class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
<input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
</div>
<el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px">
<el-form-item label="转出团号：" class="w280">
<el-input v-model="zhuanMsg.TCNUM"></el-input>
......@@ -972,7 +1017,6 @@
TCID: 0,
//数据列表
DataList: "",
isShow: false,
OutBranchId: 0,
ishowBtn: true,
CloseIncomeBtn: false,
......@@ -987,26 +1031,22 @@
},
methods: {
//判断数组包含字符串
isExists(array,str)
{
var flag=false;
array.forEach(item=>{
if(item==str && !flag)
{
flag=true;
}
isExists(array, str) {
var flag = false;
array.forEach(item => {
if (item == str && !flag) {
flag = true;
}
});
return flag;
},
//判断数组不包含字符串
NotExists(array,str)
{
var flag=true;
array.forEach(item=>{
if(item==str && flag)
{
flag=false;
}
NotExists(array, str) {
var flag = true;
array.forEach(item => {
if (item == str && flag) {
flag = false;
}
});
return flag;
},
......@@ -1072,7 +1112,6 @@
this.apipost("travel_get_GetTeamBalanceSheet", msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.isShow = true;
let data = res.data.data;
data.FiniceReciveList.forEach(x => {
x.checked = false;
......@@ -1122,7 +1161,8 @@
//导出EXCEL
ExportExcle() {
let msg = {
TCID: this.TCID
TCID: this.TCID,
uid:this.getLocalStorage().EmployeeId
};
this.GetLocalFile(
"travel_get_GetTeamBalanceSheetExport",
......@@ -1161,5 +1201,4 @@
this.getList();
}
};
</script>
</script>
\ No newline at end of file
src/components/activity/CouponList.vue
View file @ e1935009
......@@ -101,15 +101,15 @@
<td>{{item.couponCount}}</td>
<td>{{item.couponReceiveCount}}</td>
<td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
<td>{{item.lineName}}</td>
<td>{{item.lineId <= 0 ? '不限' : item.lineName}}</td>
<td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
<td>{{item.useCondition}}</td>
<td>{{item.denomination}}</td>
<!-- <td>{{item.useState}}</td> -->
<td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td>
<td>{{item.overlapUse === 0 ? "不允许" : "允许"}}</td>
<td>{{item.effectDate}}</td>
<td>{{item.expirationDate}}</td>
<td>{{item.createBy}}</td>
<td>{{item.createUserName}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改用户信息" placement="top">
<el-button
......@@ -323,12 +323,13 @@ export default {
companyList: [],
layerDepartMentList: [],
departMentList: [],
PostList: []
PostList: [],
groupId: '',
};
},
mounted() {
let userInfo = this.getLocalStorage();
this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
this.groupId = this.msg.groupId = this.getCompanyMsg.RB_Group_Id = this.addMsg.groupId = userInfo.RB_Group_id; //集团
this.msg.branchId = userInfo.RB_Branch_id; //公司
this.getList();
this.getCompany();
......@@ -456,6 +457,20 @@ export default {
resetForm(formName) {
//弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
this.addMsg = {
couponsName: "",
effectDate: "",
expirationDate: "",
couponsType: 1,
groupId: this.groupId,
branchId: "",
lineId: "",
denomination: "",
overlapUse: 0,
useCondition: "",
id: 0,
couponCount: '',
}
}
}
};
......
src/components/busManagement/BusApportionManagement.vue
View file @ e1935009
......@@ -952,7 +952,7 @@ export default {
ClientId:this.exportInfo.ClientId
}
});
window.open(routeData.href, "_blank");
window.open(routeData.href, "_blank");
},
showUpLoadFile(i){ // 预览上传文件
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ e1935009
......@@ -2,6 +2,14 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li><span><em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" class="w150" @change="getLineTeamList()">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li><span><em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150">
<el-option label="不限" value='-1'></el-option>
......@@ -273,7 +281,7 @@
pageIndex: 1,
pageSize: 10,
SelectType: 6,
LineId: 14,
LineId: 0,
LineteamId: "-1",
PriceStatus: "0",
//地接团号
......@@ -330,7 +338,7 @@
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
lineID: this.msg.LineId,
isTOOP: 1
},
res => {
......@@ -482,8 +490,9 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
this.getLineList();
this.getList()
this.getLineTeamList()
//this.getLineTeamList();
},
}
......
src/components/dmc/manager/teamReimbursement.vue
View file @ e1935009
......@@ -383,7 +383,9 @@
<div class="d7">
<el-button-group>
<el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
<el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
<el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
<!-- <el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
</el-button>
</el-button-group>
</div>
......@@ -562,6 +564,19 @@
}
})
},
//跳转打印页面
goToExport(path,obj,title){
let routeData = this.$router.resolve({
name: path,
query: {
"id": obj.TCIDs,
'num': obj.CombinationNum,
isUpdate: true,
}
});
window.open(routeData.href, "_blank");
},
//翻页
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
......
src/components/leaderPay2.vue 0 → 100644
View file @ e1935009
<style>
.leaderPayTable{
width:100%;
margin:10px auto;
text-align: center;
font-size: 12px;
color: #333;
border-collapse: collapse;
background-color: #fff;
border: 1px solid #d1d1d1;
}
.leaderPayTable th{
background: #E6E6E6;
padding:8px 0;
color: #333;
border: 1px solid #d1d1d1;
font-weight:bold;
}
.leaderPayTable tr td{
background-color:#fff;
padding:8px 0;
height: 32px;
border: 1px solid #d1d1d1;
}
.LeaderPrintDiv .LeaderTitle{
padding:10px;
text-align: left;
}
.leaderPayTable .itemName {
text-align: left;
padding: 0 10px;
}
.LeaderPrintDiv .printBtn{
color: #fff;
padding: 0 15px;
height: 30px;
background: #E95252;
border: 1px solid #E95252;
cursor: pointer;
border-radius: 15px;
position: fixed;
right:50px;
top:30px;
}
@media print{
.LeaderPrintDiv .printBtn{display:none}
}
.comTotal{
text-align:left;
padding-left:30px!important;
}
.LeaderPrintDiv{
width:100%;
position: absolute;
}
.LeaderPrintDiv .childDiv{
width:1000px;
margin:0 auto;
}
</style>
<template>
<div class="LeaderPrintDiv">
<div class="childDiv">
<table border="0" cellspacing='1' class="leaderPayTable">
<tr>
<th width="8%">出发地</th>
<th width="30%">行程名称</th>
<th width="15%">团号</th>
<th width="15%">出发时间</th>
<th width="8%">天数</th>
<th width="8%">出团人数</th>
<th width="8%">领队</th>
<th width="8%">导游</th>
</tr>
<tr v-for="item in nav">
<td>{{item.StartCityNames}}</td>
<td>
<div class="LeaderTitle">{{item.Titles}}</div>
</td>
<td>{{item.TCNUMS}}</td>
<td>{{item.FlightDate}}</td>
<td>{{item.DayNum}}天</td>
<td>{{item.TotalSeat}}人</td>
<td>{{item.LeaderName}}</td>
<td>{{item.GuideName}}</td>
</tr>
</table>
<table border="0" cellspacing='1' class="leaderPayTable">
<tbody>
<tr>
<th>项目类型</th>
<th>项目内容</th>
<th>实付金额</th>
<th>备注</th>
</tr>
<template v-for='(item,index) in dataList.ScenicList'>
<tr>
<td v-if="index==0" :rowspan="dataList.ScenicList.length">景点门票</td>
<td>
<div class="itemName" v-for="subItem in item.ScenicStatisticsList">
{{subItem.ScenicName}}
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
{{getTotal(subItem.ReimburseList.ReimburseDetailsList)}}
</div>
</td>
<td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}}
</template>
</td>
</tr>
</template>
<tr>
<td class="comTotal" colspan="4">合计：</td>
</tr>
<tr v-for="(item,index) in dataList.BusList">
<td v-if="index==0" :rowspan="dataList.BusList.length">交通</td>
<td>
<span v-if='index==0'>接机</span>
<span v-if='index!=0&&index!=dataList.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==dataList.BusList.length-1'>送机</span>
</td>
<td>
{{item.TotalPrice}}
</td>
<td>
{{item.Remarks}}
</td>
</tr>
<tr>
<td class="comTotal" colspan="4">合计：{{totalTrafficPrice}}</td>
</tr>
<template v-for='(item,index) in dataList.DiningList'>
<tr class="splitP ScenicTr" v-for='(titem,tindex) in item.DiningSummaryList'>
<td v-if="index==0" :rowspan="dataList.DiningList.length">餐饮</td>
<td>
<div class="itemName" v-for="subItem in item.DiningSummaryList">
{{subItem.DiningName}}
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
{{getTotal(subItem.ReimburseList.ReimburseDetailsList)}}
</div>
</td>
<td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}}
</template>
</td>
</tr>
</template>
<tr>
<td class="comTotal" colspan="4">合计：</td>
</tr>
<template v-for='(item,index) in dataList.HotelList'>
<tr>
<td v-if="index==0" :rowspan="dataList.HotelList.length">酒店</td>
<td width="30%">
<div class="itemName" >{{item.NewHotelName}}</div>
</td>
<td>{{item.TotalPrice}}</td>
<td>{{item.Remarks}}</td>
</tr>
</template>
<tr>
<td class="comTotal" colspan="4">合计：{{totalHotelPrice}}</td>
</tr>
</tbody>
</table>
<input type="button" class="printBtn" value="打印" @click="printTable()">
</div>
</div>
</template>
<script>
export default {
data () {
return {
isUpdate: false,
loading:false,
msg: {
TCIDs: '',
NewCombinationNum: ''
},
nav:[],
dataList:[],
//合计酒店
totalHotelPrice:0,
//合计交通
totalTrafficPrice:0,
}
},
methods: {
//获取数据
getList(){
this.loading = true
this.apipost('dmcstatistics_post_GetNewLeaderPayStatics', this.msg, res => {
this.loading = false
if (res.data.resultCode == 1) {
console.log(res,'ressssssss');
this.dataList = res.data.data;
this.dataList.HotelList.forEach(x=>{
this.totalHotelPrice+=x.TotalPrice
})
this.dataList.BusList.forEach(x=>{
this.totalTrafficPrice+=x.TotalPrice
})
} else {
this.Error(res.data.message)
}
}, err => {})
},
//获取顶部数据
getNav() {
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
TCIDs: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
this.nav = res.data.data;
} else {
this.Error(res.data.message)
}
}, err => {})
},
//获取总额
getTotal(obj) {
let totalPrice = 0
obj.forEach(x => {
totalPrice += x.UserNum * x.UnitPrice
})
return totalPrice
},
//打印
printTable(){
window.print();
}
},
created() {
},
mounted() {
this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id;
this.getNav();
this.getList();
},
}
</script>
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ e1935009
......@@ -774,7 +774,7 @@
goB2B() {
let userInfo = this.getLocalStorage();
var B2BDomain = userInfo.B2BDomain;
let configId = this.NewConfigId
let configId = this.NewConfigId;
window.open(
B2BDomain + "/#/detailTwo/" +
encodeURIComponent(configId) + '/' + 0 +
......
src/components/newTravelmanager/travelLineTrip/trifficTrip.vue
View file @ e1935009
......@@ -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>
......@@ -44,7 +44,8 @@
<!--增加交通计划-->
<span v-if="!isOpenGroup" class="addTrafficPlan" @click="addTrafficPlan(trafficObj)">+</span>
<!--减少交通计划-->
<span v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup" class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span>
<span v-if="trafficObj!=null && trafficObj.SubTraffic!=null && trafficObj.SubTraffic.length>1&&!isOpenGroup"
class="addTrafficPlan" @click="minusTrafficPlan(trafficObj)">-</span>
</div>
</div>
<div class="TC-TrauseCar">
......@@ -287,26 +288,22 @@
},
//用车类型点击事件
UseTypeClick(item, value) {
if(item.UseType==value)
{
item.UseType=0;
}
else
{
item.UseType = value;
if (item.UseType == value) {
item.UseType = 0;
} else {
item.UseType = value;
}
},
//点击添加交通计划
addTrafficPlan(item) {
if(item.SubTraffic==null)
{
item.SubTraffic=[];
if (item.SubTraffic == null) {
item.SubTraffic = [];
}
item.SubTraffic.push(this.$tripUtils.subTrafficObj());
},
//减去交通计划
minusTrafficPlan(item) {
if (item.SubTraffic!=null && item.SubTraffic.length > 1) {
if (item.SubTraffic != null && item.SubTraffic.length > 1) {
item.SubTraffic.splice(item.SubTraffic.length - 1, 1);
}
},
......@@ -324,13 +321,13 @@
this.DepartList1 = [];
this.ArriveList1 = [];
this.trafficObj.SubTraffic.forEach(item => {
if (item.StartCityId > 0) {
if (item.StartCityId > 0 && !this.CheckExists(this.DepartList1, item.StartCityId)) {
this.DepartList1.push({
ID: Number(item.StartCityId),
Name: item.StartCityName
});
}
if (item.ArrivalCityId > 0) {
if (item.ArrivalCityId > 0 && !this.CheckExists(this.ArriveList1, item.ArrivalCityId)) {
this.ArriveList1.push({
ID: Number(item.ArrivalCityId),
Name: item.ArrivalCityName
......@@ -340,6 +337,17 @@
}
}
},
CheckExists(array, Id) {
var flag = false;
if (array != null && array.length > 0) {
array.forEach(item => {
if (!flag && item.ID == Id) {
flag = true;
}
});
}
return flag;
},
//根据id获取出发城市
getTrafficType(id) {
var name = '';
......
src/plug/index.js
View file @ e1935009
......@@ -115,6 +115,7 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://reborn.oytour.com";
......
src/router/config.js
View file @ e1935009
......@@ -66,6 +66,11 @@ export default {
name: 'BusExport',
component: resolve => require(['@/components/BusExport'], resolve),
},
{
path: '/leaderPay2', //领队报账
name: 'leaderPay2',
component: resolve => require(['@/components/leaderPay2'], resolve),
},
{
path: '/index',
name: 'index',
......@@ -1031,7 +1036,8 @@ export default {
meta: {
title: '机票列表'
},
}, {
},
{
path: '/individualTicket', //散客机票
name: 'individualTicket',
component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
......@@ -1039,14 +1045,15 @@ export default {
title: '散客机票'
},
},
,{
path: '/IndividualTicketOrder', //散客今日机票订单
name: 'IndividualTicketOrder',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
meta: {
title: '散客机票今日订单'
},
},{
// ,{
// path: '/IndividualTicketOrder', //散客今日机票订单
// name: 'IndividualTicketOrder',
// component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
// meta: {
// title: '散客机票今日订单'
// },
// },
{
path: '/IndividualTicketOrderDetails', //散客机票订单详情
name: 'IndividualTicketOrderDetails',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrderDetails'], resolve),
......@@ -1866,14 +1873,14 @@ export default {
title: '机票订单'
},
},
{ // 销售 散卖机票订单
path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders',
component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
meta: {
title: '散卖机票订单'
},
},
// { // 销售 散卖机票订单
// path: '/BulkAirTicketOrders',
// name: 'BulkAirTicketOrders',
// component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
// meta: {
// title: '散卖机票订单'
// },
// },
{ // 销售 报名统计
path: '/enrollTotal',
......
static/CurveLine.min.js 0 → 100644
View file @ e1935009
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 @ e1935009
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