From f3e6369f50eadef9f3662c9f8cc0329721501c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=8E=E9=96=93?= Date: Tue, 18 Jul 2023 17:50:09 +0900 Subject: [PATCH] =?UTF-8?q?datepicker=E3=81=A8=E3=81=AE=E6=88=A6=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/model/db/bio_sales_view.py | 67 ------------------- .../static/function/businessLogicScript.js | 30 +++++---- ecs/jskult-webapp/src/templates/_header.html | 2 + .../src/templates/bioSearchList.html | 8 ++- 4 files changed, 26 insertions(+), 81 deletions(-) diff --git a/ecs/jskult-webapp/src/model/db/bio_sales_view.py b/ecs/jskult-webapp/src/model/db/bio_sales_view.py index 8b28f225..59192b86 100644 --- a/ecs/jskult-webapp/src/model/db/bio_sales_view.py +++ b/ecs/jskult-webapp/src/model/db/bio_sales_view.py @@ -5,73 +5,6 @@ from src.model.db.base_db_model import BaseDBModel class BioSalesViewModel(BaseDBModel): - # conv_cd: Optional[int] - # rec_data: Optional[str] - # rec_whs_cd: Optional[str] - # rec_whs_sub_cd: Optional[str] - # rec_whs_org_cd: Optional[str] - # rec_cust_cd: Optional[str] - # rec_comm_cd: Optional[str] - # rec_tran_kbn: Optional[str] - # rev_hsdnymd_wrk: Optional[str] - # rev_hsdnymd_srk: Optional[str] - # rec_urag_num: Optional[str] - # rec_comm_name: Optional[str] - # rec_nonyu_fcl_name: Optional[str] - # rec_nonyu_fcl_addr: Optional[str] - # rec_lot_num: Optional[str] - # qty: Optional[str] - # rec_ymd: Optional[str] - # sale_data_cat: Optional[str] - # slip_file_name: Optional[str] - # slip_mgt_num: Optional[str] - # row_num: Optional[int] - # hsdn_ymd: Optional[str] - # exec_dt: Optional[str] - # v_tran_cd: Optional[int] - # tran_kbn_name: Optional[str] - # whs_org_cd: Optional[str] - # v_whsorg_cd: Optional[str] - # whs_org_name: Optional[str] - # whs_org_kn: Optional[str] - # v_whs_cd: Optional[int] - # whs_name: Optional[str] - # nonyu_fcl_cd: Optional[str] - # v_inst_cd: Optional[str] - # v_inst_kn: Optional[str] - # v_inst_nm: Optional[str] - # v_inst_addr: Optional[str] - # comm_cd: Optional[str] - # product_name: Optional[str] - # whs_rep_comm_name: Optional[str] - # whs_rep_nonyu_fcl_name: Optional[str] - # whs_rep_nonyu_fcl_addr: Optional[str] - # mkr_inf_1: Optional[str] - # mkr_cd: Optional[str] - # htdnymd_err_kbn: Optional[str] - # prd_exis_kbn: Optional[str] - # fcl_exis_kbn: Optional[str] - # amt: Optional[int] - # slip_org_kbn: Optional[str] - # bef_slip_mgt_num: Optional[str] - # lot_no_err_flg: Optional[str] - # iko_flg: Optional[str] - # kjyo_ym: Optional[str] - # tksnbk_kbn: Optional[str] - # fcl_exec_kbn: Optional[str] - # rec_sts_kbn: Optional[str] - # ins_dt: Optional[datetime] - # ins_usr: Optional[str] - # dcf_inst_cd: Optional[str] - # inst_cd: Optional[str] - # inst_name_form: Optional[str] - # address: Optional[str] - # tel_num: Optional[str] - # data_kbn: Optional[str] - # ser_no: Optional[str] - # lot_num: Optional[str] - # expr_dt: Optional[date] - # amt_fugo: Optional[str] slip_mgt_num: Optional[str] conv_cdR: Optional[int] rec_whs_cd: Optional[str] diff --git a/ecs/jskult-webapp/src/static/function/businessLogicScript.js b/ecs/jskult-webapp/src/static/function/businessLogicScript.js index 7ce3b9ba..7447572e 100644 --- a/ecs/jskult-webapp/src/static/function/businessLogicScript.js +++ b/ecs/jskult-webapp/src/static/function/businessLogicScript.js @@ -84,6 +84,7 @@ function selectDropDowList(id, selectedName){ function enableDatePicker() { // カレンダーの表示を日曜日始まりに変更 flatpickr.l10ns.ja.firstDayOfWeek = 0; + $('.date_picker').flatpickr( { locale: 'ja', // 日本語カレンダー @@ -93,20 +94,22 @@ function enableDatePicker() { ) } +function setDatePicker() { + // カレンダーの表示を日曜日始まりに変更 + flatpickr.l10ns.ja.firstDayOfWeek = 0; + + $(".date_picker").datepicker({ + locale: 'ja', + dateFormat: 'YYY/mm/dd' + }); + +} + // 日付入力チェック // 引数:チェックするﾃｷｽﾄﾎﾞｯｸｽNo function autoModifyDate($this){ // 日付フォーマットチェック - - if($this.value === "" || - (!$this.value.match(/^\d{4}\/\d{2}\/\d{2}$/) && !$this.value.match(/^\d{4}\d{2}\d{2}$/))) - { - $this.value = ""; - return; - } - - /** @type { string }*/ - let strFormat = $this.value;; + let strFormat = $this.value; // yyyyMMddの場合→yyyy/MM/dd const datePatternMatches = strFormat.match(/^(\d{4})(\d{2})(\d{2})$/); if (datePatternMatches){ @@ -117,15 +120,16 @@ function autoModifyDate($this){ // 開始日の場合 if ($this.name.includes('from')){ strFormat = strFormat.replace("00/00", "01/01"); - strFormat = strFormat.replace("00", "01"); + strFormat = strFormat.replace("/00", "/01"); } // 終了日の場合 else if ($this.name.includes('to')){ strFormat = strFormat.replace("00/00", "12/31"); const date = new Date(strFormat.slice(0, 4), strFormat.slice(5, 7), 0).getDate(); - strFormat = strFormat.replace("00", date.toString()); + strFormat = strFormat.replace("/00", "/"+date.toString()); } - $this.value = strFormat; + $this.value = strFormat; + return false; } diff --git a/ecs/jskult-webapp/src/templates/_header.html b/ecs/jskult-webapp/src/templates/_header.html index 01a1521a..adfa228d 100644 --- a/ecs/jskult-webapp/src/templates/_header.html +++ b/ecs/jskult-webapp/src/templates/_header.html @@ -15,3 +15,5 @@ + + \ No newline at end of file diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html index 89436d67..7d07a22b 100644 --- a/ecs/jskult-webapp/src/templates/bioSearchList.html +++ b/ecs/jskult-webapp/src/templates/bioSearchList.html @@ -13,7 +13,8 @@ // ボタン、テキストボックス初期化 formBtDisabled(); // DatePickerを有効化 - enableDatePicker(); + setDatePicker(); + }); @@ -55,11 +56,13 @@ ～ @@ -97,11 +100,13 @@ ～ @@ -342,6 +347,7 @@ ` }) } +