From cd034866b83ab40b78973935f06052a5eccc0e0e Mon Sep 17 00:00:00 2001
From: "shimoda.m@nds-tyo.co.jp" <shimoda.m@nds-tyo.co.jp>
Date: Fri, 6 Oct 2023 15:44:40 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E3=82=AF=E3=83=AA=E3=82=A2=E6=8A=BC?=
 =?UTF-8?q?=E4=B8=8B=E5=BE=8C=E3=80=81=E6=A4=9C=E7=B4=A2=E3=83=AA=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=81=AF=E6=B6=88=E3=81=88=E3=81=AA=E3=81=84=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=87=BA=E5=8A=9B?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=80=82=E3=81=9D=E3=81=AE=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=80=81=E6=A4=9C=E7=B4=A2=E6=99=82=E7=82=B9=E3=81=AE?=
 =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=82=92=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E3=81=97=E3=81=A6=E3=82=AF=E3=83=AA=E3=82=A2=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=82=82=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/templates/bioSearchList.html          | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/ecs/jskult-webapp/src/templates/bioSearchList.html b/ecs/jskult-webapp/src/templates/bioSearchList.html
index f77b17a3..823dea7a 100644
--- a/ecs/jskult-webapp/src/templates/bioSearchList.html
+++ b/ecs/jskult-webapp/src/templates/bioSearchList.html
@@ -113,7 +113,7 @@
                         <label for="ikoFlg">2017年11月以前のデータを含める</label>
                     </td>
                     <td>
-                        <input class="buttonSize" id="clear" type="button" name="clear_bt" value="クリア" onclick="clearForm()">
+                        <input class="buttonSize" id="clear" type="button" name="clear_bt" value="クリア" onclick="clr();clearHidden('bioSearchHidden')">
                         <input class="buttonSize" id="search_bt" value="検索" type="button" onclick="searchBioList()">
                     </td>
                 </tr>
@@ -177,7 +177,19 @@
             <div id="message_area" class="resultAreaMsg"></div>
         </div>
     </form>
-    <form id="search_param_hidden" name="bioHidden">
+    <form id="search_param_hidden" name="bioSearchHidden">
+        <input type="hidden" name="ctrl_wholesaler" value="">
+        <input type="hidden" name="ctrl_org_kbn" value="">
+        <input type="hidden" name="ctrl_rec_ymd_from" value="">
+        <input type="hidden" name="ctrl_rec_ymd_to" value="">
+        <input type="hidden" name="ctrl_rec_lot_num" value="">
+        <input type="hidden" name="ctrl_data_kbn" value="">
+        <input type="hidden" name="ctrl_maker_cd" value="">
+        <input type="hidden" name="ctrl_rev_hsdnymd_srk_from" value="">
+        <input type="hidden" name="ctrl_rev_hsdnymd_srk_to" value="">
+        <input type="checkbox" name="ikoFlg" value="true" style="display: none;">
+    </form>
+    <form id="download_hidden" name="bioDownloadHidden">
         <input type="hidden" name="ctrl_wholesaler" value="">
         <input type="hidden" name="ctrl_org_kbn" value="">
         <input type="hidden" name="ctrl_rec_ymd_from" value="">
@@ -192,11 +204,9 @@
 
     <script type="text/javascript">
 
-        function clearForm() {
-            // 検索項目をクリア
-            clr()
-            // 非表示項目もクリア
-            const formElement = document.bioHidden
+        function clearHidden(hiddenName) {
+            // 非表示項目をクリア
+            const formElement = document[hiddenName]
             const formInputElements = Array.from(formElement.elements)
             for (const formInput of formInputElements) {
                 if (formInput.name.startsWith('ctrl_')) {
@@ -219,7 +229,7 @@
                 ext: ext,
             }
             // 検索パラメータを取得
-            const searchParams = createSearchParams()
+            const searchParams = createSearchParams('download_hidden')
             $.extend(downloadRequestParams, searchParams)
 
             $.ajax({
@@ -275,9 +285,9 @@
             });
         }
 
-        function createSearchParams() {
+        function createSearchParams(paramId) {
             // 検索パラメータを取得
-            const formData = $('#search_param_hidden').serializeArray()
+            const formData = $(`#${paramId}`).serializeArray()
             // リクエスト用に加工
             const searchParams = {}
             for (let i = 0; i < formData.length; i++) {
@@ -288,14 +298,12 @@
         }
 
         function applySearchParam(elem) {
-            console.log(elem.value)
-            console.log(elem.name)
-            const bioHiddenForm = document['bioHidden']
-            bioHiddenForm[elem.name].value = elem.value
-            if (bioHiddenForm[elem.name].type === 'checkbox') {
-                bioHiddenForm[elem.name].checked = elem.checked
+            const bioSearchHiddenForm = document['bioSearchHidden']
+            bioSearchHiddenForm[elem.name].value = elem.value
+
+            if (elem.type === 'checkbox') {
+                bioSearchHiddenForm[elem.name].checked = elem.checked
             }
-            console.log(bioHiddenForm[elem.name].value)
         }
 
         // 生物由来データの検索＆ページネーションの作成
@@ -304,7 +312,7 @@
             messageArea.text('')
             messageArea.hide()
             const loading = new Loading('_loading_for_other')
-            const searchParams = createSearchParams()
+            const searchParams = createSearchParams('search_param_hidden')
             $('.pagination').pagination({
                 dataSource: '/bio/search',
                 locator: 'data',
@@ -350,6 +358,15 @@
 
                 },
                 callback: function(data, pagination) {
+                    // ダウンロード用の非表示項目に検索値を埋め込む
+                    const bioSearchHiddenForm = document['bioSearchHidden']
+                    const bioDownloadHiddenForm = document['bioDownloadHidden']
+                    for (const elem of Array.from(bioSearchHiddenForm.elements)) {
+                        bioDownloadHiddenForm[elem.name].value = elem.value
+                        if (elem.type === 'checkbox') {
+                            bioDownloadHiddenForm[elem.name].checked = elem.checked
+                        }
+                    }
                     $('#result_data').html('')
                     if (pagination.totalNumber === 0) {
                         loading.stop()
@@ -376,6 +393,7 @@
                     loading.stop()
                     $('#outExcel').removeAttr('disabled')
                     $('#outCSV').removeAttr('disabled')
+
                     $('.paginationjs-pages > ul > li').not('.disabled,.active').each(function(index, val) {
                         // paginationにtabindexをつける
                         $(val).attr('tabindex', '0')