mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/IZYIM-Prototype.git
synced 2026-08-19 04:33:55 +00:00
...
This commit is contained in:
Nur Nadiah Nabilah Binti Hashinordin
@@ -159,8 +159,9 @@
|
||||
</a>
|
||||
<!-- END RESPONSIVE MENU TOGGLER -->
|
||||
<!-- BEGIN TOP NAVIGATION MENU -->
|
||||
<img style="border-radius:100%" class="media-object-4" src="../assets/layouts/layout/img/1.png" alt="...">
|
||||
|
||||
<div class="top-menu">
|
||||
<img style="margin-left:100px; margin-top:9px; border-radius:100%" class="media-object-4" src="../assets/layouts/layout/img/1.png" alt="...">
|
||||
<ul class="nav navbar-nav pull-right">
|
||||
<!-- BEGIN USER LOGIN DROPDOWN -->
|
||||
<!-- DOC: Apply "dropdown-dark" class after below "dropdown-extended" to change the dropdown styte -->
|
||||
@@ -478,33 +479,7 @@
|
||||
|
||||
<div class="portlet-body">
|
||||
<div style="margin-top:60px" class="form-group">
|
||||
<<<<<<< HEAD
|
||||
<label for="multiple" class="control-label">Select2 multi select</label>
|
||||
<select id="multiple" class="form-control select2-multiple" multiple>
|
||||
<optgroup label="Shipping Order">
|
||||
<option>Please select</option>
|
||||
<option value="000">00012 </option>
|
||||
<option value="001">00114</option>
|
||||
<option value="002">00216</option>
|
||||
<option value="004">00418</option>
|
||||
<option value="006">00624</option>
|
||||
<option value="183">18332</option>
|
||||
<option value="187">18742</option>
|
||||
<option value="197">19745</option>
|
||||
<option value="256">25654</option>
|
||||
<option value="287">28782</option>
|
||||
<option value="348">34829</option>
|
||||
<option value="368">36894</option>
|
||||
<option value="380">38090</option>
|
||||
<option value="426">42679</option>
|
||||
<option value="448">44895</option>
|
||||
<option value="468">46894</option>
|
||||
<option value="489">48939</option>
|
||||
<option value="578">57839</option>
|
||||
</optgroup>
|
||||
</select>
|
||||
=======
|
||||
<label for="so" class="col-md-2 control-label">Shipping Order</label>
|
||||
<label for="so" class="col-md-2 control-label">Shipping Order</label>
|
||||
<div class="col-md-10">
|
||||
<div class="input-group select2-bootstrap-append">
|
||||
<select id="multi-append" class="form-control select2" multiple>
|
||||
@@ -534,7 +509,7 @@
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
>>>>>>> 40777d3164b058705971944bdee1a5e66f0ab847
|
||||
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div style="margin-top:30px" class="form-group">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -466,6 +466,8 @@ License: You must have a valid license purchased only from themeforest(the above
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<button style="margin-left:180px" type="select" class="btn green">
|
||||
Select All</button>
|
||||
</div>
|
||||
<div class="table-scrollable">
|
||||
<table style="" class="table table-striped table-bordered table-hover" id="sample_3">
|
||||
@@ -562,17 +564,19 @@ License: You must have a valid license purchased only from themeforest(the above
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<div class="row">
|
||||
<div class="col-md-offset-5 col-md-5">
|
||||
<div style="margin-left:220px" class="col-md-offset-5 col-md-5">
|
||||
<button type="submit" class="btn green">
|
||||
Send</button>
|
||||
<button type="button" class="btn dark btn-outline" data-dismiss="modal">Close</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -250,7 +250,7 @@
|
||||
</center>
|
||||
</li>
|
||||
<hr>
|
||||
<li class="nav-item start ">
|
||||
<li class="nav-item">
|
||||
<a href="index.html" class="nav-link nav-toggle">
|
||||
<i class="icon-home"></i>
|
||||
<span class="title">Order Status</span>
|
||||
@@ -271,10 +271,10 @@
|
||||
<span class="arrow"></span>
|
||||
</a>
|
||||
<ul class="sub-menu">
|
||||
<li class="nav-item ">
|
||||
<a href="deliveryarrange.html" class="nav-link ">
|
||||
<i class="icon-clock"></i>
|
||||
<span class="title">Delivery Arrangement</span>
|
||||
<li class="nav-item start">
|
||||
<a href="warehousenote.html" class="nav-link ">
|
||||
<i class="icon-check"></i>
|
||||
<span class="title">Warehouse Receive Note</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
@@ -283,10 +283,10 @@
|
||||
<span class="title">Shipment Arrangement</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a href="warehousenote.html" class="nav-link ">
|
||||
<i class="icon-check"></i>
|
||||
<span class="title">Warehouse Receive Note</span>
|
||||
<li class="nav-item ">
|
||||
<a href="deliveryarrange.html" class="nav-link ">
|
||||
<i class="icon-clock"></i>
|
||||
<span class="title">Delivery Arrangement</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
@@ -444,9 +444,11 @@
|
||||
<div class="portlet-body">
|
||||
<div class="table-container">
|
||||
<div id="mask"></div>
|
||||
<button style="margin-left:800px; margin-bottom:-50px" type="select" class="btn green">
|
||||
QR Scan</button>
|
||||
<!-- <span id="switch" class="pull-right" style="margin-left:5px; margin-right:5px;">Status : <input type='checkbox' class='make-switch pull-right asdasd' checked data-size='small' data-on-color='success' data-on-text='ON' data-off-color='default' data-off-text='OFF'></span> -->
|
||||
<table id="example" class="table table-striped table-bordered table-hover order-column"></table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- End: life time stats -->
|
||||
@@ -500,15 +502,40 @@
|
||||
</div>
|
||||
<div class="tab-pane active" id="tab1">
|
||||
<h4 class="block"><b>Departure Warehouse Received Note</b></h4>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="column">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3" style="font-size: 100%">Transport Company Name</label>
|
||||
<label class="control-label col-md-3" style="font-size: 100%">Order No</label>
|
||||
<div class="col-md-9">
|
||||
<input type="text" class="form-control">
|
||||
<select class="form-control select2">
|
||||
<optgroup label="Order No">
|
||||
<option>Please choose your order</option>
|
||||
<option value="000">00012</option>
|
||||
<option value="001">00114</option>
|
||||
<option value="002">00216</option>
|
||||
<option value="004">00418</option>
|
||||
<option value="006">00624</option>
|
||||
<option value="183">18332</option>
|
||||
<option value="187">18742</option>
|
||||
<option value="197">19745</option>
|
||||
<option value="256">25654</option>
|
||||
<option value="287">28782</option>
|
||||
<option value="348">34829</option>
|
||||
<option value="368">36894</option>
|
||||
<option value="380">38090</option>
|
||||
<option value="426">42679</option>
|
||||
<option value="448">44895</option>
|
||||
<option value="468">46894</option>
|
||||
<option value="489">48939</option>
|
||||
<option value="578">57839</option>
|
||||
</optgroup>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<!--/span-->
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
@@ -561,40 +588,22 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<br>
|
||||
<br>
|
||||
<!--/span-->
|
||||
<!--/span-->
|
||||
|
||||
|
||||
<div class="column">
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3" style="font-size: 100%">Order No</label>
|
||||
<label class="control-label col-md-3" style="font-size: 98%">Transport<br> Company Name</label>
|
||||
<div class="col-md-9">
|
||||
<select class="form-control select2">
|
||||
<optgroup label="Order No">
|
||||
<option>Please choose your order</option>
|
||||
<option value="000">00012</option>
|
||||
<option value="001">00114</option>
|
||||
<option value="002">00216</option>
|
||||
<option value="004">00418</option>
|
||||
<option value="006">00624</option>
|
||||
<option value="183">18332</option>
|
||||
<option value="187">18742</option>
|
||||
<option value="197">19745</option>
|
||||
<option value="256">25654</option>
|
||||
<option value="287">28782</option>
|
||||
<option value="348">34829</option>
|
||||
<option value="368">36894</option>
|
||||
<option value="380">38090</option>
|
||||
<option value="426">42679</option>
|
||||
<option value="448">44895</option>
|
||||
<option value="468">46894</option>
|
||||
<option value="489">48939</option>
|
||||
<option value="578">57839</option>
|
||||
</optgroup>
|
||||
</select>
|
||||
<input type="text" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group" style="margin-left:33px">
|
||||
<label class="control-label col-md-2" style="font-size: 100%">Remark</label>
|
||||
@@ -603,7 +612,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button type="button" class="btn green" id="Sumbit" href="" style="margin-left: 650px" data-toggle="modal">+ Add New Form</button>
|
||||
<button type="button" class="btn green" id="Sumbit" href="" style=" margin-top:-30px;margin-left: 630px" data-toggle="modal">+ Add New Field</button>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -760,7 +769,7 @@
|
||||
</td>
|
||||
<td><a href="javascript:;" id="weight3" data-type="text" data-pk="1" data-original-title="Weight" style="color: red"> 9.8kg </a>
|
||||
</td>
|
||||
<td><a style="color: red">Unmatched <br><a style="color: red">Damage</a></td>
|
||||
<td><a style="color: red">Unmatched <br></td>
|
||||
<td>
|
||||
<label class="mt-checkbox mt-checkbox-single mt-checkbox-outline">
|
||||
<input type="checkbox" class="checkboxes" value="1">
|
||||
@@ -783,12 +792,22 @@
|
||||
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div style="margin-top: 50px; margin-left: 5px;" class="col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3" style="margin-bottom:100px; font-size: 80%">Remark</label>
|
||||
<div class="col-md-9">
|
||||
<textarea class="form-control" id="message" rows="3" placeholder="Enter a remark..."></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<div class="row">
|
||||
<div class="col-md-offset-5 col-md-9">
|
||||
<a href="javascript:;" class="btn default button-previous">
|
||||
<i class="fa fa-angle-left"></i> Back </a>
|
||||
<a href="javascript:window.open('decisionmaking.html', 'Track Order', 'width=1000,height=600');" class="btn green button-submit"> Submit
|
||||
<a onclick="confirm('Notification: Your warehouse receive note has been submitted')" data-toggle="modal" href="#marking2" class="btn green button-submit"> Submit
|
||||
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
@@ -799,16 +818,7 @@
|
||||
<br>
|
||||
<p style="color:red; font-size:90%" align="center">Notification: Please keep key in the information if there have any problem with the goods</p>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-offset-5 col-md-9">
|
||||
<a href="javascript:;" class="btn btn-outline green button-next"> Submit</a>
|
||||
<button type="button" class="btn btn-outline green button-next" data-container="body" data-toggle="popover" data-placement="top" data-html="true" data-content="<button type='button' class='btn btn-outline green button-next'></button>
|
||||
<script>
|
||||
$('#testing').click(function(){$('#decision').modal('show');})
|
||||
</script>
|
||||
"><i class="fa fa-plus-square" aria-hidden="true"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1096,12 +1106,12 @@
|
||||
|
||||
|
||||
var dataSet = [
|
||||
["01-08-2017", "ABC Warehouse", "101", "CIEF/00012/00012", "00012", "CBD SDN BHD", "00012-00012", "4", " Pallet", "10cmx10cmx10cm", "10kg", ""],
|
||||
["04-08-2017", "ABC Warehouse", "102", "CIEF/00022/00022", "00022", "CBD SDN BHD", "00022-00022", "5", " Package", "14cmx10cmx12cm", "17kg", ""],
|
||||
["11-08-2017", "ABC Warehouse", "103", "CIEF/00034/00034", "00034", "CBD SDN BHD", "00034-00034", "8", " Pallet", "16cmx10cmx17cm", "84kg", ""],
|
||||
["31-08-2017", "ABC Warehouse", "104", "CIEF/00089/00089", "00089", "CBD SDN BHD", "00089-00089", "10", " Package", "11cmx12cmx12cm", "100kg", ""],
|
||||
["01-09-2017", "ABC Warehouse", "105", "CIEF/00100/00100", "00100", "CBD SDN BHD", "00100-00100", "3", " Pallet", "19cmx20cmx20cm", "30kg", ""],
|
||||
["17-09-2017", "ABC Warehouse", "106", "CIEF/00156/00156", "00156", "CBD SDN BHD", "00156-00156", "4", " Package", "12cmx10cmx12cm", "20kg", ""],
|
||||
["01-08-2017", "ABC Warehouse", "101", "CIEF/00012/00012", "00012", "CBD SDN BHD", "00012-00012", "4", " Pallet", "12 CBM", "10kg", "", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>"],
|
||||
["04-08-2017", "ABC Warehouse", "102", "CIEF/00022/00022", "00022", "CBD SDN BHD", "00022-00022", "5", " Package", "13 CBM", "17kg", "", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>"],
|
||||
["11-08-2017", "ABC Warehouse", "103", "CIEF/00034/00034", "00034", "CBD SDN BHD", "00034-00034", "8", " Pallet", "23 CBM", "84kg", "", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>"],
|
||||
["31-08-2017", "ABC Warehouse", "104", "CIEF/00089/00089", "00089", "CBD SDN BHD", "00089-00089", "10", " Package", "54 CBM", "100kg", "", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>"],
|
||||
["01-09-2017", "ABC Warehouse", "105", "CIEF/00100/00100", "00100", "CBD SDN BHD", "00100-00100", "3", " Pallet", "10 CBM", "30kg", "", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>"],
|
||||
["17-09-2017", "ABC Warehouse", "106", "CIEF/00156/00156", "00156", "CBD SDN BHD", "00156-00156", "4", " Package", "24 CBM", "20kg", "", "<td><center><div class='btn-group'><button class='btn green btn-xs btn-circle btn-outline dropdown-toggle btiv' data-toggle='dropdown'>Actions<i class='fa fa-angle-down'></i></button><ul class='dropdown-menu'><li><a href='#'> View </a></li><li><a href='#'> Edit </a></li><li><a href='#'> Cancel </a></li></ul></div><br/></center></td>"],
|
||||
// ["7","<a style='float:center' data-toggle='modal' href='#profile'> CTN133 </a>","789ABC","01-08-2017","<span style='color:red'>02-08-2017 </span>","<span style='color:red'>04-08-2017 </span>","68679","Guangzhou","Customs Examination","03-07-2017","<span style='color:red'><strong>03-07-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
|
||||
// ["8","<a style='float:center' data-toggle='modal' href='#profile'> CTN135 </a>","789ABC","01-08-2017","<span style='color:red'>01-08-2017 </span>","<span style='color:red'>05-08-2017 </span>","12345","Dongguan","Customs Examination","03-07-2017","<span style='color:red'><strong>03-07-2017<br/>Delayed</strong></span>","Delivery Request <span style='color:#F1C40F;font-weight: 700;'>Sent</span>", "Not Completed"],
|
||||
];
|
||||
@@ -1197,7 +1207,10 @@
|
||||
title: 'Total Goods<br>Weight<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_11\')"></span>'
|
||||
}, {
|
||||
title: 'Remark<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_12\')"></span>'
|
||||
}, {
|
||||
title: 'Actions<br> <span class="fa fa-filter filterIcon blue" onclick="showFilter(event,\'example_12\')"></span>'
|
||||
},
|
||||
|
||||
// { title: 'Stats' },
|
||||
],
|
||||
|
||||
@@ -1493,7 +1506,7 @@
|
||||
|
||||
var lengths = $( "#sample_editable_1 tbody tr:nth-child(2) td" ).length;
|
||||
|
||||
$('#sample_editable_1 > tbody:last-child').append('<tr><td>'+next_count+'</td><td><input style="width: 34px;" type="text"/></td><td><input style="width: 75px;" type="text"/></td><td><input style="width: 34px;" type="text"/></td><td><input style="width: 34px;" type="text"/></td><td><input style="width: 75px;" type="text"/></td><td><input style="width: 34px;" type="text"/></td><td></td><td><label class="mt-checkbox mt-checkbox-single mt-checkbox-outline"><input type="checkbox" class="checkboxes" value="1"><span></span></label></td><td><div><span class="fileinput-new"></span><span class="fileinput-exists"></span><input type="file" name="..."></div></td>');
|
||||
$('#sample_editable_1 > tbody:last-child').append('<tr><td>'+next_count+'</td><td></td><td></td><td></td><td><input style="width: 34px;" type="text"/></td><td><input style="width: 75px;" type="text"/></td><td><input style="width: 34px;" type="text"/></td><td></td><td><label class="mt-checkbox mt-checkbox-single mt-checkbox-outline"><input type="checkbox" class="checkboxes" value="1"><span></span></label></td><td><div><span class="fileinput-new"></span><span class="fileinput-exists"></span><input type="file" name="..."></div></td>');
|
||||
|
||||
var rowCount = $('#sample_editable_1 tbody tr').length;
|
||||
$('#total').html(rowCount);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -184,11 +184,7 @@ License: You must have a valid license purchased only from themeforest(the above
|
||||
</li>
|
||||
<!-- END USER LOGIN DROPDOWN -->
|
||||
|
||||
<li class="dropdown dropdown-quick-sidebar-toggler">
|
||||
<a href="javascript:;" class="dropdown-toggle">
|
||||
<i class="icon-logout"></i>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<!-- END TOP NAVIGATION MENU -->
|
||||
|
||||
Reference in New Issue
Block a user