Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
d2c14b10
Commit
d2c14b10
authored
Dec 02, 2022
by
Takumi Imai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#50922 表領域がある報告済の作業がある報告で「報告追加」ボタンをクリックしても、処理待ち状態のままになる場合がある
parent
adc38c55
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
abweb/js/reportForm/reportForm.js
+8
-5
No files found.
abweb/js/reportForm/reportForm.js
View file @
d2c14b10
...
@@ -122,12 +122,17 @@ RF.initFormView = function () {
...
@@ -122,12 +122,17 @@ RF.initFormView = function () {
if
(
reportStartDate
)
params
.
reportStartDate
=
reportStartDate
;
if
(
reportStartDate
)
params
.
reportStartDate
=
reportStartDate
;
const
url
=
COMMON
.
format
(
ClientData
.
conf_checkApiUrl
(),
ClientData
.
userInfo_accountPath
())
+
CONSTANT
.
URL
.
CMS
.
HTML
.
BASE
+
CONSTANT
.
URL
.
CMS
.
HTML
.
LIST_REPORT_FORM
;
const
url
=
COMMON
.
format
(
ClientData
.
conf_checkApiUrl
(),
ClientData
.
userInfo_accountPath
())
+
CONSTANT
.
URL
.
CMS
.
HTML
.
BASE
+
CONSTANT
.
URL
.
CMS
.
HTML
.
LIST_REPORT_FORM
;
$
(
'#report-form'
).
load
(
url
,
params
,
function
()
{
$
(
'#report-form'
).
load
(
url
,
params
,
function
(
data
,
status
)
{
if
(
status
===
'success'
)
{
initPageLoad
();
initPageLoad
();
COMMON
.
closeLoading
();
COMMON
.
closeLoading
();
}
else
{
RF
.
backPage
();
COMMON
.
closeLoading
();
}
});
});
}
else
{
}
else
{
COMMON
.
avwScreenMove
(
'index.html'
);
COMMON
.
avwScreenMove
(
CONSTANT
.
URL_TREE_NAME
.
OPERATION_LIST
);
}
}
};
};
...
@@ -137,9 +142,6 @@ RF.initFormView = function () {
...
@@ -137,9 +142,6 @@ RF.initFormView = function () {
RF
.
backPage
=
function
()
{
RF
.
backPage
=
function
()
{
// need to save Data
// need to save Data
setTimeout
(
function
()
{
setTimeout
(
function
()
{
RF
.
initFormView
();
},
750
);
if
(
sessionStorage
.
activeHomePage
==
CONSTANT
.
PAGE_TAB
.
DASHBOARD
)
{
if
(
sessionStorage
.
activeHomePage
==
CONSTANT
.
PAGE_TAB
.
DASHBOARD
)
{
if
(
sessionStorage
.
getItem
(
'pickUpType'
)
==
CONSTANT
.
PICK_UP_TYPE
.
NEW_REPORT
)
{
if
(
sessionStorage
.
getItem
(
'pickUpType'
)
==
CONSTANT
.
PICK_UP_TYPE
.
NEW_REPORT
)
{
COMMON
.
avwScreenMove
(
'reportList.html'
);
COMMON
.
avwScreenMove
(
'reportList.html'
);
...
@@ -154,4 +156,5 @@ RF.backPage = function () {
...
@@ -154,4 +156,5 @@ RF.backPage = function () {
COMMON
.
avwScreenMove
(
'index.html'
);
COMMON
.
avwScreenMove
(
'index.html'
);
}
}
}
}
},
750
);
};
};
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