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

簡易帳票・改行改列の報告データアラート表示修正

See merge request !128

abweb/js/reportForm/reportForm.js

@@ -6,6 +6,8 @@
 var RF = {};
 var RF = {};
 
 
 RF.addReportFlg;
 RF.addReportFlg;
+RF.isQRTableInspect;
+RF.isQRTableReport;
 
 
 /**
 /**
  * init
  * init
@@ -19,6 +21,8 @@ RF.init = function () {
     COMMON.checkQuickReport(function (result) {
     COMMON.checkQuickReport(function (result) {
         if (result) {
         if (result) {
             RF.addReportFlg = result.addReportFlg;
             RF.addReportFlg = result.addReportFlg;
+            RF.isQRTableInspect = result.isQRTableInspect;
+            RF.isQRTableReport = result.isQRTableReport;
         }
         }
     });
     });
     RF.loadCommon();
     RF.loadCommon();
@@ -87,7 +91,12 @@ RF.loadMainTitleCallback = function () {
             '<div><span class=" lang" style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>' +
             '<div><span class=" lang" style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>' +
             '<div><span id="inspectDate"></span></div></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">');
     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);
     elmA.append(elmImg);
     $('#mainTitleHeader').after(elmA);
     $('#mainTitleHeader').after(elmA);

abweb/js/reportList/reportList.js

@@ -8,6 +8,7 @@
 
 
  RL.isQuickReport;
  RL.isQuickReport;
  RL.isQRTableInspect;
  RL.isQRTableInspect;
+ RL.isQRTableReport;
 
 
  /**
  /**
   * init
   * init
@@ -20,6 +21,7 @@
         if (result) {
         if (result) {
             RL.isQuickReport = result.isQuickReport;
             RL.isQuickReport = result.isQuickReport;
             RL.isQRTableInspect = result.isQRTableInspect;
             RL.isQRTableInspect = result.isQRTableInspect;
+            RL.isQRTableReport = result.isQRTableReport;
         };
         };
     });
     });
     RL.loadCommon();
     RL.loadCommon();
@@ -94,8 +96,8 @@
 RL.loadMainTitleCallback = function () {
 RL.loadMainTitleCallback = function () {
     //add dashboard setting item
     //add dashboard setting item
     if (RL.isQuickReport) {
     if (RL.isQuickReport) {
-        var elmA;
-        if (RL.isQRTableInspect) {
+        let elmA;
+        if (RL.isQRTableInspect || RL.isQRTableReport) {
             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();">');