diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_english.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_english.jsp
new file mode 100644
index 0000000..41a3f73
--- /dev/null
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_english.jsp
@@ -0,0 +1,727 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page import="com.pms.common.utils.*"%>
+<%@ page import="java.util.*"%>
+<%@include file="/init_jqGrid.jsp"%>
+<%
+ Map info = (HashMap)(request.getAttribute("info"));
+ boolean isModify = true;
+ if(info!=null &&
+ ( CommonUtils.checkNull(info.get("APPR_STATUS")).equals( "결재중" )
+ ||CommonUtils.checkNull(info.get("APPR_STATUS")).equals( "결재완료" )
+ ||CommonUtils.checkNull(info.get("STATUS")).equals( "cancel" )
+ )
+ ){
+ isModify = false;
+ }
+ String actType = (String)request.getAttribute("actType");
+
+ List userList = (List)request.getAttribute("userList");
+ if(userList == null) userList = new ArrayList();
+
+ String managerId = CommonUtils.checkNull(info != null ? info.get("SALES_MNG_USER_ID") : "");
+ String managerId2 = CommonUtils.checkNull(info != null ? info.get("SALES_MNG_USER_ID2") : "");
+%>
+
+
+
+
+
+<%=Constants.SYSTEM_NAME%> - Purchase Order
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
index 3e2eabf..93e4b89 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
@@ -507,19 +507,21 @@ function fn_formPopUp(objId, copy, formType){
var url = "";
if(formType == 'outsourcing'){
- // 외주가공 발주서 양식
target = "purchaseOrderFormPopup_outsourcing";
url = "/purchaseOrder/purchaseOrderFormPopup_outsourcing.do";
popup_width = 1200;
popup_height = 900;
+ } else if(formType == 'english'){
+ target = "purchaseOrderFormPopup_english";
+ url = "/purchaseOrder/purchaseOrderFormPopup_english.do";
+ popup_width = 1100;
+ popup_height = 900;
} else if(formType == 'general'){
- // 일반 발주서 양식
target = "purchaseOrderFormPopup_general";
url = "/purchaseOrder/purchaseOrderFormPopup_general.do";
popup_width = 1000;
popup_height = 900;
} else {
- // 기존 발주서 양식 (FORM_TYPE이 없거나 기존 데이터)
target = "purchaseOrderFormPopup_new";
url = "/purchaseOrder/purchaseOrderFormPopup_new.do";
}
diff --git a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp
index 9ea5053..e719039 100644
--- a/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp
+++ b/WebContent/WEB-INF/view/purchaseOrder/purchaseOrderMailFormPopup.jsp
@@ -529,21 +529,24 @@ function fn_generatePdfAndSend(){
}
});
- // 발주서 양식 타입 확인 (일반/외주)
+ // 발주서 양식 타입 확인 (일반/외주/영문)
var formType = fnc_checkNull(purchaseOrderInfo.FORM_TYPE) || 'general';
var url = "";
if(formType === 'outsourcing') {
url = "/purchaseOrder/purchaseOrderFormPopup_outsourcing.do?actType=VIEW&PURCHASE_ORDER_MASTER_OBJID=" + purchaseOrderObjId;
+ } else if(formType === 'english') {
+ url = "/purchaseOrder/purchaseOrderFormPopup_english.do?actType=VIEW&PURCHASE_ORDER_MASTER_OBJID=" + purchaseOrderObjId;
} else {
url = "/purchaseOrder/purchaseOrderFormPopup_general.do?actType=VIEW&PURCHASE_ORDER_MASTER_OBJID=" + purchaseOrderObjId;
}
// 숨겨진 iframe으로 발주서 페이지 로드
+ var iframeWidth = (formType === 'english') ? '1100px' : '900px';
var iframe = $('