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
56ab16fa
Commit
56ab16fa
authored
Mar 14, 2022
by
qiaoyanqi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同意驳回 加信息提示校验
parent
fc97fca8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
agreeAction.js
...lop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
+4
-1
rejectAction.js
...op/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
+4
-1
No files found.
develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js
View file @
56ab16fa
...
@@ -8,7 +8,10 @@ export default {
...
@@ -8,7 +8,10 @@ export default {
GMS
.
$hideContainer
.
$Message
.
error
(
'请配置审批轨迹'
)
GMS
.
$hideContainer
.
$Message
.
error
(
'请配置审批轨迹'
)
return
return
}
}
if
(
compareData
(
GMS
.
oldBillData
,
bill
.
getBuillData
()))
{
let
curTagId
=
window
.
nros
.
context
.
getCurrTag
();
let
oldObj
=
curTagId
&&
GMS
.
oldBillDataMap
[
curTagId
]?
GMS
.
oldBillDataMap
[
curTagId
]:
GMS
.
oldBillData
;
let
flag
=
compareData
(
oldObj
,
bill
.
getBuillData
())
||
bill
.
getGlobalParam
(
"noRunTimeFormula"
);
if
(
flag
)
{
this
.
approvalLogical
(
bill
,
param
,
this
)
this
.
approvalLogical
(
bill
,
param
,
this
)
}
else
{
}
else
{
GMS
.
$hideContainer
.
$Modal
.
confirm
({
GMS
.
$hideContainer
.
$Modal
.
confirm
({
...
...
develop/@gms/gms-plugin-billexpand/src/actions/rejectAction.js
View file @
56ab16fa
...
@@ -3,7 +3,10 @@ import { compareData } from "../components-control/util/dataChange"
...
@@ -3,7 +3,10 @@ import { compareData } from "../components-control/util/dataChange"
export
default
{
export
default
{
execute
:
function
(
bill
,
param
)
{
execute
:
function
(
bill
,
param
)
{
if
(
bill
){
if
(
bill
){
if
(
compareData
(
GMS
.
oldBillData
,
bill
.
getBuillData
()))
{
let
curTagId
=
window
.
nros
.
context
.
getCurrTag
();
let
oldObj
=
curTagId
&&
GMS
.
oldBillDataMap
[
curTagId
]?
GMS
.
oldBillDataMap
[
curTagId
]:
GMS
.
oldBillData
;
let
flag
=
compareData
(
oldObj
,
bill
.
getBuillData
())
||
bill
.
getGlobalParam
(
"noRunTimeFormula"
);
if
(
flag
)
{
this
.
approvalLogical
(
bill
,
param
,
this
)
this
.
approvalLogical
(
bill
,
param
,
this
)
}
else
{
}
else
{
GMS
.
$hideContainer
.
$Modal
.
confirm
({
GMS
.
$hideContainer
.
$Modal
.
confirm
({
...
...
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