テスト

abweb/html/reportForm.html

@@ -35,23 +35,25 @@
         <!-- report list -->
         <main>
             <div class="container-wrap">
-                <!-- breadcrumb -->
-                <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb px-0 mb-0">
-                        <li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>
-                        <li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li>
-                        <li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
-                    </ol>
-                </nav>
-                <!-- title -->
-                <div class="d-flex align-items-center">
-                    <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto" lang="reportForm"></h1>
-                    <div style="display: none;">
-                        <div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>
-                        <div><span id="inspectDate"></span></div>
-                    </div>
-                    <div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
-                        <img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">
+                <div id="main-ttl">
+                    <!-- breadcrumb -->
+                    <nav aria-label="breadcrumb">
+                        <ol class="breadcrumb px-0 mb-0">
+                            <li class="breadcrumb-item"><a href="task-list.html" class="text-decoration-none text-underline">作業一覧</a></li>
+                            <li class="breadcrumb-item active" aria-current="page"><span>報告一覧</span></li>
+                            <li class="breadcrumb-item active" aria-current="page"><span>報告</span></li>
+                        </ol>
+                    </nav>
+                    <!-- title -->
+                    <div class="d-flex align-items-center">
+                        <h1 class="fs-14 font-weight-bold pt-sm-4 pt-2 pb-3 mb-0 mr-auto" lang="reportForm"></h1>
+                        <div style="display: none;">
+                            <div><span style="font-size:18px;" lang="periodicInspectionPeriod"></span></div>
+                            <div><span id="inspectDate"></span></div>
+                        </div>
+                        <div class="quickReportBtn" id="quickReportBtn" onclick="submitForm();">
+                            <img src="../common/img/icon_pdf.svg" alt="pdf出力" class="p-1 w-40px" data-toggle="tooltip" data-placement="bottom" title="pdfPrint">
+                        </div>
                     </div>
                 </div>
             </div>

abweb/js/reportForm/reportForm.js

@@ -12,36 +12,25 @@ RF.init = function () {
     //Check if user is logged in
     COMMON.checkAuth(false);
 
-    RF.loadCommon();
-
+    TEMPLATE.loadHearder('#includedHeader');
+    TEMPLATE.loadConfirmModal('#includedConfirmModal');
     RF.initFormView();
 };
 
 /**
- * load common
- */
-RF.loadCommon = function () {
-    $('#includedHeader').load('../common/html/header.html', function () {
-        I18N.initi18n();
-        HEADER.init();
-    });
-    $('#includedConfirmModal').load('../html/common/confirm-modal.html', function () {
-        I18N.initi18n();
-    });
-};
-
-/**
  * iinit form view
  */
 RF.initFormView = function () {
     const urlParameterList = COMMON.getUrlParameter();
     const operationId = urlParameterList['operationId'];
+    sessionStorage.setItem(['operationId'], operationId);
     if (operationId) {
         let params = {};
         const taskKey = urlParameterList['taskKey'];
         const replyNo = urlParameterList['replyNo'];
         const processKey = urlParameterList['processKey'];
         const phaseNo = urlParameterList['phaseNo'];
+        const reportStartDate = urlParameterList['reportStartDate'];
 
         params.sid = COMMON.getSid();
         params.operationId = operationId;
@@ -50,11 +39,13 @@ RF.initFormView = function () {
         if (replyNo) params.replyNo = replyNo;
         if (processKey) params.processKey = processKey;
         if (phaseNo) params.phaseNo = phaseNo;
+        if (reportStartDate) prarams.reportStartDate = reportStartDate;
 
         const url = COMMON.format(ClientData.conf_checkApiUrl(), ClientData.userInfo_accountPath()) + CONSTANT.URL.CMS.HTML.BASE + CONSTANT.URL.CMS.HTML.LIST_REPORT_FORM;
         $('#report-form').load(url, params, function () {
             initPageLoad();
-            COMMON.closeLoading();
+            $('#contentFieldOrverlay').show();
+            //COMMON.closeLoading();
         });
     } else {
         COMMON.avwScreenMove('index.html');

abweb/js/template/template.js

@@ -6,7 +6,7 @@ var TEMPLATE = {};
 
 /** template load header */
 TEMPLATE.loadHearder = function (elmentId) {
-    COMMON.showLoading();
+    // COMMON.showLoading();
     $(elmentId).load('../common/html/header.html', function () {
         $('#iconHomeDashboard').removeClass('active');
         $('#iconHomeWorkList').removeClass('active');