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
2373c2f6
Commit
2373c2f6
authored
1 year ago
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
a0255499
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
16 deletions
+29
-16
domesticCommissionTW2.vue
src/components/FinancialModule/domesticCommissionTW2.vue
+2
-2
domesticCommissionUserTW2.vue
src/components/FinancialModule/domesticCommissionUserTW2.vue
+5
-5
domesticCommissiondetailsTW2.vue
...mponents/FinancialModule/domesticCommissiondetailsTW2.vue
+19
-6
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+3
-3
No files found.
src/components/FinancialModule/domesticCommissionTW2.vue
View file @
2373c2f6
...
...
@@ -217,7 +217,7 @@
msg
:
{
pageIndex
:
1
,
pageSize
:
20
,
Periods
:
0
,
Periods
Id
:
-
1
,
Name
:
''
,
OutBranchId
:
-
1
,
},
...
...
@@ -238,7 +238,7 @@
mounted
()
{
let
userInfo
=
this
.
getLocalStorage
();
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
this
.
msg
.
OutBranchId
=
userInfo
.
RB_Branch_id
//
this.msg.OutBranchId = userInfo.RB_Branch_id
if
(
ActionMenuCode
.
indexOf
(
'F_DCommissionSend'
)
!=
-
1
)
{
this
.
btnShow
=
true
;
}
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/domesticCommissionUserTW2.vue
View file @
2373c2f6
...
...
@@ -162,21 +162,21 @@
this
.
disabled
=
false
;
}
else
{
this
.
disabled
=
true
;
this
.
msg
.
UserId
=
Number
(
userInfo
.
EmployeeId
)
//
this.msg.UserId = Number(userInfo.EmployeeId)
}
if
(
ActionMenuCode
.
indexOf
(
'S_CheckBranchOrder'
)
!=
-
1
){
this
.
S_CheckBranchOrder
=
true
this
.
msg
.
OutBranchId
=
userInfo
.
RB_Branch_id
//
this.msg.OutBranchId = userInfo.RB_Branch_id
}
this
.
msg
.
PeriodId
=
this
.
$route
.
query
.
PeriodId
?
Number
(
this
.
$route
.
query
.
PeriodId
):
0
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
OutBranchId
)
{
this
.
msg
.
OutBranchId
=
this
.
$route
.
query
.
OutBranchId
//
this.msg.OutBranchId = this.$route.query.OutBranchId
}
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
RB_Branch_Id
)
{
this
.
msg
.
RB_Branch_Id
=
this
.
$route
.
query
.
RB_Branch_Id
//
this.msg.RB_Branch_Id = this.$route.query.RB_Branch_Id
}
if
(
this
.
$route
.
query
&&
this
.
$route
.
query
.
RB_Department_Id
)
{
this
.
msg
.
RB_Department_Id
=
this
.
$route
.
query
.
RB_Department_Id
//
this.msg.RB_Department_Id = this.$route.query.RB_Department_Id
}
this
.
getList
();
// this.getqishilist()
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/domesticCommissiondetailsTW2.vue
View file @
2373c2f6
...
...
@@ -141,7 +141,10 @@
<td>
{{
item
.
UserName
}}
</td>
<td>
销售
</td>
<td>
{{
item
.
OrderType
==
1
?
'团队'
:
item
.
OrderType
==
2
?
'酒店'
:
item
.
OrderType
==
3
?
'门票'
:
item
.
OrderType
==
4
?
'车辆'
:
''
}}
</td>
<td>
{{
item
.
OrderId
?
item
.
OrderId
:
'-'
}}
{{
item
.
OrderType
==
1
?
'('
+
item
.
TCNUM
+
')'
:
''
}}
</td>
<td>
<span
class=
"cursor-p"
:style=
"
{'color': !disabled?'#409EFF':''}" @click="!disabled?goTuanDetails(item):''">
{{
item
.
OrderId
?
item
.
OrderId
:
'-'
}}
{{
item
.
OrderType
==
1
?
'('
+
item
.
TCNUM
+
')'
:
''
}}
</span>
</td>
<td>
{{
item
.
LineName
}}
</td>
<td>
{{
item
.
OriginalProfit
?
item
.
OriginalProfit
:
'-'
}}
</td>
<td>
{{
item
.
CurrencyName
}}
</td>
...
...
@@ -209,16 +212,16 @@
this
.
msg
.
PeriodId
=
Number
(
this
.
$route
.
query
.
PeriodId
)
}
if
(
this
.
$route
.
query
.
UserId
&&
this
.
$route
.
query
.
UserId
>
0
)
{
this
.
msg
.
UserId
=
Number
(
this
.
$route
.
query
.
UserId
)
//
this.msg.UserId = Number(this.$route.query.UserId)
}
if
(
this
.
$route
.
query
.
RB_Branch_Id
)
{
this
.
msg
.
RB_Branch_Id
=
Number
(
this
.
$route
.
query
.
RB_Branch_Id
)
//
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
}
if
(
this
.
$route
.
query
.
RB_Department_Id
&&
this
.
$route
.
query
.
RB_Department_Id
>
0
)
{
this
.
msg
.
RB_Department_Id
=
Number
(
this
.
$route
.
query
.
RB_Department_Id
)
//
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
}
if
(
this
.
$route
.
query
.
OutBranchId
&&
this
.
$route
.
query
.
OutBranchId
!=
''
)
{
this
.
msg
.
OutBranchId
=
Number
(
this
.
$route
.
query
.
OutBranchId
)
//
this.msg.OutBranchId = Number(this.$route.query.OutBranchId)
}
}
if
(
ActionMenuCode
.
indexOf
(
'home_CommissionSeeAll'
)
!=
-
1
)
{
//是否有看所有人的权限
...
...
@@ -229,7 +232,7 @@
}
if
(
ActionMenuCode
.
indexOf
(
'S_CheckBranchOrder'
)
!=
-
1
){
this
.
S_CheckBranchOrder
=
true
this
.
msg
.
OutBranchId
=
userInfo
.
RB_Branch_id
//
this.msg.OutBranchId = userInfo.RB_Branch_id
}
this
.
getList
();
this
.
getqishilist
()
...
...
@@ -238,6 +241,16 @@
this
.
getDerpartMent
()
//部门
},
methods
:
{
goTuanDetails
(
row
)
{
this
.
$router
.
push
({
path
:
'TeamBalancePayment'
,
//TravelControlList
query
:
{
id
:
row
.
OrderId
,
blank
:
'y'
,
tab
:
'团队收支'
//团控列表
}
});
},
getDerpartMent
()
{
//获取部门
this
.
apipost
(
...
...
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
2373c2f6
...
...
@@ -264,10 +264,10 @@
<template
v-for=
"(subItem,index) in DataList.ExpectedCutList"
>
<div
style=
"margin-bottom:5px;"
>
{{
subItem
.
BranchName
}}
<template>
¥
</
template
>
{{subItem.expectedCut}}
<span
style=
"margin-left: 5px;font-size: 10px;"
v-if=
"subItem.CurrencyName"
>
{{subItem.CurrencyName}}
</span>
<
!-- <
span style="margin-left: 5px;font-size: 10px;"
v-if="subItem.CurrencyName">{{subItem.CurrencyName}}</span>
-->
<span
style=
"font-size: 10px;color: #ff9c00;margin-left: 5px;"
v-if=
"subItem.StandardMoney"
>
结算{{subItem.StandardMoney}}{{DataList.TeamBalance.StandardCurrencyName}}
(结算{{subItem.StandardMoney}}{{DataList.TeamBalance.StandardCurrencyName}})
</span>
</div>
</template>
...
...
This diff is collapsed.
Click to expand it.
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