From 822549a4533cd0cc2dcf7381b4a1a0648f81f6d6 Mon Sep 17 00:00:00 2001
From: "gary_chen\\gary_chen" <gary_chen@masada.com.tw>
Date: Thu, 9 Nov 2023 09:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86=E5=A4=A7?=
 =?UTF-8?q?=E6=97=A5=E7=A8=8B=20=E7=94=B3=E8=AB=8B=E8=A8=88=E5=8A=83?=
 =?UTF-8?q?=E5=9C=96=E4=B8=8A=E5=82=B3=20=E7=9A=84=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/wipwhole-index-function.php            |  2 ++
 wms/wipwhole-rec-invoice-edit.php          | 25 +++++++++++-----------
 wms/wipwhole-renovate-index-function.php   |  2 ++
 wms/wipwhole-renovate-rec-invoice-edit.php | 22 +++++++++----------
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/wms/wipwhole-index-function.php b/wms/wipwhole-index-function.php
index 6fe832da..3f8c6d67 100644
--- a/wms/wipwhole-index-function.php
+++ b/wms/wipwhole-index-function.php
@@ -1126,6 +1126,7 @@ function getAllCustomerPlanningVerify($link, $id)
 {
     $sql = "
         SELECT
+            custom AS custom_name,
             customer_planning_verify_file,
             create_at
         FROM wipwholestatus
@@ -1134,6 +1135,7 @@ function getAllCustomerPlanningVerify($link, $id)
         AND customer_planning_verify_file IS NOT NULL
         UNION
         SELECT
+            custom_name,
             customer_planning_verify_file,
             create_at
         FROM wipwhole_change_planning_customer_details
diff --git a/wms/wipwhole-rec-invoice-edit.php b/wms/wipwhole-rec-invoice-edit.php
index 9809feae..c9f39638 100644
--- a/wms/wipwhole-rec-invoice-edit.php
+++ b/wms/wipwhole-rec-invoice-edit.php
@@ -364,21 +364,21 @@ include "wipwhole-rec-invoice-edit-submit.php";
                         </td>
                         <td style="vertical-align: middle;">附件</td>
                         <td style="vertical-align: middle;">
-                            <!-- <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
-                                                                                                                                                                if (isset($row2['change_status'])) {
-                                                                                                                                                                    echo $row2['change_status'] === 'Z' ? "" : "disabled";
-                                                                                                                                                                } else {
-                                                                                                                                                                    echo "disabled";
-                                                                                                                                                                }
-                                                                                                                                                                ?>>
+                            <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
+                                                                                                                                                            if (isset($row2['change_status'])) {
+                                                                                                                                                                echo $row2['change_status'] === 'Z' ? "" : "disabled";
+                                                                                                                                                            } else {
+                                                                                                                                                                echo "disabled";
+                                                                                                                                                            }
+                                                                                                                                                            ?>>
                             <?php
-                            echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?> -->
+                            // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
                             <?php
                             $customer_planning_verify_files = getAllCustomerPlanningVerify($link, $id);
                             foreach ($customer_planning_verify_files as $row2) :
                                 echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
-                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a><br/>";
+                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['custom_name'] . "_" . $row2['create_at'] . "</a><br/>";
                             endforeach;
                             ?>
                         </td>
@@ -1330,7 +1330,7 @@ include "wipwhole-rec-invoice-edit-submit.php";
                 <!-- <tr>
                     <td style="vertical-align: middle">發包類型</td>
                     <td>
-                        <input type='radio' name='outsourcer_type' id='outsourcer_type_I' value='I' />
+                        <input type='radio' name='outsourcer_type' id='outsourcer_type_I' value='I' checked />
                         <label for='outsourcer_type_I'>安裝</label>
                         <input type='radio' name='outsourcer_type' id='outsourcer_type_T' value='T' />
                         <label for='outsourcer_type_T'>試車</label>
@@ -1912,10 +1912,11 @@ include "wipwhole-rec-invoice-edit-submit.php";
 
     //     if (outsourcer_type === 'I') {
     //         // 預計安裝開工日
-    //         Date.prototype.addDays = function(days) {
+    //         let tmp = Date.prototype.addDays = function(days) {
     //             this.setDate(this.getDate() + days);
     //             return this;
     //         }
+    //         alert(tmp);
 
     //     }
     //     if (outsourcer_type === 'T') {
diff --git a/wms/wipwhole-renovate-index-function.php b/wms/wipwhole-renovate-index-function.php
index 72a58afd..341b2d60 100644
--- a/wms/wipwhole-renovate-index-function.php
+++ b/wms/wipwhole-renovate-index-function.php
@@ -1105,6 +1105,7 @@ function getAllCustomerPlanningVerify($link, $id)
 {
     $sql = "
         SELECT
+            custom AS custom_name,
             customer_planning_verify_file,
             create_at
         FROM wipwholestatus
@@ -1113,6 +1114,7 @@ function getAllCustomerPlanningVerify($link, $id)
         AND customer_planning_verify_file IS NOT NULL
         UNION
         SELECT
+            custom_name,
             customer_planning_verify_file,
             create_at
         FROM wipwhole_change_planning_customer_details
diff --git a/wms/wipwhole-renovate-rec-invoice-edit.php b/wms/wipwhole-renovate-rec-invoice-edit.php
index 24d8b8a6..8b35985a 100644
--- a/wms/wipwhole-renovate-rec-invoice-edit.php
+++ b/wms/wipwhole-renovate-rec-invoice-edit.php
@@ -414,21 +414,21 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                         </td>
                         <td style="vertical-align: middle;">附件</td>
                         <td style="vertical-align: middle;">
-                            <!-- <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
-                                                                                                                                                                if (isset($row2['change_status'])) {
-                                                                                                                                                                    echo $row2['change_status'] === 'Z' ? "" : "disabled";
-                                                                                                                                                                } else {
-                                                                                                                                                                    echo "disabled";
-                                                                                                                                                                }
-                                                                                                                                                                ?>>
+                            <input style="width:70%;display:inline;" type="file" id="customer_planning_verify_file" name="customer_planning_verify_file" <?php
+                                                                                                                                                            if (isset($row2['change_status'])) {
+                                                                                                                                                                echo $row2['change_status'] === 'Z' ? "" : "disabled";
+                                                                                                                                                            } else {
+                                                                                                                                                                echo "disabled";
+                                                                                                                                                            }
+                                                                                                                                                            ?>>
                             <?php
-                            echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                            ?> -->
+                            // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
+                            ?>
                             <?php
                             $customer_planning_verify_files = getAllCustomerPlanningVerify($link, $id);
                             foreach ($customer_planning_verify_files as $row2) :
                                 echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
-                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a>";
+                                    href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['custom_name'] . "_" . $row2['create_at'] . "</a></br>";
                             endforeach;
                             ?>
                         </td>
@@ -766,7 +766,7 @@ include "wipwhole-renovate-rec-invoice-edit-submit.php";
                         <td style="vertical-align: middle;">
                             <?php
                             // echo !empty($row['customer_planning_verify_file']) ? "<a id='customer_planning_verify_file_a' style='color:#00F;' href='" . $row['customer_planning_verify_file'] . "' target='_blank'>下載附件</a>" : "";
-                                                        foreach ($customer_planning_verify_files as $row2) :
+                            foreach ($customer_planning_verify_files as $row2) :
                                 echo "<a id='customer_planning_verify_file_a' style='color:#00F;' 
                                     href='" . $row2['customer_planning_verify_file'] . "' target='_blank'>下載附件_" . $row2['create_at'] . "</a>";
                             endforeach;