diff --git a/ecs/jskult-webapp/src/model/view/bio_view_model.py b/ecs/jskult-webapp/src/model/view/bio_view_model.py index 57d5f153..5af25c32 100644 --- a/ecs/jskult-webapp/src/model/view/bio_view_model.py +++ b/ecs/jskult-webapp/src/model/view/bio_view_model.py @@ -54,7 +54,7 @@ class BioViewModel(BaseModel): """生物由来ロット分解データの検索結果を指定された件数ごとに分割しながら返す""" def date_handler(obj): """json.dumpsの日付項目のフォーマットハンドラ""" - return obj.isoformat() if hasattr(obj, 'isoformat') else obj + return obj.isoformat().replace('T', ' ') if hasattr(obj, 'isoformat') else obj search_data_list = [model.dict() for model in self.bio_data] search_data_len = len(search_data_list) diff --git a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py index 8841f643..e9229d8e 100644 --- a/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py +++ b/ecs/jskult-webapp/src/repositories/wholesaler_master_repository.py @@ -22,7 +22,7 @@ class WholesalerMasterRepository(BaseRepository): v_whs_cd, rec_sts_kbn FROM src05.whs_mst_v - WHERE (SELECT STR_TO_DATE(syor_date, '%Y%m%d') FROM src05.hdke_tbl) BETWEEN start_date AND end_date + WHERE src05.get_syor_date() BETWEEN start_date AND end_date ) v2 ON b.v_whs_cd = v2.v_whs_cd AND v2.rec_sts_kbn <> '9' diff --git a/ecs/jskult-webapp/src/static/css/bioStyle.css b/ecs/jskult-webapp/src/static/css/bioStyle.css index 0eadc543..14fe4ea6 100644 --- a/ecs/jskult-webapp/src/static/css/bioStyle.css +++ b/ecs/jskult-webapp/src/static/css/bioStyle.css @@ -1,7 +1,7 @@ /* Bootstrap 5.10以降、box-sizingのデフォルト値によってテーブルがずれるため、このページ限定的にリセット */ /* @see https://bootstrap-guide.com/content/reboot#page-defaults */ *, ::after, ::before { - box-sizing: initial; + box-sizing: revert; } body { diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js index 9983067d..56d971e4 100644 --- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js +++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js @@ -16,6 +16,9 @@ function clr() { if (formInput.name.startsWith('ctrl_')) { formInput.value = ""; } + if(formInput.name == 'ikoFlg' || formInput.name == 'delFlg_ctrl'){ + formInput.checked = false; + } } // 検索ボタンを再度非活性にする diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index 4dafce34..6dc40888 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -294,6 +294,9 @@ $(val).off('keypress') }) }) + // ページ送りしたときにヘッダがずれるのを修正 + FixedMidashi.remove(); + FixedMidashi.create(); } }) });