Compare commits

..

No commits in common. "ab0b225b37717ed34be2fffb9c39c47865057246" and "4cb210adb608e9d7387807f6302ab540b1796056" have entirely different histories.

4 changed files with 57 additions and 20 deletions

View File

@ -25,10 +25,20 @@ function fn_setGridCombo() {
<c:set var="num" value="0"/> <c:set var="num" value="0"/>
<c:forEach var="item" items="${commCode2}" varStatus="status"> <c:forEach var="item" items="${commCode2}" varStatus="status">
arrTestType["${num}"] = {}; <c:if test="${item.code == 'CM017'}">
arrTestType["${num}"]['code'] = "${item.codeValue}"; <c:if test="${num == 0}">
arrTestType["${num}"]['label'] = "${item.codeText}"; arrTestType["${num}"] = {};
<c:set var="num" value="${num + 1}"/> arrTestType["${num}"]['code'] = "${item.codeValue}";
arrTestType["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
<c:if test="${num != 0}">
arrTestType["${num}"] = {};
arrTestType["${num}"]['code'] = "${item.codeValue}";
arrTestType["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
</c:if>
</c:forEach> </c:forEach>
} }
@ -553,12 +563,9 @@ function fn_grid_refresh(){
fn_setHeaderText(); //기준계 조회 해서 SetHeaderText fn_setHeaderText(); //기준계 조회 해서 SetHeaderText
var grid = kendoJQuery("#kictGrid").data("kendoGrid"); var grid = kendoJQuery("#kictGrid");
var dataSource = grid.dataSource; var dataSource = grid.dataSource;
// 콤보박스 데이터 추출을 위한 refresh
grid.refresh();
if(!(state == 2 || state == 4 || state == 5 || state == "")){ if(!(state == 2 || state == 4 || state == 5 || state == "")){
//입력중, 수정요청 중일땐 저장 못하게 막음. //입력중, 수정요청 중일땐 저장 못하게 막음.
kendoJQuery('.kist-btn-rowAdd, .kist-btn-rowRemove, .btn_top_L_Cnt, .btn_top_L, .btn_top_R').addClass("trViewOff"); kendoJQuery('.kist-btn-rowAdd, .kist-btn-rowRemove, .btn_top_L_Cnt, .btn_top_L, .btn_top_R').addClass("trViewOff");

View File

@ -14,10 +14,20 @@ function fn_setGridCombo() {
<c:set var="num" value="0"/> <c:set var="num" value="0"/>
<c:forEach var="item" items="${commCode}" varStatus="status"> <c:forEach var="item" items="${commCode}" varStatus="status">
arrRockType["${num}"] = {}; <c:if test="${item.code == 'CM015'}">
arrRockType["${num}"]['code'] = "${item.codeValue}"; <c:if test="${num == 0}">
arrRockType["${num}"]['label'] = "${item.codeText}"; arrRockType["${num}"] = {};
<c:set var="num" value="${num + 1}"/> arrRockType["${num}"]['code'] = "${item.codeValue}";
arrRockType["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
<c:if test="${num != 0}">
arrRockType["${num}"] = {};
arrRockType["${num}"]['code'] = "${item.codeValue}";
arrRockType["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
</c:if>
</c:forEach> </c:forEach>
} }

View File

@ -14,10 +14,20 @@ function fn_setGridCombo() {
<c:set var="num" value="0"/> <c:set var="num" value="0"/>
<c:forEach var="item" items="${commCode}" varStatus="status"> <c:forEach var="item" items="${commCode}" varStatus="status">
arrRockType["${num}"] = {}; <c:if test="${item.code == 'CM015'}">
arrRockType["${num}"]['code'] = "${item.codeValue}"; <c:if test="${num == 0}">
arrRockType["${num}"]['label'] = "${item.codeText}"; arrRockType["${num}"] = {};
<c:set var="num" value="${num + 1}"/> arrRockType["${num}"]['code'] = "${item.codeValue}";
arrRockType["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
<c:if test="${num != 0}">
arrRockType["${num}"] = {};
arrRockType["${num}"]['code'] = "${item.codeValue}";
arrRockType["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
</c:if>
</c:forEach> </c:forEach>
} }

View File

@ -17,10 +17,20 @@ function fn_setGridCombo(){
<c:set var="num" value="0"/> <c:set var="num" value="0"/>
<c:forEach var="item" items="${commCode}" varStatus="status"> <c:forEach var="item" items="${commCode}" varStatus="status">
arrLayerEng["${num}"] = {}; <c:if test="${item.code == 'CM011'}">
arrLayerEng["${num}"]['code'] = "${item.codeValue}"; <c:if test="${num == 0}">
arrLayerEng["${num}"]['label'] = "${item.codeText}"; arrLayerEng["${num}"] = {};
<c:set var="num" value="${num + 1}"/> arrLayerEng["${num}"]['code'] = "${item.codeValue}";
arrLayerEng["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
<c:if test="${num != 0}">
arrLayerEng["${num}"] = {};
arrLayerEng["${num}"]['code'] = "${item.codeValue}";
arrLayerEng["${num}"]['label'] = "${item.codeText}";
<c:set var="num" value="${num + 1}"/>
</c:if>
</c:if>
</c:forEach> </c:forEach>
} }