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
a1440714
Commit
a1440714
authored
Dec 26, 2022
by
Kang Donghun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
・IO帳票登録際に出力タイプが「Book全体」の場合、PDF出力画面へ遷移されないように対応
parent
f0ee9ec6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
abweb/js/reportForm/reportForm.js
+3
-1
abweb/js/reportList/reportList.js
+3
-2
No files found.
abweb/js/reportForm/reportForm.js
View file @
a1440714
...
@@ -8,6 +8,7 @@ var RF = {};
...
@@ -8,6 +8,7 @@ var RF = {};
RF
.
addReportFlg
;
RF
.
addReportFlg
;
RF
.
isQRTableInspect
;
RF
.
isQRTableInspect
;
RF
.
isQRTableReport
;
RF
.
isQRTableReport
;
RF
.
isQRWholeBook
;
/**
/**
* init
* init
...
@@ -23,6 +24,7 @@ RF.init = function () {
...
@@ -23,6 +24,7 @@ RF.init = function () {
RF
.
addReportFlg
=
result
.
addReportFlg
;
RF
.
addReportFlg
=
result
.
addReportFlg
;
RF
.
isQRTableInspect
=
result
.
isQRTableInspect
;
RF
.
isQRTableInspect
=
result
.
isQRTableInspect
;
RF
.
isQRTableReport
=
result
.
isQRTableReport
;
RF
.
isQRTableReport
=
result
.
isQRTableReport
;
RF
.
isQRWholeBook
=
result
.
isQRWholeBook
;
}
}
});
});
RF
.
loadCommon
();
RF
.
loadCommon
();
...
@@ -92,7 +94,7 @@ RF.loadMainTitleCallback = function () {
...
@@ -92,7 +94,7 @@ RF.loadMainTitleCallback = function () {
'<div><span id="inspectDate"></span></div></div>'
,
'<div><span id="inspectDate"></span></div></div>'
,
);
);
let
elmA
;
let
elmA
;
if
(
RF
.
isQRTableInspect
||
RF
.
isQRTableReport
)
{
if
(
RF
.
isQRTableInspect
||
RF
.
isQRTableReport
||
RF
.
isQRWholeBook
)
{
elmA
=
$
(
"<div class=
\"
quickReportBtn
\"
id=
\"
quickReportBtn
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
elmA
=
$
(
"<div class=
\"
quickReportBtn
\"
id=
\"
quickReportBtn
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
}
else
{
}
else
{
elmA
=
$
(
'<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">'
);
elmA
=
$
(
'<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">'
);
...
...
abweb/js/reportList/reportList.js
View file @
a1440714
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
RL
.
isQuickReport
;
RL
.
isQuickReport
;
RL
.
isQRTableInspect
;
RL
.
isQRTableInspect
;
RL
.
isQRTableReport
;
RL
.
isQRTableReport
;
RL
.
isQRWholeBook
;
/**
/**
* init
* init
...
@@ -21,7 +22,7 @@
...
@@ -21,7 +22,7 @@
if
(
result
)
{
if
(
result
)
{
RL
.
isQuickReport
=
result
.
isQuickReport
;
RL
.
isQuickReport
=
result
.
isQuickReport
;
RL
.
isQRTableInspect
=
result
.
isQRTableInspect
;
RL
.
isQRTableInspect
=
result
.
isQRTableInspect
;
RL
.
isQR
TableReport
=
result
.
isQRTableReport
;
RL
.
isQR
WholeBook
=
result
.
isQRWholeBook
;
};
};
});
});
RL
.
loadCommon
();
RL
.
loadCommon
();
...
@@ -97,7 +98,7 @@ RL.loadMainTitleCallback = function () {
...
@@ -97,7 +98,7 @@ RL.loadMainTitleCallback = function () {
//add dashboard setting item
//add dashboard setting item
if
(
RL
.
isQuickReport
)
{
if
(
RL
.
isQuickReport
)
{
let
elmA
;
let
elmA
;
if
(
RL
.
isQRTableInspect
||
RL
.
isQRTableReport
)
{
if
(
RL
.
isQRTableInspect
||
RL
.
isQRTableReport
||
RL
.
isQRWholeBook
)
{
elmA
=
$
(
"<div id=
\"
btnPdfPrint
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
elmA
=
$
(
"<div id=
\"
btnPdfPrint
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
}
else
{
}
else
{
elmA
=
$
(
'<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'
);
elmA
=
$
(
'<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'
);
...
...
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