Inicio Explorar Axuda
Rexistro Iniciar sesión
orderqueen
/
oqpo-view
Seguir 3
Destacar 0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

yhl88 %!s(int64=2) %!d(string=hai) anos
pai
fa3839acb4 844fefb955
achega
d3a8219d11
Modificáronse 3 ficheiros con 121 adicións e 15 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 54 0
      src/main/webapp/app/inoutmng/INOUTMNG01010.html
  2. 54 0
      src/main/webapp/app/inoutmng/INOUTMNG03010.html
  3. 13 15
      src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

+ 54 - 0
src/main/webapp/app/inoutmng/INOUTMNG01010.html
Ver ficheiro 

@@ -6,6 +6,7 @@
6 6 
 				<div class="pull-right itp_cicon">
7 7 
 					<button type="button" id="ITP_BTN_INOUTMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8 8 
 					<button type="button" id="ITP_BTN_INOUTMNG01010_OUT" class="btn btn-success btn-sm OUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;출하지시&nbsp;&nbsp;</button>
9 
+					<button type="button" id="ITP_BTN_INOUTMNG01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
9 10 
 				</div>
10 11 
 			</div>
11 12 
 			<div class="itp_det_in">
 
@@ -63,6 +64,59 @@
63 64 
 						</div>
64 65 
 					</div>
65 66 
 				</div>
67 
+				<div id="ITP_AJAX_INOUTMNG01010_VIEW_CONTAINER" >
68 
+					<div class="itp_form itp_type1 fix">
69 
+						<div class="col-xs-12">
70 
+							<form id="ITP_FORM_INOUTMNG01010_VIEW" class="form-horizontal">
71 
+								<input type="hidden" id="ITP_FORM_INOUTMNG01010_VIEW_" name="" value="">
72 
+								<section class="itp_form_sec">
73 
+									<h4 class="itp_form_tit">출하지시 기본정보</h4>
74 
+									<div class="itp_form_in">
75 
+										<div class="form-group">
76 
+											<label class="col-xs-2 itp_lb">브랜드</label>
77 
+											<div class="col-xs-4 itp_ip">
78 
+												<div class="col-xs-7 itp_in">
79 
+													<div class="fnBrandNm"></div>
80 
+												</div>
81 
+											</div>
82 
+											<label class="col-xs-2 itp_lb">납품일자 *</label>
83 
+											<div class="col-xs-4 itp_ip">
84 
+												<div class="col-xs-7 itp_in">
85 
+													<input type="date" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_DT" data-check-required="empty" class="form-control itp_input" name="dlvDt" value="">
86 
+												</div>
87 
+											</div>
88 
+										</div>
89 
+										<div class="form-group border">
90 
+											<label class="col-xs-2 itp_lb">납품담당자 *</label>
91 
+											<div class="col-xs-4 itp_ip">
92 
+												<div class="col-xs-7 itp_in">
93 
+													<input type="text" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_MGR_NM" data-check-required="empty" class="form-control itp_input" name="dlvMgrNm" value="">
94 
+												</div>
95 
+											</div>
96 
+											<label class="col-xs-2 itp_lb">납품담당자 전화번호*</label>
97 
+											<div class="col-xs-4 itp_ip">
98 
+												<div class="col-xs-7 itp_in">
99 
+													<input type="text" id="ITP_FORM_INOUTMNG01010_VIEW_DLV_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="dlvMgrTelNo" value="">
100 
+												</div>
101 
+											</div>
102 
+										</div>
103 
+									</div>
104 
+								</section>
105 
+							</form>
106 
+						</div>
107 
+					</div>
108 
+					<div class="itp_table fix">
109 
+						<div class="itp_table_head fix" style="background:#f5f5f5;">
110 
+							<h4 class="itp_table_tit">출하지시 품목</h4>
111 
+						</div>
112 
+						<div id="ITP_INOUTMNG01010_VIEW_jqGrid_list" class="itp_tb_list">
113 
+							<div id="ITP_INOUTMNG01010_VIEW_jqGridView" class="itp_views fix"></div>
114 
+							<table id="ITP_INOUTMNG01010_VIEW_jqGrid"></table>
115 
+							<div id="ITP_INOUTMNG01010_VIEW_jqGridPager"></div>
116 
+							<div id="ITP_INOUTMNG01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
117 
+						</div>
118 
+					</div>
119 
+				</div>
66 120 
 			</div>
67 121 
 		</article>
68 122 
 	</div>

+ 54 - 0
src/main/webapp/app/inoutmng/INOUTMNG03010.html
Ver ficheiro 

@@ -5,6 +5,7 @@
5 5 
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>수거지시</strong></h2>
6 6 
 				<div class="pull-right itp_cicon">
7 7 
 					<button type="button" id="ITP_BTN_INOUTMNG03010_SRH" class="btn btn-success btn-sm CUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수거지시&nbsp;&nbsp;</button>
8 
+					<button type="button" id="ITP_BTN_INOUTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
8 9 
 				</div>
9 10 
 			</div>
10 11 
 			<div class="itp_det_in">
 
@@ -62,6 +63,59 @@
62 63 
 						</div>
