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
8db571a6
Commit
8db571a6
authored
Nov 11, 2022
by
Takumi Imai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#49767 報告フォーム取得処理修正
parent
582dfa9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
48 deletions
+12
-48
abweb/common/js/common.js
+0
-26
abweb/js/pickup/pickup.js
+12
-22
No files found.
abweb/common/js/common.js
View file @
8db571a6
...
...
@@ -189,32 +189,6 @@ COMMON.cmsAjax = function (url, param, async = true, callback, errorCallback, ty
};
/**
* Communicate with cms and post
*
* @param {String} url
* @param {Object} params
* @param {String} method
*/
COMMON
.
postCommunication
=
function
(
url
,
params
,
method
=
'post'
)
{
const
form
=
document
.
createElement
(
'form'
);
form
.
method
=
method
;
form
.
action
=
url
;
for
(
const
key
in
params
)
{
if
(
params
.
hasOwnProperty
(
key
))
{
const
hiddenField
=
document
.
createElement
(
'input'
);
hiddenField
.
type
=
'hidden'
;
hiddenField
.
name
=
key
;
hiddenField
.
value
=
params
[
key
];
form
.
appendChild
(
hiddenField
);
}
}
document
.
body
.
appendChild
(
form
);
form
.
submit
();
};
/**
* Check if user is logged in
*
* @param {boolean} async
...
...
abweb/js/pickup/pickup.js
View file @
8db571a6
...
...
@@ -747,11 +747,8 @@ PICKUP.getInspectDate = function (dateString) {
*/
PICKUP
.
sendReportFormFromNewReport
=
function
(
operationId
)
{
//Transition to the report form or operation list screen
let
params
=
{};
params
.
sid
=
COMMON
.
getSid
();
params
.
operationId
=
operationId
;
let
url
=
COMMON
.
format
(
ClientData
.
conf_checkApiUrl
(),
ClientData
.
userInfo_accountPath
())
+
CONSTANT
.
URL
.
CMS
.
HTML
.
BASE
+
CONSTANT
.
URL
.
CMS
.
HTML
.
LIST_REPORT_FORM
;
COMMON
.
postCommunication
(
url
,
params
);
const
url
=
'reportForm.html?operationId='
+
operationId
;
COMMON
.
avwScreenMove
(
url
);
};
/**
...
...
@@ -763,13 +760,8 @@ PICKUP.sendReportFormFromNewReport = function (operationId) {
*/
PICKUP
.
sendReportFormFromContinuousWork
=
function
(
operationId
,
taskKey
,
processKey
,
phaseNo
)
{
//Transition to the report form or operation list screen
let
params
=
{};
params
.
sid
=
COMMON
.
getSid
();
params
.
operationId
=
operationId
;
params
.
processKey
=
processKey
;
params
.
phaseNo
=
phaseNo
;
let
url
=
COMMON
.
format
(
ClientData
.
conf_checkApiUrl
(),
ClientData
.
userInfo_accountPath
())
+
CONSTANT
.
URL
.
CMS
.
HTML
.
BASE
+
CONSTANT
.
URL
.
CMS
.
HTML
.
LIST_REPORT_FORM
;
COMMON
.
postCommunication
(
url
,
params
);
const
url
=
'reportForm.html?operationId='
+
operationId
+
'&processKey='
+
processKey
+
'&phaseNo='
+
phaseNo
;
COMMON
.
avwScreenMove
(
url
);
};
/**
...
...
@@ -783,25 +775,23 @@ PICKUP.sendReportFormFromContinuousWork = function (operationId, taskKey, proces
*/
PICKUP
.
sendReportFormFromWarningReport
=
function
(
operationId
,
reportType
,
taskKey
,
processKey
,
phaseNo
,
replyNo
)
{
//Transition to the report form or operation list screen
let
params
=
{};
params
.
sid
=
COMMON
.
getSid
();
params
.
operationId
=
operationId
;
let
url
=
'reportForm.html?operationId='
+
operationId
;
switch
(
reportType
)
{
case
PICKUP
.
REPORT_TYPE
.
REPORTONLY
:
params
.
taskKey
=
taskKey
;
url
+=
'&taskKey'
+
taskKey
;
break
;
case
PICKUP
.
REPORT_TYPE
.
INSPECT
:
params
.
taskKey
=
taskKey
;
url
+=
'&taskKey'
+
taskKey
;
break
;
case
PICKUP
.
REPORT_TYPE
.
WITHREPLY
:
params
.
replyNo
=
replyNo
;
url
+=
'&taskKey'
+
taskKey
;
url
+=
'&replyNO'
+
replyNo
;
break
;
case
PICKUP
.
REPORT_TYPE
.
WORKFLOW
:
params
.
processKey
=
processKey
;
params
.
phaseNo
=
phaseNo
;
url
+=
'&processKey'
+
processKey
;
url
+=
'&phaseNo'
+
phaseNo
;
break
;
}
let
url
=
COMMON
.
format
(
ClientData
.
conf_checkApiUrl
(),
ClientData
.
userInfo_accountPath
())
+
CONSTANT
.
URL
.
CMS
.
HTML
.
BASE
+
CONSTANT
.
URL
.
CMS
.
HTML
.
LIST_REPORT_FORM
;
COMMON
.
postCommunication
(
url
,
params
);
COMMON
.
avwScreenMove
(
url
);
};
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