From 7c77b46b757e6e61266df4e3c81da50a0614f0b3 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Fri, 17 Nov 2023 17:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=90=88=E7=B4=84=E7=94=B3?=
 =?UTF-8?q?=E8=AB=8B1117?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract/contract-new-apply.php | 77 ++++++++++++++++++++++-------
 wms/contract/js/alpine.js           | 11 +++--
 2 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index 15eb41f5..ee154a62 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -8,15 +8,17 @@ if(!(isset($_GET['id']) && !empty($_GET['id']))){
     exit;
 }
 $id = $_GET["id"];
-$sql_str = "SELECT pricereview_main.*, account.name as accountname
+echo $id;
+$sql_str = "SELECT pricereview_main.*, account.name as accountname, pricereview_item.*
             FROM pricereview_main
             JOIN account ON pricereview_main.person = account.accountid
+            JOIN pricereview_item ON pricereview_main.id = pricereview_item.mid
             WHERE pricereview_main.id = :id";
 $stmt = $conn->prepare($sql_str);
 $stmt->bindParam(':id',$id);
 $stmt->execute();
 $contract = $stmt->fetch(PDO::FETCH_ASSOC);
-
+print_r($contract);
 $accounttype = "M";
 $sql_str = "SELECT * FROM account WHERE accounttype = :accounttype";
 $stmt = $conn->prepare($sql_str);
@@ -29,10 +31,10 @@ $stmt = $conn->prepare($sql_str);
 $stmt->bindParam(':vol_no', $contract['contractno']);
 $stmt->execute();
 $customer = $stmt->fetch(PDO::FETCH_ASSOC);
-print_r($customer);
 ?>
 <link rel="stylesheet" href="./styles/style.css">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<link rel="stylesheet" href="semantic/dist/semantic.min.css">
 <script defer src="./js/alpinejs/cdn.min.js"></script>
 <script src="./js/axios/axios.min.js"></script>
 
@@ -134,29 +136,66 @@ print_r($customer);
                         </td>
                         <td style="vertical-align: middle">完工期限</td>
                         <td style="vertical-align: middle" colspan=3>
-                            <input class="form-control disabled_select" type="text"  x-model="data.deadline" >
+                        <div class="ui labeled input">
+                            <div class="ui label">
+                                貨抵工地
+                            </div>
+                            <input type="text" placeholder="30" style="width:45px;padding:0 8px;" x-model="data.workdeadline_a">
+                            <div class="ui label">
+                                天內安裝完成，甲方應於貨底工地前
+                            </div>
+                            <input type="text" placeholder="7" style="width:45px;padding:0 8px;" x-model="data.workdeadline_b">
+                            <div class="ui label">
+                                天完成並整理完善。
+                            </div>
+                        </div>
+                            <!-- <input class="form-control disabled_select" type="text"  x-model="data.deadline" > -->
                             <p class="alerttext" x-show="data.deadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                     </tr>
                     <tr>
                         <td style="vertical-align: middle">附則</td>
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.regulations" >
+                        <td style="vertical-align: middle" colspan=3>
+                            <div class="ui labeled input">
+                                <div class="ui label">
+                                    乙方應於
+                                </div>
+                                <input type="text" placeholder="10" style="width:45px;padding:0 8px;" x-model="data.regulations">
+                                <div class="ui label">
+                                    天內試車完成
+                                </div>
+                            </div>
                             <p class="alerttext" x-show="data.regulations==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                         <td style="vertical-align: middle">免保期限</td>
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.freedeadline" >
+                        <td style="vertical-align: middle" colspan=3>
+                            <div class="ui labeled input">
+                                <input type="text" placeholder="18" style="width:45px;padding:0 8px;" x-model="data.freedeadline">
+                                <div class="ui label">
+                                    個月
+                                </div>
+                            </div>
                             <p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
+                        
+                    </tr>
+                    <tr>
                         <td style="vertical-align: middle">交貨地點</td>
-                        <td style="vertical-align: middle">
+                        <td style="vertical-align: middle" colspan=3>
                             <input class="form-control disabled_select" type="text"  x-model="data.tradeaddress" >
                             <p class="alerttext" x-show="data.tradeaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                         <td style="vertical-align: middle">交貨期限</td>
-                        <td style="vertical-align: middle">
-                            <input class="form-control disabled_select" type="text"  x-model="data.tradedeadline" >
+                        <td style="vertical-align: middle" colspan=3>
+                            <div class="ui labeled input">
+                                <div class="ui label">
+                                    圖色確認第
+                                </div>
+                                <input type="text" placeholder="90" style="width:45px;padding:0 8px;" x-model="data.tradedeadline">
+                                <div class="ui label">
+                                    天出貨
+                                </div>
+                            </div>
                             <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
                     </tr>
@@ -444,17 +483,19 @@ print_r($customer);
     </div>
 </div>
 
+<script src="./js/jquery/jquery-3.1.1.min.js"></script>
+<script src="semantic/dist/semantic.min.js" ></script>
 <script src="./js/alpine.js"></script>
 <script>
-    const contractno = '<?php echo $contract['contractno'] ?>'
+    const contractno = '<?php echo $contract['contractno'] ?>';
     const salesman = '<?php echo $contract['person'] ?>';
     const apply_date = '<?php echo date('Y-m-d') ?>';
-    const case_name = '<?php echo $contract['case_name'] ?>'
-    const company = '<?php echo $contract['company'] ?>'
-    const manager = '<?php  echo $customer['manager'] ?>'
-    const vat = '<?php echo $customer['uscc'] ?>'
-    const price_total = <?php echo $contract['price_total'] ?>
-
+    const case_name = '<?php echo $contract['case_name'] ?>';
+    const company = '<?php echo $contract['company'] ?>';
+    const manager = '<?php  echo $customer['manager'] ?>';
+    const vat = '<?php echo $customer['uscc'] ?>';
+    const price_total = <?php echo $contract['price_total'] ?>;
+    const address = '<?php echo $contract['address'] ?>';
 
     console.log(123)
 </script>
\ No newline at end of file
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index 75318a5d..09168a20 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1188,12 +1188,13 @@ const contractNewApply = ()=>{
             total_price: price_total,
             price_a:'',
             price_b:'',
-            address:'',
-            deadline:'',
-            regulations:'', //附則
-            freedeadline:'', //免保期限
+            address: address,
+            workdeadline_a:30, //完工期限: 幾天內安裝完成，預設30
+            workdeadline_b:7, //完工期限: 幾天內整理完善，預設7
+            regulations:10, //附則
+            freedeadline:18, //免保期限(月)
             tradeaddress:'', //交貨地點
-            tradedeadline:'', //交貨期限
+            tradedeadline: 90, //交貨期限
         }
     }
 }
\ No newline at end of file