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

bin/src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -7,7 +7,6 @@
 					<button type="button" id="ITP_BTN_VENDINFO01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon"></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 				</div>				
 				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
 					<button type="button" id="ITP_BTN_VENDINFO01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 					<button type="button" id="ITP_BTN_VENDINFO01010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 				</div>
@@ -83,7 +82,7 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="itp_form_change">
 													<div class="col-xs-7 itp_in">
-									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO" data-check-required="empty" class="form-control itp_input" name="bsnsRegNo" value="">
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
 													</div>
 												</div>
 											</div>
@@ -101,14 +100,14 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="itp_form_change">
 													<div class="col-xs-7 itp_in">
-									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="">
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO" class="form-control itp_input" data-key-up="corpNo" name="corpRegNo" value="">
 													</div>
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="mgrTelNo" value="">
+								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="mgrTelNo" value="">
 												</div>
 											</div>
 										</div>
@@ -121,8 +120,11 @@
 													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">FAX</label>
-											<div class="col-xs-4 itp_ip">												
+											<label class="col-xs-2 itp_lb">핸드폰</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
+													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_MBL_NO" data-key-up="tel" class="form-control itp_input" name="mgrMblNo" value="">
+												</div>
 											</div>
 										</div>
 									</div>
@@ -134,10 +136,11 @@
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_EMAL_ADDR" class="form-control itp_input" name="mgrEmal" value="">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">핸드폰</label>
+											<label class="col-xs-2 itp_lb">은행</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-6 itp_in">
-													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_MBL_NO" class="form-control itp_input" name="mgrMblNo" value="">
+												<div class="col-xs-8 itp_in">
+				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
+												</select>
 												</div>
 											</div>
 										</div>
@@ -151,13 +154,8 @@
 													</select>												
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">은행</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
-												</select>
-												</div>
-											</div>
+											<label class="col-xs-2 itp_lb"></label>
+											<div class="col-xs-4 itp_ip"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
@@ -176,14 +174,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_in">
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_VENDINFO01010_DETAIL_ACCT_FILE_LOGO_FILE" class="col-xs-4 itp_in">bjb hnjnn jl</div>
-											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_VENDINFO01010_DETAIL_CORP_FILE_LOGO_FILE" class="col-xs-4 itp_in">ghgggggggggggggggggggggggggg</div>
-										</div>
-									</div>
+									
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">통장사본</label>
@@ -229,13 +220,13 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">등록자/등록일</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-2 itp_in fnRegId"></div>
+												<div class="col-xs-4 itp_in fnRegId"></div>
 												<label class="col-xs-1 itp_in">/</label>
 												<div class="col-xs-5 itp_in fnRegDt"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">수정자/수정일</label>
 											<div class="4 itp_ip">
-												<div class="col-xs-2 itp_in fnChgId"></div>
+												<div class="col-xs-4 itp_in fnChgId"></div>
 												<label class="col-xs-1 itp_in">/</label>
 												<div class="col-xs-5 itp_in fnChgDt"></div>
 											</div>

bin/src/main/webapp/app/vendinfo/VENDINFO03010.html

@@ -7,7 +7,6 @@
 					<button type="button" id="ITP_BTN_VENDINFO03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 				</div>	
 				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
 					<button type="button" id="ITP_BTN_VENDINFO03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 					<button type="button" id="ITP_BTN_VENDINFO03010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 				</div>				

bin/src/main/webapp/js/app/config.js

@@ -1700,7 +1700,7 @@ function itp_fn_grid_make_not_paging(option) {
 	});
 }
 
-function itp_fn_grid_make_local(option) { //예를 원격으로 호출하면 됨     처음url 안주던지     빈 그리드 시용
+function itp_fn_grid_make_local(option) {
 	var options = $.extend({
 		multiselect: false,
 		rownumbers: false
@@ -3038,4 +3038,5 @@ let itp_fn_attach_file = {
 			$('#' + id).append(text);
 		});
 	}
-};
+};
+

bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STORE_SPPLY.js

