Commit 02a2e850 by Takumi Imai

Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev'

Feature/1.0 check web dev kdh 2

See merge request !125
parents 95bd5b9c d4525ea9
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
var RL = {}; var RL = {};
RL.isQuickReport; RL.isQuickReport;
RL.isQRTableInspect;
/** /**
* init * init
...@@ -16,8 +17,11 @@ ...@@ -16,8 +17,11 @@
COMMON.showLoading(); COMMON.showLoading();
COMMON.checkAuth(false); COMMON.checkAuth(false);
COMMON.checkQuickReport(function(result) { COMMON.checkQuickReport(function(result) {
if (result) RL.isQuickReport = result.isQuickReport; if (result) {
} ); RL.isQuickReport = result.isQuickReport;
RL.isQRTableInspect = result.isQRTableInspect;
};
});
RL.loadCommon(); RL.loadCommon();
RL.initTaskReportList(); RL.initTaskReportList();
COMMON.closeLoading(); COMMON.closeLoading();
...@@ -87,16 +91,21 @@ ...@@ -87,16 +91,21 @@
/** /**
* load main title callcack * load main title callcack
*/ */
RL.loadMainTitleCallback = function () { RL.loadMainTitleCallback = function () {
//add dashboard setting item //add dashboard setting item
if (RL.isQuickReport) { if (RL.isQuickReport) {
var elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">'); var elmA;
if (RL.isQRTableInspect) {
elmA = $('<div id="btnPdfPrint" onclick="COMMON.showAlert("errorOccurred");">');
} else {
elmA = $('<div id="btnPdfPrint" onclick="RL.goPdfPrint();">');
}
let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">'); let elmImg = $('<img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">');
elmImg.attr('title', I18N.i18nText('reportList')); elmImg.attr('title', I18N.i18nText('reportList'));
elmA.append(elmImg); elmA.append(elmImg);
$('#mainTitleHeader').after(elmA); $('#mainTitleHeader').after(elmA);
} }
}; };
/** /**
* go pdf print * go pdf print
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment