M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

大日程 datatable 優化

gary
gary_chen\gary_chen 2 years ago
parent
1a2e9c43cc
commit
2ed72098ec
9 changed files with 146 additions and 168 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      wms/css/dataTables.fixedColumns.min.js
  2. 30
      wms/wipwhole-index-table-html.php
  3. 19
      wms/wipwhole-index.php
  4. 30
      wms/wipwhole-renovate-index-table-html.php
  5. 78
      wms/wipwhole-renovate-index.php
  6. 36
      wms/wipwholeinstall-index-table-html.php
  7. 32
      wms/wipwholeinstall-index.php
  8. 35
      wms/wipwholeinstall-renovate-index-table-html.php
  9. 50
      wms/wipwholeinstall-renovate-index.php

4
wms/css/dataTables.fixedColumns.min.js
View File

File diff suppressed because one or more lines are too long

30
wms/wipwhole-index-table-html.php
View File

@ -8,23 +8,23 @@ $tableArr = array(
"Z" => "table_index7" "Z" => "table_index7"
); );
?> ?>
<table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered" style="width:98.5%"> <table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered " style="width:100%;table-layout:fixed;">
<thead> <thead>
<tr> <tr>
<th style="vertical-align: middle;text-align:center;">合約號</th> <th style="text-align:center;width:150px;">合約號</th>
<th style="vertical-align: middle;text-align:center;">電梯編號</th> <th style="text-align:center;width:150px;">電梯編號</th>
<th style="vertical-align: middle;text-align:center;">客戶姓名</th> <th style="text-align:center;width:200px;">客戶姓名</th>
<th style="vertical-align: middle;text-align:center;">規格</th> <th style="text-align:center;width:230px;">規格</th>
<th style="vertical-align: middle;text-align:center;">地址</th> <th style="text-align:center;width:250px;">地址</th>
<th style="vertical-align: middle;text-align:center;">工勘狀態</th> <th style="text-align:center;width:100px;">工勘狀態</th>
<th style="vertical-align: middle;text-align:center;">下單日<br />(普來特富)</th> <th style="text-align:center;width:140px;">下單日(普來特富)</th>
<th style="vertical-align: middle;text-align:center;">預計到廠日<br />(觀音廠)</th> <th style="text-align:center;width:140px;">預計到廠日(觀音廠)</th>
<th style="vertical-align: middle;text-align:center;">實際到廠日<br />(觀音廠)</th> <th style="text-align:center;width:140px;">實際到廠日(觀音廠)</th>
<th style="vertical-align: middle;text-align:center;">預計出貨日<br />(到工地)</th> <th style="text-align:center;width:140px;">預計出貨日(到工地)</th>
<th style="vertical-align: middle;text-align:center;">營業/契約確認</th> <th style="text-align:center;width:100px;">營業確認</th>
<th style="vertical-align: middle;text-align:center;">設計確認</th> <th style="text-align:center;width:100px;">設計確認</th>
<th style="vertical-align: middle;text-align:center;">工務確認</th> <th style="text-align:center;width:100px;">工務確認</th>
<th style="vertical-align: middle;text-align:center;">生管(業 務)確認</th> <th style="text-align:center;width:120px;">生管(業務)確認</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

19
wms/wipwhole-index.php
View File

