Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -41,6 +41,9 @@ let API_DETAIL_INFO 		= '/api/itemunit/info-storeitemunit';		// 상세
 let API_DETAIL_NEW	 		= '/api/itemunit/new-info-storeitemunit';	// 신규
 let API_DETAIL_SAVE 		= '/api/itemunit/save-store-itemunit';		// 저장
 
+
+let ITP_FORM_STINFO06010_DETAIL_IS_VIEW = false;
+
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
@@ -146,9 +149,8 @@ const gridColModel = {
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
 			width: '9', fixed: false, align: 'center',
-			sortable: false, editable: true, formatter: 'select', edittype: 'select',
-			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT},
-			editrules: {required: true}
+			sortable: false, editable: false, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT}
 		},
 		{
 			index: 'CURR', name: 'curr',
@@ -163,7 +165,8 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '10', fixed: false, align: 'center',
 			sortable: true, editable: true, edittype: 'text',
-			editrules: {required: true}
+			editrules: {required: true},
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'UNIT_TARGET_CD', name: 'unitTargetCd',
@@ -177,7 +180,21 @@ const gridColModel = {
 			index: 'SPPLY_UNIT_AMT', name: 'spplyUnitAmt',
 			label: ITP_MSG_LOCALE.label.spplyUnitAmt, //공급단가
 			width: '6', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false,
+			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+			
+		},
+		{
+			index: 'SPPLY_NM', name: 'spplyNm',
+			label: ITP_MSG_LOCALE.label.spplyNm, //공급단가
+			width: '6', fixed: false, align: 'left',
+			sortable: false
+		},
+		{
+			index: 'SPPLY_ID', name: 'spplyId',
+			label: ITP_MSG_LOCALE.label.spplyId, //공급단가
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: true
 		}
 	]
 };
@@ -212,6 +229,8 @@ let pageObj = {
 			$('#ITP_TAB_STINFO06010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 			$('#ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
 			$('#ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker('setDate', new Date());
+			
+			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(STINFO06010_GRID_ID, STINFO06010_GRID_LIST, 'lg');
@@ -362,8 +381,25 @@ let pageObj = {
 		} else if(mode == 'MODIFY') { // 수정
 			$('#ITP_AJAX_STINFO06010_DETAIL_CONTAINER').show();
 			if(fn_make_user_info.get('authTpCd') === '50') {
+				//console.log("1111111111111111111111111111");
 				fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_CANCELLIST']);
+				//$('#ITP_STINFO06010_DETAIL_jqGrid_list').jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
+				
+				//$('#ITP_STINFO06010_DETAIL_jqGrid_list').jqGrid('showCol',["spplyNm","spplyUnitAmt"])
+				
+				//$('#ITP_STINFO06010_DETAIL_jqGrid').jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
+				//$('#ITP_STINFO06010_DETAIL_jqGridView').jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
+				
+				
+				
 			} else {
+				//console.log("22222222222222222222222");
+				//$('#ITP_STINFO06010_DETAIL_jqGrid_list').jqGrid('showCol',["spplyNm","spplyUnitAmt"]);
+				//$('#ITP_STINFO06010_DETAIL_jqGrid').jqGrid('showCol',["spplyNm","spplyUnitAmt"]);
+				//$('#ITP_STINFO06010_DETAIL_jqGridView').jqGrid('showCol',["spplyNm","spplyUnitAmt"]);
+				
+				
+				
 				fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_CANCELLIST', '#ITP_BTN_STINFO06010_SAVE']);
 			}
 			$('#ITP_BTN_STINFO06010_DETAIL_SEARCH_STORE').attr('disabled', true);
@@ -374,6 +410,7 @@ let pageObj = {
 		} else if(mode == 'VIEW') { // 보기
 			$('#ITP_AJAX_STINFO06010_VIEW_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_MODIFY', '#ITP_BTN_STINFO06010_CANCELLIST']);
+			
 		}
 		this.screenMode = mode;
 	}
@@ -524,7 +561,8 @@ let modifyObj = {
 				param: param,
 				url: DOMAIN + API_DETAIL_INFO,
 				loadComplete: function(data) {
-					console.log(data);
+					//console.log("12121212121212");
+					//$(STINFO06010_DETAIL_GRID_LIST).jqGrid('hideCol',["spplyNm","spplyUnitAmt"]);
 					createObj.rows = data.gridRows;
 					itp_fn_grid_load_complete(data, STINFO06010_DETAIL_GRID_ID, false, 'number', 'STINFO06010', modifyObj.itp_STINFO06010_search, modifyObj.empty, true, data.gridRecords, true);
 				},