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

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -38,14 +38,14 @@ const gridColModel = {
 		{
 			index: 'SHMT_REQ_UNQ_NO', name: 'shmtReqUnqNo',
 			label: ITP_MSG_LOCALE.label.shmtReqUnqNo,			// 출하지시번호
-			minwidth: 130,
+			minwidth: 170,
 			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.pchPodrUnqNo,			// 발주번호
-			minwidth: 130,
+			minwidth: 170,
 			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -66,7 +66,7 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
-			minwidth: 140,
+			minwidth: 170,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -124,7 +124,7 @@ const gridColModel = {
 			index: 'WHS_DT', name: 'whsDt',
 			label: ITP_MSG_LOCALE.label.whsDt,					// 입고일
 			width: '9', fixed: false, align: 'center',
-			minwidth: 100,
+			minwidth: 110,
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG04010.js

@@ -45,7 +45,7 @@ const gridColModel = {
 			index: 'SHMT_REQ_UNQ_NO', name: 'colCmdUnqNo',
 			label: '수거번호',										// 수거지시번호
 			width: '10', fixed: false, align: 'center',
-			minwidth: 160,
+			minwidth: 170,
 			sortable: false, hidden: false
 		},
 		{
@@ -59,7 +59,7 @@ const gridColModel = {
 			index: 'PCH_PODR_DTL_NO', name: 'rtnPodrUnqNo',
 			label: ITP_MSG_LOCALE.label.rtnPodrUnqNo,			// 반품발주번호
 			width: '9', fixed: false, align: 'center',
-			minwidth: 160,
+			minwidth: 170,
 			sortable: false, hidden: false
 		},
 		{
@@ -80,7 +80,7 @@ const gridColModel = {
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
 			width: '10', fixed: false, align: 'center',
-			minwidth: 160,
+			minwidth: 170,
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/rtnmng/ITP_RTNMNG03010.js

@@ -85,30 +85,34 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
 			label: '반품장소', 
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: '공급사명', 
 			width: '10', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
 			width: '14', fixed: false, align: 'center',
+			minwidth: 170,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
-			minwidth: 110,
+			minwidth: 200,
 			width: '9', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},

src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -50,7 +50,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
 			width: '10', fixed: false, align: 'left',
-			minwidth: 180,
+			minwidth: 190,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -89,7 +89,7 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
 			width: '7', fixed: false, align: 'left',
-			minwidth: 180,
+			minwidth: 190,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{

src/main/webapp/js/app/stockmng/ITP_STOCKMNG03010.js

@@ -92,14 +92,14 @@ const gridColModel = {
 		{
 			index: 'UNIT', name: 'unit',
 			label: "단위", 
-			width: '6', fixed: false, align: 'center',
+			width: '4', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
 			label: "적정재고수량", 
 			classes: 'input_color',
-			width: '10', fixed: false, align: 'right',
+			width: '9', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false},
 			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');", maxlength: 10},

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

@@ -149,55 +149,108 @@
 				</div>
 				<div class="itp_note_header Work">
 					<h1>주요업무</h1>
-				</div>			
-				<div class="itp_icon_bar">
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_ODER"><img src="../img/main_icon/oder.png"></button>
-					</div>
-					<div class="itp_icon md">
-						<button id="ITP_MAIN_ICON_ODER_PRO"><img src="../img/main_icon/oder_pro.png"></button>
-					</div>
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_WHS"><img src="../img/main_icon/whs.png"></button>
+				</div>	
+				<div id="ITP_BRAND_ICON_BAR" style="display: none;"><!-- 브랜드 로그인 메인화면 -->
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_ODER"><img src="../img/main_icon/oder.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_ODER_PRO"><img src="../img/main_icon/oder_pro.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_WHS"><img src="../img/main_icon/whs.png"></button>
+						</div>
 					</div>
-				</div>
-				<div class="itp_icon_bar">
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_RETURN"><img src="../img/main_icon/return.png"></button>
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_RETURN"><img src="../img/main_icon/return.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_RETURN_PRO"><img src="../img/main_icon/return_pro.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_RETURN_GO"><img src="../img/main_icon/return_go.png"></button>
+						</div>
 					</div>
-					<div class="itp_icon md">
-						<button id="ITP_MAIN_ICON_RETURN_PRO"><img src="../img/main_icon/return_pro.png"></button>
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_AMT"><img src="../img/main_icon/amt.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_NO_AMT"><img src="../img/main_icon/amt_cdd.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_DASH_BOARDS"><img src="../img/main_icon/Dashboards.png"></button>
+						</div>
 					</div>
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_RETURN_GO"><img src="../img/main_icon/return_go.png"></button>
+					<div class="itp_icon_bar mb">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_AMT"><img src="../img/main_icon/deposit.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_NO_AMT"><img src="../img/main_icon/no_amt.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_DASH_BOARDS"><img src="../img/main_icon/Sales.png"></button>
+						</div>
 					</div>
 				</div>
-				<div class="itp_icon_bar">
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_AMT"><img src="../img/main_icon/amt.png"></button>
+				<div id="ITP_STR_ICON_BAR" style="display: none;"><!-- 매장 로그인 메인화면 -->
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_ODER"><img src="../img/main_icon/str_oder.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_STR_ODER_INFO"><img src="../img/main_icon/str_oder_info.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_WHS"><img src="../img/main_icon/whs.png"></button>
+						</div>
 					</div>
-					<div class="itp_icon md">
-						<button id="ITP_MAIN_ICON_NO_AMT"><img src="../img/main_icon/no_amt.png"></button>
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_RETURN"><img src="../img/main_icon/str_return.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_STR_RETURN_INFO"><img src="../img/main_icon/return.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_RETURN_GO"><img src="../img/main_icon/return_go.png"></button>
+						</div>
 					</div>
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_DASH_BOARDS"><img src="../img/main_icon/Dashboards.png"></button>
+					<div class="itp_icon_bar mb">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_AMT_INFO"><img src="../img/main_icon/str_amt_info.png"></button>
+						</div>
+						<div class="itp_icon md">
+							<button id="ITP_MAIN_ICON_STR_NO_AMT_INFO"><img src="../img/main_icon/str_no_amt_info.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_DASH_BOARDS"><img src="../img/main_icon/Dashboards.png"></button>
+						</div>
 					</div>
 				</div>
-				<div class="itp_icon_bar">
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_AMT"><img src="../img/main_icon/amt.png"></button>
-					</div>
-					<div class="itp_icon md">
-						<button id="ITP_MAIN_ICON_NO_AMT"><img src="../img/main_icon/no_amt.png"></button>
+				<div id="ITP_SPY_ICON_BAR" style="display: block;"><!-- 공급사 로그인 메인화면 -->
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_ODER"><img src="../img/main_icon/spy_new.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_ODER_INFO"><img src="../img/main_icon/spy_info.png"></button>
+						</div>
 					</div>
-					<div class="itp_icon">
-						<button id="ITP_MAIN_ICON_DASH_BOARDS"><img src="../img/main_icon/Dashboards.png"></button>
+					<div class="itp_icon_bar">
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_ODER"><img src="../img/main_icon/spy_col_new.png"></button>
+						</div>
+						<div class="itp_icon">
+							<button id="ITP_MAIN_ICON_STR_ODER_INFO"><img src="../img/main_icon/spy_col_now.png"></button>
+						</div>
 					</div>
 				</div>
 				
 				
-				
-				
 				<!-- 나중에 다른 화면으로 옮기면됨 -->
 				
 				<!-- <div class="itp_note_header">

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

@@ -698,6 +698,7 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #ITP_MAIN_CONTAINER .itp_icon_bar {width:332px; display:flex; margin:auto; margin-bottom:40px;}
 #ITP_MAIN_CONTAINER .itp_icon_bar .itp_icon {}
 #ITP_MAIN_CONTAINER .itp_icon_bar .md {margin:0 28px;}
+#ITP_MAIN_CONTAINER .mb {margin-bottom:0;}
 #ITP_MAIN_CONTAINER .itp_icon_bar .itp_icon button{width:92px; height:92px; padding:0; border:none;}
 #ITP_MAIN_CONTAINER .itp_icon_bar .itp_icon button:hover {opacity:0.5; background: transparent;}
 #ITP_MAIN_CONTAINER .itp_icon_bar .itp_icon button img{width:92px;}