From 9b3ef38a0165cce7f507f3c34b82e1c2bba1856e Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 18 Aug 2023 12:06:54 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=BD=E8=A8=AD=E6=8B=85=E5=BD=93?=
 =?UTF-8?q?=E8=80=85CSV=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E7=94=BB=E9=9D=A2=E3=81=AB=E3=83=AD=E3=83=BC=E3=83=87?=
 =?UTF-8?q?=E3=82=A3=E3=83=B3=E3=82=B0=E3=82=92=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/static/function/businessLogicScript.js            | 2 ++
 ecs/jskult-webapp/src/templates/instEmpCsvDL.html         | 8 ++++----
 ecs/jskult-webapp/src/templates/instEmpCsvUL.html         | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
index c3aa12dc..32d1a489 100644
--- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js
+++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js
@@ -293,6 +293,8 @@ function checkNumberOnlyForm($this)
 // 機能概要：マスターメンテメニュー画面に遷移する
 function backToMainteMenu(){
     sessionStorage.clear();
+    // ローディング表示
+    showLoading();
     location.href = "/masterMainte/masterMainteMenu";
 }
 
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html
index 8bdc70ba..c51aed07 100644
--- a/ecs/jskult-webapp/src/templates/instEmpCsvDL.html
+++ b/ecs/jskult-webapp/src/templates/instEmpCsvDL.html
@@ -29,7 +29,7 @@
         function Form_Submit_Disp_Dialog(){
         var msg = 'CSVファイルを出力しますか？';
             if (confirmDialog(msg)) {
-                document.getElementById("loading").style.display = "block";
+                showLoading();
                 document.getElementById("csvOutputMsg").style.display = "none";
             } else {
                 return false;
@@ -179,9 +179,9 @@
                 <div id="csvOutputMsg" class="csvOutputMessage">{{mainte_csv_dl.result_msg}}</div>
             {% endif %}
         {% endif %}
-        <div id="loading" class="csvOutputMessage" style="display:none;">
-            <p>処理中...<br>しばらくお待ち下さい。</p>
-        </div>
     </p>
+    {% with progress_message = '処理中...しばらくお待ち下さい。'%}
+    {% include '_loading.html' %}
+    {% endwith %}
   </body>
 </html>
diff --git a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
index 1556e5e2..981e97b8 100644
--- a/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
+++ b/ecs/jskult-webapp/src/templates/instEmpCsvUL.html
@@ -200,7 +200,7 @@
             </div>
         {% endif %}
     </p>
-    {% with progress_message = '処理中...\nしばらくお待ち下さい。'%}
+    {% with progress_message = '処理中...しばらくお待ち下さい。'%}
     {% include '_loading.html' %}
     {% endwith %}
   </body>