@ -237,8 +237,20 @@ foreach ($dataArr as $key => $val) {
// 結束連線 // 結束連線
mysqli_close($link); mysqli_close($link);
?> ?>
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> <link href="/wms/css/select2.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> <script src="/wms/css/select2.min.js"></script>
<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
<style>
.dataTables_scrollHead .dataTable {
margin-bottom: -2px;
}
.dataTables_scrollBody .dataTable {
margin-bottom: 0;
}
table {
margin-left: 0px;
}
</style>
<script> <script>
var sheetNum = "<?php echo empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum']; ?>"; var sheetNum = "<?php echo empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum']; ?>";
@ -364,6 +376,9 @@ mysqli_close($link);
} }
$('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({ $('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({
scrollX: true,
fixedHeader: true,
scrollY: 500,
"language": { "language": {
"emptyTable": "無資料...", "emptyTable": "無資料...",
"processing": "處理中...", "processing": "處理中...",

30
wms/wipwhole-renovate-index-table-html.php
View File

@ -11,21 +11,21 @@ $tableArr = array(
<table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered dt-responsive nowrap" style="width:98.5%"> <table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered dt-responsive nowrap" style="width:98.5%">
<thead> <thead>
<tr> <tr>
<th style="vertical-align: middle;text-align:center;">合約號</th> <th style="text-align:center;width:150px;">合約號</th>
<th style="vertical-align: middle;text-align:center;">汰改種類</th> <th style="text-align:center;width:100px;">汰改種類</th>
<th style="vertical-align: middle;text-align:center;">電梯編號</th> <th style="text-align:center;width:150px;">電梯編號</th>
<th style="vertical-align: middle;text-align:center;">客戶姓名</th> <th style="text-align:center;width:200px;">客戶姓名</th>
<th style="vertical-align: middle;text-align:center;">規格</th> <th style="text-align:center;width:230px;">規格</th>
<th style="vertical-align: middle;text-align:center;">地址</th> <th style="text-align:center;width:250px;">地址</th>
<th style="vertical-align: middle;text-align:center;">工勘狀態</th> <th style="text-align:center;width:100px;">工勘狀態</th>
<th style="vertical-align: middle;text-align:center;">下單日<br />(普來特富)</th> <th style="text-align:center;width:140px;">下單日(普來特富)</th>
<th style="vertical-align: middle;text-align:center;">預計到廠日<br />(觀音廠)</th> <th style="text-align:center;width:140px;">預計到廠日(觀音廠)</th>
<th style="vertical-align: middle;text-align:center;">實際到廠日<br />(觀音廠)</th> <th style="text-align:center;width:140px;">實際到廠日(觀音廠)</th>
<th style="vertical-align: middle;text-align:center;">預計出貨日<br />(到工地)</th> <th style="text-align:center;width:140px;">預計出貨日(到工地)</th>
<th style="vertical-align: middle;text-align:center;">工務確認</th> <th style="text-align:center;width:100px;">工務確認</th>
<th style="vertical-align: middle;text-align:center;">營業/契約確認</th> <th style="text-align:center;width:100px;">契約確認</th>
<th style="vertical-align: middle;text-align:center;">設計確認</th> <th style="text-align:center;width:100px;">設計確認</th>
<th style="vertical-align: middle;text-align:center;">生管(業務)<br />確認</th> <th style="text-align:center;width:120px;">生管(業務)確認</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

78
wms/wipwhole-renovate-index.php
View File

@ -235,9 +235,22 @@ foreach ($dataArr as $key => $val) {
#結束連線 #結束連線
mysqli_close($link); mysqli_close($link);
?> ?>
<link href="/wms/css/select2.min.css" rel="stylesheet" />
<script src="/wms/css/select2.min.js"></script>
<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
<style>
.dataTables_scrollHead .dataTable {
margin-bottom: -2px;
}
.dataTables_scrollBody .dataTable {
margin-bottom: 0;
}
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> table {
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> margin-left: 0px;
}
</style>
<script> <script>
var sheetNum = "<?php echo empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum']; ?>"; var sheetNum = "<?php echo empty($_GET['sheetNum']) ? 'All' : $_GET['sheetNum']; ?>";
@ -319,64 +332,9 @@ mysqli_close($link);
} }
$('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({ $('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({
// columnDefs: [{ scrollX: true,
// width: 100, fixedHeader: true,
// targets: 0 scrollY: 500,
// },{
// width: 100,
// targets: 1
// },{
// width: 100,
// targets: 2
// },{
// width: 200,
// targets: 3
// },{
// width: 230,
// targets: 4
// },{
// width: 250,
// targets: 5
// },{
// width: 100,
// targets: 6
// }
// ,{
// width: 100,
// targets: 7
// }
// ,{
// width: 100,
// targets: 8
// }
// ,{
// width: 100,
// targets: 9
// }
// ,{
// width: 100,
// targets: 10
// }
// ,{
// width: 100,
// targets: 11
// }
// ,{
// width: 100,
// targets: 12
// }
// ,{
// width: 100,
// targets: 13
// }
// ,{
// width: 100,
// targets: 14
// }],
// fixedColumns: true,
// paging: false,
// scrollCollapse: true,
// scrollX: true,
"language": { "language": {
"emptyTable": "無資料...", "emptyTable": "無資料...",
"processing": "處理中...", "processing": "處理中...",

36
wms/wipwholeinstall-index-table-html.php
View File

@ -1,25 +1,23 @@
<table id="table_index2" class="table table-striped table-bordered" style="width:98.5%"> <table id="table_index2" class="table table-striped table-bordered" style="width:98.5%">
<thead> <thead>
<tr> <tr>
<!-- <th style="vertical-align: middle;text-align:center;">合約號</th> --> <th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
<th style="vertical-align: middle;text-align:center;">電梯編號</th> <th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
<th style="vertical-align: middle;text-align:center;">客戶姓名</th> <th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
<th style="vertical-align: middle;text-align:center;">合約地址</th> <th style="vertical-align: middle;text-align:center;width:250px;">地工地址</th>
<th style="vertical-align: middle;text-align:center;">地工地址</th> <th style="vertical-align: middle;text-align:center;width:140px;">預計出貨日</th>
<th style="vertical-align: middle;text-align:center;">預計出貨日</th> <th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
<!-- <th style="vertical-align: middle;text-align:center;">工勘狀態</th> --> <th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
<th style="vertical-align: middle;text-align:center;">發包廠商(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">發包日期(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">預計開工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">實際開工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">預計完工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
<th style="vertical-align: middle;text-align:center;">實際完工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
<th style="vertical-align: middle;text-align:center;">QC日(品證)</th> <th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
<th style="vertical-align: middle;text-align:center;">QC合格日(品證)</th> <th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
<th style="vertical-align: middle;text-align:center;">官檢日(品證)</th> <th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
<th style="vertical-align: middle;text-align:center;">移交日(營業)</th> <th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
<th style="vertical-align: middle;text-align:center;">營業人員</th>
<th style="vertical-align: middle;text-align:center;">編輯</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

32
wms/wipwholeinstall-index.php
View File

@ -177,10 +177,23 @@ foreach ($dataArr as $key => $val) {
// 結束連線 // 結束連線
mysqli_close($link); mysqli_close($link);
?> ?>
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> <link href="/wms/css/select2.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> <script src="/wms/css/select2.min.js"></script>
<script> <script src="/wms/css/dataTables.fixedColumns.min.js"></script>
<style>
.dataTables_scrollHead .dataTable {
margin-bottom: -2px;
}
.dataTables_scrollBody .dataTable {
margin-bottom: 0;
}
table {
margin-left: 0px;
}
</style>
<script>
// 設定 select2 (下拉式選單) // 設定 select2 (下拉式選單)
$(document).ready(function() { $(document).ready(function() {
$('#site_survey_contact_verify').select2(); $('#site_survey_contact_verify').select2();
@ -250,6 +263,9 @@ mysqli_close($link);
// 設置 datatable.js // 設置 datatable.js
$('#table_index2').DataTable({ $('#table_index2').DataTable({
scrollX: true,
fixedHeader: true,
scrollY: 500,
"language": { "language": {
"emptyTable": "無資料...", "emptyTable": "無資料...",
"processing": "處理中...", "processing": "處理中...",
@ -320,10 +336,10 @@ mysqli_close($link);
showNum = table.page.len(); showNum = table.page.len();
nowPage = table.page.info().page + 1; nowPage = table.page.info().page + 1;
searchContent = table.search(); 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=wipinstallrenovate&$token_link"; ?>" +
+ "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent "&showNum=" + showNum + "&nowPage=" + nowPage + "&searchContent=" + searchContent +
+ "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom "&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
+ "&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start "&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; "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no;
} }
</script> </script>

35
wms/wipwholeinstall-renovate-index-table-html.php
View File

@ -2,24 +2,23 @@
<thead> <thead>
<tr> <tr>
<th style="vertical-align: middle;text-align:center;width:70px;"><span id="th_1">汰改<br />種類</span></th> <th style="vertical-align: middle;text-align:center;width:70px;"><span id="th_1">汰改<br />種類</span></th>
<th style="vertical-align: middle;text-align:center;">電梯編號</th> <th style="vertical-align: middle;text-align:center;width:150px;">電梯編號</th>
<th style="vertical-align: middle;text-align:center;">客戶姓名</th> <th style="vertical-align: middle;text-align:center;width:150px;">客戶姓名</th>
<th style="vertical-align: middle;text-align:center;">合約地址</th> <th style="vertical-align: middle;text-align:center;width:250px;">合約地址</th>
<th style="vertical-align: middle;text-align:center;">地工地址</th> <th style="vertical-align: middle;text-align:center;width:250px;">地工地址</th>
<th style="vertical-align: middle;text-align:center;">預計出貨日</th> <th style="vertical-align: middle;text-align:center;width:140px;">預計出貨日</th>
<!-- <th style="vertical-align: middle;text-align:center;">工勘狀態</th> --> <th style="vertical-align: middle;text-align:center;width:140px;">發包廠商(工勘)</th>
<th style="vertical-align: middle;text-align:center;">發包廠商(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">發包日期(工勘)</th>
<th style="vertical-align: middle;text-align:center;">發包日期(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">預計開工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">預計開工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">實際開工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">實際開工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">預計完工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">預計完工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">實際完工日(工勘)</th>
<th style="vertical-align: middle;text-align:center;">實際完工日(工勘)</th> <th style="vertical-align: middle;text-align:center;width:140px;">QC日(品證)</th>
<th style="vertical-align: middle;text-align:center;">QC日(品證)</th> <th style="vertical-align: middle;text-align:center;width:140px;">QC合格日(品證)</th>
<th style="vertical-align: middle;text-align:center;">QC合格日(品證)</th> <th style="vertical-align: middle;text-align:center;width:140px;">官檢日(品證)</th>
<th style="vertical-align: middle;text-align:center;">官檢日(品證)</th> <th style="vertical-align: middle;text-align:center;width:140px;">移交日(營業)</th>
<th style="vertical-align: middle;text-align:center;">移交日(營業)</th> <th style="vertical-align: middle;text-align:center;width:120px;">營業人員</th>
<th style="vertical-align: middle;text-align:center;">營業人員</th> <th style="vertical-align: middle;text-align:center;width:120px;">編輯</th>
<th style="vertical-align: middle;text-align:center;">編輯</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

50
wms/wipwholeinstall-renovate-index.php
View File

@ -177,8 +177,22 @@ foreach ($dataArr as $key => $val) {
// 結束連線 // 結束連線
mysqli_close($link); mysqli_close($link);
?> ?>
<link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" /> <link href="/wms/css/select2.min.css" rel="stylesheet" />
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script> <script src="/wms/css/select2.min.js"></script>
<script src="/wms/css/dataTables.fixedColumns.min.js"></script>
<style>
.dataTables_scrollHead .dataTable {
margin-bottom: -2px;
}
.dataTables_scrollBody .dataTable {
margin-bottom: 0;
}
table {
margin-left: 0px;
}
</style>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#site_survey_contact_verify').select2(); $('#site_survey_contact_verify').select2();
@ -244,35 +258,9 @@ mysqli_close($link);
} }
$('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({ $('#table_index2,#table_index3,#table_index4,#table_index5,#table_index6,#table_index7').DataTable({
// "columns": [ scrollX: true,
// {"width": "10"}, fixedHeader: true,
// {"width": "5.5%"}, scrollY: 500,
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// {"width": "5.5%"},
// ],
// columnDefs: [{
// width: 200,
// targets: 0
// }],
// fixedColumns: true,
// paging: false,
// scrollCollapse: true,
// scrollX: true,
// scrollY: 300,
"language": { "language": {
"emptyTable": "無資料...", "emptyTable": "無資料...",
"processing": "處理中...", "processing": "處理中...",

Write Preview
Loading…
Cancel
Save