63 64 
 					</div>
64 65 
 				</div>
66 
+				<div id="ITP_AJAX_INOUTMNG03010_VIEW_CONTAINER" >
67 
+					<div class="itp_form itp_type1 fix">
68 
+						<div class="col-xs-12">
69 
+							<form id="ITP_FORM_INOUTMNG03010_VIEW" class="form-horizontal">
70 
+								<input type="hidden" id="ITP_FORM_INOUTMNG03010_VIEW_" name="" value="">
71 
+								<section class="itp_form_sec">
72 
+									<h4 class="itp_form_tit">수거지시 기본정보</h4>
73 
+									<div class="itp_form_in">
74 
+										<div class="form-group">
75 
+											<label class="col-xs-2 itp_lb">브랜드</label>
76 
+											<div class="col-xs-4 itp_ip">
77 
+												<div class="col-xs-7 itp_in">
78 
+													<div class="fnBrandNm"></div>
79 
+												</div>
80 
+											</div>
81 
+											<label class="col-xs-2 itp_lb">수거지시일 *</label>
82 
+											<div class="col-xs-4 itp_ip">
83 
+												<div class="col-xs-7 itp_in">
84 
+													<input type="date" id="ITP_FORM_INOUTMNG03010_VIEW_COL_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
85 
+												</div>
86 
+											</div>
87 
+										</div>
88 
+										<div class="form-group border">
89 
+											<label class="col-xs-2 itp_lb">수거담당자 *</label>
90 
+											<div class="col-xs-4 itp_ip">
91 
+												<div class="col-xs-7 itp_in">
92 
+													<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_REQ_MGR_NM" data-check-required="empty" class="form-control itp_input" name="colReqMgrNm" value="">
93 
+												</div>
94 
+											</div>
95 
+											<label class="col-xs-2 itp_lb">수거담당자 전화번호*</label>
96 
+											<div class="col-xs-4 itp_ip">
97 
+												<div class="col-xs-7 itp_in">
98 
+													<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_REQ_MGR_TEL_NO" data-check-required="empty" class="form-control itp_input" name="colReqMgrTelNo" value="">
99 
+												</div>
100 
+											</div>
101 
+										</div>
102 
+									</div>
103 
+								</section>
104 
+							</form>
105 
+						</div>
106 
+					</div>
107 
+					<div class="itp_table fix">
108 
+						<div class="itp_table_head fix" style="background:#f5f5f5;">
109 
+							<h4 class="itp_table_tit">수거지시 품목</h4>
110 
+						</div>
111 
+						<div id="ITP_INOUTMNG03010_VIEW_jqGrid_list" class="itp_tb_list">
112 
+							<div id="ITP_INOUTMNG03010_VIEW_jqGridView" class="itp_views fix"></div>
113 
+							<table id="ITP_INOUTMNG03010_VIEW_jqGrid"></table>
114 
+							<div id="ITP_INOUTMNG03010_VIEW_jqGridPager"></div>
115 
+							<div id="ITP_INOUTMNG03010_VIEW_jqGridEmpty" class="itp_no_data"></div>
116 
+						</div>
117 
+					</div>
118 
+				</div>
65 119 
 			</div>
66 120 
 		</article>
67 121 
 	</div>

+ 13 - 15
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js
Ver ficheiro 

@@ -124,7 +124,6 @@ let mobContentObj = {
124 124 
 		},
125 125 
 		itemAdd: function(rows) {
126 126 
 			var _this = this;
127 
-			console.log(rows);
128 127 
 			$.each(rows, function(index, item) {
129 128 
 				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
130 129 
 				var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
 
@@ -197,25 +196,24 @@ let mobContentObj = {
197 196 
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
198 197 
 			itp_fn_form_clear_validate(null, formId);
199 198 
 			if (itp_fn_form_event.isValid(formId)) {
200 
-				this.callbackFn('');
201 
-				// location.replace('app:barcode');
199 
+				// this.callbackApp('BRD2211000022211100000003005');
200 
+				location.replace('app:barcode');
202 201 
 				// location.href = 'app:barcode';
203 202 
 			}
204 203 
 		},
205 
-		callbackFn: function(barcode) {
204 
+		callbackApp: function(barcode) {
206 205 
 			var infoFn = function(result) {
207 
-				console.log(result);
206 
+				if(result) {
207 
+					mobContentObj.list.itemAdd([result]);
208 
+				}
209 
+			};
210 
+			const param = {
211 
+				'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
212 
+				'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
213 
+				'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
214 
+				'sBarcode': barcode
208 215 
 			};
209 
-			// const param = {
210 
-			// 	'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
211 
-			// 	'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
212 
-			// 	'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
213 
-			// 	'sBarcode': barcode
214 
-			// };
215 
-			// fn_ajax_call(API_MOBILE_BARCODE, param, callbackFn, 'GET');
216 
-			const param = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject();
217 
-			param['sBarcode'] = barcode;
218 
-			fn_ajax_call(API_MOBILE_BARCODE, JSON.stringify(param), infoFn, 'GET');
216 
+			fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
219 217 
 		}
220 218 
 	}
221 219 
 };