Commit 71e50890 authored by Mac's avatar Mac

1

parent 1a9ee2b4
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
.column-cell-class-name-test-lan-s .v-table-body-cell { .column-cell-class-name-test-lan-s .v-table-body-cell {
background-color: #9cf; background-color: #9cf;
} }
.page_EasyReport .column-cell-class-name-test-red-new{
background: #e95252;
color:#FFF;
}
</style> </style>
<template> <template>
...@@ -96,7 +100,7 @@ ...@@ -96,7 +100,7 @@
// 团队跳转 // 团队跳转
template: ` template: `
<div class="gourl_span"> <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.CostTypeIds && rowData.CostTypeIds!=''" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.YiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.YiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.YiYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -130,7 +134,7 @@ ...@@ -130,7 +134,7 @@
// 团队跳转 // 团队跳转
template: ` template: `
<div class="gourl_span"> <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.CostTypeIds && rowData.CostTypeIds!=''" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ErYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ErYue}}</span> <span style="cursor: pointer" v-else>{{rowData.ErYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -163,7 +167,7 @@ ...@@ -163,7 +167,7 @@
Vue.component("SanYueJump", { Vue.component("SanYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.SanYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.SanYue}}</span> <span style="cursor: pointer" v-else>{{rowData.SanYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -196,7 +200,7 @@ ...@@ -196,7 +200,7 @@
Vue.component("SiYueJump", { Vue.component("SiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.SiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.SiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.SiYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -229,7 +233,7 @@ ...@@ -229,7 +233,7 @@
Vue.component("WuYueJump", { Vue.component("WuYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.WuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.WuYue}}</span> <span style="cursor: pointer" v-else>{{rowData.WuYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -262,7 +266,7 @@ ...@@ -262,7 +266,7 @@
Vue.component("LiuYueJump", { Vue.component("LiuYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{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: {
...@@ -295,7 +299,7 @@ ...@@ -295,7 +299,7 @@
Vue.component("QiYueJump", { Vue.component("QiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.QiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.QiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.QiYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -328,7 +332,7 @@ ...@@ -328,7 +332,7 @@
Vue.component("BaYueJump", { Vue.component("BaYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.BaYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.BaYue}}</span> <span style="cursor: pointer" v-else>{{rowData.BaYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -361,7 +365,7 @@ ...@@ -361,7 +365,7 @@
Vue.component("JiuYueJump", { Vue.component("JiuYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.JiuYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span> <span style="cursor: pointer" v-else>{{rowData.JiuYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -394,7 +398,7 @@ ...@@ -394,7 +398,7 @@
Vue.component("ShiYueJump", { Vue.component("ShiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ShiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.ShiYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -427,7 +431,7 @@ ...@@ -427,7 +431,7 @@
Vue.component("ShiYiYueJump", { Vue.component("ShiYiYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ShiYiYue}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span> <span style="cursor: pointer" v-else>{{rowData.ShiYiYue}}</span>
</div>`, </div>`,
props: { props: {
...@@ -460,7 +464,7 @@ ...@@ -460,7 +464,7 @@
Vue.component("ShiErYueJump", { Vue.component("ShiErYueJump", {
// 团队跳转 // 团队跳转
template: ` <div class="gourl_span"> 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.CostTypeIds && rowData.CostTypeIds!='' " @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostTypeIds)">{{rowData.ShiEr}}</span>
<span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span> <span style="cursor: pointer" v-else>{{rowData.ShiEr}}</span>
</div>`, </div>`,
props: { props: {
...@@ -853,15 +857,21 @@ ...@@ -853,15 +857,21 @@
}) })
}, },
GoUrlFan(path, month, year, BranchId, ids) { GoUrlFan(path, month, year, BranchId, ids) {
this.$router.push({ // this.$router.push({
path: "/financial/" + path, // path: "/financial/" + path,
query: { // query: {
// year: year,
// month: month,
// BranchId: BranchId,
// CostIds: ids,
// blank: "y"
// }
// });
this.OpenNewUrl('/financial/'+ path, {
year: year, year: year,
month: month, month: month,
BranchId: BranchId, BranchId: BranchId,
CostIds: ids, CostIds: ids,
blank: "y"
}
}); });
}, },
rowDbClick(rowIndex, rowData, column) { rowDbClick(rowIndex, rowData, column) {
...@@ -879,7 +889,7 @@ ...@@ -879,7 +889,7 @@
} else { } else {
endDate = that.year + "-" + column.end endDate = that.year + "-" + column.end
} }
if (rowIndex < 8) { if (rowIndex < 6 ) {
// 联运收入 // 联运收入
// if(rowData.ZhaiYao=="联运收入"){ // if(rowData.ZhaiYao=="联运收入"){
// that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入") // that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
...@@ -891,34 +901,34 @@ ...@@ -891,34 +901,34 @@
// else if(rowData.ZhaiYao=="营业总成本"){ // else if(rowData.ZhaiYao=="营业总成本"){
// that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询") // that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
// } // }
that.$router.push({ if(column.title!='合计' && column.title!="摘要"){
path: "/financial/TeamRevenueReport", this.OpenNewUrl('/financial/reportform/RecPayQueryTeam', {
query: {
StartTime: startDate, StartTime: startDate,
EndTime: endDate, EndTime: endDate,
BranchId: BranchId, });
blank: "y" }
}
});
} else { } else {
if (rowData.ZhaiYao == "员工提成") { if (rowData.ZhaiYao == "员工提成") {
if (Number(this.year) == 2019) { if (Number(this.year) == 2019) {
if (column.title == "十月" || column.title == "十一月" || column.title == "十二月") { if (column.title == "十月" || column.title == "十一月" || column.title == "十二月") {
let CostIds = ""; let CostTypeIds = "";
CostIds = rowData.CostIds.replace('112,', ''); CostTypeIds = rowData.CostTypeIds.replace('112,', '');
CostIds = CostIds.replace('16,', ''); CostTypeIds = CostTypeIds.replace('16,', '');
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostIds) that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
} else { } else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds) that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
} }
} else if (Number(this.year) > 2019) { } else if (Number(this.year) > 2019) {
let CostIds = ""; let CostTypeIds = "";
CostIds = rowData.CostIds.replace('112,', ''); CostTypeIds = rowData.CostTypeIds.replace('112,', '');
CostIds = CostIds.replace('16,', ''); CostTypeIds = CostTypeIds.replace('16,', '');
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostIds) that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
} else { } else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds) that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
} }
} else if (rowData.ZhaiYao == "歐洲與南亞損失分攤") { } else if (rowData.ZhaiYao == "歐洲與南亞損失分攤") {
that.goUrl("AirTicketLoss", startDate, endDate, BranchId, "机票分摊") that.goUrl("AirTicketLoss", startDate, endDate, BranchId, "机票分摊")
...@@ -930,7 +940,7 @@ ...@@ -930,7 +940,7 @@
year: rowData.Year, year: rowData.Year,
month: month, month: month,
BranchId: rowData.BranchId, BranchId: rowData.BranchId,
CostIds: rowData.CostIds, CostIds: rowData.CostTypeIds,
"IsJapanNonbusinessIncome": 1, "IsJapanNonbusinessIncome": 1,
blank: "y" blank: "y"
} }
...@@ -944,17 +954,21 @@ ...@@ -944,17 +954,21 @@
year: rowData.Year, year: rowData.Year,
month: month, month: month,
BranchId: rowData.BranchId, BranchId: rowData.BranchId,
CostIds: rowData.CostIds, CostIds: rowData.CostTypeIds,
"IsJapanNonbusinessIncome": 1, "IsJapanNonbusinessIncome": 1,
blank: "y" blank: "y"
} }
}); });
} else { } else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds) if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
} }
} else { } else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostIds) if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
} }
} }
}, },
...@@ -998,58 +1012,61 @@ ...@@ -998,58 +1012,61 @@
}, },
columnCellClass: function (rowIndex, columnName, rowData) { columnCellClass: function (rowIndex, columnName, rowData) {
if (rowData.YiYue < 0 && columnName == "YiYue") { if (rowData.YiYue < 0 && columnName == "YiYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.ErYue < 0 && columnName == "ErYue") { if (rowData.ErYue < 0 && columnName == "ErYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.SanYue < 0 && columnName == "SanYue") { if (rowData.SanYue < 0 && columnName == "SanYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.DiYiJiDu < 0 && columnName == "DiYiJiDu") { if (rowData.DiYiJiDu < 0 && columnName == "DiYiJiDu") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.SiYue < 0 && columnName == "SiYue") { if (rowData.SiYue < 0 && columnName == "SiYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.WuYue < 0 && columnName == "WuYue") { if (rowData.WuYue < 0 && columnName == "WuYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.LiuYue < 0 && columnName == "LiuYue") { if (rowData.LiuYue < 0 && columnName == "LiuYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.DiErJiDu < 0 && columnName == "DiErJiDu") { if (rowData.DiErJiDu < 0 && columnName == "DiErJiDu") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.ShangBanNianBao < 0 && columnName == "ShangBanNianBao") { if (rowData.ShangBanNianBao < 0 && columnName == "ShangBanNianBao") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.QiYue < 0 && columnName == "QiYue") { if (rowData.QiYue < 0 && columnName == "QiYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.BaYue < 0 && columnName == "BaYue") { if (rowData.BaYue < 0 && columnName == "BaYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.JiuYue < 0 && columnName == "JiuYue") { if (rowData.JiuYue < 0 && columnName == "JiuYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
}
if (rowData.DiSanJiDu < 0 && columnName == "DiSanJiDu") {
return "column-cell-class-name-test-red-new"
} }
if (rowData.ShiYue < 0 && columnName == "ShiYue") { if (rowData.ShiYue < 0 && columnName == "ShiYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.ShiYiYue < 0 && columnName == "ShiYiYue") { if (rowData.ShiYiYue < 0 && columnName == "ShiYiYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.ShiErYue < 0 && columnName == "ShiErYue") { if (rowData.ShiErYue < 0 && columnName == "ShiErYue") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.DiSiJiDu < 0 && columnName == "DiSiJiDu") { if (rowData.DiSiJiDu < 0 && columnName == "DiSiJiDu") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.XiaBanNianBao < 0 && columnName == "XiaBanNianBao") { if (rowData.XiaBanNianBao < 0 && columnName == "XiaBanNianBao") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.ZongJi < 0 && columnName == "ZongJi") { if (rowData.ZongJi < 0 && columnName == "ZongJi") {
return "column-cell-class-name-test-red" return "column-cell-class-name-test-red-new"
} }
if (rowData.ZhaiYao == '以下项均不计入计算') { if (rowData.ZhaiYao == '以下项均不计入计算') {
...@@ -1127,7 +1144,7 @@ ...@@ -1127,7 +1144,7 @@
} }
if (rowData.ZhaiYao === '营业总毛利' || rowData.ZhaiYao === '歐洲與南亞損失分攤' || rowData.ZhaiYao === '营业税金及附加' || rowData if (rowData.ZhaiYao === '营业总毛利' || rowData.ZhaiYao === '歐洲與南亞損失分攤' || rowData.ZhaiYao === '营业税金及附加' || rowData
.ZhaiYao === '管销费用' || rowData.ZhaiYao === '财务费用' || rowData.ZhaiYao === '营业外收入' || rowData.ZhaiYao === .ZhaiYao === '管销费用' || rowData.ZhaiYao === '财务费用' || rowData.ZhaiYao === '营业外收入' || rowData.ZhaiYao ===
'其他营业支出') { '其他营业支出' || rowData.ZhaiYao.indexOf('小计')!=-1) {
return "column-cell-class-name-test-greed"; return "column-cell-class-name-test-greed";
} }
if (rowData.ZhaiYao === '社保') { if (rowData.ZhaiYao === '社保') {
......
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