Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
SuperMan
Commits
2f8f63a5
Commit
2f8f63a5
authored
Apr 28, 2019
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
团队营收增加联运提成
parent
39175816
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
1 deletion
+28
-1
CombinedRevenueReport.vue
...ents/FinancialModule/ReportForm/CombinedRevenueReport.vue
+11
-0
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+17
-1
No files found.
src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue
View file @
2f8f63a5
...
@@ -1117,6 +1117,15 @@ export default {
...
@@ -1117,6 +1117,15 @@ export default {
columnAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
isResize
:
true
},
},
{
field
:
"UnionTiCheng"
,
formatter
:
this
.
moneyFormat
,
title
:
"联运提成"
,
width
:
90
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
{
{
field
:
"YingYeE"
,
field
:
"YingYeE"
,
formatter
:
this
.
moneyFormat
,
formatter
:
this
.
moneyFormat
,
...
@@ -1538,6 +1547,8 @@ export default {
...
@@ -1538,6 +1547,8 @@ export default {
if
(
field
===
"ShiJiLiRun"
)
return
this
.
priceFormat
(
rowData
.
ShiJiLiRun
);
if
(
field
===
"ShiJiLiRun"
)
return
this
.
priceFormat
(
rowData
.
ShiJiLiRun
);
if
(
field
===
"TransportCost"
)
if
(
field
===
"TransportCost"
)
return
this
.
priceFormat
(
rowData
.
TransportCost
);
return
this
.
priceFormat
(
rowData
.
TransportCost
);
if
(
field
===
"UnionTiCheng"
)
return
this
.
priceFormat
(
rowData
.
UnionTiCheng
);
if
(
field
===
"YingYeE"
)
return
this
.
priceFormat
(
rowData
.
YingYeE
);
if
(
field
===
"YingYeE"
)
return
this
.
priceFormat
(
rowData
.
YingYeE
);
if
(
field
===
"AverageIncome"
)
if
(
field
===
"AverageIncome"
)
return
this
.
priceFormat
(
rowData
.
AverageIncome
);
return
this
.
priceFormat
(
rowData
.
AverageIncome
);
...
...
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
2f8f63a5
...
@@ -1284,6 +1284,15 @@ export default {
...
@@ -1284,6 +1284,15 @@ export default {
columnAlign
:
"right"
,
columnAlign
:
"right"
,
isResize
:
true
isResize
:
true
},
},
{
field
:
"UnionTiCheng"
,
formatter
:
this
.
moneyFormat
,
title
:
"联运提成"
,
width
:
90
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
{
field
:
"YingYeE"
,
field
:
"YingYeE"
,
formatter
:
this
.
moneyFormat
,
formatter
:
this
.
moneyFormat
,
...
@@ -1577,6 +1586,7 @@ export default {
...
@@ -1577,6 +1586,7 @@ export default {
"合肥"
,
"合肥"
,
"南宁"
,
"南宁"
,
"联运成本"
,
"联运成本"
,
"联运提成"
,
"营业额"
,
"营业额"
,
"GRP"
,
"GRP"
,
"TKT"
,
"TKT"
,
...
@@ -1673,7 +1683,8 @@ export default {
...
@@ -1673,7 +1683,8 @@ export default {
"BC"
,
"BC"
,
"BD"
,
"BD"
,
"BE"
,
"BE"
,
"BF"
"BF"
,
"BG"
];
];
const
ws
=
XLSX
.
utils
.
aoa_to_sheet
(
data
);
const
ws
=
XLSX
.
utils
.
aoa_to_sheet
(
data
);
ws
[
"!cols"
]
=
wscols
;
ws
[
"!cols"
]
=
wscols
;
...
@@ -1747,6 +1758,8 @@ export default {
...
@@ -1747,6 +1758,8 @@ export default {
if
(
field
===
"ShiJiLiRun"
)
return
this
.
priceFormat
(
rowData
.
ShiJiLiRun
);
if
(
field
===
"ShiJiLiRun"
)
return
this
.
priceFormat
(
rowData
.
ShiJiLiRun
);
if
(
field
===
"TransportCost"
)
if
(
field
===
"TransportCost"
)
return
this
.
priceFormat
(
rowData
.
TransportCost
);
return
this
.
priceFormat
(
rowData
.
TransportCost
);
if
(
field
===
"UnionTiCheng"
)
return
this
.
priceFormat
(
rowData
.
UnionTiCheng
);
if
(
field
===
"YingYeE"
)
return
this
.
priceFormat
(
rowData
.
YingYeE
);
if
(
field
===
"YingYeE"
)
return
this
.
priceFormat
(
rowData
.
YingYeE
);
if
(
field
===
"AverageIncome"
)
if
(
field
===
"AverageIncome"
)
return
this
.
priceFormat
(
rowData
.
AverageIncome
);
return
this
.
priceFormat
(
rowData
.
AverageIncome
);
...
@@ -1904,6 +1917,9 @@ export default {
...
@@ -1904,6 +1917,9 @@ export default {
}
}
if
(
rowData
.
TransportCost
<
0
&&
columnName
==
"TransportCost"
){
if
(
rowData
.
TransportCost
<
0
&&
columnName
==
"TransportCost"
){
return
"column-cell-class-name-test-red"
return
"column-cell-class-name-test-red"
}
if
(
rowData
.
UnionTiCheng
<
0
&&
columnName
==
"UnionTiCheng"
){
return
"column-cell-class-name-test-red"
}
}
if
(
rowData
.
YingYeE
<
0
&&
columnName
==
"YingYeE"
){
if
(
rowData
.
YingYeE
<
0
&&
columnName
==
"YingYeE"
){
return
"column-cell-class-name-test-red"
return
"column-cell-class-name-test-red"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment