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
fa38b46c
Commit
fa38b46c
authored
Nov 18, 2022
by
Takumi Imai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ピックアップの画面遷移修正
parent
8c4ec6ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
abweb/js/pickup/pickup.js
+7
-5
No files found.
abweb/js/pickup/pickup.js
View file @
fa38b46c
...
...
@@ -135,7 +135,7 @@ PICKUP.init = function () {
//Check if user is logged in
COMMON
.
checkAuth
(
false
);
console
.
log
(
'PICKUP.init'
);
sessionStorage
.
removeItem
(
"pickUpType"
);
sessionStorage
.
removeItem
(
'pickUpType'
);
// sessionStorage.pickUpType = null;
sessionStorage
.
activeHomePage
=
CONSTANT
.
PAGE_TAB
.
DASHBOARD
;
TEMPLATE
.
loadHeader
(
'#includedHeader'
);
...
...
@@ -155,7 +155,6 @@ PICKUP.init = function () {
COMMON
.
closeLoading
();
};
/**
* Setting pickup data
*/
...
...
@@ -750,7 +749,8 @@ PICKUP.getInspectDate = function (dateString) {
*/
PICKUP
.
sendReportFormFromNewReport
=
function
(
operationId
)
{
//Transition to the report form or operation list screen
sessionStorage
.
setItem
(
"pickUpType"
,
CONSTANT
.
PICK_UP_TYPE
.
NEW_REPORT
);
sessionStorage
.
setItem
(
'pickUpType'
,
CONSTANT
.
PICK_UP_TYPE
.
NEW_REPORT
);
sessionStorage
.
setItem
(
'operationId'
,
operationId
);
const
url
=
'reportForm.html?operationId='
+
operationId
;
COMMON
.
avwScreenMove
(
url
);
};
...
...
@@ -764,7 +764,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
*/
PICKUP
.
sendReportFormFromContinuousWork
=
function
(
operationId
,
taskKey
,
processKey
,
phaseNo
)
{
//Transition to the report form or operation list screen
sessionStorage
.
setItem
(
"pickUpType"
,
CONSTANT
.
PICK_UP_TYPE
.
CONTINOUS_WORK
);
sessionStorage
.
setItem
(
'pickUpType'
,
CONSTANT
.
PICK_UP_TYPE
.
CONTINOUS_WORK
);
sessionStorage
.
setItem
(
'operationId'
,
operationId
);
const
url
=
'reportForm.html?operationId='
+
operationId
+
'&processKey='
+
processKey
+
'&phaseNo='
+
phaseNo
;
COMMON
.
avwScreenMove
(
url
);
};
...
...
@@ -780,7 +781,8 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
*/
PICKUP
.
sendReportFormFromWarningReport
=
function
(
operationId
,
reportType
,
taskKey
,
processKey
,
phaseNo
,
replyNo
)
{
//Transition to the report form or operation list screen
sessionStorage
.
setItem
(
"pickUpType"
,
CONSTANT
.
PICK_UP_TYPE
.
WARNING_REPORT
);
sessionStorage
.
setItem
(
'pickUpType'
,
CONSTANT
.
PICK_UP_TYPE
.
WARNING_REPORT
);
sessionStorage
.
setItem
(
'operationId'
,
operationId
);
let
url
=
'reportForm.html?operationId='
+
operationId
;
switch
(
reportType
)
{
case
PICKUP
.
REPORT_TYPE
.
REPORTONLY
:
...
...
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