Skip to content

S
SuperMan
Commit 81216205 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

简易报表等

parent 3d5c8dfb
Hide whitespace changes
Inline Side-by-side
Showing with 685 additions and 179 deletions
src/assets/common/lang/zh.js
View file @ 81216205
...@@ -766,9 +766,7 @@ export const fnc = { ...@@ -766,9 +766,7 @@ export const fnc = {
fnc_tfsrhj: '团费收入合计', fnc_tfsrhj: '团费收入合计',
fnc_zksr: '直客收入', fnc_zksr: '直客收入',
fnc_thjksr: '同行交客收入', fnc_thjksr: '同行交客收入',
fnc_plattev: '平台收入', fnc_plattev: '平台收入',
acc: '账户', acc: '账户',
accBming: '账户别名：', accBming: '账户别名：',
accType: '账户类型：', accType: '账户类型：',
......
src/assets/css/cssReset.css
View file @ 81216205
...@@ -481,6 +481,11 @@ vertical-align:middle ...@@ -481,6 +481,11 @@ vertical-align:middle
overflow:auto; overflow:auto;
padding: 0 20px; padding: 0 20px;
} }
.column-cell-class-name-test-red .v-table-body-cell{
background-color:#e95252;
color:#fff;
}
.column-cell-class-name-test .v-table-body-cell{ .column-cell-class-name-test .v-table-body-cell{
background-color: yellow; background-color: yellow;
} }
......
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ 81216205
...@@ -365,7 +365,8 @@ export default { ...@@ -365,7 +365,8 @@ export default {
EmployeeId:0, EmployeeId:0,
noData:false, noData:false,
} }
},created(){ },
created(){
var date = new Date().Format("yyyy-MM-dd"); var date = new Date().Format("yyyy-MM-dd");
var arr = date.split('-'); var arr = date.split('-');
var year = arr[0]; //获取当前日期的年份 var year = arr[0]; //获取当前日期的年份
...@@ -389,11 +390,21 @@ export default { ...@@ -389,11 +390,21 @@ export default {
month2 = '0' + month2; month2 = '0' + month2;
} }
var t2 = year2 + '-' + month2 + '-' + day2; var t2 = year2 + '-' + month2 + '-' + day2;
    this.defaultMonth[0] = t2; this.msg.RB_Branch_Id=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.RB_Branch_Id;
},components: { if(this.$route.query.startDate){
this.defaultMonth[0]=this.$route.query.startDate;
this.defaultMonth[1]=this.$route.query.endDate;
}else{
this.defaultMonth[0] = t2;
}
},
components: {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
},mounted(){ },
mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
...@@ -416,7 +427,7 @@ export default { ...@@ -416,7 +427,7 @@ export default {
this.msg.CStartDate = '2019-01-01'; this.msg.CStartDate = '2019-01-01';
this.msg.QEndDate = ''; this.msg.QEndDate = '';
} }
if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0)this.msg.RB_Branch_Id=-1; if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0; if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
if(!this.msg.EnterID)this.msg.EnterID=0; if(!this.msg.EnterID)this.msg.EnterID=0;
if(!this.msg.OrderId)this.msg.OrderId=0; if(!this.msg.OrderId)this.msg.OrderId=0;
...@@ -496,7 +507,9 @@ export default { ...@@ -496,7 +507,9 @@ export default {
this.msg.CStartDate = '2019-01-01'; this.msg.CStartDate = '2019-01-01';
this.msg.QEndDate = ''; this.msg.QEndDate = '';
} }
if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0)this.msg.RB_Branch_Id=-1; if(!this.msg.RB_Branch_Id&&this.msg.RB_Branch_Id!=0){
this.msg.RB_Branch_Id=-1;
}
if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0; if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
if(!this.msg.EnterID)this.msg.EnterID=0; if(!this.msg.EnterID)this.msg.EnterID=0;
if(!this.msg.OrderId)this.msg.OrderId=0; if(!this.msg.OrderId)this.msg.OrderId=0;
......
src/components/FinancialModule/RecPayQueryTeamV2.vue
View file @ 81216205
...@@ -376,7 +376,13 @@ export default { ...@@ -376,7 +376,13 @@ export default {
month2 = '0' + month2; month2 = '0' + month2;
} }
var t2 = year2 + '-' + month2 + '-' + day2; var t2 = year2 + '-' + month2 + '-' + day2;
    this.defaultMonth[0] = t2; this.msg.RB_Branch_Id=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.RB_Branch_Id;
    if(this.$route.query.startDate){
this.defaultMonth[0]=this.$route.query.startDate;
this.defaultMonth[1]=this.$route.query.endDate;
}else{
this.defaultMonth[0] = t2;
}
},components: { },components: {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
......
src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue
View file @ 81216205
...@@ -393,6 +393,19 @@ tr._item_list td:last-child { ...@@ -393,6 +393,19 @@ tr._item_list td:last-child {
<div class="query-box"> <div class="query-box">
<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-form-item label="联运公司：">
<el-select :disabled="BranchStatus" filterable v-model="msg.Is_Transport" class>
<el-option :value="-1" label="不限"></el-option>
<el-option
v-for="item in CompanyList"
:label="item.BName"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="出团公司："> <el-form-item label="出团公司：">
<el-select filterable v-model="msg.OutBranchId" class> <el-select filterable v-model="msg.OutBranchId" class>
...@@ -622,6 +635,7 @@ export default { ...@@ -622,6 +635,7 @@ export default {
pageIndex: 1, pageIndex: 1,
pageSize: 18, pageSize: 18,
OutBranchId: "", OutBranchId: "",
Is_Transport:"",
StartCityId: "", StartCityId: "",
LineId: "", LineId: "",
LineTeamId: "", LineTeamId: "",
...@@ -1205,10 +1219,21 @@ export default { ...@@ -1205,10 +1219,21 @@ export default {
], ],
footer: [], footer: [],
pageSize: 6, pageSize: 6,
pageIndex: 1 pageIndex: 1,
BranchStatus:true,
}; };
}, },
created() {}, created() {
this.msg.Is_Transport=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
if(this.$route.query.startDate){
this.productionDate[0]=this.$route.query.startDate;
this.productionDate[1]=this.$route.query.endDate;
this.msg.startDate=this.$route.query.startDate;
this.msg.endDate=this.$route.query.endDate;
}
// console.log(this.productionDate);
// console.log(this.msg.Is_Transport);
},
components: {}, components: {},
mounted() { mounted() {
let allH, allW, cH, cW; let allH, allW, cH, cW;
...@@ -1217,6 +1242,9 @@ export default { ...@@ -1217,6 +1242,9 @@ export default {
cW = allW - 90; cW = allW - 90;
cH = allH - 350; cH = allH - 350;
this.msg.pageSize = parseInt(cH / 30) - 1; this.msg.pageSize = parseInt(cH / 30) - 1;
if(this.msg.pageSize<0){
this.msg.pageSize=10;
}
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
...@@ -1655,8 +1683,10 @@ export default { ...@@ -1655,8 +1683,10 @@ export default {
getPageList() { getPageList() {
// 获取列表数据 // 获取列表数据
this.loading = true; this.loading = true;
if (!this.msg.OutBranchId && this.msg.OutBranchId !== 0) if (!this.msg.OutBranchId)
this.msg.OutBranchId = -1; this.msg.OutBranchId = -1;
if(!this.msg.Is_Transport&&this.msg.Is_Transport!==0)
this.msg.Is_Transport=-1;
if (!this.msg.StartCityId) this.msg.StartCityId = 0; if (!this.msg.StartCityId) this.msg.StartCityId = 0;
if (!this.msg.LineId) this.msg.LineId = 0; if (!this.msg.LineId) this.msg.LineId = 0;
if (!this.msg.LineTeamId) this.msg.LineTeamId = 0; if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
...@@ -1667,6 +1697,13 @@ export default { ...@@ -1667,6 +1697,13 @@ export default {
this.msg, this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// console.log(res);
let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
this.BranchStatus=true;
}
let data = res.data.data.pmodel.pageData; let data = res.data.data.pmodel.pageData;
// res.data.data.TotalRevenue // res.data.data.TotalRevenue
this.total = res.data.data.pmodel.count; this.total = res.data.data.pmodel.count;
...@@ -1699,11 +1736,11 @@ export default { ...@@ -1699,11 +1736,11 @@ export default {
this.loading = false; this.loading = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
if ((this.msg.OutBranchId = -1)) this.msg.OutBranchId = -1; //if ((this.msg.OutBranchId = -1)) this.msg.OutBranchId = -1;
if (!this.msg.StartCityId) this.msg.StartCityId = 0; // if (!this.msg.StartCityId) this.msg.StartCityId = 0;
if (!this.msg.LineId) this.msg.LineId = 0; // if (!this.msg.LineId) this.msg.LineId = 0;
if (!this.msg.LineTeamId) this.msg.LineTeamId = 0; // if (!this.msg.LineTeamId) this.msg.LineTeamId = 0;
if (!this.msg.TCID) this.msg.TCID = ""; // if (!this.msg.TCID) this.msg.TCID = "";
}, },
err => {} err => {}
); );
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 81216205
...@@ -22,6 +22,15 @@ ...@@ -22,6 +22,15 @@
top: 55px; top: 55px;
right: 0; right: 0;
} }
.page_EasyReport .v-table-body-cell{
display: block!important;
line-height: 30px!important;
}
/* .gourl_span>span{
display: block;
width: 100%;
height: 100%;
} */
</style> </style>
<template> <template>
<div class="page_EasyReport" v-loading="AALloading"> <div class="page_EasyReport" v-loading="AALloading">
...@@ -40,7 +49,7 @@ ...@@ -40,7 +49,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="出团公司："> <el-form-item label="出团公司：">
<el-select class="w150" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option> <el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
</el-select> </el-select>
...@@ -76,6 +85,7 @@ ...@@ -76,6 +85,7 @@
:column-cell-class-name="columnCellClass" :column-cell-class-name="columnCellClass"
@on-custom-comp="customCompFunc" @on-custom-comp="customCompFunc"
@sort-change="sortChange" @sort-change="sortChange"
:row-click="rowClick"
> >
</v-table> </v-table>
</div> </div>
...@@ -87,7 +97,7 @@ import Vue from "vue"; ...@@ -87,7 +97,7 @@ import Vue from "vue";
Vue.component("YiYueJump", { Vue.component("YiYueJump", {
// 团队跳转 // 团队跳转
template: ` template: `
<div> <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.YiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.YiYue}}</span>
</div>`, </div>`,
...@@ -121,7 +131,7 @@ Vue.component("YiYueJump", { ...@@ -121,7 +131,7 @@ Vue.component("YiYueJump", {
Vue.component("ErYueJump", { Vue.component("ErYueJump", {
// 团队跳转 // 团队跳转
template: ` template: `
<div> <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ErYue}}</span> <span style="cursor: pointer" v-else>{{rowData.ErYue}}</span>
</div>`, </div>`,
...@@ -154,7 +164,7 @@ Vue.component("ErYueJump", { ...@@ -154,7 +164,7 @@ Vue.component("ErYueJump", {
//三月 //三月
Vue.component("SanYueJump", { Vue.component("SanYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.SanYue}}</span> <span style="cursor: pointer" v-else>{{rowData.SanYue}}</span>
</div>`, </div>`,
...@@ -187,7 +197,7 @@ Vue.component("SanYueJump", { ...@@ -187,7 +197,7 @@ Vue.component("SanYueJump", {
//四月 //四月
Vue.component("SiYueJump", { Vue.component("SiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.SiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.SiYue}}</span>
</div>`, </div>`,
...@@ -220,7 +230,7 @@ Vue.component("SiYueJump", { ...@@ -220,7 +230,7 @@ Vue.component("SiYueJump", {
//五月 //五月
Vue.component("WuYueJump", { Vue.component("WuYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.WuYue}}</span> <span style="cursor: pointer" v-else>{{rowData.WuYue}}</span>
</div>`, </div>`,
...@@ -253,8 +263,8 @@ Vue.component("WuYueJump", { ...@@ -253,8 +263,8 @@ Vue.component("WuYueJump", {
//六月 //六月
Vue.component("LiuYueJump", { Vue.component("LiuYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span> <span style="cursor: pointer;" v-if="rowData.CostIds" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.LiuYue}}</span> <span style="cursor: pointer" v-else>{{rowData.LiuYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -270,6 +280,7 @@ Vue.component("LiuYueJump", { ...@@ -270,6 +280,7 @@ Vue.component("LiuYueJump", {
}, },
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
console.log(123)
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
query: { query: {
...@@ -286,7 +297,7 @@ Vue.component("LiuYueJump", { ...@@ -286,7 +297,7 @@ Vue.component("LiuYueJump", {
//七月 //七月
Vue.component("QiYueJump", { Vue.component("QiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.QiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.QiYue}}</span>
</div>`, </div>`,
...@@ -319,7 +330,7 @@ Vue.component("QiYueJump", { ...@@ -319,7 +330,7 @@ Vue.component("QiYueJump", {
//八月 //八月
Vue.component("BaYueJump", { Vue.component("BaYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.BaYue}}</span> <span style="cursor: pointer" v-else>{{rowData.BaYue}}</span>
</div>`, </div>`,
...@@ -352,7 +363,7 @@ Vue.component("BaYueJump", { ...@@ -352,7 +363,7 @@ Vue.component("BaYueJump", {
//九月 //九月
Vue.component("JiuYueJump", { Vue.component("JiuYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span> <span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span>
</div>`, </div>`,
...@@ -385,7 +396,7 @@ Vue.component("JiuYueJump", { ...@@ -385,7 +396,7 @@ Vue.component("JiuYueJump", {
//十月 //十月
Vue.component("ShiYueJump", { Vue.component("ShiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span>
</div>`, </div>`,
...@@ -418,7 +429,7 @@ Vue.component("ShiYueJump", { ...@@ -418,7 +429,7 @@ Vue.component("ShiYueJump", {
//十一月 //十一月
Vue.component("ShiYiYueJump", { Vue.component("ShiYiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYiYue}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span>
</div>`, </div>`,
...@@ -451,7 +462,7 @@ Vue.component("ShiYiYueJump", { ...@@ -451,7 +462,7 @@ Vue.component("ShiYiYueJump", {
//十二月 //十二月
Vue.component("ShiErYueJump", { Vue.component("ShiErYueJump", {
// 团队跳转 // 团队跳转
template: ` <div> template: ` <div class="gourl_span">
<span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span> <span style="cursor: pointer" v-if="rowData.CostIds" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span> <span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span>
</div>`, </div>`,
...@@ -532,45 +543,56 @@ export default { ...@@ -532,45 +543,56 @@ export default {
{ {
field: "YiYue", field: "YiYue",
title: "一月", title: "一月",
start:"01-01",
end:"01-31",
month:1,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "YiYueJump" // componentName: "YiYueJump"
}, },
{ {
field: "ErYue", field: "ErYue",
title: "二月", title: "二月",
start:"02-01",
end:"02",
month:2,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "ErYueJump" // componentName: "ErYueJump"
}, },
{ {
field: "SanYue", field: "SanYue",
title: "三月", title: "三月",
start:"03-01",
end:"03-31",
month:3,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "SanYueJump" // componentName: "SanYueJump"
}, },
{ {
field: "DiYiJiDu", field: "DiYiJiDu",
title: "第一季度", title: "第一季度",
start:"01-01",
end:"03-31",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
...@@ -579,45 +601,56 @@ export default { ...@@ -579,45 +601,56 @@ export default {
{ {
field: "SiYue", field: "SiYue",
title: "四月", title: "四月",
start:"04-01",
end:"04-30",
month:4,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "SiYueJump" // componentName: "SiYueJump"
}, },
{ {
field: "WuYue", field: "WuYue",
title: "五月", title: "五月",
start:"05-01",
end:"05-31",
month:5,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "WuYueJump" // componentName: "WuYueJump"
}, },
{ {
field: "LiuYue", field: "LiuYue",
title: "六月", title: "六月",
start:"06-01",
end:"06-30",
month:6,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "LiuYueJump" // componentName: "LiuYueJump"
}, },
{ {
field: "DiErJiDu", field: "DiErJiDu",
title: "第二季度", title: "第二季度",
start:"04-01",
end:"06-30",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
...@@ -626,9 +659,11 @@ export default { ...@@ -626,9 +659,11 @@ export default {
{ {
field: "ShangBanNianBao", field: "ShangBanNianBao",
title: "上半年报", title: "上半年报",
start:"01-01",
end:"06-30",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
...@@ -637,45 +672,56 @@ export default { ...@@ -637,45 +672,56 @@ export default {
{ {
field: "QiYue", field: "QiYue",
title: "七月", title: "七月",
start:"07-01",
end:"07-31",
month:7,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "QiYueJump" // componentName: "QiYueJump"
}, },
{ {
field: "BaYue", field: "BaYue",
title: "八月", title: "八月",
start:"08-01",
end:"08-31",
month:8,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "BaYueJump" // componentName: "BaYueJump"
}, },
{ {
field: "JiuYue", field: "JiuYue",
title: "九月", title: "九月",
start:"09-01",
end:"09-30",
month:9,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "JiuYueJump" // componentName: "JiuYueJump"
}, },
{ {
field: "DiSanJiDu", field: "DiSanJiDu",
title: "第三季度", title: "第三季度",
start:"06-01",
end:"09-30",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
...@@ -684,45 +730,56 @@ export default { ...@@ -684,45 +730,56 @@ export default {
{ {
field: "ShiYue", field: "ShiYue",
title: "十月", title: "十月",
start:"10-01",
end:"10-31",
month:10,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "ShiYueJump" // componentName: "ShiYueJump"
}, },
{ {
field: "ShiYiYue", field: "ShiYiYue",
title: "十一月", title: "十一月",
start:"11-01",
end:"11-30",
month:11,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "ShiYiYueJump" // componentName: "ShiYiYueJump"
}, },
{ {
field: "ShiErYue", field: "ShiErYue",
title: "十二月", title: "十二月",
start:"12-01",
end:"12-31",
month:12,
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false, isFrozen: false,
componentName: "ShiErYueJump" // componentName: "ShiErYueJump"
}, },
{ {
field: "DiSiJiDu", field: "DiSiJiDu",
title: "第四季度", title: "第四季度",
start:"10-01",
end:"12-31",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
...@@ -731,9 +788,11 @@ export default { ...@@ -731,9 +788,11 @@ export default {
{ {
field: "XiaBanNianBao", field: "XiaBanNianBao",
title: "下半年报", title: "下半年报",
start:"10-01",
end:"12-31",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
...@@ -742,17 +801,21 @@ export default { ...@@ -742,17 +801,21 @@ export default {
{ {
field: "ZongJi", field: "ZongJi",
title: "总计", title: "总计",
start:"01-01",
end:"12-31",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
result: [], result: [],
type: "select", type: "select",
isFrozen: false isFrozen: false
}, },
] ],
BranchStatus:true,
} }
},created(){ },
created(){
if (this.$route.query.year) { if (this.$route.query.year) {
this.year = this.$route.query.year this.year = this.$route.query.year
} else { } else {
...@@ -768,10 +831,69 @@ export default { ...@@ -768,10 +831,69 @@ export default {
} }
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
},mounted(){ },
mounted(){
this.getData() this.getData()
this.getCompanyList() this.getCompanyList()
},methods:{ },
methods:{
goUrl (path,startDate,endDate,BranchId,tab) {
// return
this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} })
},
GoUrlFan(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
}
});
},
rowClick(rowIndex,rowData,column){
var that = this;
let startDate=that.year+"-"+column.start;
let endDate="";
let BranchId=that.msg.BranchId;
let month=column.month;
if(column.field=="ErYue"){
endDate=that.getFirstAndLastMonthDay(that.year,"02");
}else{
endDate=that.year+"-"+column.end
}
if(rowIndex<9){
// 联运收入
if(rowData.ZhaiYao=="联运收入"){
that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
}
// 跳转到应收团款查询
if(rowData.ZhaiYao=="营业总收入"){
that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询")
}
if(rowData.ZhaiYao=="营业总成本"){
that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
}else{
// that.goUrl("TeamRevenueReport",startDate,endDate,BranchId,"营收报表")
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
}
}else{
if(rowData.CostIds){
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
}
}
},
getFirstAndLastMonthDay( year, month){
var firstdate = year + '-' + month + '-01';
var day = new Date(year,month,0);
var lastdate = year + '-' + month + '-' + day.getDate();//获取当月最后一天日期
return lastdate;
},
togbu: function () { togbu: function () {
this.AALloading = true this.AALloading = true
let msg = { let msg = {
...@@ -806,6 +928,61 @@ export default { ...@@ -806,6 +928,61 @@ export default {
console.log(param); console.log(param);
}, },
columnCellClass: function(rowIndex, columnName, rowData) { columnCellClass: function(rowIndex, columnName, rowData) {
if(rowData.YiYue < 0 && columnName=="YiYue"){
return "column-cell-class-name-test-red"
}
if(rowData.ErYue < 0 && columnName=="ErYue"){
return "column-cell-class-name-test-red"
}
if(rowData.SanYue < 0 && columnName=="SanYue"){
return "column-cell-class-name-test-red"
}
if(rowData.DiYiJiDu < 0 && columnName=="DiYiJiDu"){
return "column-cell-class-name-test-red"
}
if(rowData.SiYue < 0 && columnName=="SiYue"){
return "column-cell-class-name-test-red"
}
if(rowData.WuYue < 0 && columnName=="WuYue"){
return "column-cell-class-name-test-red"
}
if(rowData.LiuYue < 0 && columnName=="LiuYue"){
return "column-cell-class-name-test-red"
}
if(rowData.DiErJiDu < 0 && columnName=="DiErJiDu"){
return "column-cell-class-name-test-red"
}
if(rowData.ShangBanNianBao < 0 && columnName=="ShangBanNianBao"){
return "column-cell-class-name-test-red"
}
if(rowData.QiYue < 0 && columnName=="QiYue"){
return "column-cell-class-name-test-red"
}
if(rowData.BaYue < 0 && columnName=="BaYue"){
return "column-cell-class-name-test-red"
}
if(rowData.JiuYue < 0 && columnName=="JiuYue"){
return "column-cell-class-name-test-red"
}
if(rowData.ShiYue < 0 && columnName=="ShiYue"){
return "column-cell-class-name-test-red"
}
if(rowData.ShiYiYue < 0 && columnName=="ShiYiYue"){
return "column-cell-class-name-test-red"
}
if(rowData.ShiErYue < 0 && columnName=="ShiErYue"){
return "column-cell-class-name-test-red"
}
if(rowData.DiSiJiDu < 0 && columnName=="DiSiJiDu"){
return "column-cell-class-name-test-red"
}
if(rowData.XiaBanNianBao < 0 && columnName=="XiaBanNianBao"){
return "column-cell-class-name-test-red"
}
if(rowData.ZongJi < 0 && columnName=="ZongJi"){
return "column-cell-class-name-test-red"
}
// 设置列class // 设置列class
if (columnName === "ZongJi") { if (columnName === "ZongJi") {
return "column-cell-class-name-test-pink"; return "column-cell-class-name-test-pink";
...@@ -866,10 +1043,16 @@ export default { ...@@ -866,10 +1043,16 @@ export default {
} }
this.msg.sharelist.push(obj) this.msg.sharelist.push(obj)
}) })
console.log(this.msg.sharelist)
this.msg.Year = parseInt(this.year) this.msg.Year = parseInt(this.year)
this.apipost('financestatistics_post_GetEasyReportList', this.msg, res=>{ this.apipost('financestatistics_post_GetEasyReportList', this.msg, res=>{
// console.log(res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
this.BranchStatus=true;
}
let data = res.data.data let data = res.data.data
data.sharelist.forEach((x, i) => { data.sharelist.forEach((x, i) => {
this.monthList[i].value = x.Money this.monthList[i].value = x.Money
......
src/components/FinancialModule/ReportForm/MonthReport.vue
View file @ 81216205
...@@ -416,7 +416,7 @@ tr._item_list td:last-child { ...@@ -416,7 +416,7 @@ tr._item_list td:last-child {
<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="出团公司：">
<el-select filterable v-model="msg.OutBranchId" class> <el-select :disabled="BranchStatus" filterable v-model="msg.OutBranchId" class>
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option <el-option
v-for="item in CompanyList" v-for="item in CompanyList"
...@@ -440,7 +440,7 @@ tr._item_list td:last-child { ...@@ -440,7 +440,7 @@ 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-col :span="4">
<el-form-item label="线路："> <el-form-item label="线路：">
<el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId)"> <el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId)">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
...@@ -452,7 +452,7 @@ tr._item_list td:last-child { ...@@ -452,7 +452,7 @@ tr._item_list td:last-child {
></el-option> ></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.LineTeamId" class> <el-select filterable v-model="msg.LineTeamId" class>
...@@ -577,6 +577,7 @@ export default { ...@@ -577,6 +577,7 @@ export default {
msg: { msg: {
OutBranchId: "", OutBranchId: "",
TCID: "", TCID: "",
LineId:"",
QStartDate: "", QStartDate: "",
QEndDate: "", QEndDate: "",
}, },
...@@ -612,6 +613,7 @@ export default { ...@@ -612,6 +613,7 @@ export default {
pageSize: 6, pageSize: 6,
pageIndex: 1, pageIndex: 1,
AALloading: false, AALloading: false,
BranchStatus:true,
}; };
}, },
created() {}, created() {},
...@@ -626,9 +628,12 @@ export default { ...@@ -626,9 +628,12 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.msg.OutBranchId=-1;
this.msg.LineId=14;
this.getCompanyList(); this.getCompanyList();
// this.getPageList(); // this.getPageList();
// this.getLineList(); this.getLineList();
// this.getStartList1(); // this.getStartList1();
this.togbu() this.togbu()
}, },
...@@ -647,9 +652,15 @@ export default { ...@@ -647,9 +652,15 @@ export default {
if (!this.msg.TCID) this.msg.TCID = 0; if (!this.msg.TCID) this.msg.TCID = 0;
if (this.msg.QStartDate == "") this.msg.QStartDate = "2019"; if (this.msg.QStartDate == "") this.msg.QStartDate = "2019";
this.apipost('financestatistics_get_GetTravelMonthReportList', this.msg, res=>{ this.apipost('financestatistics_get_GetTravelMonthReportList', this.msg, res=>{
// console.log(res); console.log(res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataList = res.data.data; let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
this.BranchStatus=true;
}
this.DataList = res.data.data.RObj;
this.columns = [ this.columns = [
// 团队编号、团号 点击跳转团控列表 // 团队编号、团号 点击跳转团控列表
{ {
...@@ -677,7 +688,7 @@ export default { ...@@ -677,7 +688,7 @@ export default {
title: "一月", title: "一月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -685,7 +696,7 @@ export default { ...@@ -685,7 +696,7 @@ export default {
title: "二月", title: "二月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -693,7 +704,7 @@ export default { ...@@ -693,7 +704,7 @@ export default {
title: "三月", title: "三月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -701,7 +712,7 @@ export default { ...@@ -701,7 +712,7 @@ export default {
title: "第一季度", title: "第一季度",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -709,7 +720,7 @@ export default { ...@@ -709,7 +720,7 @@ export default {
title: "四月", title: "四月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -717,7 +728,7 @@ export default { ...@@ -717,7 +728,7 @@ export default {
title: "五月", title: "五月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -725,7 +736,7 @@ export default { ...@@ -725,7 +736,7 @@ export default {
title: "六月", title: "六月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -733,7 +744,7 @@ export default { ...@@ -733,7 +744,7 @@ export default {
title: "第二季度", title: "第二季度",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -741,7 +752,7 @@ export default { ...@@ -741,7 +752,7 @@ export default {
title: "上半年报", title: "上半年报",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -749,7 +760,7 @@ export default { ...@@ -749,7 +760,7 @@ export default {
title: "七月", title: "七月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -757,7 +768,7 @@ export default { ...@@ -757,7 +768,7 @@ export default {
title: "八月", title: "八月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -765,7 +776,7 @@ export default { ...@@ -765,7 +776,7 @@ export default {
title: "九月", title: "九月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -773,7 +784,7 @@ export default { ...@@ -773,7 +784,7 @@ export default {
title: "第三季度", title: "第三季度",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -781,7 +792,7 @@ export default { ...@@ -781,7 +792,7 @@ export default {
title: "十月", title: "十月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -789,7 +800,7 @@ export default { ...@@ -789,7 +800,7 @@ export default {
title: "十一月", title: "十一月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -797,7 +808,7 @@ export default { ...@@ -797,7 +808,7 @@ export default {
title: "十二月", title: "十二月",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -805,7 +816,7 @@ export default { ...@@ -805,7 +816,7 @@ export default {
title: "第四季度", title: "第四季度",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -813,7 +824,7 @@ export default { ...@@ -813,7 +824,7 @@ export default {
title: "下半年报", title: "下半年报",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -821,7 +832,7 @@ export default { ...@@ -821,7 +832,7 @@ export default {
title: "总计", title: "总计",
width: 80, width: 80,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
} }
...@@ -899,6 +910,65 @@ export default { ...@@ -899,6 +910,65 @@ export default {
this.loading = false; this.loading = false;
}, },
columnCellClass(rowIndex, columnName, rowData) { columnCellClass(rowIndex, columnName, rowData) {
if(rowData.JAN < 0 && columnName=="JAN"){
return "column-cell-class-name-test-red"
}
if(rowData.FEB < 0 && columnName=="FEB"){
return "column-cell-class-name-test-red"
}
if(rowData.MAR < 0 && columnName=="MAR"){
return "column-cell-class-name-test-red"
}
if(rowData.FirstQuarter < 0 && columnName=="FirstQuarter"){
return "column-cell-class-name-test-red"
}
if(rowData.APR < 0 && columnName=="APR"){
return "column-cell-class-name-test-red"
}
if(rowData.MAY < 0 && columnName=="MAY"){
return "column-cell-class-name-test-red"
}
if(rowData.JUN < 0 && columnName=="JUN"){
return "column-cell-class-name-test-red"
}
if(rowData.TwoQuarter < 0 && columnName=="TwoQuarter"){
return "column-cell-class-name-test-red"
}
if(rowData.FirstHalf < 0 && columnName=="FirstHalf"){
return "column-cell-class-name-test-red"
}
if(rowData.JUL < 0 && columnName=="JUL"){
return "column-cell-class-name-test-red"
}
if(rowData.AUG < 0 && columnName=="AUG"){
return "column-cell-class-name-test-red"
}
if(rowData.ThreeQuarter < 0 && columnName=="ThreeQuarter"){
return "column-cell-class-name-test-red"
}
if(rowData.OCT < 0 && columnName=="OCT"){
return "column-cell-class-name-test-red"
}
if(rowData.NOV < 0 && columnName=="NOV"){
return "column-cell-class-name-test-red"
}
if(rowData.OCT < 0 && columnName=="OCT"){
return "column-cell-class-name-test-red"
}
if(rowData.DEC < 0 && columnName=="DEC"){
return "column-cell-class-name-test-red"
}
if(rowData.FourQuarter < 0 && columnName=="FourQuarter"){
return "column-cell-class-name-test-red"
}
if(rowData.EndHalf < 0 && columnName=="EndHalf"){
return "column-cell-class-name-test-red"
}
if(rowData.Total < 0 && columnName=="Total"){
return "column-cell-class-name-test-red"
}
if (columnName === "FirstQuarter" || columnName === "TwoQuarter" || columnName === "ThreeQuarter" || columnName === "FourQuarter" || columnName === "FirstHalf" || columnName === "EndHalf") { if (columnName === "FirstQuarter" || columnName === "TwoQuarter" || columnName === "ThreeQuarter" || columnName === "FourQuarter" || columnName === "FirstHalf" || columnName === "EndHalf") {
return "column-cell-class-name-test"; return "column-cell-class-name-test";
} }
...@@ -944,16 +1014,16 @@ export default { ...@@ -944,16 +1014,16 @@ export default {
// } // }
// ); // );
// }, // },
// getLineList() { getLineList() {
// // 获取线路 // 获取线路
// this.apipost("line_post_GetAllList", {}, res => { this.apipost("line_post_GetAllList", {}, res => {
// if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// this.LineList = res.data.data; this.LineList = res.data.data;
// } else { } else {
// this.$message.error(res.data.message); this.$message.error(res.data.message);
// } }
// }); });
// }, },
customCompFunc(param) { customCompFunc(param) {
console.log(param); console.log(param);
}, },
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 81216205
<style scoped> <style>
.page_fnDm { .page_fnDm {
background-color: white; background-color: white;
} }
...@@ -404,6 +404,12 @@ tr._item_list td:last-child { ...@@ -404,6 +404,12 @@ tr._item_list td:last-child {
border-radius: 4px; border-radius: 4px;
margin-bottom: 10px; margin-bottom: 10px;
} }
._fnDm_content .v-table-body-cell{
display: block!important;
line-height: 30px!important;
}
</style> </style>
<template> <template>
...@@ -413,7 +419,7 @@ tr._item_list td:last-child { ...@@ -413,7 +419,7 @@ tr._item_list td:last-child {
<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="出团公司：">
<el-select filterable v-model="msg.OutBranchId" class> <el-select :disabled="BranchStatus" filterable v-model="msg.OutBranchId" class>
<el-option :value="-1" label="不限"></el-option> <el-option :value="-1" label="不限"></el-option>
<el-option <el-option
v-for="item in CompanyList" v-for="item in CompanyList"
...@@ -505,6 +511,7 @@ tr._item_list td:last-child { ...@@ -505,6 +511,7 @@ tr._item_list td:last-child {
<el-option value="2" label="国际机票"></el-option> <el-option value="2" label="国际机票"></el-option>
<el-option value="4" label="国内票务"></el-option> <el-option value="4" label="国内票务"></el-option>
<el-option value="5" label="散卖机票"></el-option> <el-option value="5" label="散卖机票"></el-option>
<el-option value="6" label="地接部专户"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -603,6 +610,7 @@ Vue.component("TCIDJump", { ...@@ -603,6 +610,7 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
</div> </div>
`, `,
...@@ -639,6 +647,7 @@ Vue.component("TCNUMJump", { ...@@ -639,6 +647,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
</div>`, </div>`,
props: { props: {
rowData: { rowData: {
...@@ -718,6 +727,14 @@ Vue.component("TCIDJumpWang", { ...@@ -718,6 +727,14 @@ Vue.component("TCIDJumpWang", {
type: Number type: Number
} }
}, },
data(){
return {
red: false
}
},mounted(){
// console.log("rowData",this.rowData)
// this.red = this.rowData.Compare1.indexOf("-")!==-1 ? true : false
},
methods: { methods: {
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
...@@ -736,7 +753,7 @@ export default { ...@@ -736,7 +753,7 @@ export default {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 16, pageSize: 16,
OutBranchId: "", OutBranchId:-1,
StartCityId: "", StartCityId: "",
LineId: "", LineId: "",
LineTeamId: "", LineTeamId: "",
...@@ -867,7 +884,7 @@ export default { ...@@ -867,7 +884,7 @@ export default {
title: "应收金额", title: "应收金额",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, //,orderBy:'' }, //,orderBy:''
...@@ -877,7 +894,7 @@ export default { ...@@ -877,7 +894,7 @@ export default {
title: "实收金额", title: "实收金额",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -887,7 +904,7 @@ export default { ...@@ -887,7 +904,7 @@ export default {
title: "退款", title: "退款",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -897,7 +914,7 @@ export default { ...@@ -897,7 +914,7 @@ export default {
title: "平台税金", title: "平台税金",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -907,7 +924,7 @@ export default { ...@@ -907,7 +924,7 @@ export default {
title: "在途", title: "在途",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -917,7 +934,7 @@ export default { ...@@ -917,7 +934,7 @@ export default {
title: "优惠", title: "优惠",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -927,7 +944,7 @@ export default { ...@@ -927,7 +944,7 @@ export default {
title: "待收金额", title: "待收金额",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -937,7 +954,7 @@ export default { ...@@ -937,7 +954,7 @@ export default {
title: "溢收金额", title: "溢收金额",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -946,7 +963,7 @@ export default { ...@@ -946,7 +963,7 @@ export default {
title: "人数", title: "人数",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "GuestNum" componentName: "GuestNum"
}, },
...@@ -956,7 +973,7 @@ export default { ...@@ -956,7 +973,7 @@ export default {
title: "邀请函", title: "邀请函",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -966,7 +983,7 @@ export default { ...@@ -966,7 +983,7 @@ export default {
title: "车资", title: "车资",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -976,7 +993,7 @@ export default { ...@@ -976,7 +993,7 @@ export default {
title: "机票款", title: "机票款",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -986,7 +1003,7 @@ export default { ...@@ -986,7 +1003,7 @@ export default {
title: "国内联运机票", title: "国内联运机票",
width: 120, width: 120,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -997,7 +1014,7 @@ export default { ...@@ -997,7 +1014,7 @@ export default {
title: "签证", title: "签证",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1006,7 +1023,7 @@ export default { ...@@ -1006,7 +1023,7 @@ export default {
title: "提成", title: "提成",
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1016,7 +1033,7 @@ export default { ...@@ -1016,7 +1033,7 @@ export default {
formatter: this.moneyFormat, formatter: this.moneyFormat,
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1026,7 +1043,7 @@ export default { ...@@ -1026,7 +1043,7 @@ export default {
formatter: this.moneyFormat, formatter: this.moneyFormat,
width: 100, width: 100,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1036,7 +1053,7 @@ export default { ...@@ -1036,7 +1053,7 @@ export default {
title: "其他", title: "其他",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1046,7 +1063,7 @@ export default { ...@@ -1046,7 +1063,7 @@ export default {
title: "地接款支出", title: "地接款支出",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1056,7 +1073,7 @@ export default { ...@@ -1056,7 +1073,7 @@ export default {
title: "地接款收入", title: "地接款收入",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1066,7 +1083,7 @@ export default { ...@@ -1066,7 +1083,7 @@ export default {
title: "自费收入", title: "自费收入",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1076,7 +1093,7 @@ export default { ...@@ -1076,7 +1093,7 @@ export default {
title: "小费收入", title: "小费收入",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1086,7 +1103,7 @@ export default { ...@@ -1086,7 +1103,7 @@ export default {
title: "佣金收入", title: "佣金收入",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1096,7 +1113,7 @@ export default { ...@@ -1096,7 +1113,7 @@ export default {
title: "应付金额", title: "应付金额",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1106,7 +1123,7 @@ export default { ...@@ -1106,7 +1123,7 @@ export default {
title: "毛利", title: "毛利",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1116,7 +1133,7 @@ export default { ...@@ -1116,7 +1133,7 @@ export default {
title: "毛利率", title: "毛利率",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1126,7 +1143,7 @@ export default { ...@@ -1126,7 +1143,7 @@ export default {
title: "实际利润", title: "实际利润",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true, isResize: true,
componentName: "TCIDJumpWang" componentName: "TCIDJumpWang"
}, },
...@@ -1136,7 +1153,7 @@ export default { ...@@ -1136,7 +1153,7 @@ export default {
title: "备注", title: "备注",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1144,7 +1161,7 @@ export default { ...@@ -1144,7 +1161,7 @@ export default {
title: "公司别", title: "公司别",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1152,7 +1169,7 @@ export default { ...@@ -1152,7 +1169,7 @@ export default {
title: "成都", title: "成都",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1160,7 +1177,7 @@ export default { ...@@ -1160,7 +1177,7 @@ export default {
title: "昆明", title: "昆明",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1168,7 +1185,7 @@ export default { ...@@ -1168,7 +1185,7 @@ export default {
title: "重庆", title: "重庆",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1176,7 +1193,7 @@ export default { ...@@ -1176,7 +1193,7 @@ export default {
title: "武汉", title: "武汉",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1184,7 +1201,7 @@ export default { ...@@ -1184,7 +1201,7 @@ export default {
title: "西安", title: "西安",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1192,7 +1209,7 @@ export default { ...@@ -1192,7 +1209,7 @@ export default {
title: "长沙", title: "长沙",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1200,7 +1217,7 @@ export default { ...@@ -1200,7 +1217,7 @@ export default {
title: "贵阳", title: "贵阳",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1208,7 +1225,7 @@ export default { ...@@ -1208,7 +1225,7 @@ export default {
title: "南昌", title: "南昌",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1216,7 +1233,7 @@ export default { ...@@ -1216,7 +1233,7 @@ export default {
title: "厦门", title: "厦门",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1224,7 +1241,7 @@ export default { ...@@ -1224,7 +1241,7 @@ export default {
title: "兰州", title: "兰州",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1232,7 +1249,7 @@ export default { ...@@ -1232,7 +1249,7 @@ export default {
title: "南京", title: "南京",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1240,7 +1257,7 @@ export default { ...@@ -1240,7 +1257,7 @@ export default {
title: "微途", title: "微途",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1248,7 +1265,7 @@ export default { ...@@ -1248,7 +1265,7 @@ export default {
title: "合肥", title: "合肥",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1256,7 +1273,7 @@ export default { ...@@ -1256,7 +1273,7 @@ export default {
title: "南宁", title: "南宁",
width: 50, width: 50,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1265,7 +1282,7 @@ export default { ...@@ -1265,7 +1282,7 @@ export default {
title: "联运成本", title: "联运成本",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1274,7 +1291,7 @@ export default { ...@@ -1274,7 +1291,7 @@ export default {
title: "联运营业额", title: "联运营业额",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1283,7 +1300,7 @@ export default { ...@@ -1283,7 +1300,7 @@ export default {
title: "实际营业额", title: "实际营业额",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1291,7 +1308,7 @@ export default { ...@@ -1291,7 +1308,7 @@ export default {
title: "GRP", title: "GRP",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1299,7 +1316,7 @@ export default { ...@@ -1299,7 +1316,7 @@ export default {
title: "TKT", title: "TKT",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1307,7 +1324,7 @@ export default { ...@@ -1307,7 +1324,7 @@ export default {
title: "VISA", title: "VISA",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1315,7 +1332,7 @@ export default { ...@@ -1315,7 +1332,7 @@ export default {
title: "自由行", title: "自由行",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1323,7 +1340,7 @@ export default { ...@@ -1323,7 +1340,7 @@ export default {
title: "地接", title: "地接",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1331,7 +1348,7 @@ export default { ...@@ -1331,7 +1348,7 @@ export default {
title: "酒店", title: "酒店",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1339,7 +1356,7 @@ export default { ...@@ -1339,7 +1356,7 @@ export default {
title: "单团", title: "单团",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1347,7 +1364,7 @@ export default { ...@@ -1347,7 +1364,7 @@ export default {
title: "护照", title: "护照",
width: 60, width: 60,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1356,7 +1373,7 @@ export default { ...@@ -1356,7 +1373,7 @@ export default {
title: "平均收入", title: "平均收入",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1365,7 +1382,7 @@ export default { ...@@ -1365,7 +1382,7 @@ export default {
title: "平均成本", title: "平均成本",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
}, },
{ {
...@@ -1374,20 +1391,22 @@ export default { ...@@ -1374,20 +1391,22 @@ export default {
title: "平均利润", title: "平均利润",
width: 90, width: 90,
titleAlign: "left", titleAlign: "left",
columnAlign: "left", columnAlign: "right",
isResize: true isResize: true
} }
], ],
footer: [], footer: [],
pageSize: 6, pageSize: 6,
pageIndex: 1, pageIndex: 1,
AALloading: false AALloading: false,
BranchStatus:true,
}; };
}, },
created() { created() {
this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:''; 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.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.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
this.msg.OutBranchId=this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
if(this.msg.endDate!=""){ if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate; this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate; this.productionDate[1]=this.msg.endDate;
...@@ -1758,6 +1777,175 @@ export default { ...@@ -1758,6 +1777,175 @@ export default {
return x1 + x2; return x1 + x2;
}, },
columnCellClass(rowIndex, columnName, rowData) { columnCellClass(rowIndex, columnName, rowData) {
if(rowData.YingShou < 0 && columnName=="YingShou"){
return "column-cell-class-name-test-red"
}
if(rowData.ShiShou < 0 && columnName=="ShiShou"){
return "column-cell-class-name-test-red"
}
if(rowData.TuiKuan < 0 && columnName=="TuiKuan"){
return "column-cell-class-name-test-red"
}
if(rowData.PingTaiShuiJin < 0 && columnName=="PingTaiShuiJin"){
return "column-cell-class-name-test-red"
}
if(rowData.ZaiTu < 0 && columnName=="ZaiTu"){
return "column-cell-class-name-test-red"
}
if(rowData.YouHui < 0 && columnName=="YouHui"){
return "column-cell-class-name-test-red"
}
if(rowData.DaiShou < 0 && columnName=="DaiShou"){
return "column-cell-class-name-test-red"
}
if(rowData.YiShou < 0 && columnName=="YiShou"){
return "column-cell-class-name-test-red"
}
if(rowData.GuestNum < 0 && columnName=="GuestNum"){
return "column-cell-class-name-test-red"
}
if(rowData.YaoQingHan < 0 && columnName=="YaoQingHan"){
return "column-cell-class-name-test-red"
}
if(rowData.CheZi < 0 && columnName=="CheZi"){
return "column-cell-class-name-test-red"
}
if(rowData.JiPiao < 0 && columnName=="JiPiao"){
return "column-cell-class-name-test-red"
}
if(rowData.GuoNeiLianYunJiPiao < 0 && columnName=="GuoNeiLianYunJiPiao"){
return "column-cell-class-name-test-red"
}
if(rowData.Visa < 0 && columnName=="Visa"){
return "column-cell-class-name-test-red"
}
if(rowData.TiCheng < 0 && columnName=="TiCheng"){
return "column-cell-class-name-test-red"
}
if(rowData.CompensationMoney < 0 && columnName=="CompensationMoney"){
return "column-cell-class-name-test-red"
}
if(rowData.BaoXian < 0 && columnName=="BaoXian"){
return "column-cell-class-name-test-red"
}
if(rowData.QiTa < 0 && columnName=="QiTa"){
return "column-cell-class-name-test-red"
}
if(rowData.DiJieZhiChu < 0 && columnName=="DiJieZhiChu"){
return "column-cell-class-name-test-red"
}
if(rowData.DiJieShouRu < 0 && columnName=="DiJieShouRu"){
return "column-cell-class-name-test-red"
}
if(rowData.ZiFei < 0 && columnName=="ZiFei"){
return "column-cell-class-name-test-red"
}
if(rowData.XiaoFeiShouRu < 0 && columnName=="XiaoFeiShouRu"){
return "column-cell-class-name-test-red"
}
if(rowData.YongJinShouRu < 0 && columnName=="YongJinShouRu"){
return "column-cell-class-name-test-red"
}
if(rowData.YingFu < 0 && columnName=="YingFu"){
return "column-cell-class-name-test-red"
}
if(rowData.MaoLi < 0 && columnName=="MaoLi"){
return "column-cell-class-name-test-red"
}
if(rowData.MaoLiRate < 0 && columnName=="MaoLiRate"){
return "column-cell-class-name-test-red"
}
if(rowData.ShiJiLiRun < 0 && columnName=="ShiJiLiRun"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportCD < 0 && columnName=="TransportCD"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportKM < 0 && columnName=="TransportKM"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportCQ < 0 && columnName=="TransportCQ"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportWH < 0 && columnName=="TransportWH"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportXA < 0 && columnName=="TransportXA"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportCS < 0 && columnName=="TransportCS"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportGY < 0 && columnName=="TransportGY"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportNC < 0 && columnName=="TransportNC"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportXM < 0 && columnName=="TransportXM"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportLZ < 0 && columnName=="TransportLZ"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportNJ < 0 && columnName=="TransportNJ"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportWT < 0 && columnName=="TransportWT"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportHF < 0 && columnName=="TransportHF"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportNN < 0 && columnName=="TransportNN"){
return "column-cell-class-name-test-red"
}
if(rowData.TransportCost < 0 && columnName=="TransportCost"){
return "column-cell-class-name-test-red"
}
if(rowData.YingYeE < 0 && columnName=="YingYeE"){
return "column-cell-class-name-test-red"
}
if(rowData.RealIncome < 0 && columnName=="RealIncome"){
return "column-cell-class-name-test-red"
}
if(rowData.GRPNum < 0 && columnName=="GRPNum"){
return "column-cell-class-name-test-red"
}
if(rowData.TKTNum < 0 && columnName=="TKTNum"){
return "column-cell-class-name-test-red"
}
if(rowData.VisaNum < 0 && columnName=="VisaNum"){
return "column-cell-class-name-test-red"
}
if(rowData.ZiYouXingNum < 0 && columnName=="ZiYouXingNum"){
return "column-cell-class-name-test-red"
}
if(rowData.DiJieNum < 0 && columnName=="DiJieNum"){
return "column-cell-class-name-test-red"
}
if(rowData.HotelNum < 0 && columnName=="HotelNum"){
return "column-cell-class-name-test-red"
}
if(rowData.DanTuanNum < 0 && columnName=="DanTuanNum"){
return "column-cell-class-name-test-red"
}
if(rowData.HuZhaoNum < 0 && columnName=="HuZhaoNum"){
return "column-cell-class-name-test-red"
}
if(rowData.AverageIncome < 0 && columnName=="AverageIncome"){
return "column-cell-class-name-test-red"
}
if(rowData.AverageCost < 0 && columnName=="AverageCost"){
return "column-cell-class-name-test-red"
}
if(rowData.AverageProfit < 0 && columnName=="AverageProfit"){
return "column-cell-class-name-test-red"
}
// 给三行column为‘hobby’的列设置className // 给三行column为‘hobby’的列设置className
if (columnName === "LineName") { if (columnName === "LineName") {
return "column-cell-class-name-test"; return "column-cell-class-name-test";
...@@ -1896,6 +2084,12 @@ export default { ...@@ -1896,6 +2084,12 @@ export default {
this.msg, this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let BranchStatus=res.data.data.IsBranchButton;
if(BranchStatus==-1){
this.BranchStatus=false;
}else{
this.BranchStatus=true;
}
//console.log( res.data.data); //console.log( res.data.data);
let data = res.data.data.pmodel.pageData; let data = res.data.data.pmodel.pageData;
// res.data.data.TotalRevenue // res.data.data.TotalRevenue
...@@ -1959,7 +2153,6 @@ export default { ...@@ -1959,7 +2153,6 @@ export default {
"admin_get_BranchGetList", "admin_get_BranchGetList",
this.getCompanyMsg, this.getCompanyMsg,
res => { res => {
console.log("出团gongsi",res)
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CompanyList = res.data.data; this.CompanyList = res.data.data;
} else { } else {
......
src/components/FinancialModule/priceIncomeConfirmList.vue
View file @ 81216205
...@@ -57,32 +57,33 @@ ...@@ -57,32 +57,33 @@
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
<th>{{$t('scen.sc_temID')}}</th> <th>{{$t('scen.sc_temID')}}</th>
<th>{{$t('admin.admin_Department')}}</th> <th>线路系列</th>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('visa.v_tuanhao')}}</th> <th>{{$t('visa.v_tuanhao')}}</th>
<th>{{$t('scen.sc_ftTime')}}</th>
<th>{{$t('admin.admin_Department')}}</th>
<th>{{$t('admin.admin_personNumber')}}</th> <th>{{$t('admin.admin_personNumber')}}</th>
<th>{{$t('leader.leader_Leader')}}</th> <th>{{$t('leader.leader_Leader')}}</th>
<th>{{$t('fnc.fnc_tfsrhj')}}</th> <th>{{$t('fnc.fnc_tfsrhj')}} </th>
<th>{{$t('fnc.fnc_zksr')}}</th> <th>{{$t('fnc.fnc_zksr')}}</th>
<th>{{$t('fnc.fnc_thjksr')}}</th> <th>{{$t('fnc.fnc_thjksr')}}</th>
<th>{{$t('fnc.fnc_plattev')}}</th> <th>{{$t('fnc.fnc_plattev')}}</th>
<th>{{$t('scen.sc_ftTime')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th> <th>{{$t('admin.admin_czPerson')}}</th>
<th>{{$t('hotel.table_operattime')}}</th> <th>{{$t('hotel.table_operattime')}}</th>
</tr> </tr>
<tr v-for="item in tableList" :key="item.Id"> <tr v-for="item in tableList" :key="item.Id">
<td><span @click='goUrl("priceIncomeConfirmInfo",item.TCID,"收入确认单")' style="cursor:pointer;text-decoration: underline">{{item.TCID}}</span></td> <td><span @click='goUrl("priceIncomeConfirmInfo",item.TCID,"收入确认单")' style="cursor:pointer;text-decoration: underline">{{item.TCID}}</span></td>
<td>{{item.LineName}}</td>
<td>{{item.TCNUM}}</td>
<td>{{item.StartDate}}</td>
<td>{{item.DepartmentName}}</td> <td>{{item.DepartmentName}}</td>
<td>{{item.Id}}</td>
<td>{{item.TCNUM}}</td>
<td>{{item.PeopleNum}}</td> <td>{{item.PeopleNum}}</td>
<td>{{item.LeaderName}}</td> <td>{{item.LeaderName}}</td>
<td>{{item.TotalIncome}}</td> <td>{{item.TotalIncome}}</td>
<td>{{item.DirectGuestIncome}}</td> <td>{{item.DirectGuestIncome}}</td>
<td>{{item.PlatformGuestIncome}}</td> <td>{{item.PlatformGuestIncome}}</td>
<td>{{item.PlatformIncome}}</td> <td>{{item.PlatformIncome}}</td>
<td>{{item.StartDate}}</td>
<td>{{item.EmpName}}</td> <td>{{item.EmpName}}</td>
<td>{{item.DateTimeStr}}</td> <td>{{item.DateTimeStr}}</td>
</tr> </tr>
...@@ -98,7 +99,7 @@ ...@@ -98,7 +99,7 @@
<script> <script>
import moment from "moment";
export default { export default {
data () { data () {
...@@ -112,7 +113,7 @@ export default { ...@@ -112,7 +113,7 @@ export default {
LineId:0, LineId:0,
LineteamId:0, LineteamId:0,
TCNUM:"", TCNUM:"",
StartDate:"", StartDate:moment().format("YYYY-MM-DD"),
EndDate:"", EndDate:"",
currentPage:1, currentPage:1,
}, },
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 81216205
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
padding:10px; padding:10px;
} }
.priceContent .pri_EmpName{ .priceContent .pri_EmpName{
float:left; float:left ;
margin-left:20px; margin-left:20px;
} }
.priceContent .pri_DateTime{ .priceContent .pri_DateTime{
......
src/plug/index.js
View file @ 81216205
...@@ -118,9 +118,9 @@ export default { ...@@ -118,9 +118,9 @@ export default {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名 // domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名 // domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082"; // domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.16:8083"; domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) { } else if (locationName.indexOf('viitto') !== -1) {
......
src/router/config.js
View file @ 81216205
...@@ -2295,7 +2295,7 @@ export default { ...@@ -2295,7 +2295,7 @@ export default {
}, },
{ //财务 财务单据 应付团款查询 { //财务 财务单据 应付团款查询
path: '/RecPayQueryTeamV2', path: '/RecPayQueryTeamV2',
name: '/RecPayQueryTeamV2', name: 'RecPayQueryTeamV2',
component: resolve => require(['@/components/FinancialModule/RecPayQueryTeamV2'], resolve), component: resolve => require(['@/components/FinancialModule/RecPayQueryTeamV2'], resolve),
meta: { meta: {
title: '应付团款查询' title: '应付团款查询'
......
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