add reject request and page flow fixed

This commit is contained in:
Zain Fauzan Rofie Azizi
2018-03-23 16:26:56 +08:00
parent 46dcaa4f30
commit b0f536f924
9 changed files with 265 additions and 238 deletions
@@ -76,6 +76,10 @@
<!-- Page content start -->
<main class="fix-top-menu">
<form>
<div class="form-divider"></div>
<div class="form-label-divider">
<span class="label-span">List of Items</span>
</div>
<!-- Content List Spawner Start Here -->
<div class="form-divider"></div>
<div class="list-box-emp">
+6 -1
View File
@@ -75,8 +75,13 @@
<!-- Header area end -->
<!-- Page content start -->
<main class="fix-top-menu">
<form>
<form>
<div class="form-divider"></div>
<div class="form-label-divider">
<span class="label-span">List of Items</span>
</div>
<!-- Content List Spawner Start Here -->
<div class="form-divider"></div>
<div class="list-box-emp">
<a href="arrangements-warehouse_receive_note1.2.html" class="list-item">
+1 -1
View File
@@ -81,7 +81,7 @@
<a href="javascript:void(0);" class="list-item" data-popup="formPopup">
<i class="fa fa-plus"></i>
<em class="seperate"></em>
<span class="list-item-title">Add New</span>
<span class="list-item-title">Add New Note</span>
</a>
<!-- Content List Spawner Start Here -->
+8 -75
View File
@@ -81,9 +81,12 @@
<a href="javascript:void(0);" class="list-item" data-popup="formPopup">
<i class="fa fa-plus"></i>
<em class="seperate"></em>
<span class="list-item-title">Add New</span>
<span class="list-item-title">Add New Note</span>
</a>
<div class="form-divider"></div>
<div class="form-label-divider">
<span class="label-span">List of Notes</span>
</div>
<!-- Content List Spawner Start Here -->
<div class="form-divider"></div>
@@ -108,6 +111,7 @@
<!-- Content List Spawner End Here -->
</div>
</form>
</main>
<!-- Page content end -->
@@ -205,77 +209,6 @@
<input type="text" class="form-element" placeholder="1/00002" disabled required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Description</label>
</div>
<input type="text" class="form-element" placeholder="Item is missing" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Total Carton(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="0" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Total Carton(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="0" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Balanced</label>
</div>
<input type="text" class="form-element" placeholder="1 carton" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Measurement(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Measurement(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Weight(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Weight(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Damages</label>
</div><br>
<label><input type="radio" name="gender" /> Yes</label>
<label class="form-element"><input type="radio" name="gender" /> No</label>
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Status</label>
</div>
<input type="text" class="form-element" placeholder="Matched/Unmatched/Damaged/Matched Damaged/Unmatched Damaged" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Photo</label>
@@ -297,9 +230,9 @@
</div>
<!-- Warehouse Receive Note Details End Here-->
</div>
<div class="popup-footer"></div>
<div class="popup-footer">
<div class="form-divider"></div>
<a href="arrangements-warehouse_receive_note2.html"><span class="button blue" data-dismiss="true">Submit</span></a>
<a href="arrangements-warehouse_receive_note_review3.html"><span class="button blue" data-dismiss="true">Submit</span></a>
</div>
<div class="form-divider"></div>
</div>
@@ -62,7 +62,7 @@
<div class="form-element-title">
<label style="color: #000">Transporter Company Name</label>
</div>
<input type="text" class="form-element" placeholder="DHL" disabled/>
<input type="text" class="form-element" placeholder="SF Express" disabled/>
</div>
<div class="form-row no-padding">
@@ -103,7 +103,7 @@
<!-- Warehouse Receive Note start -->
<div class="form-divider"></div>
<div class="form-row txt-center">
<a href="arrangements-warehouse_receive_note_review2.html"><span class="button green">Details</span></a>
<a href="arrangements-warehouse_receive_note_review3.html"><span class="button green">Details</span></a>
</div>
<div class="form-divider"></div>
</form>
@@ -1,159 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>AzureUI - VIEW RECEIVE NOTE2</title>
<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/global.style.css">
</head>
<body>
<div class="wrapper">
<div class="wrapper-inline">
<!-- Header area start -->
<header style="background-color: #FFF">
<a class="go-back-link" href="javascript:history.back();"><i class="fa fa-arrow-left"></i></a>
<h1 id="HT" class="page-title" style="color: #000">Warehouse Receive Note</h1>
</header>
<!-- Header area end -->
<!-- Warehouse Receive Note start -->
<main class="fix-top-menu">
<section class="container">
<form>
<div class="form-divider"></div>
<div class="form-label-divider">
<span class="label-span">Warehouse Receive Note : STEAM/12345/0001</span>
</div>
<div class="form-divider"></div>
<div class="form-row-group with-icons-no-padding">
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Marking Number</label>
</div>
<input type="text" class="form-element" placeholder="STEAM/12345/0001/00003" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Transport Company Name</label>
</div>
<input type="text" class="form-element" placeholder="SF Express" disabled/>
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Consignment Note</label>
</div>
<input type="text" class="form-element" placeholder="00001" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Warehouse Receive Note Number</label>
</div>
<input type="text" class="form-element" placeholder="00001/00002" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Receiving Person</label>
</div>
<input type="text" class="form-element" placeholder="John" disabled/>
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Product Description</label>
</div>
<input type="text" class="form-element" placeholder="Television" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Total Carton(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="22" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Total Carton(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="22" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">CBM(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="22.00x22.00x22.00" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">CBM(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="22.00x22.00x22.00" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Weight(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="22.00" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Weight(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="22.00" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Status</label>
</div>
<input type="text" class="form-element" placeholder="Matched/Unmatched/Damaged/Matched Damaged/Unmatched Damaged" disabled />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Photo</label>
</div>
<div class="form-divider"></div>
<div class="form-row txt-center">
<div class="profile-image">
<div class="profile-image-item">
<img id="CompanyProfile" src="avatar.png" width="210" height="110" />
</div>
<div class="form-divider-2"></div>
<input id="fileInput" type="file" style="display:none;" />
</div>
</div>
<div class="form-divider"></div>
</div>
</div>
<!-- Warehouse Receive Note end -->
<div class="form-divider"></div>
<div class="form-row txt-center">
<a href="arrangements-warehouse_receive_note1.1.html"><span class="button green">Finish</span></a>
</div>
<div class="form-divider"></div>
</form>
</section>
</main>
<!-- Page content end -->
</div>
</div>
<script src="js/jquery-3.2.1.min.js"></script>
<script src="js/global.script.js"></script>
</body>
</html>
@@ -0,0 +1,123 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>AzureUI - WAREHOUSE RECEIVE NOTE</title>
<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/global.style.css">
</head>
<body>
<div class="nav-menu">
<nav class="menu">
<!-- profile logo start -->
<div class="nav-header">
<a href="home.html"><img src="images/CIEF.png" width="160"></a>
</div>
<!-- profile logo end -->
<!-- Menu navigation start -->
<div class="nav-container">
<ul class="main-menu">
<li>
<a href="home.html"><i class="fa fa-home"></i> Home</a>
</li>
<li>
<a href="#"><i class="fa fa-bell"></i> Notice</a>
</li>
<li>
<a href="javascript:void(0);"><i class="fa fa-briefcase"></i> Arrangement <span class="fa fa-angle-down"></span></a>
<ul>
<li><a href="arrangements-warehouse_receive_note1.html" data-loader="show"><i class="fa fa-industry"></i> Warehouse Receive Note</a></li>
<li><a href="arrangements-shipment_arrangements1.html" data-loader="show"><i class="fa fa-ship"></i> Shipment Arrangement</a></li>
<li><a href="arrangements-delivery_arrangements1.html" data-loader="show"><i class="fa fa-truck"></i> Delivery Arrangement</a></li>
</ul>
</li>
<li>
<a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Orders <span class="fa fa-angle-down"></span></a>
<ul>
<li><a href="shipping-order.html" data-loader="show"><i class="fa fa-truck"></i> Shipping Order</a></li>
</ul>
</li>
<li>
<a href="custom_declaration.html"><i class="fa fa-suitcase"></i> Custom Declaration</a>
</li>
<li>
<a href="#"><i class="fa fa-comments"></i> Messenger</a>
</li>
<li>
<a href="javascript:void(0);"><i class="fa fa-shopping-cart"></i> Track Order</a>
</li>
<li>
<a href="example-element.html"><i class="fa fa-code"></i>Example Element</a>
</li>
</ul>
</div>
<!-- Menu navigation end -->
</nav>
</div>
<div class="wrapper">
<div class="wrapper-inline">
<!-- Header area start -->
<header style="background-color: #FFF">
<a class="go-back-link" href="javascript:history.back();"><i class="fa fa-arrow-left"></i></a>
<h1 id="HT" class="page-title" style="color: #000">Warehouse Receive Note</h1>
<div class="navi-menu-button">
<em></em>
<em></em>
<em></em>
</div>
</header>
<!-- Header area end -->
<!-- Page content start -->
<main class="fix-top-menu">
<form>
<div class="form-divider"></div>
<div class="form-label-divider">
<span class="label-span">List of Items</span>
</div>
<!-- Content List Spawner Start Here -->
<div class="form-divider"></div>
<div class="list-box-emp">
<a href="arrangements-warehouse_receive_note_review4.html" class="list-item">
<i class="fa fa-plus"></i>
<em class="seperate"></em>
<span class="list-item-title">Item 1</span>
</a>
</div>
<div class="list-box-emp">
<a href="arrangements-warehouse_receive_note_review4.html" class="list-item">
<i class="fa fa-plus"></i>
<em class="seperate"></em>
<span class="list-item-title">Item 2</span>
</a>
</div>
<div class="list-box-emp">
<a href="arrangements-warehouse_receive_note_review4.html" class="list-item">
<i class="fa fa-plus"></i>
<em class="seperate"></em>
<span class="list-item-title">Item 3</span>
</a>
</div>
<div class="form-divider"></div>
<!-- Content List Spawner End Here -->
</div>
</form>
</main>
<!-- Page content end -->
</div>
</div>
<script src="js/jquery-3.2.1.min.js"></script>
<script src="js/global.script.js"></script>
</body>
</html>
@@ -0,0 +1,113 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>AzureUI - VIEW RECEIVE NOTE1</title>
<link href="https://fonts.googleapis.com/css?family=Nunito:400,600,700,900" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/global.style.css">
</head>
<body>
<div class="wrapper">
<div class="wrapper-inline">
<!-- Header area start -->
<header style="background-color: #FFF">
<a class="go-back-link" href="javascript:history.back();" a><i class="fa fa-arrow-left"></i></a>
<h1 id="HT" class="page-title" style="color: #000">Warehouse Receive Note</h1>
</header>
<!-- Header area end -->
<!-- Page content start -->
<main class="fix-top-menu">
<section class="container">
<form>
<div class="form-divider"></div>
<!-- Warehouse Receive Note start -->
<div class="form-label-divider">
<span class="label-span">Item Details</span>
</div>
<div class="form-divider"></div>
<div class="form-row-group with-icons-no-padding">
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Total Carton(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="0" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Total Carton(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="0" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Balanced</label>
</div>
<input type="text" class="form-element" placeholder="1 carton" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Measurement(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Measurement(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Weight(Nominal)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Weight(Actual)</label>
</div>
<input type="text" class="form-element" placeholder="0.00" required />
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Damages</label>
</div><br>
<label><input type="radio" name="gender" /> Yes</label>
<label class="form-element"><input type="radio" name="gender" /> No</label>
</div>
<div class="form-row no-padding">
<div class="form-element-title">
<label style="color: #000">Status</label>
</div>
<input type="text" class="form-element" placeholder="Matched/Unmatched/Damaged/Matched Damaged/Unmatched Damaged" required />
</div>
</div>
<!-- Warehouse Receive Note start -->
</form>
</section>
</main>
<!-- Page content end -->
</div>
</div>
<script src="js/jquery-3.2.1.min.js"></script>
<script src="js/global.script.js"></script>
</body>
</html>
+8
View File
@@ -1351,6 +1351,14 @@ select.form-element{
font-size: 16px;
color: #069;
}
.list-box-emp .list-item .list-item-title-edit{
font-weight: 700;
display: inline-block;
line-height: 28px;
float: right;
font-size: 16px;
color: #069;
}
.list-box-emp .list-item .seperate{
display: block;
float: left;