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
274149ca
Commit
274149ca
authored
Nov 24, 2023
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
f07b54c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
142 additions
and
108 deletions
+142
-108
CombinedRevenueReport.vue
...ents/FinancialModule/ReportForm/CombinedRevenueReport.vue
+62
-54
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+80
-54
No files found.
src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue
View file @
274149ca
...
...
@@ -853,14 +853,14 @@ export default {
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"TransportCS"
,
title
:
"长沙"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
//
{
//
field: "TransportCS",
//
title: "长沙",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "left",
//
isResize: true
//
},
{
field
:
"TransportGY"
,
title
:
"贵阳"
,
...
...
@@ -869,38 +869,38 @@ export default {
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"TransportNC"
,
title
:
"南昌"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"TransportXM"
,
title
:
"厦门"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"TransportLZ"
,
title
:
"兰州"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"TransportNJ"
,
title
:
"南京"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
//
{
//
field: "TransportNC",
//
title: "南昌",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "left",
//
isResize: true
//
},
//
{
//
field: "TransportXM",
//
title: "厦门",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "left",
//
isResize: true
//
},
//
{
//
field: "TransportLZ",
//
title: "兰州",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "left",
//
isResize: true
//
},
//
{
//
field: "TransportNJ",
//
title: "南京",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "left",
//
isResize: true
//
},
{
field
:
"TransportWT"
,
title
:
"微途"
,
...
...
@@ -909,14 +909,14 @@ export default {
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"TransportHF"
,
title
:
"合肥"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
//
{
//
field: "TransportHF",
//
title: "合肥",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "left",
//
isResize: true
//
},
{
field
:
"TransportNN"
,
title
:
"南宁"
,
...
...
@@ -933,25 +933,33 @@ export default {
columnAlign
:
"left"
,
isResize
:
true
},
// {
// field: "TransportXC",
// title: "西昌",
// width: 50,
// titleAlign: "left",
// columnAlign: "left",
// isResize: true
// },
{
field
:
"Transport
XC
"
,
title
:
"
西昌
"
,
field
:
"Transport
WL
"
,
title
:
"
网络
"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"Transport
WL
"
,
title
:
"
网络
"
,
field
:
"Transport
PW
"
,
title
:
"
票务
"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
isResize
:
true
},
{
field
:
"Transport
PW
"
,
title
:
"
票务
"
,
field
:
"Transport
SH
"
,
title
:
"
上海
"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"left"
,
...
...
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
274149ca
...
...
@@ -1864,14 +1864,14 @@ export default {
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"TransportCS"
,
title
:
"长沙"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
//
{
//
field: "TransportCS",
//
title: "长沙",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "right",
//
isResize: true
//
},
{
field
:
"TransportGY"
,
title
:
"贵阳"
,
...
...
@@ -1880,38 +1880,38 @@ export default {
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"TransportNC"
,
title
:
"南昌"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"TransportXM"
,
title
:
"厦门"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"TransportLZ"
,
title
:
"兰州"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"TransportNJ"
,
title
:
"南京"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
//
{
//
field: "TransportNC",
//
title: "南昌",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "right",
//
isResize: true
//
},
//
{
//
field: "TransportXM",
//
title: "厦门",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "right",
//
isResize: true
//
},
//
{
//
field: "TransportLZ",
//
title: "兰州",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "right",
//
isResize: true
//
},
//
{
//
field: "TransportNJ",
//
title: "南京",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "right",
//
isResize: true
//
},
{
field
:
"TransportWT"
,
title
:
"微途"
,
...
...
@@ -1920,14 +1920,14 @@ export default {
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"TransportHF"
,
title
:
"合肥"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
//
{
//
field: "TransportHF",
//
title: "合肥",
//
width: 50,
//
titleAlign: "left",
//
columnAlign: "right",
//
isResize: true
//
},
{
field
:
"TransportNN"
,
title
:
"南宁"
,
...
...
@@ -1944,25 +1944,33 @@ export default {
columnAlign
:
"right"
,
isResize
:
true
},
// {
// field: "TransportXC",
// title: "西昌",
// width: 50,
// titleAlign: "left",
// columnAlign: "right",
// isResize: true
// },
{
field
:
"Transport
XC
"
,
title
:
"
西昌
"
,
field
:
"Transport
WL
"
,
title
:
"
网络
"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"Transport
WL
"
,
title
:
"
网络
"
,
field
:
"Transport
PW
"
,
title
:
"
票务
"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
isResize
:
true
},
{
field
:
"Transport
PW
"
,
title
:
"
票务
"
,
field
:
"Transport
SH
"
,
title
:
"
上海
"
,
width
:
50
,
titleAlign
:
"left"
,
columnAlign
:
"right"
,
...
...
@@ -2199,6 +2207,24 @@ export default {
if
(
this
.
msg
.
LineId
==-
5
){
this
.
msg
.
DataType
=
"6"
;
}
if
(
this
.
msg
.
LineId
==-
13
){
this
.
msg
.
DataType
=
"16"
;
}
if
(
this
.
msg
.
LineId
==-
14
){
this
.
msg
.
DataType
=
"17"
;
}
if
(
this
.
msg
.
LineId
==-
15
){
this
.
msg
.
DataType
=
"18"
;
}
if
(
this
.
msg
.
LineId
==-
16
){
this
.
msg
.
DataType
=
"19"
;
}
if
(
this
.
msg
.
LineId
==-
17
){
this
.
msg
.
DataType
=
"20"
;
}
if
(
this
.
msg
.
LineId
==-
18
){
this
.
msg
.
DataType
=
"21"
;
}
let
userInfo
=
this
.
getLocalStorage
();
if
((
","
+
userInfo
.
ActionMenuCode
+
","
).
indexOf
(
',F_Query_TicketTeamRevenueReport,'
)
!=-
1
){
this
.
isShowType
=
false
;
...
...
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