diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp index a22c2924..3229cc2b 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp @@ -215,31 +215,21 @@ return false; } - - const checkedRows = $('input.dlivyCk:checked').closest('tr'); - let checkedRowTd = null; let rowTdClass = null; let data = []; - checkedRows.each(function(index) { const currentRow = $(this); const nextRow = currentRow.next('tr'); - checkedRowTd = currentRow.find('td').eq(1); - - rowTdClass = checkedRowTd.find('button').attr('class'); - if (rowTdClass && rowTdClass.includes('closed')) { - - - let tempRow = nextRow.next(); // 'nextRow'는 제외하고 그 다음 'tr'부터 시작 + while (tempRow.length && !tempRow.hasClass('sendOut-info__first')) { const inputs = tempRow.find('input[name], select[name]'); let rowData = {}; @@ -247,39 +237,24 @@ inputs.each(function () { const input = $(this); rowData[input.attr('name')] = input.val(); - - - fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm); + fn_create_input_popup('hidden', 'dlivyUpdtVOList[' + index + '].'+(input.attr('name').split('.')[1]), input.val(), hiddenForm); }); - - data.push(rowData); - tempRow = tempRow.next(); // 다음 'tr'로 이동 } - } else { - - - - const inputs = currentRow.find('input[name], select[name]').add(nextRow.find('input[name], select[name]')); let rowData = {}; inputs.each(function() { const input = $(this); rowData[input.attr('name')] = input.val(); - - - fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm); + fn_create_input_popup('hidden', 'dlivyUpdtVOList[' + index + '].'+(input.attr('name').split('.')[1]), input.val(), hiddenForm); + // fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm); }); - - data.push(rowData); - } - }); fn_create_input_popup('hidden', 'dlivyDt', dlivyRegistDate, hiddenForm); @@ -287,11 +262,6 @@ const hiddenData = $('#hiddenForm').serializeArray(); - - - - - if (isChecked()) { if (confirm('해당 주문을 출고처리 하시겠습니까?')) { $.ajax({ diff --git a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp index 3518d89b..d3b101cc 100644 --- a/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp @@ -851,7 +851,7 @@ tr += '