ECR 조치담당자 컬럼 제거, 컬럼 순서 변경

WebContent/WEB-INF/view/quality/ecrList.jsp

@@ -77,21 +77,28 @@ $(document).ready(function(){
 
 // 컬럼: ECR No, 요청일, 요청자, 품번, 품명, 이슈사항, 완료요청일, 조치부서, 조치담당자, 조치자, 조치내용, 완료일, 이미지파일, 첨부파일, 설계변경요청서
 var columns = [
-	{headerHozAlign:'center', hozAlign:'center', minWidth:130, widthGrow:1, title:'ECR No', field:'ECR_NO',
+	{headerHozAlign:'center', hozAlign:'center', minWidth:110, widthGrow:1, title:'ECR No', field:'ECR_NO',
 		formatter:fnc_createGridAnchorTag,
 		cellClick: function(e, cell){
 			var objId = fnc_checkNull(cell.getData().OBJID);
 			fn_viewEcrPopUp(objId);
 		}
 	},
-	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1, title:'요청일', field:'REQUEST_DATE'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:90, widthGrow:1, title:'요청일', field:'REQUEST_DATE'},
 	{headerHozAlign:'center', hozAlign:'center', minWidth:80,  widthGrow:1, title:'요청자', field:'REQUESTER_NAME'},
 	{headerHozAlign:'center', hozAlign:'left',   minWidth:120, widthGrow:2, title:'품번', field:'PART_NO'},
 	{headerHozAlign:'center', hozAlign:'left',   minWidth:150, widthGrow:2, title:'품명', field:'PART_NAME'},
 	{headerHozAlign:'center', hozAlign:'left',   minWidth:150, widthGrow:2, title:'이슈사항', field:'ISSUE_CONTENT'},
 	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1, title:'완료요청일', field:'DUE_DATE'},
+	{headerHozAlign:'center', hozAlign:'center', minWidth:120, widthGrow:1, title:'설계변경요청서', field:'ECR_DOC_CNT',
+		formatter:fnc_subInfoValueFormatter,
+		cellClick:function(e, cell){
+			var objid = fnc_checkNull(cell.getData().OBJID);
+			fn_openEcrDocPopUp(objid);
+		}
+	},
 	{headerHozAlign:'center', hozAlign:'center', minWidth:90,  widthGrow:1, title:'조치부서', field:'ACTION_DEPT_NAME'},
-	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1, title:'조치담당자', field:'ACTION_MANAGER_NAME'},
+	//{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1, title:'조치담당자', field:'ACTION_MANAGER_NAME'},
 	{headerHozAlign:'center', hozAlign:'center', minWidth:80,  widthGrow:1, title:'조치자', field:'ACTION_USER_NAME'},
 	{headerHozAlign:'center', hozAlign:'left',   minWidth:150, widthGrow:2, title:'조치내용', field:'ACTION_CONTENT'},
 	{headerHozAlign:'center', hozAlign:'center', minWidth:100, widthGrow:1, title:'완료일', field:'COMPLETE_DATE'},
@@ -108,13 +115,6 @@ var columns = [
 			var objid = fnc_checkNull(cell.getData().OBJID);
 			fn_FileRegist(objid,"ECR_RESULT","ECR결과첨부");
 		}
-	},
-	{headerHozAlign:'center', hozAlign:'center', minWidth:110, widthGrow:1, title:'설계변경요청서', field:'ECR_DOC_CNT',
-		formatter:fnc_subInfoValueFormatter,
-		cellClick:function(e, cell){
-			var objid = fnc_checkNull(cell.getData().OBJID);
-			fn_openEcrDocPopUp(objid);
-		}
 	}
 ];
 
@@ -340,13 +340,13 @@ function fn_approval(){
 						</tr>
 
 						<tr>
-							<td><label>조치담당자</label></td>
+							<!-- <td><label>조치담당자</label></td>
 							<td>
 								<select name="search_action_manager" id="search_action_manager" class="select2" style="width:215px;">
 									<option value="">전체</option>
 									${code_map.action_manager_id}
 								</select>
-							</td>
+							</td> -->
 							<td><label>조치자</label></td>
 							<td>
 								<select name="search_action_user" id="search_action_user" class="select2" style="width:150px;">

WebContent/WEB-INF/view/quality/ecrRegistFormPopUp.jsp

@@ -187,7 +187,7 @@ function fn_save(){
 						</select>
 					</td>
 				</tr>
-				<tr>
+				<!-- <tr>
 					<td class="input_title"><label>조치담당자</label></td>
 					<td>
 						<select name="ACTION_MANAGER_ID" id="ACTION_MANAGER_ID" class="select2" type="select" style="width:100%;">
@@ -197,7 +197,7 @@ function fn_save(){
 					</td>
 					<td class="input_title"><label></label></td>
 					<td></td>
-				</tr>
+				</tr> -->
 				<tr>
 					<td class="input_title"><label>이슈사항 <span style="color:red;">*</span></label></td>
 					<td colspan="3">

WebContent/WEB-INF/view/quality/ecrResultFormPopUp.jsp

@@ -346,9 +346,9 @@ function fn_save(){
 									</tr>
 									<tr>
 										<td class="input_title"><label>조치부서</label></td>
-										<td>${info.action_dept_name}</td>
+										<td colspan="3">${info.action_dept_name}</td>
-										<td class="input_title"><label>조치담당자</label></td>
+										<!-- <td class="input_title"><label>조치담당자</label></td>
-										<td>${info.action_manager_name}</td>
+										<td>${info.action_manager_name}</td> -->
 									</tr>
 									<tr>
 										<td class="input_title"><label>이슈사항</label></td>