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

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

@@ -46,7 +46,11 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">공급엄체번호</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-10 itp_in fnSpplyId"></div>
+												<div class="itp_form_change">
+													<div class="col-xs-7 itp_in">
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyid" value="" readonly="readonly">
+													</div>
+												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">기업형태 *</label>
 											<div class="col-xs-4 itp_ip">

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

@@ -24,13 +24,13 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_STT_DT" class="form-control itp_input" name="contSttDt" value="">
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_STT_DT" class="form-control itp_input" name="fromDt" value="">
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_END_DT" class="form-control itp_input" name="contEndDt" value="">
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_END_DT" class="form-control itp_input" name="toDt" value="">
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_VENDINFO03010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sStCd">
+											<select id="ITP_FORM_VENDINFO03010_SERVICE_UNIT_ST_CD" data-select-code="UNIT_ST_CD" class="form-control itp_input" name="sunitStCd">
 												<option value="N">상태(대기/진행/폐기)</option>
 											</select>										
 										</div>

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

@@ -374,7 +374,7 @@ let modifyObj = {
 		
 		$('#ITP_FORM_VENDINFO01010_DETAIL .fnBrandNm').text(result.brandNm);									// 브랜드
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_ST_CD').val(result.stCd);				// 상태
-		$('#ITP_FORM_VENDINFO01010_DETAIL .fnSpplyId').text(result.spplyId);									// 공급업체번호
+		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID').val(result.spplyId);									// 공급업체번호
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO').val(result.bsnsRegNo);	// 사업자번호
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO').val(result.corpRegNo);	// 법인번호
 		$('#ITP_FORM_VENDINFO01010_DETAIL .fnRegId').text(result.sysRegId);										// 등록자

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

@@ -81,7 +81,7 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},
 		{
-			index: 'STATUS', name: 'status',
+			index: 'UNIT_ST_NM', name: 'unitStNm',
 			label: ITP_MSG_LOCALE.label.status, 	//상태
 			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
@@ -309,3 +309,5 @@ let listObj = {
         }
     }
 };
+
+console.log(CONN_KEY);

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

@@ -46,7 +46,11 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">공급엄체번호</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-10 itp_in fnSpplyId"></div>
+												<div class="itp_form_change">
+													<div class="col-xs-7 itp_in">
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyid" value="" readonly="readonly">
+													</div>
+												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">기업형태 *</label>
 											<div class="col-xs-4 itp_ip">

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

@@ -24,13 +24,13 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_STT_DT" class="form-control itp_input" name="contSttDt" value="">
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_STT_DT" class="form-control itp_input" name="fromDt" value="">
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_END_DT" class="form-control itp_input" name="contEndDt" value="">
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_END_DT" class="form-control itp_input" name="toDt" value="">
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_VENDINFO03010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sStCd">
+											<select id="ITP_FORM_VENDINFO03010_SERVICE_UNIT_ST_CD" data-select-code="UNIT_ST_CD" class="form-control itp_input" name="sunitStCd">
 												<option value="N">상태(대기/진행/폐기)</option>
 											</select>										
 										</div>

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

@@ -374,7 +374,7 @@ let modifyObj = {
 		
 		$('#ITP_FORM_VENDINFO01010_DETAIL .fnBrandNm').text(result.brandNm);									// 브랜드
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_ST_CD').val(result.stCd);				// 상태
-		$('#ITP_FORM_VENDINFO01010_DETAIL .fnSpplyId').text(result.spplyId);									// 공급업체번호
+		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID').val(result.spplyId);									// 공급업체번호
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_BSNS_REG_NO').val(result.bsnsRegNo);	// 사업자번호
 		$('#ITP_FORM_VENDINFO01010_DETAIL #ITP_FORM_VENDINFO01010_DETAIL_CORP_REG_NO').val(result.corpRegNo);	// 법인번호
 		$('#ITP_FORM_VENDINFO01010_DETAIL .fnRegId').text(result.sysRegId);										// 등록자

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

@@ -81,7 +81,7 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},
 		{
-			index: 'STATUS', name: 'status',
+			index: 'UNIT_ST_NM', name: 'unitStNm',
 			label: ITP_MSG_LOCALE.label.status, 	//상태
 			width: '7', fixed: false, align: 'center',
 			sortable: false, hidden: false
@@ -309,3 +309,5 @@ let listObj = {
         }
     }
 };
+
+console.log(CONN_KEY);