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
f0ee9ec6
Commit
f0ee9ec6
authored
Dec 23, 2022
by
Kang Donghun
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web'
Feature/1.0 check web dev See merge request
!129
parents
6278daf0
87e26126
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
abweb/js/reportForm/reportForm.js
+10
-1
abweb/js/reportList/reportList.js
+4
-2
No files found.
abweb/js/reportForm/reportForm.js
View file @
f0ee9ec6
...
...
@@ -6,6 +6,8 @@
var
RF
=
{};
RF
.
addReportFlg
;
RF
.
isQRTableInspect
;
RF
.
isQRTableReport
;
/**
* init
...
...
@@ -19,6 +21,8 @@ RF.init = function () {
COMMON
.
checkQuickReport
(
function
(
result
)
{
if
(
result
)
{
RF
.
addReportFlg
=
result
.
addReportFlg
;
RF
.
isQRTableInspect
=
result
.
isQRTableInspect
;
RF
.
isQRTableReport
=
result
.
isQRTableReport
;
}
});
RF
.
loadCommon
();
...
...
@@ -87,7 +91,12 @@ RF.loadMainTitleCallback = function () {
'<div><span class=" lang" style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>'
+
'<div><span id="inspectDate"></span></div></div>'
,
);
let
elmA
=
$
(
'<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">'
);
let
elmA
;
if
(
RF
.
isQRTableInspect
||
RF
.
isQRTableReport
)
{
elmA
=
$
(
"<div class=
\"
quickReportBtn
\"
id=
\"
quickReportBtn
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
}
else
{
elmA
=
$
(
'<div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">'
);
}
const
elmImg
=
$
(
'<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">'
);
elmA
.
append
(
elmImg
);
$
(
'#mainTitleHeader'
).
after
(
elmA
);
...
...
abweb/js/reportList/reportList.js
View file @
f0ee9ec6
...
...
@@ -8,6 +8,7 @@
RL
.
isQuickReport
;
RL
.
isQRTableInspect
;
RL
.
isQRTableReport
;
/**
* init
...
...
@@ -20,6 +21,7 @@
if
(
result
)
{
RL
.
isQuickReport
=
result
.
isQuickReport
;
RL
.
isQRTableInspect
=
result
.
isQRTableInspect
;
RL
.
isQRTableReport
=
result
.
isQRTableReport
;
};
});
RL
.
loadCommon
();
...
...
@@ -94,8 +96,8 @@
RL
.
loadMainTitleCallback
=
function
()
{
//add dashboard setting item
if
(
RL
.
isQuickReport
)
{
var
elmA
;
if
(
RL
.
isQRTableInspect
)
{
let
elmA
;
if
(
RL
.
isQRTableInspect
||
RL
.
isQRTableReport
)
{
elmA
=
$
(
"<div id=
\"
btnPdfPrint
\"
onclick=
\"
COMMON.showAlert('onlyPrintCms');
\"
>"
);
}
else
{
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