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

src/main/webapp/app/popup/biz/BIZPOP_AFFL_BRAND.html

@@ -14,7 +14,7 @@
 									<input type="text" name="scmpyCd" id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_CD" class="form-control itp_input" placeholder="브랜드그룹코드">
 								</div>-->
 								<div class="col-xs-9 itp_ip itp_pr">
-									<input type="text" name="afflShopNm" id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_NM" class="form-control itp_input" placeholder="브랜드그룹명">
+									<input type="text" name="brandNm" id="ITP_FORM_BIZPOP_AFFL_BRAND_NM" class="form-control itp_input" placeholder="브랜드명">
 								</div>
 								<!--<div class="col-xs-4 itp_ip itp_noMar">
 									<select id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_TYPE_CD" class="form-control itp_input" name="scmpyTypeCd"></select>

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

@@ -91,7 +91,7 @@ function itp_fn_BIZPOP_AFFL_BRAND(parentPopFn, args, returnType) {
 			{
 				index: 'AFFL_SHOP_NM', name: 'afflShopNm',
 				label: '브랜드그룹명', //
-				width: '20', fixed: false, align: 'center',
+				width: '20', fixed: false, align: 'left',
 				sortable: false, hidden: false
 			},
 			{
@@ -103,7 +103,7 @@ function itp_fn_BIZPOP_AFFL_BRAND(parentPopFn, args, returnType) {
 			{
 				index: 'BRAND_NM', name: 'brandNm',
 				label: '브랜드명', //
-				width: '20', fixed: false, align: 'center',
+				width: '20', fixed: false, align: 'left',
 				sortable: false, hidden: false
 			},
 			{

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

@@ -515,18 +515,14 @@ let createObj = {
 			listObj.grid.search();
 		},
 		save: function() {
-			//console.log("====================");
 			const formId = '#ITP_FORM_STINFO02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			//console.log("1111111111111111");
-			//console.log($(formId).serializeObject());
 			if (itp_fn_form_event.isValid(formId)) {
-				//console.log("222222222222222222");
 				var modalFn = {
 					callBack: (args) => {
 						itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
 						let param = $(formId).serializeObject();
-						//console.log(JSON.stringify(param));
+						console.log(JSON.stringify(param));
 						var searhFn = function () {
 							ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
 							listObj.grid.search();

src/main/webapp/mobile/app/main.html

@@ -33,21 +33,12 @@
 				<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
 			</div>
 			<div class="logout">
-				<button id="ITP_MOBILE_BTN_LOGOUT">로그<br>아웃</button>
+				<button id="ITP_MOBILE_BTN_LOGOUT"><img src="../img/logout.png" alt=""></button>
 			</div>
 			<div class="name_info">
-				<label>
-					<div class="fnMenuNm"></div>
-				</label>
-				<label>
-					<div class="fnBrnadNm">브랜드명</div>
-				</label>
-				<label class="fnLblDash">
-					<div>-</div>
-				</label>
-				<label class="fnLblStoreNm">
-					<div class="fnStoreNm">매장명</div>
-				</label>
+				<div class="bn fnMenuNm"></div>
+				<div class="bn fnBrnadNm">브랜드명</div>
+				<div class="fnStoreNm">매장명</div>
 			</div>
 		</div>
 	</header>

src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -30,7 +30,7 @@
           <label>납품장소</label>
           <div class="search_nm">
             <div class="float_left">
-              <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
+                <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
             </div>
@@ -50,7 +50,7 @@
       </div>
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
-        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display:none;">
+        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: block;">
           <li class="list-row">
             <div class="left_info">
               <div class="check_box"><!-- class 변경 -->

src/main/webapp/mobile/css/style.css

@@ -176,7 +176,7 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
+input {margin-top: 3px; border: 1px solid #aaa; border-radius:5px; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
 select {border: 1px solid #000; height: 35px; font-size: 1rem; text-align: left; padding:0 15px;}
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
@@ -185,13 +185,16 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 55px;background-color:#F7B014;align-items: center;border-bottom: 1px solid #000;z-index: 11;}
 #ITP_WRAPPER header .header_wrap {width: 100%; height: 55px; margin: 0 auto;}
 #ITP_WRAPPER header .header_wrap .menu_logo button {width: 40px; height: 40px; float: left; padding: 0; background: transparent; border: none; margin-top: 7px; margin-left: 7px;}
-#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 35px; height: 35px; margin: 0; border-radius: 0; border: none;}
+#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 25px; height: 20px; margin: 0; border-radius: 0; border: none;}
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
-#ITP_WRAPPER header .header_wrap .name_info {width: auto; float: right;}
-#ITP_WRAPPER header .header_wrap .name_info label {width: auto; font-size: 1.1rem; }
+#ITP_WRAPPER header .header_wrap .name_info {width: 50%; height:55px; margin:0 auto; display:inline-flex;}
+#ITP_WRAPPER header .header_wrap .name_info div {width: auto; font-size: 20px; color:#eee; margin-top:17px;}
+#ITP_WRAPPER header .header_wrap .name_info div.bn {padding-right:5px; font-size:22px; margin-top:14px;}
+
 #ITP_WRAPPER header .header_wrap .logout {float: right; width: 60px;}
-#ITP_WRAPPER header .header_wrap .logout button { margin: 3px 0px; padding: 0px; width: 50px; height: 50px; border-radius: 15px; font-size: 0.8rem;}
+#ITP_WRAPPER header .header_wrap .logout button { margin: 3px 0px; width: 50px; height: 50px; border:none; font-size: 0.8rem;background: transparent;}
+#ITP_WRAPPER header .header_wrap .logout button img {width:22px;}
 
 /* 메뉴바 */
 #ITP_MENU .menu_area {position: fixed; width: 100%; height: 100%; top: 0; left: -0%; background: #000; opacity: 0.7; z-index: 12; transition: all 0.5s;}
@@ -247,24 +250,25 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   padding-top: 50px;
   font-size: 2rem;
 }
-.content {top: 55px; position: fixed; z-index: 10; width:100%; background: #fff;}
-.content .line {position: relative; display: inline-block; width: 100%; height: 35px; margin-bottom: 0px;}
+.content {z-index: 10; margin-top:5px; width:100%; background: #f4f5f4;}
+.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin-bottom: 0px;}
 .content .line div {font-weight: 700;}
-.content .line label {font-size: 1.2rem; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
+.content .line label {min-width:110px; color:#555; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
 .content .line label.pay_label {margin:38px 1%; width:98%;}
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
-.content .line .search_nm {float: right; margin-right: 2%;}
+.content .line .search_nm {float: left; margin-right: 2%;}
 .content .line .search_wrap {float:right; margin-right:10px;}
-.content .line .float_left {float: left;}
+.content .line .float_left {float: left; margin-top:2px;}
+.content .line .float_left button {float: left;	border:none;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #000; text-align: left;}
 .content .line .float_left div {font-size: 1rem; margin-top: 8px;}
-.content .line .float_left_btn {float: left; margin-top: 5px; margin-left: 5px;}
+.content .line .float_left_btn {float: left; margin-top: 0px; margin-left: 5px;}
 .content .line .float_left_btn button {padding:0; width:36px; height:36px; border-radius:5px;}
 .content .line .float_left_btn button img {width:20px; height:20px;}
 .content .line .float_left select {float: left; width: 150px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem;}
 .content .line .line_right {font-size: 2rem; float: right; margin-right: 0%;}
-.content .line .line_right div {float: right; font-size: 1.2rem; margin-top: 12px; margin-right: 30px;}
+.content .line .line_right div {float: right; font-size: 18px;; margin-top: 12px; margin-right: 30px; color:#555;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
@@ -272,7 +276,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right select.m9 {margin-right:83px;}
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
-.content .line input.date {width: 40%; margin: 10px; height: 40px; float: right; margin-right: 3%;}
+.content .line input.date {width: 40%; margin: 10px; height: 35px; float: left;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
 .content .line div.date_to {float: right; margin-right:10px;}
 .content .line div.date_to input.year {width: 120px; height: 30px;}