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
62df3b47
Commit
62df3b47
authored
Jul 13, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
e7cb4d8e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
8 deletions
+21
-8
ChoiceAddFinancialDocuments2.vue
...mponents/FinancialModule/ChoiceAddFinancialDocuments2.vue
+12
-6
groupInquiry.vue
src/components/SalesModule/groupInquiry.vue
+6
-0
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+3
-2
No files found.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @
62df3b47
...
...
@@ -386,12 +386,18 @@
if
(
x
.
Type
==
1
){
this
.
collectList
.
push
(
x
);
}
else
if
(
x
.
Type
==
2
){
// noTypeCost 不是leaderReimbursement制单排除流程
if
(
this
.
$route
.
query
.
noTypeCost
){
if
(
x
.
Id
!=
94
&&
x
.
Id
!=
95
&&
x
.
Id
!=
96
&&
x
.
Id
!=
97
&&
x
.
Id
!=
51
&&
x
.
Id
!=
52
&&
x
.
Id
!=
54
&&
x
.
Id
!=
55
&&
x
.
Id
!=
49
&&
x
.
Id
!=
50
&&
x
.
Id
!=
57
&&
x
.
Id
!=
58
&&
x
.
Id
!=
88
&&
x
.
Id
!=
89
){
this
.
payList
.
push
(
x
);
}
// 不是团队收支界面制单排除流程 排除签证流程
if
(
this
.
$route
.
query
.
noTypeCost
||
this
.
$route
.
query
.
isVisa
){
if
(
x
.
Id
!=
94
&&
x
.
Id
!=
95
&&
x
.
Id
!=
96
&&
x
.
Id
!=
97
&&
x
.
Id
!=
51
&&
x
.
Id
!=
52
&&
x
.
Id
!=
54
&&
x
.
Id
!=
55
&&
x
.
Id
!=
49
&&
x
.
Id
!=
50
&&
x
.
Id
!=
57
&&
x
.
Id
!=
58
&&
x
.
Id
!=
88
&&
x
.
Id
!=
89
){
if
(
this
.
$route
.
query
.
isVisa
){
//屏蔽签证
if
(
x
.
Name
.
indexOf
(
'签证'
)
==-
1
){
this
.
payList
.
push
(
x
);
}
}
else
{
this
.
payList
.
push
(
x
);
}
}
}
else
{
this
.
payList
.
push
(
x
);
}
...
...
src/components/SalesModule/groupInquiry.vue
View file @
62df3b47
...
...
@@ -1608,6 +1608,12 @@ export default {
}
else
{
this
.
queryCommonData
.
IsParentCompany
=
userInfo
.
IsParentCompany
;
}
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
if
(
ActionMenuCode
.
indexOf
(
"isSuperManagement"
)
!=
-
1
)
{
this
.
queryCommonData
.
IsParentCompany
=
1
;
}
if
(
this
.
$route
.
query
.
hasOwnProperty
(
"cache"
))
{
if
(
this
.
$store
.
state
.
pageCondition
!=
null
)
{
this
.
queryMsg
=
this
.
$store
.
state
.
pageCondition
;
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
62df3b47
...
...
@@ -731,7 +731,7 @@
<div
class=
"TB_comtitle TB-Title"
>
成本
</div>
<
template
v-if=
"IsHaveAuth"
>
<input
type=
"button"
value=
"团队折让"
class=
"hollowFixedBtn TeamAddBtn"
v-show=
"ishowBtn"
@
click=
"TDZR"
/>
<input
type=
"button"
value=
"新增"
class=
"hollowFixedBtn TeamAddBtn"
v-show=
"ishowBtn"
@
click=
"AddOutDetail"
/>
<input
type=
"button"
value=
"新增"
class=
"hollowFixedBtn TeamAddBtn"
v-show=
"ishowBtn"
@
click=
"AddOutDetail
(3)
"
/>
</
template
>
</div>
<div
class=
"clearfix TB_PrintDiv"
>
...
...
@@ -2397,7 +2397,7 @@
});
},
//支出跳转
AddOutDetail
()
{
AddOutDetail
(
visaType
)
{
var
TCArr
=
[
this
.
TCID
];
let
orderObj
=
{
OrderID
:
0
,
...
...
@@ -2412,6 +2412,7 @@
Type
:
2
,
companyID
:
this
.
OutBranchId
,
noTypeCost
:
true
,
isVisa
:
visaType
==
3
?
true
:
false
,
//屏蔽签证相关流程
'blank'
:
'y'
,
'orderObj'
:
JSON
.
stringify
(
orderObj
)
}
...
...
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