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
7a76265a
Commit
7a76265a
authored
Aug 08, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1 流程端口增加
parent
3c80be86
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
44 deletions
+42
-44
ChoiceAddFinancialDocuments2.vue
...mponents/FinancialModule/ChoiceAddFinancialDocuments2.vue
+6
-40
OrderList.vue
src/components/Hotel/reservation/OrderList.vue
+6
-0
VisaProductOrder.vue
src/components/SalesVisa/VisaProductOrder.vue
+6
-0
visaOrderList.vue
src/components/SalesVisa/components/visaOrderList.vue
+6
-0
TicketManager.vue
src/components/Ticketing/TicketManager.vue
+4
-2
orderList.vue
...omponents/busManagement/BookAcar/components/orderList.vue
+6
-0
payURL.vue
src/components/commonPage/payURL.vue
+1
-1
OrderList.vue
src/components/scenicSpot/reservation/OrderList.vue
+7
-1
No files found.
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @
7a76265a
...
...
@@ -109,6 +109,7 @@
crmOrderObj
:
null
,
commissionObj
:
null
,
tradeObj
:
null
,
portTypeId
:
null
,
}
},
computed
:
{
...
...
@@ -243,6 +244,7 @@
"Type"
:
Type
,
"tradeObj"
:
JSON
.
stringify
(
this
.
tradeObj
),
'path'
:
this
.
$route
.
query
.
path
,
'companyID'
:
this
.
$route
.
query
.
companyID
,
blank
:
'y'
,
tab
:
'新增付款单'
}
...
...
@@ -318,8 +320,8 @@
}
else
{
this
.
noData
=
false
;
}
let
newList
=
[];
if
(
this
.
templateID
)
{
let
newList
=
[];
this
.
templateID
.
forEach
(
x
=>
{
this
.
GetList
.
forEach
(
y
=>
{
if
(
x
==
y
.
Id
)
{
...
...
@@ -334,54 +336,17 @@
}
else
{
this
.
GetList
.
forEach
(
y
=>
{
y
.
showYes
=
false
newList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
y
)))
//
newList.push(JSON.parse(JSON.stringify(y)))
})
}
},
Financial_post_GetList
(){
//获取
this
.
apipost
(
'Financial_post_GetList'
,{},
res
=>
{
this
.
apipost
(
'Financial_post_GetList'
,{
PortType
:
this
.
portTypeId
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
let
list
=
[
94
,
95
,
96
,
97
,
51
,
52
,
54
,
55
,
49
,
50
,
57
,
58
,
88
,
89
]
if
(
data
){
data
.
forEach
(
x
=>
{
// 5-8 OrderSource 为5 并且当前登录人为吴珊,只显示49和50
// 如果不是吴珊,只显示49
// 如果没有 OrderSource 则49和50都不显示
// if (this.OrderSource === '5' && this.showTab === '2' && (x.Id === 49 || x.Id === 50)) {
// if (x.Id === 49 || x.Id === 50){
// x.bigShow = false
// if (x.Id === 49){
// x.bigShow = true
// } else if (x.Id === 50 && this.EmployeeId === 639){
// x.bigShow = true
// }
// } else {
// x.bigShow = false
// }
// } else if (x.Id === 49 || x.Id === 50){
// x.bigShow = false
// } else {
// 5-5 仅茈、而巳。 14:32:06
// 部门id = 242 或者 240 就展示出 templeteId=33 的流程, 流程名字叫做 公司佣金收款
// if (x.Id === 33 || x.Id === 48) {
// if (x.Id === 33) {
// if (this.DepartID === 242 || this.DepartID === 240) {
// x.bigShow = true
// } else {
// x.bigShow = false
// }
// } else if (x.Id === 48 ) { //76 77 稽核单据|| x.Id === 76 || x.Id === 77
// if (this.EmployeeId === 1725) {
// x.bigShow = true
// } else {
// x.bigShow = false
// }
// }
// } else {
// x.bigShow = true
// }
// }
x
.
bigShow
=
true
if
(
x
.
Type
==
1
){
this
.
collectList
.
push
(
x
);
...
...
@@ -446,6 +411,7 @@
this
.
EmployeeId
=
userInfo
.
EmployeeId
;
}
this
.
templateID
=
this
.
$route
.
query
.
templateID
?
JSON
.
parse
(
this
.
$route
.
query
.
templateID
)
:
null
this
.
portTypeId
=
this
.
$route
.
query
.
portTypeId
?
this
.
$route
.
query
.
portTypeId
:
null
this
.
OrderSource
=
this
.
$route
.
query
.
OrderSource
?
this
.
$route
.
query
.
OrderSource
:
null
// this.showTab = this.$route.query.Type?this.$route.query.Type:0;
this
.
tradeWay
=
this
.
$route
.
query
.
tradeWay
?
this
.
$route
.
query
.
tradeWay
:
0
;
...
...
src/components/Hotel/reservation/OrderList.vue
View file @
7a76265a
...
...
@@ -1150,7 +1150,13 @@ export default {
tab
:
`新增
${
text
}
单据`
,
Type
:
type
,
tradeObj
:
JSON
.
stringify
(
this
.
BillMakingMsg
),
companyID
:
row
.
OutBranchId
};
if
(
num
==
2
){
query
.
searchTitle
=
'溢收团费退款'
;
}
else
if
(
num
==
3
&&
this
.
cdState
==
false
){
query
.
portTypeId
=
4
;
}
this
.
queryObj
=
query
if
(
!
Offset
){
this
.
$store
.
commit
(
"ChoiceAddFinancialDocuments"
);
...
...
src/components/SalesVisa/VisaProductOrder.vue
View file @
7a76265a
...
...
@@ -1390,6 +1390,12 @@
orderObj
:
JSON
.
stringify
(
orderObj
),
Type
:
type
,
}
if
(
num
==
2
){
query
.
searchTitle
=
'签证退款'
}
else
if
(
num
==
3
&&
this
.
cdState
==
false
){
query
.
portTypeId
=
2
;
}
this
.
queryObj
=
query
if
(
!
Offset
){
this
.
$router
.
push
({
...
...
src/components/SalesVisa/components/visaOrderList.vue
View file @
7a76265a
...
...
@@ -1508,6 +1508,12 @@ export default {
orderObj
:
JSON
.
stringify
(
orderObj
),
Type
:
type
,
}
if
(
num
==
2
){
query
.
searchTitle
=
'签证退款'
}
else
if
(
num
==
3
&&
this
.
cdState
==
false
){
query
.
portTypeId
=
2
;
//签证成本
}
this
.
queryObj
=
query
if
(
!
Offset
){
this
.
$router
.
push
({
...
...
src/components/Ticketing/TicketManager.vue
View file @
7a76265a
...
...
@@ -1504,7 +1504,7 @@
<p
class=
"_num3"
>
{{
item
.
TicketNum
==
null
?
'0'
:
item
.
TicketNum
}}
</p>
<p
class=
"_wz"
>
{{
$t
(
'Airticket.Air_reservation'
)
}}
</p>
</li>
<li>
<p
:class=
"
{'_num3':item.ConfigUnionCount!=item.UnionCount,'_num2':item.ConfigUnionCount==item.UnionCount}">
...
...
@@ -3528,9 +3528,10 @@
name
:
"ChoiceAddFinancialDocuments"
,
query
:
{
Type
:
nFeeType
,
portTypeId
:
1
,
path
:
"TicketFinace"
,
blank
:
"y"
,
orderObj
:
JSON
.
stringify
(
orderObj
)
orderObj
:
JSON
.
stringify
(
orderObj
)
,
}
});
},
...
...
@@ -3558,6 +3559,7 @@
name
:
"ChoiceAddFinancialDocuments"
,
query
:
{
Type
:
nFeeType
,
portTypeId
:
1
,
path
:
"TicketFinace"
,
blank
:
"y"
,
orderObj
:
JSON
.
stringify
(
orderObj
)
...
...
src/components/busManagement/BookAcar/components/orderList.vue
View file @
7a76265a
...
...
@@ -1360,7 +1360,13 @@ export default {
tab
:
`新增
${
text
}
单据`
,
Type
:
type
,
tradeObj
:
JSON
.
stringify
(
this
.
BillMakingMsg
),
companyID
:
row
.
OutBranchId
};
if
(
num
==
2
){
query
.
searchTitle
=
'溢收团费退款'
;
}
else
if
(
num
==
3
&&
this
.
cdState
==
false
){
query
.
portTypeId
=
3
;
}
this
.
queryObj
=
query
;
if
(
!
Offset
)
{
this
.
$store
.
commit
(
"ChoiceAddFinancialDocuments"
);
...
...
src/components/commonPage/payURL.vue
View file @
7a76265a
...
...
@@ -31,7 +31,7 @@
</div>
</div>
<el-select
slot=
"reference"
v-model=
"value"
class=
'w80'
placeholder=
"收款方式"
@
change=
'chanceType(item)'
>
<
el-option
label=
"二维码"
value=
"1"
></el-option
>
<
!--
<el-option
label=
"二维码"
value=
"1"
></el-option>
--
>
<el-option
label=
"团队收款"
value=
"2"
></el-option>
<el-option
v-if=
'item.orderState===1'
label=
"团队退款"
value=
"3"
></el-option>
<el-option
label=
"团队小费"
value=
"4"
></el-option>
...
...
src/components/scenicSpot/reservation/OrderList.vue
View file @
7a76265a
...
...
@@ -1362,8 +1362,14 @@
blank
:
"y"
,
tab
:
`新增
${
text
}
单据`
,
Type
:
type
,
tradeObj
:
JSON
.
stringify
(
this
.
BillMakingMsg
)
tradeObj
:
JSON
.
stringify
(
this
.
BillMakingMsg
),
companyID
:
row
.
OutBranchId
};
if
(
num
==
2
){
query
.
searchTitle
=
'溢收团费退款'
;
}
else
if
(
num
==
3
&&
this
.
cdState
==
false
){
query
.
portTypeId
=
6
;
}
this
.
queryObj
=
query
if
(
!
Offset
){
this
.
$store
.
commit
(
"ChoiceAddFinancialDocuments"
);
...
...
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