@@ -6,8 +6,8 @@ require(['config'], function() {
 	});
 });
 
-//let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
-let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
+let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
+//let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
 
 
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {

bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -17,6 +17,9 @@ const VENDINFO01010_DETAIL_GRID_EMPTY = 'ITP_VENDINFO01010_DETAIL_jqGridEmpty';
 let ITP_FORM_VENDINFO01010_DETAIL_IS_DUPLICATE = false;
 let ITP_FORM_VENDINFO01010_DETAIL_IS_WRITING = false;
 
+let ITP_COMMON_ASSGN_TASK = fn_make_common_cd_list(CODE_LIST, 'ASSGN_TASK', true, '담당업무');
+
+
 //API URL
 let API_SPPLY_DETAIL_GRID_LIST = '/api/spply/detail-grid-list';
 let API_SPPLY_INFO_SPPLY = '/api/spply/info-spply';
@@ -48,7 +51,7 @@ const gridColModel = {
 		},
 		{
 			index: 'ASSGN_TASK_NM', name: 'spplyMgrNm',
-			label: ITP_MSG_LOCALE.label.spplyMgrNm, //담당자명
+			label: ITP_MSG_LOCALE.label.spplyMgrNm, 	//담당자명
 			width: '20', fixed: false, align: 'center',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}
@@ -69,19 +72,16 @@ const gridColModel = {
             index: 'RPRST_TEL_NO', name: 'rprstTelNo',
             label: ITP_MSG_LOCALE.label.rprstTelNo,		// 전화번호
             width: '10', fixed: false, align: 'center',
-            sortable: false, hidden: false, editable: true, edittype: 'text'
-        },
-        {
-            index: 'RPRST_MBL_NO', name: 'rprstMblNo',
-            label: ITP_MSG_LOCALE.label.rprstMblNo,		// 핸드폰번호
-            width: '10', fixed: false, align: 'center',
-            sortable: false, hidden: false, editable: true, edittype: 'text'
+            sortable: false, hidden: false, editable: true, edittype: 'text',
+            editoptions: {'data-key-up': 'tel'}
         },
         {
-            index: 'ASSGN_TASK_NM', name: 'assgnTask',
+            index: 'ASSGN_TASK', name: 'assgnTask',
             label: ITP_MSG_LOCALE.label.assgnTaskNm,	// 담당업무
             width: '10', fixed: false, align: 'center',
-            sortable: false, hidden: false, editable: true, edittype: 'text'
+            sortable: false, editable: true, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_ASSGN_TASK},
+			editrules: {required: false}
         }
     ]
 };
@@ -97,6 +97,7 @@ let pageObj = {
         init: function () {
             this.view();
             this.grid();
+            this.form();
             this.ready();
         },
         view: function() {
@@ -110,6 +111,9 @@ let pageObj = {
                 }
             });
         },
