itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 관리자 전체 주문목록, 주문->출고처리 출고처리 수정

Browse Source
This commit is contained in:
jazz
2026-02-19 13:46:13 +09:00
parent 3e64dd72a0
commit b2a67966ee
2 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/OrdrDlivyPopupForm.jsp
View File

@@ -215,31 +215,21 @@
return false; return false;
} }
const checkedRows = $('input.dlivyCk:checked').closest('tr'); const checkedRows = $('input.dlivyCk:checked').closest('tr');
let checkedRowTd = null; let checkedRowTd = null;
let rowTdClass = null; let rowTdClass = null;
let data = []; let data = [];
checkedRows.each(function(index) { checkedRows.each(function(index) {
const currentRow = $(this); const currentRow = $(this);
const nextRow = currentRow.next('tr'); const nextRow = currentRow.next('tr');
checkedRowTd = currentRow.find('td').eq(1); checkedRowTd = currentRow.find('td').eq(1);
rowTdClass = checkedRowTd.find('button').attr('class'); rowTdClass = checkedRowTd.find('button').attr('class');
if (rowTdClass && rowTdClass.includes('closed')) { if (rowTdClass && rowTdClass.includes('closed')) {
let tempRow = nextRow.next(); // 'nextRow'는 제외하고 그 다음 'tr'부터 시작 let tempRow = nextRow.next(); // 'nextRow'는 제외하고 그 다음 'tr'부터 시작
while (tempRow.length && !tempRow.hasClass('sendOut-info__first')) { while (tempRow.length && !tempRow.hasClass('sendOut-info__first')) {
const inputs = tempRow.find('input[name], select[name]'); const inputs = tempRow.find('input[name], select[name]');
let rowData = {}; let rowData = {};
@@ -247,39 +237,24 @@
inputs.each(function () { inputs.each(function () {
const input = $(this); const input = $(this);
rowData[input.attr('name')] = input.val(); rowData[input.attr('name')] = input.val();
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); data.push(rowData);
tempRow = tempRow.next(); // 다음 'tr'로 이동 tempRow = tempRow.next(); // 다음 'tr'로 이동
} }
} else { } else {
const inputs = currentRow.find('input[name], select[name]').add(nextRow.find('input[name], select[name]')); const inputs = currentRow.find('input[name], select[name]').add(nextRow.find('input[name], select[name]'));
let rowData = {}; let rowData = {};
inputs.each(function() { inputs.each(function() {
const input = $(this); const input = $(this);
rowData[input.attr('name')] = input.val(); rowData[input.attr('name')] = input.val();
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);
fn_create_input_popup('hidden', input.attr('name'), input.val(), hiddenForm);
}); });
data.push(rowData); data.push(rowData);
} }
}); });
fn_create_input_popup('hidden', 'dlivyDt', dlivyRegistDate, hiddenForm); fn_create_input_popup('hidden', 'dlivyDt', dlivyRegistDate, hiddenForm);
@@ -287,11 +262,6 @@
const hiddenData = $('#hiddenForm').serializeArray(); const hiddenData = $('#hiddenForm').serializeArray();
if (isChecked()) { if (isChecked()) {
if (confirm('해당 주문을 출고처리 하시겠습니까?')) { if (confirm('해당 주문을 출고처리 하시겠습니까?')) {
$.ajax({ $.ajax({

2
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
View File

@@ -851,7 +851,7 @@
tr += ' <td>'; tr += ' <td>';
/** 구독서비스 여부 (구독/일반)*/ /** 구독서비스 여부 (구독/일반)*/
if (data.usbsvcAt == 'Y'){ if (data.subsvcAt == 'Y'){
tr += '구독'; tr += '구독';
}else{ }else{
tr += '일반'; tr += '일반';