From ea90ec18fb104fc3d7595408ab1d9041e85860b0 Mon Sep 17 00:00:00 2001
From: "gary_chen\\gary_chen" <gary_chen@masada.com.tw>
Date: Tue, 31 Oct 2023 17:47:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E5=A4=A7=E6=97=A5=E7=A8=8B?=
 =?UTF-8?q?=E6=AC=84=E4=BD=8D=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/wipwhole-index-table-html.php          | 28 +++++++++++++---------
 wms/wipwhole-renovate-index-table-html.php | 25 ++++++++++++-------
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/wms/wipwhole-index-table-html.php b/wms/wipwhole-index-table-html.php
index 85d7fff0..9e4155d3 100644
--- a/wms/wipwhole-index-table-html.php
+++ b/wms/wipwhole-index-table-html.php
@@ -11,16 +11,17 @@ $tableArr = array(
 <table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered " style="width:100%;table-layout:fixed;">
     <thead>
         <tr>
-            <th style="text-align:center;width:150px;">合約號</th>
-            <th style="text-align:center;width:150px;">電梯編號</th>
-            <th style="text-align:center;width:200px;">客戶姓名</th>
-            <th style="text-align:center;width:230px;">規格</th>
-            <th style="text-align:center;width:250px;">地址</th>
-            <th style="text-align:center;width:100px;">工勘狀態</th>
-            <th style="text-align:center;width:140px;">下單日(普來特富)</th>
-            <th style="text-align:center;width:140px;">預計到廠日(觀音廠)</th>
-            <th style="text-align:center;width:140px;">實際到廠日(觀音廠)</th>
-            <th style="text-align:center;width:140px;">預計出貨日(到工地)</th>
+            <th style="text-align:center;width:120px;">合約號</th>
+            <th style="text-align:center;width:120px;">電梯編號</th>
+            <th style="text-align:center;width:150px;">客戶姓名</th>
+            <th style="text-align:center;width:150px;">規格</th>
+            <th style="text-align:center;width:150px;">地址</th>
+            <th style="text-align:center;width:80px;">工勘狀態</th>
+            <th style="text-align:center;width:100px;">下單日(普來特富)</th>
+            <th style="text-align:center;width:100px;">預計到廠日(觀音廠)</th>
+            <th style="text-align:center;width:100px;">實際到廠日(觀音廠)</th>
+            <th style="text-align:center;width:100px;">預計出貨日(到工地)</th>
+            <th style="text-align:center;width:100px;">實際出貨日(到工地)</th>
             <th style="text-align:center;width:100px;">營業確認</th>
             <th style="text-align:center;width:100px;">設計確認</th>
             <th style="text-align:center;width:100px;">工務確認</th>
@@ -172,7 +173,12 @@ $tableArr = array(
                     echo "<td></td>";
                 }
                 ?>
-
+                <td>
+                    <?php
+                    if (!empty($data['real_arrival_date']))
+                        echo date("Y/m/d", strtotime($data['real_arrival_date']));
+                    ?>
+                </td>
                 <td>
                     <?php
                     $str = $data['yingyeok'] . "/5";
diff --git a/wms/wipwhole-renovate-index-table-html.php b/wms/wipwhole-renovate-index-table-html.php
index c0518c49..93195ebf 100644
--- a/wms/wipwhole-renovate-index-table-html.php
+++ b/wms/wipwhole-renovate-index-table-html.php
@@ -11,17 +11,18 @@ $tableArr = array(
 <table id="<?php echo $tableArr[$key]; ?>" class="table table-striped table-bordered  dt-responsive nowrap" style="width:98.5%">
     <thead>
         <tr>
-            <th style="text-align:center;width:150px;">合約號</th>
+            <th style="text-align:center;width:120px;">合約號</th>
             <th style="text-align:center;width:100px;">汰改種類</th>
-            <th style="text-align:center;width:150px;">電梯編號</th>
-            <th style="text-align:center;width:200px;">客戶姓名</th>
-            <th style="text-align:center;width:230px;">規格</th>
-            <th style="text-align:center;width:250px;">地址</th>
+            <th style="text-align:center;width:120px;">電梯編號</th>
+            <th style="text-align:center;width:150px;">客戶姓名</th>
+            <th style="text-align:center;width:150px;">規格</th>
+            <th style="text-align:center;width:150px;">地址</th>
             <th style="text-align:center;width:100px;">工勘狀態</th>
-            <th style="text-align:center;width:140px;">下單日(普來特富)</th>
-            <th style="text-align:center;width:140px;">預計到廠日(觀音廠)</th>
-            <th style="text-align:center;width:140px;">實際到廠日(觀音廠)</th>
-            <th style="text-align:center;width:140px;">預計出貨日(到工地)</th>
+            <th style="text-align:center;width:100px;">下單日(普來特富)</th>
+            <th style="text-align:center;width:100px;">預計到廠日(觀音廠)</th>
+            <th style="text-align:center;width:100px;">實際到廠日(觀音廠)</th>
+            <th style="text-align:center;width:100px;">預計出貨日(到工地)</th>
+            <th style="text-align:center;width:100px;">實際出貨日(到工地)</th>
             <th style="text-align:center;width:100px;">工務確認</th>
             <th style="text-align:center;width:100px;">契約確認</th>
             <th style="text-align:center;width:100px;">設計確認</th>
@@ -179,6 +180,12 @@ $tableArr = array(
                     echo "<td></td>";
                 }
                 ?>
+                <td>
+                    <?php
+                    if (!empty($data['real_arrival_date']))
+                        echo date("Y/m/d", strtotime($data['real_arrival_date']));
+                    ?>
+                </td>
                 <td>
                     <?php
                     $str = $data['gongwuok'] . "/3";