+        form: function() {
+			itp_fn_form_event.onKeyup('#ITP_FORM_VENDINFO01010_DETAIL');
+		},
         grid: function() {
             itp_fn_jqgrid_resize(VENDINFO01010_DETAIL_GRID_ID, VENDINFO01010_DETAIL_GRID_LIST, 'lg');
             modifyObj.empty.init();
@@ -270,6 +274,7 @@ let modifyObj = {
 		},
 		addRow: function() {
 			itp_fn_grid_add_row(VENDINFO01010_DETAIL_GRID_ID, undefined, ['spplyId'], 'VENDINFO01010_DETAIL');
+			itp_fn_form_event.onKeyup(VENDINFO01010_DETAIL_GRID_ID);
 		},
 		delRow: function() {
 			itp_fn_grid_del_row(VENDINFO01010_DETAIL_GRID_ID);
@@ -385,11 +390,6 @@ let modifyObj = {
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_CORP_FILE_NO').val(result.bsnsRegFileNo);		// 사업자등록파일
 
 		pageObj.fileUpload();
-		itp_fn_attach_file.view('ITP_VENDINFO01010_DETAIL_ACCT_FILE_LOGO_FILE', result.fileBookCopyNoList,
-				'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
-		itp_fn_attach_file.view('ITP_VENDINFO01010_DETAIL_CORP_FILE_LOGO_FILE', result.fileBsnsRegNoList,
-				'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
-		
 
 		// 권한정보 리스트 조회
 		pageObj.grid.init('DETAIL', result.spplyMgrList);

bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -53,6 +53,12 @@ const gridColModel = {
 					width: '12', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
+			{
+					index: 'ITEM_ID', name: 'itemId',
+					label: ITP_MSG_LOCALE.label.itemId, //품목번호
+					width: '12', fixed: false, align: 'center',
+					sortable: false, hidden: true
+			},
 			{
 					index: 'ITEM_NM', name: 'itemNm',
 					label: ITP_MSG_LOCALE.label.itemNm, //품목명
@@ -68,7 +74,7 @@ const gridColModel = {
 			{
 					index: 'ITEM_CLASS_NM', name: 'itemClassNm',
 					label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
-					width: '15', fixed: false, align: 'center',
+					width: '12', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
 			{
@@ -92,13 +98,13 @@ const gridColModel = {
 			{
 					index: 'PCH_ITEM_YN', name: 'pchItemYn',
 					label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
-					width: '6', fixed: false, align: 'center',
+					width: '8', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
 			{
 					index: 'SALE_ITEM_YN', name: 'saleItemYn',
 					label: ITP_MSG_LOCALE.label.saleItemYn, //판매품목여부
-					width: '10', fixed: false, align: 'center',
+					width: '8', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
 	],
@@ -145,6 +151,7 @@ let pageObj = {
 			this.event.init();
 			this.fileUpload();
 			storeSpplyObj.init();
+			$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val("SPY221000002");
 	},
 	ui: {
 			init: function () {
@@ -364,7 +371,7 @@ let listObj = {
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
 					param.gridSize = $.jgrid.defaults.rowNum;
 					param.gridPage = $.jgrid.defaults.page;
-					$(VENDINFO02010_GRID_ID).setGridParam({'url': url,'data': JSON.stringify(param)}).trigger('reloadGrid');
+					$(VENDINFO02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 			},
 			create: function() {
 					if(!fn_make_user_info.isEmpty()) {
@@ -414,9 +421,9 @@ let listObj = {
 			colModel: gridColModel.list,
 			search: function() {
 					pageObj.switchScreen('LIST');
-					this.unload();
-					this.localLoad();
-//					this.load();
+//					this.unload();
+//					this.localLoad();
+					this.load();
 			},
 			localLoad: function() {
 				var option = {

bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -38,12 +38,6 @@ const gridColModel = {
 			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
-		{
-			index: 'STDD_QTY', name: 'stddQty',
-			label: ITP_MSG_LOCALE.label.stddQty, 	//기준수량
-			width: '7', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
 		{
 			index: 'CURR', name: 'curr',
 			label: ITP_MSG_LOCALE.label.curr, 		//통화
@@ -54,7 +48,8 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, 	//단가
 			width: '7', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'CONT_STT_DT', name: 'contSttDt',
@@ -74,12 +69,6 @@ const gridColModel = {
 			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
-		{
-			index: 'REG_DT', name: 'regDt',
-			label: ITP_MSG_LOCALE.label.regDt, 		//등록일
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
 		{
 			index: 'UNIT_ST_NM', name: 'unitStNm',
 			label: ITP_MSG_LOCALE.label.status, 	//상태

src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -7,7 +7,6 @@
 					<button type="button" id="ITP_BTN_VENDINFO01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon"></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 				</div>				
 				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
 					<button type="button" id="ITP_BTN_VENDINFO01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 					<button type="button" id="ITP_BTN_VENDINFO01010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 				</div>
@@ -83,7 +82,7 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="itp_form_change">
 													<div class="col-xs-7 itp_in">
-									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO" data-check-required="empty" class="form-control itp_input" name="bsnsRegNo" value="">
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO" data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
 													</div>
 												</div>
 											</div>
@@ -101,14 +100,14 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="itp_form_change">
 													<div class="col-xs-7 itp_in">
-									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="">
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO" class="form-control itp_input" data-key-up="corpNo" name="corpRegNo" value="">
 													</div>
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="mgrTelNo" value="">
+								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="mgrTelNo" value="">
 												</div>
 											</div>
 										</div>
@@ -121,8 +120,11 @@
 													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">FAX</label>
-											<div class="col-xs-4 itp_ip">												
+											<label class="col-xs-2 itp_lb">핸드폰</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-6 itp_in">
+													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_MBL_NO" data-key-up="tel" class="form-control itp_input" name="mgrMblNo" value="">
+												</div>
 											</div>
 										</div>
 									</div>
@@ -134,10 +136,11 @@
 								                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_EMAL_ADDR" class="form-control itp_input" name="mgrEmal" value="">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">핸드폰</label>
+											<label class="col-xs-2 itp_lb">은행</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-6 itp_in">
-													<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_MBL_NO" class="form-control itp_input" name="mgrMblNo" value="">
+												<div class="col-xs-8 itp_in">
+				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
+												</select>
 												</div>
 											</div>
 										</div>
@@ -151,13 +154,8 @@
 													</select>												
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">은행</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-				                             	<select id="ITP_FORM_VENDINFO01010_DETAIL_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd">
-												</select>
-												</div>
-											</div>
+											<label class="col-xs-2 itp_lb"></label>
+											<div class="col-xs-4 itp_ip"></div>
 										</div>
 									</div>
 									<div class="itp_form_in">
@@ -176,14 +174,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_in">
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_VENDINFO01010_DETAIL_ACCT_FILE_LOGO_FILE" class="col-xs-4 itp_in">bjb hnjnn jl</div>
-											<label class="col-xs-2 itp_lb"></label>
-											<div id="ITP_VENDINFO01010_DETAIL_CORP_FILE_LOGO_FILE" class="col-xs-4 itp_in">ghgggggggggggggggggggggggggg</div>
-										</div>
-									</div>
+									
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">통장사본</label>
@@ -229,13 +220,13 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">등록자/등록일</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-2 itp_in fnRegId"></div>
+												<div class="col-xs-4 itp_in fnRegId"></div>
 												<label class="col-xs-1 itp_in">/</label>
 												<div class="col-xs-5 itp_in fnRegDt"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">수정자/수정일</label>
 											<div class="4 itp_ip">
-												<div class="col-xs-2 itp_in fnChgId"></div>
+												<div class="col-xs-4 itp_in fnChgId"></div>
 												<label class="col-xs-1 itp_in">/</label>
 												<div class="col-xs-5 itp_in fnChgDt"></div>
 											</div>

src/main/webapp/app/vendinfo/VENDINFO03010.html

@@ -7,7 +7,6 @@
 					<button type="button" id="ITP_BTN_VENDINFO03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 				</div>	
 				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
 					<button type="button" id="ITP_BTN_VENDINFO03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 					<button type="button" id="ITP_BTN_VENDINFO03010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 				</div>				

src/main/webapp/js/app/config.js

@@ -1700,7 +1700,7 @@ function itp_fn_grid_make_not_paging(option) {
 	});
 }
 
-function itp_fn_grid_make_local(option) { //예를 원격으로 호출하면 됨     처음url 안주던지     빈 그리드 시용
+function itp_fn_grid_make_local(option) {
 	var options = $.extend({
 		multiselect: false,
 		rownumbers: false,
@@ -3048,4 +3048,5 @@ let itp_fn_attach_file = {
 			$('#' + id).append(img);
 		});
 	}
-};
+};
+

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STORE_SPPLY.js

@@ -6,8 +6,8 @@ require(['config'], function() {
 	});
 });
 
-//let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
-let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
+let API_POP_GRID_LIST = '/api/spply/pop-grid-list';
+//let API_POP_GRID_LIST = '/api/spply/detail-grid-list';
 
 
 function itp_fn_BIZPOP_STORE_SPPLY(parentPopFn, args, returnType) {

src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -17,6 +17,9 @@ const VENDINFO01010_DETAIL_GRID_EMPTY = 'ITP_VENDINFO01010_DETAIL_jqGridEmpty';
 let ITP_FORM_VENDINFO01010_DETAIL_IS_DUPLICATE = false;
 let ITP_FORM_VENDINFO01010_DETAIL_IS_WRITING = false;
 
+let ITP_COMMON_ASSGN_TASK = fn_make_common_cd_list(CODE_LIST, 'ASSGN_TASK', true, '담당업무');
+
+
 //API URL
 let API_SPPLY_DETAIL_GRID_LIST = '/api/spply/detail-grid-list';
 let API_SPPLY_INFO_SPPLY = '/api/spply/info-spply';
@@ -48,7 +51,7 @@ const gridColModel = {
 		},
 		{
 			index: 'ASSGN_TASK_NM', name: 'spplyMgrNm',
-			label: ITP_MSG_LOCALE.label.spplyMgrNm, //담당자명
+			label: ITP_MSG_LOCALE.label.spplyMgrNm, 	//담당자명
 			width: '20', fixed: false, align: 'center',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}
@@ -69,19 +72,16 @@ const gridColModel = {
             index: 'RPRST_TEL_NO', name: 'rprstTelNo',
             label: ITP_MSG_LOCALE.label.rprstTelNo,		// 전화번호
             width: '10', fixed: false, align: 'center',
-            sortable: false, hidden: false, editable: true, edittype: 'text'
-        },
-        {
-            index: 'RPRST_MBL_NO', name: 'rprstMblNo',
-            label: ITP_MSG_LOCALE.label.rprstMblNo,		// 핸드폰번호
-            width: '10', fixed: false, align: 'center',
-            sortable: false, hidden: false, editable: true, edittype: 'text'
+            sortable: false, hidden: false, editable: true, edittype: 'text',
+            editoptions: {'data-key-up': 'tel'}
         },
         {
-            index: 'ASSGN_TASK_NM', name: 'assgnTask',
+            index: 'ASSGN_TASK', name: 'assgnTask',
             label: ITP_MSG_LOCALE.label.assgnTaskNm,	// 담당업무
             width: '10', fixed: false, align: 'center',
-            sortable: false, hidden: false, editable: true, edittype: 'text'
+            sortable: false, editable: true, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_ASSGN_TASK},
+			editrules: {required: false}
         }
     ]
 };
@@ -97,6 +97,7 @@ let pageObj = {
         init: function () {
             this.view();
             this.grid();
+            this.form();
             this.ready();
         },
         view: function() {
@@ -110,6 +111,9 @@ let pageObj = {
                 }
             });
         },
+        form: function() {
+			itp_fn_form_event.onKeyup('#ITP_FORM_VENDINFO01010_DETAIL');
+		},
         grid: function() {
             itp_fn_jqgrid_resize(VENDINFO01010_DETAIL_GRID_ID, VENDINFO01010_DETAIL_GRID_LIST, 'lg');
             modifyObj.empty.init();
@@ -270,6 +274,7 @@ let modifyObj = {
 		},
 		addRow: function() {
 			itp_fn_grid_add_row(VENDINFO01010_DETAIL_GRID_ID, undefined, ['spplyId'], 'VENDINFO01010_DETAIL');
+			itp_fn_form_event.onKeyup(VENDINFO01010_DETAIL_GRID_ID);
 		},
 		delRow: function() {
 			itp_fn_grid_del_row(VENDINFO01010_DETAIL_GRID_ID);
@@ -385,11 +390,6 @@ let modifyObj = {
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_CORP_FILE_NO').val(result.bsnsRegFileNo);		// 사업자등록파일
 
 		pageObj.fileUpload();
-		itp_fn_attach_file.view('ITP_VENDINFO01010_DETAIL_ACCT_FILE_LOGO_FILE', result.fileBookCopyNoList,
-				'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
-		itp_fn_attach_file.view('ITP_VENDINFO01010_DETAIL_CORP_FILE_LOGO_FILE', result.fileBsnsRegNoList,
-				'form-control itp_input', 'border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;');
-		
 
 		// 권한정보 리스트 조회
 		pageObj.grid.init('DETAIL', result.spplyMgrList);

src/main/webapp/js/app/vendinfo/ITP_VENDINFO02010.js

@@ -53,6 +53,12 @@ const gridColModel = {
 					width: '12', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
+			{
+					index: 'ITEM_ID', name: 'itemId',
+					label: ITP_MSG_LOCALE.label.itemId, //품목번호
+					width: '12', fixed: false, align: 'center',
+					sortable: false, hidden: true
+			},
 			{
 					index: 'ITEM_NM', name: 'itemNm',
 					label: ITP_MSG_LOCALE.label.itemNm, //품목명
@@ -68,7 +74,7 @@ const gridColModel = {
 			{
 					index: 'ITEM_CLASS_NM', name: 'itemClassNm',
 					label: ITP_MSG_LOCALE.label.itemClassNm, //품목분류
-					width: '15', fixed: false, align: 'center',
+					width: '12', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
 			{
@@ -92,13 +98,13 @@ const gridColModel = {
 			{
 					index: 'PCH_ITEM_YN', name: 'pchItemYn',
 					label: ITP_MSG_LOCALE.label.pchItemYn, //구매품목여부
-					width: '6', fixed: false, align: 'center',
+					width: '8', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
 			{
 					index: 'SALE_ITEM_YN', name: 'saleItemYn',
 					label: ITP_MSG_LOCALE.label.saleItemYn, //판매품목여부
-					width: '10', fixed: false, align: 'center',
+					width: '8', fixed: false, align: 'center',
 					sortable: false, hidden: false
 			},
 	],
@@ -145,6 +151,7 @@ let pageObj = {
 			this.event.init();
 			this.fileUpload();
 			storeSpplyObj.init();
+			$('#ITP_FORM_VENDINFO02010_SEARCH_SPPLY_ID').val("SPY221000002");
 	},
 	ui: {
 			init: function () {
@@ -364,7 +371,7 @@ let listObj = {
 					let param = $('#ITP_FORM_VENDINFO02010_SEARCH').serializeObject();
 					param.gridSize = $.jgrid.defaults.rowNum;
 					param.gridPage = $.jgrid.defaults.page;
-					$(VENDINFO02010_GRID_ID).setGridParam({'url': url,'data': JSON.stringify(param)}).trigger('reloadGrid');
+					$(VENDINFO02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 			},
 			create: function() {
 					if(!fn_make_user_info.isEmpty()) {
@@ -414,9 +421,9 @@ let listObj = {
 			colModel: gridColModel.list,
 			search: function() {
 					pageObj.switchScreen('LIST');
-					this.unload();
-					this.localLoad();
-//					this.load();
+//					this.unload();
+//					this.localLoad();
+					this.load();
 			},
 			localLoad: function() {
 				var option = {

src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -38,12 +38,6 @@ const gridColModel = {
 			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
-		{
-			index: 'STDD_QTY', name: 'stddQty',
-			label: ITP_MSG_LOCALE.label.stddQty, 	//기준수량
-			width: '7', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
 		{
 			index: 'CURR', name: 'curr',
 			label: ITP_MSG_LOCALE.label.curr, 		//통화
@@ -54,7 +48,8 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, 	//단가
 			width: '7', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'CONT_STT_DT', name: 'contSttDt',
@@ -74,12 +69,6 @@ const gridColModel = {
 			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
-		{
-			index: 'REG_DT', name: 'regDt',
-			label: ITP_MSG_LOCALE.label.regDt, 		//등록일
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
 		{
 			index: 'UNIT_ST_NM', name: 'unitStNm',
 			label: ITP_MSG_LOCALE.label.status, 	//상태