fix: 검색조건 변경 : 취급일자 -> 폐기일자

그리드 항목 위치 조정
dev
Jonguk. Lim 4 months ago
parent 8d5d35d4ca
commit bc80df4b81

@ -88,7 +88,7 @@
<!-- DataTables(그리드) --> <!-- DataTables(그리드) -->
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-500" id="table-responsive--${pageName}"> <div class="table-responsive ox-scroll oy-scroll" style="height: 580px !important;" id="table-responsive--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info"> <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">
<tr id="theadTr--${pageName}" <tr id="theadTr--${pageName}"
@ -259,27 +259,6 @@
} else { } else {
$("#theadTr--${pageName}").find("input[type='checkbox']").prop("checked", false); // 체크 해제 $("#theadTr--${pageName}").find("input[type='checkbox']").prop("checked", false); // 체크 해제
} }
}
// 신청서 정보 dialog
$P.control.getInfo = (gdccId) => {
/*let dialogTitle = "신청서 정보 등록";
let params = {};
ajax.get({
url : wctx.url("/adds/nims/dsuseMgtReceipt-info.do")
, data : params || {}
, success : resp => {
dialog.open({
id : $P.control.prefixed("Dialog")
, title : dialogTitle
, content : resp
, size : $P.control.infoSize
, onClose : () => { }
});
}
});*/
} }
@ -381,7 +360,7 @@
}); });
fetch(wctx.url("/adds/nims/getHwpForRptDoc.do") + "?" + parameter) fetch(wctx.url("/adds/nims/getHwpForRptDoc.do") + "?" + parameter)
.then((response) => { .then((response) => {
var header = response.headers.get('Content-Disposition'); let header = response.headers.get('Content-Disposition');
if(!header){ if(!header){
response.json().then((responseJson)=>{ response.json().then((responseJson)=>{
dialog.alert({ dialog.alert({
@ -393,8 +372,8 @@
}); });
new Error(""); new Error("");
} }
var parts = header.split(';'); let parts = header.split(';');
filename = decodeURIComponent(parts[1].split('=')[1]); let filename = decodeURIComponent(parts[1].split('=')[1]);
if(filename.startsWith("\"")){ if(filename.startsWith("\"")){
filename = filename.substring(1); filename = filename.substring(1);
} }
@ -412,7 +391,7 @@
document.body.appendChild(a); document.body.appendChild(a);
a.click(); a.click();
a.remove(); a.remove();
if($("#tbody--${pageName}").find("td input[type='checkbox']:checked").length == 1){ if($("#tbody--${pageName}").find("td input[type='checkbox']:checked").length == 1){
$P.control.load($P.control.pageNum); $P.control.load($P.control.pageNum);
} }

@ -81,7 +81,7 @@
<!-- DataTables(그리드) --> <!-- DataTables(그리드) -->
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-250" id="table-responsive--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-350" id="table-responsive--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info"> <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">
<tr id="theadTr--${pageName}" <tr id="theadTr--${pageName}"
@ -141,7 +141,7 @@
<div class="row g-1"> <div class="row g-1">
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-1--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-200" id="table-responsive-1--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer"
id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info"> id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">

@ -524,9 +524,18 @@
}); });
return false; return false;
} }
if(isNaN($P.productFormFields.get().dsuseQy)){
dialog.alert({
content: "폐기 수량은 숫자만 입력 가능합니다",
onOK: () => {}
});
return false;
}
if(!$P.productFormFields.get().dsuseQy){ if(!$P.productFormFields.get().dsuseQy){
dialog.alert({ dialog.alert({
content: "폐기수량을 입력해 주세요" content: "폐기 수량을 입력해 주세요"
}); });
return false; return false;
} }

@ -83,7 +83,7 @@
<!-- DataTables(그리드) --> <!-- DataTables(그리드) -->
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-250" id="table-responsive--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-350" id="table-responsive--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info"> <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">
<tr id="theadTr--${pageName}" <tr id="theadTr--${pageName}"
@ -143,7 +143,7 @@
<div class="row g-1"> <div class="row g-1">
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-1--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-200" id="table-responsive-1--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer"
id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info"> id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">

@ -142,6 +142,8 @@
let initDataset = false; let initDataset = false;
// 변경 화면 // 변경 화면
let isEditData = false; let isEditData = false;
// 폐기결과 이미지 등록 및 변경
let isImgChange = true;
const searchRsltImgList = () => { const searchRsltImgList = () => {
document.getElementById("rsltImgList").innerHTML = ""; document.getElementById("rsltImgList").innerHTML = "";
@ -173,6 +175,7 @@
let isSelf = list.filter(item => item.SEL_YN == 'Y') let isSelf = list.filter(item => item.SEL_YN == 'Y')
if(isSelf.length > 0) return; if(isSelf.length > 0) return;
isImgChange = false;
$('#btnImgAdd--${pageName}').prop('disabled', true); $('#btnImgAdd--${pageName}').prop('disabled', true);
$('#btnImgDel--${pageName}').prop('disabled', true); $('#btnImgDel--${pageName}').prop('disabled', true);
let tagsTextArr = []; let tagsTextArr = [];
@ -447,6 +450,16 @@
let fileArr = $P.fileArr; let fileArr = $P.fileArr;
if(isImgChange){
if(fileArr.length == 0){
dialog.alert({
content: "폐기(진행) 사진을 등록해 주세요.",
onOK: () => {}
});
return;
}
}
dialog.alert({ dialog.alert({
content: "현재 " + $P.control.prefixName + " 정보를 저장하시겠습니까?" content: "현재 " + $P.control.prefixName + " 정보를 저장하시겠습니까?"
, init: () => { setDialogZindex(); } , init: () => { setDialogZindex(); }
@ -484,6 +497,7 @@
$("#btnSave--${pageName}").on("click", () => $P.fnSave()); // 저장 $("#btnSave--${pageName}").on("click", () => $P.fnSave()); // 저장
$("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => { $("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => {
isImgChange = true;
if(!initDataset){ if(!initDataset){
initDataset = true; initDataset = true;
return; return;

@ -78,7 +78,7 @@
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_0_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-250" id="table-responsive--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-350" id="table-responsive--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info"> <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">
<tr id="theadTr--${pageName}" <tr id="theadTr--${pageName}"
@ -136,7 +136,7 @@
<div class="row g-1"> <div class="row g-1">
<div class="card-datatable text-nowrap"> <div class="card-datatable text-nowrap">
<div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}"> <div class="dataTables_wrapper dt-bootstrap5 no-footer" id="DataTables_Table_1_wrapper--${pageName}">
<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-1--${pageName}"> <div class="table-responsive ox-scroll oy-scroll h-px-200" id="table-responsive-1--${pageName}">
<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" <table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer"
id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info"> id="DataTables_Table_1--${pageName}" aria-describedby="DataTables_Table_0_info">
<thead class="sticky-thead"> <thead class="sticky-thead">

Loading…
Cancel
Save