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
90239f08
Commit
90239f08
authored
May 11, 2022
by
Joey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(@gms/gms-plugin-billexpand): 同意默认意见,驳回意见必填
parent
6be176d1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
agreeAction.js
...lop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
+8
-0
rejectAction.js
...op/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
+14
-2
index.js
develop/@gms/gms-plugin-billexpand/src/actions/util/index.js
+1
-1
No files found.
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
View file @
90239f08
...
@@ -154,6 +154,14 @@ export default {
...
@@ -154,6 +154,14 @@ export default {
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
?
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
?
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
:
''
;
:
''
;
if
(
!
comments
)
{
comments
=
'同意'
bill
.
setGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
,
{
taskId
,
suggestions
:
comments
})
}
const
fn
=
()
=>
{
const
fn
=
()
=>
{
saveBill
(
bill
,
param
).
then
(()
=>
{
saveBill
(
bill
,
param
).
then
(()
=>
{
...
...
develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
View file @
90239f08
...
@@ -9,7 +9,7 @@ export default {
...
@@ -9,7 +9,7 @@ export default {
if
(
!
this
.
isApproverEqulloginer
(
bill
,
param
))
{
if
(
!
this
.
isApproverEqulloginer
(
bill
,
param
))
{
GMS
.
$hideContainer
.
$Message
.
error
(
'单据审批状态已发生变化,请刷新界面'
)
GMS
.
$hideContainer
.
$Message
.
error
(
'单据审批状态已发生变化,请刷新界面'
)
return
return
}
}
let
curTagId
=
window
.
nros
.
context
.
getCurrTag
();
let
curTagId
=
window
.
nros
.
context
.
getCurrTag
();
let
oldObj
=
curTagId
&&
GMS
.
oldBillDataMap
[
curTagId
]?
GMS
.
oldBillDataMap
[
curTagId
]:
GMS
.
oldBillData
;
let
oldObj
=
curTagId
&&
GMS
.
oldBillDataMap
[
curTagId
]?
GMS
.
oldBillDataMap
[
curTagId
]:
GMS
.
oldBillData
;
let
flag
=
compareData
(
oldObj
,
bill
.
getBuillData
())
||
bill
.
getGlobalParam
(
"noRunTimeFormula"
);
let
flag
=
compareData
(
oldObj
,
bill
.
getBuillData
())
||
bill
.
getGlobalParam
(
"noRunTimeFormula"
);
...
@@ -51,10 +51,22 @@ export default {
...
@@ -51,10 +51,22 @@ export default {
}
}
},
},
approval
:
function
(
bill
,
param
){
approval
:
function
(
bill
,
param
){
if
(
!
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
)
||
!
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
taskId
)
{
if
(
!
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
)
||
!
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
taskId
)
{
GMS
.
$hideContainer
.
$Message
.
error
(
'请配置审批轨迹'
)
GMS
.
$hideContainer
.
$Message
.
error
(
'请配置审批轨迹'
)
return
return
}
}
if
(
!
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
)
||
!
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
)
{
GMS
.
$hideContainer
.
$Message
.
error
(
'请输入审批意见'
)
bill
.
setControlsSate
(
param
[
"_control_name_"
],
"enable"
,
true
)
return
}
let
taskId
=
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
taskId
;
let
taskId
=
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
taskId
;
let
comments
=
let
comments
=
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
...
...
develop/@gms/gms-plugin-billexpand/src/actions/util/index.js
View file @
90239f08
...
@@ -52,7 +52,7 @@ export const showSignModal = (bill, param, nodeName) => {
...
@@ -52,7 +52,7 @@ export const showSignModal = (bill, param, nodeName) => {
const
approvalComment
=
const
approvalComment
=
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
)
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
)
&&
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
&&
bill
.
getGlobalParam
(
BILL_GLOBAL_PARAM
.
APPROVAL_COMMENT
).
suggestions
||
''
||
'
同意
'
const
subDataObj
=
bill
.
getSubData
(
SIGNATURE_TABLE_NAME
)
const
subDataObj
=
bill
.
getSubData
(
SIGNATURE_TABLE_NAME
)
const
tableLength
=
subDataObj
.
length
||
0
const
tableLength
=
subDataObj
.
length
||
0
const
subDataIndex
=
tableLength
-
1
const
subDataIndex
=
tableLength
-
1
...
...
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