Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
rbc-demo
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
王衍超
rbc-demo
Commits
da3ca9d3
Commit
da3ca9d3
authored
2 years ago
by
乔延琦
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop-zhouyi' into 'develop'
Develop zhouyi See merge request GFP/RBC/rbc-frontend!129
parents
eb909d88
0cc81ff9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
80 deletions
+62
-80
agreeAction.js
...lop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
+59
-58
CheckSublistSize.js
...gms/gms-plugin-billexpand/src/formula/CheckSublistSize.js
+3
-22
No files found.
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
View file @
da3ca9d3
...
...
@@ -84,71 +84,72 @@ export default {
})
},
approvalLogical
:
function
(
bill
,
param
)
{
let
taskId
=
bill
.
getGlobalParam
(
'reviewParam'
).
taskId
;
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
false
)
let
selectedApprovers
=
[]
window
.
GMS
.
$http
.
get
(
`/bpm/bill/selectApprover/ApproverList/
${
taskId
}
`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
204
)
{
this
.
executeApproval
(
bill
,
param
)
return
}
else
if
(
res
.
data
.
code
!=
200
)
{
const
getApprovalList
=
()
=>
{
let
taskId
=
bill
.
getGlobalParam
(
'reviewParam'
).
taskId
;
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
false
)
let
selectedApprovers
=
[]
window
.
GMS
.
$http
.
get
(
`/bpm/bill/selectApprover/ApproverList/
${
taskId
}
`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
==
204
)
{
this
.
executeApproval
(
bill
,
param
)
return
}
else
if
(
res
.
data
.
code
!=
200
)
{
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
true
)
GMS
.
$hideContainer
.
$Message
.
error
(
res
.
data
.
msg
||
'提交失败,请联系系统管理员'
);
return
}
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
true
)
GMS
.
$hideContainer
.
$Message
.
error
(
res
.
data
.
msg
||
'提交失败,请联系系统管理员'
);
return
}
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
true
)
const
nodeData
=
res
.
data
.
ApproverVo
const
optionList
=
[...
nodeData
.
approvers
]
if
(
optionList
.
length
==
0
)
{
GMS
.
$hideContainer
.
$Message
.
error
(
'未找到下一节点的审批人'
)
return
}
GMS
.
$hideContainer
.
$Modal
.
confirm
({
width
:
700
,
render
:
(
h
)
=>
{
return
h
(
SelectApprovers
,
{
props
:
{
optionList
,
},
on
:
{
'on-change'
:
(
val
)
=>
{
selectedApprovers
=
val
const
nodeData
=
res
.
data
.
ApproverVo
const
optionList
=
[...
nodeData
.
approvers
]
if
(
optionList
.
length
==
0
)
{
GMS
.
$hideContainer
.
$Message
.
error
(
'未找到下一节点的审批人'
)
return
}
GMS
.
$hideContainer
.
$Modal
.
confirm
({
width
:
700
,
render
:
(
h
)
=>
{
return
h
(
SelectApprovers
,
{
props
:
{
optionList
,
},
on
:
{
'on-change'
:
(
val
)
=>
{
selectedApprovers
=
val
}
}
}
}
)
},
onOk
:
()
=>
{
window
.
GMS
.
$http
.
post
(
'/bpm/bill/selectApprover/addApprovers'
,
{
...
nodeData
,
approvers
:
selectedApprovers
,
}
).
then
(()
=>
{
this
.
executeApproval
(
bill
,
param
)
}).
catch
(()
=>
{
GMS
.
$hideContainer
.
$Message
.
error
(
'选择审批人发生错误'
)
})
},
onCancel
:
()
=>
{
}
});
}).
catch
(()
=>
{
GMS
.
$hideContainer
.
$Message
.
error
(
'未找到下一节点的审批人'
);
})
},
executeApproval
:
function
(
bill
,
param
)
{
)
},
onOk
:
()
=>
{
window
.
GMS
.
$http
.
post
(
'/bpm/bill/selectApprover/addApprovers'
,
{
...
nodeData
,
approvers
:
selectedApprovers
,
}
).
then
(()
=>
{
this
.
executeApproval
(
bill
,
param
)
}).
catch
(()
=>
{
GMS
.
$hideContainer
.
$Message
.
error
(
'选择审批人发生错误'
)
})
},
onCancel
:
()
=>
{
}
});
}).
catch
(()
=>
{
GMS
.
$hideContainer
.
$Message
.
error
(
'未找到下一节点的审批人'
);
})
}
if
(
param
.
param
.
actions
)
{
let
saveParam
=
{
actions
:
param
.
param
.
actions
}
bill
.
executeServerAction
(
saveParam
,
function
(
code
,
data
)
{
if
(
code
===
200
)
{
this
.
approval
(
bill
,
param
);
getApprovalList
()
}
else
{
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
true
)
if
(
data
.
message
.
includes
(
'还款金额不能大于未还金额'
))
{
...
...
@@ -160,10 +161,10 @@ export default {
}
}.
bind
(
this
));
}
else
{
this
.
approval
(
bill
,
param
);
getApprovalList
()
}
},
approval
:
function
(
bill
,
param
)
{
executeApproval
:
function
(
bill
,
param
)
{
let
taskId
=
bill
.
getGlobalParam
(
'reviewParam'
).
taskId
;
let
comments
=
bill
.
getGlobalParam
(
'reviewParam'
).
suggestions
?
bill
.
getGlobalParam
(
'reviewParam'
).
suggestions
:
""
;
GMS
.
$http
.
post
(
'/rbc/workflow/approve/completed/'
+
taskId
+
'?result=1&comments='
+
comments
).
then
(
...
...
This diff is collapsed.
Click to expand it.
develop/@gms/gms-plugin-billexpand/src/formula/CheckSublistSize.js
View file @
da3ca9d3
...
...
@@ -8,32 +8,12 @@ export default {
if
(
context
.
getTableType
)
{
let
_tn
=
context
.
getTableType
(
table
);
let
_data
=
context
.
getSubData
(
_tn
.
title
);
if
(
_data
instanceof
Array
)
{
let
field
=
arguments
[
0
][
0
].
FieldCode
let
matchProp
=
arguments
[
0
][
1
].
StaticValue
let
matchValue
=
arguments
[
0
][
2
].
StaticValue
if
(
matchValue
)
{
for
(
const
iterator
of
_data
)
{
let
_val
=
iterator
.
getValue
(
field
)
if
(
_val
instanceof
Object
)
{
if
(
_val
[
matchProp
]
==
matchValue
)
{
size
++
;
}
}
else
{
if
(
_val
==
matchValue
)
{
size
++
;
}
}
}
}
else
{
size
=
_data
.
length
}
}
return
_data
.
length
>
0
}
}
return
size
},
getResultType
:
function
()
{
return
FMR
.
ConstDataTypes
.
General
;
return
1
;
}
}
\ No newline at end of file
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