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 @@
{{mainte_csv_dl.result_msg}}
{% endif %} {% endif %} -

+ {% with progress_message = '処理中...しばらくお待ち下さい。'%} + {% include '_loading.html' %} + {% endwith %} 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 @@ {% endif %}

- {% with progress_message = '処理中...\nしばらくお待ち下さい。'%} + {% with progress_message = '処理中...しばらくお待ち下さい。'%} {% include '_loading.html' %} {% endwith %}