diff --git a/wms/wipwhole-index.php b/wms/wipwhole-index.php
index 2822b43a..54ca665f 100644
--- a/wms/wipwhole-index.php
+++ b/wms/wipwhole-index.php
@@ -244,9 +244,11 @@ mysqli_close($link);
     .dataTables_scrollHead .dataTable {
         margin-bottom: -2px;
     }
+
     .dataTables_scrollBody .dataTable {
         margin-bottom: 0;
     }
+
     table {
         margin-left: 0px;
     }
@@ -429,6 +431,8 @@ mysqli_close($link);
     var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
     var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
     var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
+    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
+    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
 
     var dataArr2 = {
         "All": "table_index2",
@@ -440,10 +444,23 @@ mysqli_close($link);
     }
 
     var table = $('#' + dataArr2[sheetNum]).DataTable();
+
+    // 设置排序信息
+    if (orderColumn !== '' && orderDirection !== '') {
+        table.order([orderColumn, orderDirection]).draw();
+    }
+
     table.search(searchContent).draw();
     table.page.len(showNum).draw();
     table.page((nowPage) - 1).draw('page');
 
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
     // 監聽頁碼
     table.on('page.dt', function() {
         searchDatatable(table);
@@ -465,6 +482,7 @@ mysqli_close($link);
         searchContent = table.search();
         window.location.href = "<?php echo "wipwhole-index.php?function_name=wipinstall&$token_link"; ?>" +
             "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent + "&sheetNum=" + sheetNum +
+            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
             "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
             "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_contract_arrival_date_start=" + real_contract_arrival_date_start +
             "&real_contract_arrival_date_end=" + real_contract_arrival_date_end + "&area_no=" + area_no;
diff --git a/wms/wipwhole-renovate-index.php b/wms/wipwhole-renovate-index.php
index 296e6155..67e508c9 100644
--- a/wms/wipwhole-renovate-index.php
+++ b/wms/wipwhole-renovate-index.php
@@ -431,6 +431,8 @@ mysqli_close($link);
     var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
     var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
     var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
+    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
+    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
 
     var dataArr2 = {
         "All": "table_index2",
@@ -443,10 +445,23 @@ mysqli_close($link);
 
 
     var table = $('#' + dataArr2[sheetNum]).DataTable();
+
+    // 设置排序信息
+    if (orderColumn !== '' && orderDirection !== '') {
+        table.order([orderColumn, orderDirection]).draw();
+    }
+
     table.search(searchContent).draw();
     table.page.len(showNum).draw();
     table.page((nowPage) - 1).draw('page');
 
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
     // 監聽頁碼
     table.on('page.dt', function() {
         searchDatatable(table);
@@ -469,6 +484,7 @@ mysqli_close($link);
         searchContent = table.search();
         window.location.href = "<?php echo "wipwhole-renovate-index.php?function_name=wipinstall&$token_link"; ?>" +
             "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent + "&sheetNum=" + sheetNum +
+            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
             "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
             "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_contract_arrival_date_start=" + real_contract_arrival_date_start +
             "&real_contract_arrival_date_end=" + real_contract_arrival_date_end + "&area_no=" + area_no;
diff --git a/wms/wipwholeinstall-index.php b/wms/wipwholeinstall-index.php
index b7c2377a..eea8c46a 100644
--- a/wms/wipwholeinstall-index.php
+++ b/wms/wipwholeinstall-index.php
@@ -311,12 +311,27 @@ mysqli_close($link);
     var showNum = <?php echo empty($_GET['showNum']) ? '10' : $_GET['showNum']; ?>;
     var nowPage = <?php echo empty($_GET['nowPage']) ? '1' : $_GET['nowPage']; ?>;
     var searchContent = "<?php echo empty($_GET['searchContent']) ? '' : $_GET['searchContent']; ?>";
+    var orderColumn = "<?php echo empty($_GET['orderColumn']) ? '' : $_GET['orderColumn']; ?>";
+    var orderDirection = "<?php echo empty($_GET['orderDirection']) ? '' : $_GET['orderDirection']; ?>";
 
     var table = $('#table_index2').DataTable();
+
+    // 设置排序信息
+    if (orderColumn !== '' && orderDirection !== '') {
+        table.order([orderColumn, orderDirection]).draw();
+    }
+
     table.search(searchContent).draw();
     table.page.len(showNum).draw();
     table.page((nowPage) - 1).draw('page');
 
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
     // 監聽頁碼
     table.on('page.dt', function() {
         searchDatatable(table);
@@ -336,8 +351,9 @@ mysqli_close($link);
         showNum = table.page.len();
         nowPage = table.page.info().page + 1;
         searchContent = table.search();
-        window.location.href = "<?php echo "wipwholeinstall-index.php?function_name=wipinstallrenovate&$token_link"; ?>" +
+        window.location.href = "<?php echo "wipwholeinstall-index.php?function_name=wipinstall&$token_link"; ?>" +
             "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent +
+            "&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
             "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
             "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
             "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no;
diff --git a/wms/wipwholeinstall-renovate-index.php b/wms/wipwholeinstall-renovate-index.php
index 90b257ad..3de83dfc 100644
--- a/wms/wipwholeinstall-renovate-index.php
+++ b/wms/wipwholeinstall-renovate-index.php
@@ -257,7 +257,7 @@ mysqli_close($link);
         document.getElementById("myForm").submit();
     }
 
-    $('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({
+    $('#table_index2').DataTable({
             scrollX: true,
             fixedHeader: true,
             scrollY: 500,
@@ -320,6 +320,13 @@ mysqli_close($link);
     table.page.len(showNum).draw();
     table.page((nowPage) - 1).draw('page');
 
+    // 監聽排序
+    table.on('order.dt', function() {
+        var order = table.order();
+        orderColumn = order[0][0];
+        orderDirection = order[0][1];
+    });
+
     // 監聽頁碼
     table.on('page.dt', function() {
         searchDatatable(table);