Skip to content

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

解决冲突

parents 11511fb6 7b847975
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 85 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ a7cf7852
...@@ -124,7 +124,12 @@ ...@@ -124,7 +124,12 @@
if(x.Type==1){ if(x.Type==1){
this.collectList.push(x); this.collectList.push(x);
}else{ }else{
this.payList.push(x); if(this.active===2){
if(x.Id!=11){
this.payList.push(x);
}
}else{
this.payList.push(x);}
} }
}); });
} }
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ a7cf7852
...@@ -496,6 +496,16 @@ tr._item_list td:last-child { ...@@ -496,6 +496,16 @@ tr._item_list td:last-child {
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </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-row>
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix">
...@@ -570,7 +580,13 @@ import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy"; ...@@ -570,7 +580,13 @@ import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
import { setTimeout } from "timers"; import { setTimeout } from "timers";
Vue.component("TCIDJump", { 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: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -588,7 +604,12 @@ Vue.component("TCIDJump", { ...@@ -588,7 +604,12 @@ Vue.component("TCIDJump", {
path: "/" + path, path: "/" + path,
query: { id: id, blank: "y" } query: { id: id, blank: "y" }
}); });
} },goUrlVisa(path, id) {
this.$router.push({
path: "/" + path,
query: { VisaID: id, blank: "y" }
});
},
} }
}); });
Vue.component("TCNUMJump", { Vue.component("TCNUMJump", {
...@@ -662,6 +683,7 @@ export default { ...@@ -662,6 +683,7 @@ export default {
endDate: "", endDate: "",
Type: 1, Type: 1,
QueryCondition:"-1", QueryCondition:"-1",
DataType:"-1"
}, },
getCompanyMsg: { getCompanyMsg: {
// 公司 // 公司
...@@ -730,7 +752,7 @@ export default { ...@@ -730,7 +752,7 @@ export default {
{ {
field: "LineName", field: "LineName",
title: "线路", title: "线路",
width: 80, width: 120,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
......
src/components/LeaderManagement/leaderManagement.vue
View file @ a7cf7852
...@@ -342,8 +342,8 @@ ...@@ -342,8 +342,8 @@
</div> </div>
<div class="clearfix botmInfo" v-if="!item.LeaderGuidClass"> <div class="clearfix botmInfo" v-if="!item.LeaderGuidClass">
<div class="leftCode"> <div class="leftCode">
<barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}" <!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> tag="canvas"></barcode> -->
</div> </div>
<div class="phoneNum"> <div class="phoneNum">
<!-- <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} --> <!-- <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} -->
...@@ -382,8 +382,8 @@ ...@@ -382,8 +382,8 @@
</div> </div>
<div class="clearfix botmInfo"> <div class="clearfix botmInfo">
<div class="leftCode"> <div class="leftCode">
<barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}" <!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> tag="canvas"></barcode> -->
</div> </div>
<div class="phoneNum"> <div class="phoneNum">
<!-- <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} --> <!-- <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} -->
......
src/components/SalesModule/BulkAirTicketOrders.vue
View file @ a7cf7852
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<span v-if="item.RefundStatus==2">退款中</span> <span v-if="item.RefundStatus==2">退款中</span>
<span v-if="item.RefundStatus==3">已退款</span> <span v-if="item.RefundStatus==3">已退款</span>
</p> </p>
<p else> <p v-else>
<span v-if="item.Status==1">正常</span> <span v-if="item.Status==1">正常</span>
<span v-if="item.Status==2">取消</span> <span v-if="item.Status==2">取消</span>
<span v-if="item.Status==3">待付款</span> <span v-if="item.Status==3">待付款</span>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</td> </td>
<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-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-button @click="RefundPay(item)" type="danger" icon="el-icon-star-off" circle></el-button>
</el-tooltip> </el-tooltip>
...@@ -160,9 +160,12 @@ ...@@ -160,9 +160,12 @@
<div> <div>
<span style="cursor: default;"> <span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin"> <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>
<span v-if="item.FinanceList==0"> <span v-if="item.FinanceList.length==0">
暂无数据 暂无数据
</span> </span>
</span> </span>
...@@ -174,9 +177,13 @@ ...@@ -174,9 +177,13 @@
<div> <div>
<span style="cursor: default;"> <span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin"> <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>
<span v-if="item.RefundFinanceList==0"> <span v-if="item.RefundFinanceList.length==0">
暂无数据 暂无数据
</span> </span>
</span> </span>
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ a7cf7852
...@@ -94,12 +94,16 @@ ...@@ -94,12 +94,16 @@
<tbody v-for="(item,index) in dataList" :key="index"> <tbody v-for="(item,index) in dataList" :key="index">
<tr> <tr>
<td>{{item.Id}} </td> <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> <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
<!-- <p class="fz12">123456</p> --> <!-- <p class="fz12">123456</p> -->
</td> </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.TC_Price}}</td>
<td class="fz12">{{item.Unit_Price}}</td> <td class="fz12">{{item.Unit_Price}}</td>
<td style="color:#E95252">{{item.PreferPrice}}</td> <td style="color:#E95252">{{item.PreferPrice}}</td>
...@@ -107,9 +111,15 @@ ...@@ -107,9 +111,15 @@
<td>{{item.Refund}}</td> <td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td> <td>{{item.PlatformTax}}</td>
<td> <td>
<span v-if="item.Status==1">正常</span> <p v-if="item.RefundStatus!=1">
<span v-if="item.Status==2">取消</span> <span v-if="item.RefundStatus==2">退款中</span>
<span v-if="item.Status==3">待付款</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> </td>
</tr> </tr>
...@@ -170,26 +180,33 @@ ...@@ -170,26 +180,33 @@
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
<div> <div style="cursor: pointer;">
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin"> <span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> <span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}</span>
</span> <span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.FrID}}</span>
<span v-if="item.FinanceList==0"> <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>
</span>
</div> </div>
</div> </div>
<div> <div>
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;"> <span style="cursor: pointer;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin"> <span 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>
<span v-if="item.RefundFinanceList==0"> <span v-if="item.RefundFinanceList.length==0">
暂无数据 暂无数据
</span> </span>
</span> </span>
...@@ -279,7 +296,7 @@ export default { ...@@ -279,7 +296,7 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// console.log(res); console.log(res);
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
} else { } else {
...@@ -304,6 +321,14 @@ export default { ...@@ -304,6 +321,14 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/newTravelManager.css"; @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 { .tickets_green {
color: #008000; color: #008000;
text-decoration: underline; text-decoration: underline;
......
src/components/Ticketing/IndividualTicketOrderDetails.vue
View file @ a7cf7852
...@@ -113,11 +113,15 @@ ...@@ -113,11 +113,15 @@
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span style="cursor: default;"> <span style="cursor: pointer;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin"> <span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> <span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}</span>
</span> <span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.FrID}}</span>
<span v-if="item.FinanceList==0"> <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>
</span> </span>
...@@ -127,14 +131,18 @@ ...@@ -127,14 +131,18 @@
<div> <div>
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;"> <span style="cursor: pointer;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin"> <span 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> <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span v-if="item.RefundFinanceList==0"> <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 @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span> </span>
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
</div> </div>
</div> </div>
</td> </td>
......
src/components/Ticketing/individualTicket.vue
View file @ a7cf7852
...@@ -286,6 +286,7 @@ ...@@ -286,6 +286,7 @@
<span> <span>
<em>状态</em> <em>状态</em>
<el-select v-model="msg.FlyState" :placeholder="$t('system.ph_in')"> <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='0'></el-option>
<el-option label="已起飞" :value='1'></el-option> <el-option label="已起飞" :value='1'></el-option>
</el-select> </el-select>
...@@ -493,6 +494,7 @@ ...@@ -493,6 +494,7 @@
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
export default { export default {
data() { data() {
return { return {
...@@ -500,14 +502,14 @@ ...@@ -500,14 +502,14 @@
pageIndex: 1, pageIndex: 1,
pageSize: 6, pageSize: 6,
ID: 0, ID: 0,
QFlightDateStart:'', QFlightDateStart:moment().format("YYYY-MM-DD"),
QFlightDateEnd: "", QFlightDateEnd: "",
Flight_number:'', Flight_number:'',
AirLineID: 0, AirLineID: 0,
TicketType: 2, //定金类型(1定，2定等) TicketType: 2, //定金类型(1定，2定等)
LineId: 0, //线路编号 LineId: 0, //线路编号
IsPayOrder:0, IsPayOrder:0,
FlyState: 0, FlyState: -1,
CreateBy: 0, //操作人 CreateBy: 0, //操作人
}, },
//员工列表 //员工列表
...@@ -544,6 +546,11 @@ ...@@ -544,6 +546,11 @@
}, },
}; };
}, },
created(){
if(this.$route.query.id){
this.msg.Flight_number=this.$route.query.id;
}
},
methods: { methods: {
goUrl(path, item) { goUrl(path, item) {
// console.log(item); // console.log(item);
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ a7cf7852
...@@ -240,8 +240,8 @@ ...@@ -240,8 +240,8 @@
</div> </div>
<div class="clearfix botmInfo"> <div class="clearfix botmInfo">
<div class="leftCode"> <div class="leftCode">
<barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}" <!-- <barcode :value="item.Passport" :options="{ lineColor: '#000',displayValue:true, width:'2', height: '40px', fontSize: '20px',background:'transparent',textPosition :'top',textMargin:'5px'}"
tag="canvas"></barcode> tag="canvas"></barcode> -->
</div> </div>
<div class="phoneNum"> <div class="phoneNum">
<i class="iconfont icon-dianhua"></i>{{item.MobilePhone}} <i class="iconfont icon-dianhua"></i>{{item.MobilePhone}}
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ a7cf7852
...@@ -117,12 +117,12 @@ ...@@ -117,12 +117,12 @@
</style> </style>
<template> <template>
<div class="flexOne TeamBalancePayment" v-if="isShow" v-loading="loading"> <div class="flexOne TeamBalancePayment" v-loading="loading">
<div id="print"> <div id="print">
<div class="Team_Details"> <div class="Team_Details">
<div class="TB_comtitle">团队收支明细</div> <div class="TB_comtitle">团队收支明细</div>
<div class="Team_Content"> <div class="Team_Content" v-loading="loading">
<el-row :gutter="12"> <el-row :gutter="12" v-if="DataList&&DataList.TeamBalance">
<el-col :span="4"> <el-col :span="4">
<div class="Team_DList"> <div class="Team_DList">
<div class="Team_firstTitle">收客情况</div> <div class="Team_firstTitle">收客情况</div>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="Team_collection"> <div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入</div> <div class="TB_comtitle TB-Title">收入</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddIncomeDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddIncomeDetail" />
...@@ -459,7 +459,7 @@ ...@@ -459,7 +459,7 @@
</template> </template>
</table> </table>
</div> </div>
<div class="Team_collection"> <div class="Team_collection" v-loading="loading">
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div> <div class="TB_comtitle TB-Title">成本</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
...@@ -573,7 +573,8 @@ ...@@ -573,7 +573,8 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <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> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -793,6 +794,53 @@ ...@@ -793,6 +794,53 @@
</tr> </tr>
</template> </template>
</table> </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="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">其他：</div> <div class="TB_comtitle TB-Title">其他：</div>
</div> </div>
...@@ -808,7 +856,7 @@ ...@@ -808,7 +856,7 @@
<th width="200">当前审核人</th> <th width="200">当前审核人</th>
</tr> </tr>
<template v-for="item in DataList.FinicePayList"> <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> <td>
<el-checkbox v-model="item.checked"></el-checkbox> <el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span> <span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
...@@ -841,8 +889,7 @@ ...@@ -841,8 +889,7 @@
</template> </template>
</table> </table>
</div> </div>
<div class="Team_collection" v-loading="loading">
<div class="Team_collection">
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div> <div class="TB_comtitle TB-Title">非成本</div>
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
...@@ -942,17 +989,15 @@ ...@@ -942,17 +989,15 @@
</template> </template>
</table> </table>
</div> </div>
</div> </div>
<div class="Team_BtnList"> <div class="Team_BtnList">
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" /> <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" /> class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" /> <input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
<input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" /> <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
</div> </div>
<el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg"> <el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
<!--zhaunMsg.TCNUM-->
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item label="转出团号：" class="w280"> <el-form-item label="转出团号：" class="w280">
<el-input v-model="zhuanMsg.TCNUM"></el-input> <el-input v-model="zhuanMsg.TCNUM"></el-input>
...@@ -972,7 +1017,6 @@ ...@@ -972,7 +1017,6 @@
TCID: 0, TCID: 0,
//数据列表 //数据列表
DataList: "", DataList: "",
isShow: false,
OutBranchId: 0, OutBranchId: 0,
ishowBtn: true, ishowBtn: true,
CloseIncomeBtn: false, CloseIncomeBtn: false,
...@@ -987,26 +1031,22 @@ ...@@ -987,26 +1031,22 @@
}, },
methods: { methods: {
//判断数组包含字符串 //判断数组包含字符串
isExists(array,str) isExists(array, str) {
{ var flag = false;
var flag=false; array.forEach(item => {
array.forEach(item=>{ if (item == str && !flag) {
if(item==str && !flag) flag = true;
{ }
flag=true;
}
}); });
return flag; return flag;
}, },
//判断数组不包含字符串 //判断数组不包含字符串
NotExists(array,str) NotExists(array, str) {
{ var flag = true;
var flag=true; array.forEach(item => {
array.forEach(item=>{ if (item == str && flag) {
if(item==str && flag) flag = false;
{ }
flag=false;
}
}); });
return flag; return flag;
}, },
...@@ -1072,7 +1112,6 @@ ...@@ -1072,7 +1112,6 @@
this.apipost("travel_get_GetTeamBalanceSheet", msg, res => { this.apipost("travel_get_GetTeamBalanceSheet", msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.isShow = true;
let data = res.data.data; let data = res.data.data;
data.FiniceReciveList.forEach(x => { data.FiniceReciveList.forEach(x => {
x.checked = false; x.checked = false;
...@@ -1122,7 +1161,8 @@ ...@@ -1122,7 +1161,8 @@
//导出EXCEL //导出EXCEL
ExportExcle() { ExportExcle() {
let msg = { let msg = {
TCID: this.TCID TCID: this.TCID,
uid:this.getLocalStorage().EmployeeId
}; };
this.GetLocalFile( this.GetLocalFile(
"travel_get_GetTeamBalanceSheetExport", "travel_get_GetTeamBalanceSheetExport",
...@@ -1161,5 +1201,4 @@ ...@@ -1161,5 +1201,4 @@
this.getList(); this.getList();
} }
}; };
</script>
</script> \ No newline at end of file
src/components/newTravelmanager/travelLineTrip/trifficTrip.vue
View file @ a7cf7852
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.StartCityId" <el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.StartCityId"
@visible-change="GetDepartList1($event)" @change="changeGetDepartList(subTraffic.StartCityId)"> @visible-change="GetDepartList1($event)" @change="changeGetDepartList(subTraffic.StartCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <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-select>
</el-form-item> </el-form-item>
</span> </span>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.ArrivalCityId" <el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.ArrivalCityId"
@visible-change="GetArrivalList1($event)" @change="changeArrivalCity(subTraffic.ArrivalCityId)"> @visible-change="GetArrivalList1($event)" @change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <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-select>
</el-form-item> </el-form-item>
</span> </span>
......
src/plug/index.js
View file @ a7cf7852
...@@ -115,9 +115,13 @@ export default { ...@@ -115,9 +115,13 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
<<<<<<< HEAD
domainUrl = "http://192.168.2.65:8025"; //214主域名 domainUrl = "http://192.168.2.65:8025"; //214主域名
=======
domainUrl = "http://192.168.2.214:8082"; //214主域名
>>>>>>> 7b8479755cbf4d14d1c76d3cc81fe02bca102d72
if (locationName.indexOf('oytour')!==-1) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://webapi.viitto.com"; domainUrl = "http://reborn.oytour.com";
} }
else if (locationName.indexOf('viitto')!==-1) { else if (locationName.indexOf('viitto')!==-1) {
domainUrl = "https://test.viitto.com"; domainUrl = "https://test.viitto.com";
......
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