diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp index b57b147..c415e67 100644 --- a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp @@ -420,8 +420,8 @@ function fn_controlButtons() { console.log("=== fn_controlButtons 호출 ==="); console.log("g_apprStatus:", g_apprStatus); - if(g_apprStatus === "결재완료") { - console.log("결재완료 상태 - 입력 필드 비활성화"); + if(g_apprStatus === "결재완료" || g_apprStatus === "결재중") { + console.log(g_apprStatus + " 상태 - 입력 필드 비활성화"); // 결재완료된 경우 행추가, 저장 버튼 숨김 $("#btnAddRow").hide(); $("#btnSave").hide(); diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate2.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate2.jsp index d1b5f0e..fbd1970 100644 --- a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate2.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate2.jsp @@ -9,7 +9,7 @@ String userId = CommonUtils.checkNull(person.getUserId()); String objId = CommonUtils.checkNull(request.getParameter("objId")); String templateObjId = CommonUtils.checkNull(request.getParameter("templateObjId")); String apprStatus = CommonUtils.checkNull((String)request.getAttribute("apprStatus")); -boolean isApproved = "결재완료".equals(apprStatus); +boolean isApproved = "결재완료".equals(apprStatus) || "결재중".equals(apprStatus); %> diff --git a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp index 7ca7f9c..1be8465 100644 --- a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp @@ -165,7 +165,7 @@ var columns = [ } }, // 2. 주문유형 - {headerHozAlign : 'center', hozAlign : 'center', minWidth : 55, widthGrow: 0.6, title : '주문유형', field : 'CATEGORY_NAME' }, + {headerHozAlign : 'center', hozAlign : 'center', minWidth : 77, widthGrow: 0.8, title : '주문유형', field : 'CATEGORY_NAME' }, // 3. 발주일 {headerHozAlign : 'center', hozAlign : 'center', minWidth : 70, widthGrow: 0.7, title : '발주일', field : 'ORDER_DATE' }, // 4. 발주번호 @@ -343,7 +343,7 @@ var columns = [ function fn_search(){ // fnc_tabul_search로 페이징 처리 _tabulGrid = fnc_tabul_search( - _tabul_layout_fitColumns, + _tabul_layout_fitDataStretch, _tabulGrid, "/contractMgmt/contractGridList.do", columns, diff --git a/WebContent/WEB-INF/view/quality/customerCsList.jsp b/WebContent/WEB-INF/view/quality/customerCsList.jsp index dfa769c..bd2eee1 100644 --- a/WebContent/WEB-INF/view/quality/customerCsList.jsp +++ b/WebContent/WEB-INF/view/quality/customerCsList.jsp @@ -343,13 +343,13 @@ function fn_delete(){ ${code_map.customer_cd} - + @@ -359,14 +359,16 @@ function fn_delete(){ --> - - - + + - + + + + - @@ -376,7 +378,7 @@ function fn_delete(){ - diff --git a/src/com/pms/salesmgmt/controller/ContractMgmtController.java b/src/com/pms/salesmgmt/controller/ContractMgmtController.java index 455cc52..5de59ff 100644 --- a/src/com/pms/salesmgmt/controller/ContractMgmtController.java +++ b/src/com/pms/salesmgmt/controller/ContractMgmtController.java @@ -2193,6 +2193,9 @@ public class ContractMgmtController { request.setAttribute("estimate", estimate); request.setAttribute("items", items); request.setAttribute("code_map", code_map); + if(estimate != null && estimate.get("APPR_STATUS") != null) { + request.setAttribute("apprStatus", estimate.get("APPR_STATUS")); + } } catch (Exception e) { e.printStackTrace(); diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml index 394766c..166227c 100644 --- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -4191,18 +4191,17 @@ ORDER BY ASM.CLIENT_NM ROW_NUMBER() OVER (PARTITION BY ET.TEMPLATE_TYPE ORDER BY ET.REGDATE) AS "REVISION", COALESCE( (SELECT CASE - WHEN A.STATUS = 'complete' THEN '결재완료' - WHEN A.STATUS = 'cancel' THEN '취소' - WHEN A.STATUS = 'reject' THEN '반려' - WHEN A.STATUS = 'inProcess' THEN '결재중' - ELSE '작성중' + WHEN AMR.STATUS = 'complete' THEN '결재완료' + WHEN AMR.STATUS = 'reject' THEN '반려' + WHEN AMR.STATUS = 'inProcess' THEN '결재중' + WHEN AMR.STATUS = 'create' THEN '작성중' + ELSE '' END - FROM APPROVAL A - WHERE A.TARGET_OBJID::VARCHAR = ET.OBJID - AND A.TARGET_TYPE = 'CONTRACT_ESTIMATE' - ORDER BY A.REGDATE DESC + FROM AMARANTH_APPROVAL AMR + WHERE AMR.TARGET_OBJID = ET.OBJID::VARCHAR + AND AMR.TARGET_TYPE = 'CONTRACT_ESTIMATE' LIMIT 1), - '작성중' + '' ) AS "APPR_STATUS" FROM ESTIMATE_TEMPLATE ET @@ -4248,18 +4247,17 @@ ORDER BY ASM.CLIENT_NM CODE_NAME(CM.CONTRACT_CURRENCY) AS CONTRACT_CURRENCY_NAME, COALESCE( (SELECT CASE - WHEN A.STATUS = 'complete' THEN '결재완료' - WHEN A.STATUS = 'cancel' THEN '취소' - WHEN A.STATUS = 'reject' THEN '반려' - WHEN A.STATUS = 'inProcess' THEN '결재중' - ELSE '작성중' + WHEN AMR.STATUS = 'complete' THEN '결재완료' + WHEN AMR.STATUS = 'reject' THEN '반려' + WHEN AMR.STATUS = 'inProcess' THEN '결재중' + WHEN AMR.STATUS = 'create' THEN '작성중' + ELSE '' END - FROM APPROVAL A - WHERE A.TARGET_OBJID::VARCHAR = ET.OBJID - AND A.TARGET_TYPE = 'CONTRACT_ESTIMATE' - ORDER BY A.REGDATE DESC + FROM AMARANTH_APPROVAL AMR + WHERE AMR.TARGET_OBJID = ET.OBJID::VARCHAR + AND AMR.TARGET_TYPE = 'CONTRACT_ESTIMATE' LIMIT 1), - '작성중' + '' ) AS APPR_STATUS FROM ESTIMATE_TEMPLATE ET @@ -4318,18 +4316,17 @@ ORDER BY ASM.CLIENT_NM CODE_NAME(CM.CONTRACT_CURRENCY) AS CONTRACT_CURRENCY_NAME, COALESCE( (SELECT CASE - WHEN A.STATUS = 'complete' THEN '결재완료' - WHEN A.STATUS = 'cancel' THEN '취소' - WHEN A.STATUS = 'reject' THEN '반려' - WHEN A.STATUS = 'inProcess' THEN '결재중' - ELSE '작성중' + WHEN AMR.STATUS = 'complete' THEN '결재완료' + WHEN AMR.STATUS = 'reject' THEN '반려' + WHEN AMR.STATUS = 'inProcess' THEN '결재중' + WHEN AMR.STATUS = 'create' THEN '작성중' + ELSE '' END - FROM APPROVAL A - WHERE A.TARGET_OBJID::VARCHAR = ET.OBJID - AND A.TARGET_TYPE = 'CONTRACT_ESTIMATE' - ORDER BY A.REGDATE DESC + FROM AMARANTH_APPROVAL AMR + WHERE AMR.TARGET_OBJID = ET.OBJID::VARCHAR + AND AMR.TARGET_TYPE = 'CONTRACT_ESTIMATE' LIMIT 1), - '작성중' + '' ) AS APPR_STATUS FROM ESTIMATE_TEMPLATE ET