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

# Conflicts:
#	abweb/js/reportForm/reportForm.js

abweb/html/reportForm.html

@@ -33,29 +33,7 @@
         <div id="includedHeader"></div>
         <div id="includedHeader"></div>
 
 
         <!-- report list -->
         <!-- 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>
-                </div>
-            </div>
-        </main>
+        <div id="includedMainTitle"></div>
 
 
         <div class="mb-5" id="report-form"></div>
         <div class="mb-5" id="report-form"></div>
 
 

abweb/js/reportForm/reportForm.js

@@ -13,7 +13,6 @@ RF.init = function () {
     COMMON.checkAuth(false);
     COMMON.checkAuth(false);
 
 
     RF.loadCommon();
     RF.loadCommon();
-
     RF.initFormView();
     RF.initFormView();
 };
 };
 
 
@@ -114,12 +113,14 @@ RF.initBreadcrumb = function () {
 RF.initFormView = function () {
 RF.initFormView = function () {
     const urlParameterList = COMMON.getUrlParameter();
     const urlParameterList = COMMON.getUrlParameter();
     const operationId = urlParameterList['operationId'];
     const operationId = urlParameterList['operationId'];
+    sessionStorage.setItem(['operationId'], operationId);
     if (operationId) {
     if (operationId) {
         let params = {};
         let params = {};
         const taskKey = urlParameterList['taskKey'];
         const taskKey = urlParameterList['taskKey'];
         const replyNo = urlParameterList['replyNo'];
         const replyNo = urlParameterList['replyNo'];
         const processKey = urlParameterList['processKey'];
         const processKey = urlParameterList['processKey'];
         const phaseNo = urlParameterList['phaseNo'];
         const phaseNo = urlParameterList['phaseNo'];
+        const reportStartDate = urlParameterList['reportStartDate'];
 
 
         params.sid = COMMON.getSid();
         params.sid = COMMON.getSid();
         params.operationId = operationId;
         params.operationId = operationId;
@@ -128,11 +129,13 @@ RF.initFormView = function () {
         if (replyNo) params.replyNo = replyNo;
         if (replyNo) params.replyNo = replyNo;
         if (processKey) params.processKey = processKey;
         if (processKey) params.processKey = processKey;
         if (phaseNo) params.phaseNo = phaseNo;
         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;
         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 () {
         $('#report-form').load(url, params, function () {
             initPageLoad();
             initPageLoad();
-            // COMMON.closeLoading();
+            $('#contentFieldOrverlay').show();
+            //COMMON.closeLoading();
         });
         });
     } else {
     } else {
         COMMON.avwScreenMove('index.html');
         COMMON.avwScreenMove('index.html');

abweb/js/template/template.js

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