diff --git a/WebContent/WEB-INF/view/contractMgmt/FileRegistPopup.jsp b/WebContent/WEB-INF/view/contractMgmt/FileRegistPopup.jsp new file mode 100644 index 0000000..dd8e3ec --- /dev/null +++ b/WebContent/WEB-INF/view/contractMgmt/FileRegistPopup.jsp @@ -0,0 +1,298 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page import="com.pms.common.utils.*"%> +<%@ page import="java.util.*" %> +<%@include file= "/init.jsp" %> + + + + +<%=Constants.SYSTEM_NAME%> + + + +
+ +
+
+

+ 파일등록 +

+
+
+ + + + + + + + + + + + + +
FTC주문서 +
+
Drag & Drop Files Here
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + +
No파일명등록일Size
+
+
+
+
주문서 +
+
Drag & Drop Files Here
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + +
No파일명등록일Size
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp index 2114cab..99ba1c4 100644 --- a/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp @@ -223,36 +223,34 @@ body { z-index: 1000; } -.plm_btns:first-child { - margin-left: 600px; -} -/* .plm_btns { +/* 견적서 전용 버튼 스타일 */ +.estimate-btn { display: inline-block; - padding: 12px 40px; - margin: 0 5px; - font-size: 15px; - font-weight: bold; + padding: 5px 15px; + margin: 0 2px; + font-size: 12px; + font-weight: normal; cursor: pointer; - border: 2px solid #007bff; - background-color: #007bff; + border: 1px solid #60a5fa; + background-color: #60a5fa; color: white; - border-radius: 5px; + border-radius: 3px; transition: all 0.3s; line-height: 1; vertical-align: middle; white-space: nowrap; -} */ +} -.plm_btns:hover { - background-color: #0056b3; - border-color: #0056b3; +.estimate-btn:hover { + background-color: #1e3a8a; + border-color: #1e3a8a; box-shadow: 0 2px 6px rgba(0,123,255,0.4); } -.plm_btns:active { - background-color: #004085; - border-color: #004085; - box-shadow: 0 1px 3px rgba(0,123,255,0.2); +.estimate-btn:active { + background-color: #1e3a8a; + border-color: #1e3a8a; + box-shadow: 0 1px 3px rgba(96,165,250,0.3); } input[type="text"], @@ -1267,10 +1265,10 @@ function fn_save() {
- - - - + + + +
diff --git a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp index ffb6178..a491d77 100644 --- a/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp +++ b/WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp @@ -254,13 +254,13 @@ function approval_form(APPROVAL_OBJID,ROUTE_OBJID){ function fn_FileRegist(objId, docType, docTypeName){ var popup_width = 800; - var popup_height = 350; + var popup_height = 650; var objId = objId; var docType = docType; var docTypeName = docTypeName; var params = "?targetObjId="+objId+"&docType="+docType+"&docTypeName="+docTypeName; - var url = "/common/FileRegistPopup.do"+params; + var url = "/contractMgmt/FileRegistPopup.do"+params; fn_centerPopup(popup_width, popup_height, url); } diff --git a/src/com/pms/salesmgmt/controller/ContractMgmtController.java b/src/com/pms/salesmgmt/controller/ContractMgmtController.java index 1a1824b..6035eb5 100644 --- a/src/com/pms/salesmgmt/controller/ContractMgmtController.java +++ b/src/com/pms/salesmgmt/controller/ContractMgmtController.java @@ -2250,4 +2250,11 @@ public class ContractMgmtController { return resultMap; } + + @RequestMapping("/contractMgmt/FileRegistPopup.do") + public String FileRegistPopup(HttpServletRequest request, @RequestParam Map paramMap){ + request.setAttribute("docType", CommonUtils.checkNull(paramMap.get("docType"))); + request.setAttribute("docTypeName", CommonUtils.checkNull(paramMap.get("docTypeName"))); + return "/contractMgmt/FileRegistPopup"; + } } diff --git a/src/com/pms/salesmgmt/mapper/contractMgmt.xml b/src/com/pms/salesmgmt/mapper/contractMgmt.xml index ce87ce7..4717863 100644 --- a/src/com/pms/salesmgmt/mapper/contractMgmt.xml +++ b/src/com/pms/salesmgmt/mapper/contractMgmt.xml @@ -463,7 +463,7 @@ ,TO_CHAR(REGDATE,'YYYY-MM-DD') AS REG_DATE ,WRITER ,(SELECT USER_NAME FROM USER_INFO AS O WHERE O.USER_ID = T.WRITER ) AS WRITER_NAME - ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = T.OBJID AND DOC_TYPE='ORDER_DOC' AND UPPER(STATUS) = 'ACTIVE') AS CU01_CNT + ,(SELECT COUNT(1) FROM ATTACH_FILE_INFO WHERE TARGET_OBJID = T.OBJID AND DOC_TYPE IN ('FTC_ORDER', 'ORDER') AND UPPER(STATUS) = 'ACTIVE') AS CU01_CNT ,(CASE WHEN (RESULT_CD is null or RESULT_CD ='') and (SPEC_RESULT_CD is null or RESULT_CD ='') and (EST_RESULT_CD is null or RESULT_CD ='') then '0'