Commit e4787f74 authored by 罗超's avatar 罗超

1

parent 01d8e971
...@@ -418,82 +418,46 @@ ...@@ -418,82 +418,46 @@
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;"> <el-row style="padding:15px 20px 0 0;">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="出团公司:"> <el-form-item label="校区id:">
<el-select :disabled="BranchStatus" filterable v-model="msg.OutBranchId" class> <el-input v-model="msg.TCNUM" class></el-input>
<el-option :value="-1" label="不限"></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.BName"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="出发城市:"> <el-form-item label="类型:">
<el-select filterable v-model="msg.StartCityId" class> <el-select filterable v-model="msg.DateType">
<el-option :value="0" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option <el-option :value="1" label="培训"></el-option>
v-for="item in startCityList1" <el-option :value="2" label="留学"></el-option>
:label="item.startCityName"
:value="item.ID"
:key="item.startCityName"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="线路:"> <el-form-item label="班级名称:">
<el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId,-1),getLinePlaceList(msg.LineId)"> <el-input v-model="msg.ClassName"></el-input>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in LineList"
:label="item.LineName"
:value="item.LineID"
:key="item.LineName"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="目的地"> <el-form-item label=" 班级状态:">
<el-select filterable v-model="msg.PlaceId" @change="getLineTeamList(msg.LineId,msg.PlaceId)"> <el-select filterable v-model="msg.ClassState">
<el-option :value="0" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option <el-option :value="1" label="未开课"></el-option>
v-for="(item,index) in PlaceList" <el-option :value="2" label="学习中"></el-option>
:label="item.PlaceName" <el-option :value="3" label="已结课"></el-option>
:value="item.PlaceID"
:key="index+1000"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="系列:">
<el-select filterable v-model="msg.LineTeamId" class>
<el-option :value="0" label="不限"></el-option>
<el-option
v-for="item in LineTeamList"
:label="item.LtName"
:value="item.LtID"
:key="item.LtName"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="团号:"> <el-form-item label="课程名称:">
<el-input v-model="msg.TCNUM" class></el-input> <el-input v-model="msg.CourseName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="团队编号:"> <el-form-item label="教师名称:">
<el-input v-model="msg.TCID" class></el-input> <el-input v-model="msg.TeacherName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="发团日期:"> <el-form-item label="开班时间:">
<el-date-picker <el-date-picker
class="h34" class="h34"
@change="timeAdd(1)" @change="timeAdd(1)"
...@@ -505,101 +469,8 @@ ...@@ -505,101 +469,8 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="数据类别:">
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150" v-if="isShowGrounding==true">
<el-option value="-1" v-if="isShowType" label="不限"></el-option>
<el-option value="1" v-if="isShowType" label="团队营收"></el-option>
<el-option value="3" v-if="isShowType" label="单办签证"></el-option>
<el-option value="2" label="国际机票"></el-option>
<el-option value="4" label="国内票务"></el-option>
<!-- <el-option value="5" v-if="isShowType" label="散卖机票"></el-option> -->
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
<el-option value="12" v-if="isShowType" label="日本地接部专户(人民币)"></el-option>
<el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option>
<el-option value="8" label="票务部专户"></el-option>
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
<el-option value="13" label="机票折让收入"></el-option>
<el-option value="14" label="单机票收入"></el-option>
<el-option value="15" v-if="isShowType" label="手配费收入"></el-option>
</el-select>
<el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150" v-if="isShowGrounding==false">
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
<el-option value="12" v-if="isShowType" label="日本地接部专户(人民币)"></el-option>
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
<el-option value="15" v-if="isShowType" label="手配费收入"></el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="heightQueryBox">
<el-col :span="4">
<el-form-item label="状态:">
<el-select v-model="msg.QueryCondition" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="0" label="待收"></el-option>
<el-option value="1" label="退款"></el-option>
<el-option value="2" label="在途"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="出团状态:">
<el-select v-model="msg.OutTCStatus" filterable class="w150">
<el-option value="0" label="不限"></el-option>
<el-option value="1" label="已出团"></el-option>
<el-option value="2" label="未出团"></el-option>
<el-option value="3" label="未发团"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="是否联运:">
<el-select v-model="msg.Is_Transport" filterable class="w150">
<el-option value="-1" label="不限"></el-option>
<el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="地接团号:">
<el-input v-model="msg.DMCNUM" class></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队类型:">
<el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
<el-option :value="0" label="请选择"></el-option>
<el-option :value="1" label="领队"></el-option>
<el-option :value="2" label="领兼导"></el-option>
<el-option :value="3" label="导游"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队/导游:">
<el-select v-model="msg.LeaderId" filterable class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="只看收据未制单:" label-width="125px">
<el-select v-model="msg.IsSelectReceipt" filterable class="w150">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="0"></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="4" v-if="userId==1 || userId==5 || F_GeneralManager"> <el-col :span="4" v-if="userId==1 || userId==5 || F_GeneralManager">
<el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button> <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
<el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button> <el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
</el-col> </el-col>
...@@ -610,8 +481,6 @@ ...@@ -610,8 +481,6 @@
每日8点、12点、19点、22点数据更新~ 每日8点、12点、19点、22点数据更新~
</p> </p>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<ul class="clearfix"> <ul class="clearfix">
...@@ -621,7 +490,7 @@ ...@@ -621,7 +490,7 @@
<span> <span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em> <em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> </span>
<button class="normalBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> <button class="normalBtn" @click="resetPageIndex(),getData()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="method5()">导出</button> <button class="hollowFixedBtn" @click="method5()">导出</button>
<!-- <button class="normalBtn" @click="togbu">一键同步</button> --> <!-- <button class="normalBtn" @click="togbu">一键同步</button> -->
<!--<button class="hollowFixedBtn" @click="exportExcelCurrentPage">导出2</button>--> <!--<button class="hollowFixedBtn" @click="exportExcelCurrentPage">导出2</button>-->
...@@ -689,6 +558,10 @@ ...@@ -689,6 +558,10 @@
import Vue from "vue"; import Vue from "vue";
import XLSX from "xlsx"; import XLSX from "xlsx";
// import downloadExcelEasy from "./utils/downloadExcelEasy"; // import downloadExcelEasy from "./utils/downloadExcelEasy";
import {
getRevenueReportPageList,
} from '../../api/report/index'
console.log(getRevenueReportPageList)
import { setTimeout } from "timers"; import { setTimeout } from "timers";
Vue.component("TCIDJump", { Vue.component("TCIDJump", {
// 团队跳转 // 团队跳转
...@@ -784,7 +657,7 @@ ...@@ -784,7 +657,7 @@
}, },
goRec(path,rowData){ goRec(path,rowData){
let BankID=""; let BankID="";
let StartDate=""; let StartTime="";
if(rowData.DataType===6){ if(rowData.DataType===6){
BankID=14; BankID=14;
} }
...@@ -797,24 +670,24 @@ ...@@ -797,24 +670,24 @@
// 机票折让费 // 机票折让费
if(rowData.DataType===13){ if(rowData.DataType===13){
BankID=""; BankID="";
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD"); StartTime=moment(rowData.StartTime).format("YYYY-MM-DD");
} }
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){ if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD"); StartTime=moment(rowData.StartTime).format("YYYY-MM-DD");
} }
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"} query: {'rec':'rec','StartTime':StartTime,"BankID":BankID,blank: "y"}
}); });
}, },
goAIR(path,rowData){ goAIR(path,rowData){
let StartDate=""; let StartTime="";
if(rowData.TCNUM.indexOf('AIR')!=-1){ if(rowData.TCNUM.indexOf('AIR')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD"); StartTime=moment(rowData.StartTime).format("YYYY-MM-DD");
} }
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: {'air':'air','StartDate':StartDate,"BankID":17,blank: "y"} query: {'air':'air','StartTime':StartTime,"BankID":17,blank: "y"}
}); });
}, },
...@@ -954,43 +827,27 @@ ...@@ -954,43 +827,27 @@
isShowType:true, isShowType:true,
isShowGrounding:true, isShowGrounding:true,
msg: { msg: {
Is_Open:-1, SchoolId:"",
pageIndex: 1, DateType:"",
pageSize: 16, ClassName:"",
OutBranchId:-1, ClassState:"",
StartCityId: "", CourseName:"",
LineId: "", TeacherName:"",
LineTeamId: "", StartTime:"",
TCID: "", EndTime:"",
startDate: "",
endDate: "",
Type: 1,
QueryCondition: "-1",
DataType: "1",
Is_Transport:'-1',
LeaderId:0,
LeaderType:0,
OutTCStatus:'0',
IsSelectReceipt:0,
},
getCompanyMsg: {
// 公司
RB_Group_Id: "0",
Status: "0"
}, },
DataList: [], DataList: [],
UpdateStaus:0, UpdateStaus:0,
UpdateStartTime:'', UpdateStartTime:'',
UpdateEndTime:'', UpdateEndTime:'',
CompanyList: [],
productionDate: [], productionDate: [],
loading: false, loading: false,
currentPage: 1, currentPage: 1,
total: 0, total: 0,
tableData: [], tableData: [],
LineList: [],
LineTeamList: [],
startCityList1: [],
multipleSort: false, multipleSort: false,
kaiqiZzBox: false, kaiqiZzBox: false,
KaiqiZzTime: [], KaiqiZzTime: [],
...@@ -998,7 +855,7 @@ ...@@ -998,7 +855,7 @@
kaiqiZzTitle: "", kaiqiZzTitle: "",
kaiqiZzLoading: false, kaiqiZzLoading: false,
kaiqiZzMsg: { kaiqiZzMsg: {
QStartDate: "", QStartTime: "",
QEndDate: "", QEndDate: "",
Is_Open: "" Is_Open: ""
}, },
...@@ -1044,8 +901,8 @@ ...@@ -1044,8 +901,8 @@
columns: [ columns: [
// 团队编号、团号 点击跳转团控列表 // 团队编号、团号 点击跳转团控列表
{ {
field: "LineName", field: "SchoolName",
title: "线路", title: "校区",
width: 120, width: 120,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
...@@ -1055,18 +912,18 @@ ...@@ -1055,18 +912,18 @@
isFrozen: true isFrozen: true
}, },
{ {
field: "TCID", field: "ClassId",
title: "团队编号", title: "班级编号",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
isFrozen: true, isFrozen: true,
componentName: "TCIDJump"
}, },
{ {
field: "TCNUM", field: "ClassName",
title: "团号", title: "班级",
width: 150, width: 150,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
...@@ -1075,22 +932,20 @@ ...@@ -1075,22 +932,20 @@
filterMultiple: false, filterMultiple: false,
type: "text", type: "text",
isFrozen: true, isFrozen: true,
componentName: "TCNUMJump"
}, },
{ {
field: "OutTCStatus", field: "ClassBeginsStr",
title: "团队状态", title: "开班时间",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
isFrozen: true, isFrozen: true,
componentName: "TCStatusport"
}, },
{ {
field: "LeaderName", field: "ClassState",
title: "领队", title: "班级状态",
width: 60, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
...@@ -1099,9 +954,9 @@ ...@@ -1099,9 +954,9 @@
isFrozen: true isFrozen: true
}, },
{ {
field: "GuideName", field: "CourseName",
title: "导游", title: "课程",
width: 60, width: 200,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
...@@ -1110,45 +965,32 @@ ...@@ -1110,45 +965,32 @@
isFrozen: true isFrozen: true
}, },
{ {
field: "Is_Transport", field: "TeacherName",
title: "是否有联运支出", title: "教师",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "left",
isResize: true, isResize: true,
isFrozen: true, isFrozen: true,
componentName: "Transport"
}, },
{
field: "DMCNUM",
formatter: this.moneyFormat,
title: "地接团号",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
}, //,orderBy:''
{ {
field: "YingShou", field: "YingShou",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "应收金额", title: "应收",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, //,orderBy:'' }, //,orderBy:''
{ {
field: "ShiShou", field: "ShiShou",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "实收金额", title: "实收",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" }, //,orderBy:''
},
{ {
field: "TuiKuan", field: "TuiKuan",
formatter: this.moneyFormat, formatter: this.moneyFormat,
...@@ -1157,284 +999,102 @@ ...@@ -1157,284 +999,102 @@
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "PingTaiShuiJin", field: " PingTaiShuiJin",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "平台税金", title: "手续费",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ZaiTu",
formatter: this.moneyFormat,
title: "在途",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "YouHui", field: "YouHui",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "优惠", title: "优惠金额",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RedEnvelopeMoney",
formatter: this.moneyFormat,
title: "幸福存折",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "DaiShou", field: "DaiShou",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "待收金额", title: "待收",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "YiShou", field: "YiShou",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "溢收金额", title: "溢收",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "GuestNum", field: "GuestNum",
title: "人数",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "GuestNum"
},
{
field: "ManNum",
title: "男/女",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "ManNum"
},
{
field: "AgeAvg",
title: "平均年龄",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YaoQingHan",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "邀请函", title: "学生数量",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "CheZi",
formatter: this.moneyFormat,
title: "车资",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "JiPiao",
formatter: this.moneyFormat,
title: "机票款",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "GuoNeiLianYunJiPiao",
formatter: this.moneyFormat,
title: "国内联运机票",
width: 120,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
// {field: 'Money11', title: '房费',width: 90, titleAlign: 'left',columnAlign:'left',isResize:true},
{
field: "Visa",
formatter: this.moneyFormat,
title: "签证",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TiCheng",
title: "提成",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "CompensationMoney", field: " QTShouRu",
title: "赔偿",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "其他收入",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "BaoXian", field: "TiCheng",
title: "保险费",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "提成",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "QiTa",
formatter: this.moneyFormat,
title: "其他支出",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DiJieZhiChu",
formatter: this.moneyFormat,
title: "地接款支出",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "DiJieShouRu", field: "ClassFee",
formatter: this.moneyFormat, title: "课时费",
title: "地接款收入", width: 50,
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ZiFei",
formatter: this.moneyFormat,
title: "自费收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "XiaoFeiShouRu",
formatter: this.moneyFormat,
title: "小费收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "XiaoFeiFinance",
formatter: this.moneyFormat,
title: "单据小费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "XiaoFeiTravelStr",
formatter: this.moneyFormat,
title: "团队小费",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "YongJinShouRu",
formatter: this.moneyFormat,
title: "佣金收入",
width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "YongJinShouRuAvg", field: "JiXiaoMoney",
formatter: this.moneyFormat, title: "绩效奖金",
title: "平均佣金收入", width: 50,
width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "QTShouRu", field: "QTZhiChu",
formatter: this.moneyFormat, title: "其他支出",
title: "其他收入", width: 50,
width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "YingFu", field: "YingFu",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "应付金额", title: "应付",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "MaoLi", field: "MaoLi",
...@@ -1444,47 +1104,24 @@ ...@@ -1444,47 +1104,24 @@
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "MaoLiRate", field: "MaoLiRate",
// formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "毛利率", title: "毛利率",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "GZIncome",
// formatter: this.moneyFormat,
title: "挂账收入",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "CDIncome",
// formatter: this.moneyFormat,
title: "挂账支出",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "ShiJiLiRun", field: "ShiJiLiRun",
formatter: this.moneyFormat, formatter: this.moneyFormat,
title: "实际利润", title: "实际利润",
width: 90, width: 120,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang"
}, },
{ {
field: "Remark", field: "Remark",
...@@ -1493,296 +1130,34 @@ ...@@ -1493,296 +1130,34 @@
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true isResize: true,
},
{
field: "BName",
title: "公司别",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCD",
title: "成都",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportKM",
title: "昆明",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCQ",
title: "重庆",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportWH",
title: "武汉",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXA",
title: "西安",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCS",
title: "长沙",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportGY",
title: "贵阳",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNC",
title: "南昌",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXM",
title: "厦门",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportLZ",
title: "兰州",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNJ",
title: "南京",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportWT",
title: "微途",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportHF",
title: "合肥",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportNN",
title: "南宁",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportZZ",
title: "郑州",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportXC",
title: "西昌",
width: 50,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TransportCost",
formatter: this.moneyFormat,
title: "联运成本",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "UnionExtraMoney",
formatter: this.moneyFormat,
title: "额外返佣",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "UnionTiCheng",
formatter: this.moneyFormat,
title: "联运提成",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "YingYeE",
formatter: this.moneyFormat,
title: "联运营业额",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "RealIncome",
formatter: this.moneyFormat,
title: "实际营业额",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "GRPNum",
title: "GRP",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "TKTNum",
title: "TKT",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "VisaNum",
title: "VISA",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "ZiYouXingNum",
title: "自由行",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "DiJieNum",
title: "地接",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "HotelNum",
title: "酒店",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "DanTuanNum",
title: "单团",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
},
{
field: "HuZhaoNum",
title: "护照",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
}, },
{ {
field: "AverageIncome", field: "AverageIncome",
formatter: this.moneyFormat,
title: "平均收入", title: "平均收入",
width: 90, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true isResize: true,
}, },
{ {
field: "AverageCost", field: "AverageCost",
formatter: this.moneyFormat,
title: "平均成本", title: "平均成本",
width: 90, formatter: this.moneyFormat,
width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true isResize: true,
}, },
{ {
field: "AverageProfit", field: "AverageProfit",
formatter: this.moneyFormat,
title: "平均利润", title: "平均利润",
width: 90, formatter: this.moneyFormat,
titleAlign: "left", width: 100,
columnAlign: "right",
isResize: true
},
{
field: "ReceiptNotFinance",
title: "未制单收据",
width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "right", columnAlign: "right",
isResize: true isResize: true,
}, },
{
field: "ReceiptNotAudit",
title: "制单未审核收据",
width: 60,
titleAlign: "left",
columnAlign: "right",
isResize: true
}
], ],
footer: [], footer: [],
pageSize: 6, pageSize: 6,
...@@ -1794,100 +1169,10 @@ ...@@ -1794,100 +1169,10 @@
F_GeneralManager:false, F_GeneralManager:false,
}; };
}, },
created() {
this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
this.msg.OutBranchId=this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):this.msg.OutBranchId;
if(this.$route.query.LtIdStr){
this.msg.LtIdStr=this.$route.query.LtIdStr
}
if(this.$route.query.IsSelectTravelLoss){
this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss
}
if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
}
if(this.msg.LineId>0){
this.msg.DataType="1";
}
if(this.msg.LineId==-1){
// 其余都是不限
this.msg.DataType="-1";
this.msg.OutBranchId=45;
this.msg.LineId=0;
}
if(this.msg.LineId==-2){
this.msg.DataType="2";
}
if(this.msg.LineId==-3){
this.msg.DataType="5";
}
if(this.msg.LineId==-4){
this.msg.DataType="3";
}
//景点门票
if(this.msg.LineId==-8){
this.msg.DataType="10";
}
// 票务部专户
if(this.msg.LineId==-7){
this.msg.DataType="8";
}
// 酒店住宿
if(this.msg.LineId==-9){
this.msg.DataType="9";
}
// 餐厅美食
if(this.msg.LineId==-10){
this.msg.DataType="11";
}
// 单机票
if(this.msg.LineId==-11){
this.msg.DataType="14";
}
// 单机票
if(this.msg.LineId==-11){
this.msg.DataType="14";
}
// 老挝地接部
if(this.msg.LineId==-6){
this.msg.DataType="7";
}
// 日本地接部
if(this.msg.LineId==-5){
this.msg.DataType="6";
}
// let userInfo = this.getLocalStorage();
// if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
// this.isShowType = false;
// this.msg.DataType='2';
// }else{
// if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_LocalTeamRevenueReport,')!==-1){
// this.isShowGrounding = false;
// this.msg.DataType='6';
// }
// }
},
components: {},
mounted() { mounted() {
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight; this.getData()
allW = document.documentElement.clientWidth;
cW = allW - 90;
cH = allH - 350 - 52;
this.msg.pageSize = parseInt(cH / 30) - 1;
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.Group_Id; //集团ID
this.userId = userInfo.Id;
this.getCompanyList();
this.getLineList();
this.getStartList1();
this.getPageList();
// this.GetSupperOrderEditAuth();
}, },
methods: { methods: {
GetSupperOrderEditAuth() { GetSupperOrderEditAuth() {
...@@ -1913,97 +1198,15 @@ ...@@ -1913,97 +1198,15 @@
} }
} }
}, },
//获取目的地列表
getLinePlaceList(lineId) {
let msg = {
lineID: lineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.PlaceList = res.data.data;
}
})
},
//获取领队和导游
GetLeaderList() {
this.LeaderList=[];
this.msg.LeaderId=0;
let msg = {
Type: this.msg.LeaderType,
}
this.apipost(
'leader_post_GetList', msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data;
}
},
err => {}
)
},
getLineTeamList(lineId,PlaceId) {
//获取系列列表
this.apipost(
"team_post_GetList",
{
lineID: lineId,
placeID:PlaceId,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineTeamId = "-1";
this.LineTeamList = res.data.data;
}
}
);
},
SetTravelClose(){
this.btnloading=true;
this.apipost(
"financestatistics_post_SetTravelCloseReceipts",
this.msg,
res => {
this.btnloading=false;
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
} else {
this.AALloading = false;
this.Error(res.data.message);
}
}
);
},
goEasyReport: function() {
let year = this.productionDate[0]
? this.productionDate[0].substring(0, 4)
: "";
this.$router.push({
path: "/EasyReport",
query: { year: year, blank: "y" }
});
},
togbu: function() {
this.AALloading = true;
this.apipost(
"financestatistics_post_InsertFinanceStatistics",
{},
res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
} else {
this.AALloading = false;
this.$message.error(res.data.message);
}
}
);
},
submitKaiqiZzBox: function() { submitKaiqiZzBox: function() {
// 开关闸提交 // 开关闸提交
if ( if (
this.kaiqiZzMsg.QStartDate === "" || this.kaiqiZzMsg.QStartTime === "" ||
this.kaiqiZzMsg.QEndDate === "" this.kaiqiZzMsg.QEndDate === ""
) { ) {
return this.$message.error("请选择发团日期"); return this.$message.error("请选择发团日期");
...@@ -2035,7 +1238,7 @@ ...@@ -2035,7 +1238,7 @@
// 初始化开关闸信息 // 初始化开关闸信息
this.KaiqiZzTime = []; this.KaiqiZzTime = [];
this.kaiqiZzMsg = { this.kaiqiZzMsg = {
QStartDate: "", QStartTime: "",
QEndDate: "", QEndDate: "",
Is_Open: "" Is_Open: ""
}; };
...@@ -2091,32 +1294,7 @@ ...@@ -2091,32 +1294,7 @@
"毛利率", "毛利率",
"实际利润", "实际利润",
"备注", "备注",
"公司别",
"成都",
"昆明",
"重庆",
"武汉",
"西安",
"长沙",
"贵阳",
"南昌",
"厦门",
"兰州",
"南京",
"微途",
"合肥",
"南宁",
"联运成本",
"联运提成",
"营业额",
"GRP",
"TKT",
"VISA",
"自由行",
"地接",
"酒店",
"单团",
"护照",
"平均收入", "平均收入",
"平均成本", "平均成本",
"平均利润" "平均利润"
...@@ -2504,37 +1682,11 @@ ...@@ -2504,37 +1682,11 @@
return "column-cell-class-name-test-row"; return "column-cell-class-name-test-row";
} }
}, },
getStartList1() {
// 获取出发城市
this.apipost(
"city_post_GetList",
{
isDefault: -1,
priceType: -1
},
res => {
if (res.data.resultCode == 1) {
this.startCityList1 = res.data.data;
} else {
}
}
);
},
getLineList() {
// 获取线路
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
customCompFunc(param) {
},
compare(property, type) { compare(property, type) {
// 升序 t 1升 2降 // 升序 t 1升 2降
if (type === 1) { if (type === 1) {
...@@ -2570,127 +1722,33 @@ ...@@ -2570,127 +1722,33 @@
this.pageIndex = this.msg.pageIndex = val; this.pageIndex = this.msg.pageIndex = val;
this.getPageList(); this.getPageList();
}, },
getPageList() { // 获取数据
// 获取列表数据 getData(){
this.loading = true; getRevenueReportPageList(this.msg).then((res)=>{
if (!this.msg.StartCityId) this.msg.StartCityId = 0; this.DataList = res.Data.pageModel.PageData;
if (!this.msg.LineId) this.msg.LineId = 0;
if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
if (!this.msg.TCID) this.msg.TCID = 0;
if (this.msg.startDate == "") this.msg.startDate = "2019-01-01";
this.apipost(
"financestatistics_post_GetPageList",
this.msg,
res => {
if (res.data.resultCode == 1) {
let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-2){
BranchStatus = -1;
this.shujuType = true;
this.apipost("line_post_GetList", {'LineDirection':2}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
} else {
this.Error(res.data.message);
}
});
}
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
this.BranchStatus=true;
this.msg.OutBranchId=BranchStatus;
}
})
},
let data = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count;
this.SDate=res.data.data.pmodel.StartDate;
this.EDate=res.data.data.pmodel.NextDate;
this.UpdateStaus=res.data.data.Status;
this.UpdateStartTime=res.data.data.UpdateTime;
if (this.total == 0) {
this.DataList = [];
} else {
let newData = [];
data.forEach((x, index) => {
x.MaoLiRate=x.MaoLiRate+"%";
if (index !== data.length - 1) {
x.Is_Transport = x.Is_Transport === 0 ? "否" : "是";
newData.push(x);
} else {
// x.MaoLiRate =
// this.total === 0 ? 0 : parseFloat(x.MaoLiRate / this.total);
// x.AverageIncome =
// this.total === 0
// ? 0
// : parseFloat(x.AverageIncome / this.total);
// x.AverageCost =
// this.total === 0
// ? 0
// : parseFloat(x.AverageCost / this.total);
// x.AverageProfit =
// this.total === 0
// ? 0
// : parseFloat(x.AverageProfit / this.total);
x.LineName = "合计";
x.TCID = "";
x.TCNUM = "";
x.Is_Transport = "";
x.BName = "";
newData.push(x);
}
});
this.DataList = newData;
// this.footer.push(data[data.length-1])
}
this.loading = false;
} else {
this.loading = false;
this.$message.error(res.data.message);
}
// if (this.msg.OutBranchId === -1) this.msg.OutBranchId = -1;
if (!this.msg.StartCityId) this.msg.StartCityId = 0;
if (!this.msg.LineId) this.msg.LineId = 0;
if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
if (!this.msg.TCID) this.msg.TCID = "";
},
err => {}
);
},
getCompanyList() {
//获取公司列表
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
} else {
}
},
err => {}
);
},
timeAdd(type) { timeAdd(type) {
// 日期格式 // 日期格式
if (type === 1) { if (type === 1) {
if (!this.productionDate) { if (!this.productionDate) {
this.msg.startDate = ""; this.msg.StartTime = "";
this.msg.endDate = ""; this.msg.EndTime = "";
return; return;
} }
this.msg.startDate = this.productionDate[0]; this.msg.StartTime = this.productionDate[0];
this.msg.endDate = this.productionDate[1]; this.msg. EndTime = this.productionDate[1];
} }
if (type === 2) { if (type === 2) {
if (!this.KaiqiZzTime) { if (!this.KaiqiZzTime) {
this.kaiqiZzMsg.QStartDate = ""; this.kaiqiZzMsg.QStartTime = "";
this.kaiqiZzMsg.QEndDate = ""; this.kaiqiZzMsg.QEndDate = "";
return; return;
} }
this.kaiqiZzMsg.QStartDate = this.KaiqiZzTime[0]; this.kaiqiZzMsg.QStartTime = this.KaiqiZzTime[0];
this.kaiqiZzMsg.QEndDate = this.KaiqiZzTime[1]; this.kaiqiZzMsg.QEndDate = this.KaiqiZzTime[1];
} }
}, },
......
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