From 39ce14a8d670c6252ae7d894a95a9d2ba5d4215a Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 19 Dec 2023 18:36:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E7=B4=84=E6=9B=B8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=20=E9=99=84=E4=BB=B6=E4=B8=8A=E5=82=B3=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract/contract-download.php  | 29 ++++++++++++++++++-----------
 wms/contract/contract-new-apply.php |  2 +-
 wms/contract/js/alpine.js           |  2 +-
 wms/contract/prviewPdf.php          | 22 +++++++++++++++++++++-
 4 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php
index 169bbf06..17410b24 100644
--- a/wms/contract/contract-download.php
+++ b/wms/contract/contract-download.php
@@ -79,13 +79,19 @@ if(isset($_GET['id']) && $_GET['id']!=""){
             
             }
         }
-        print_r($buyArr);
-       
+
+        $sql_str = "SELECT  file_name FROM contract_apply_files WHERE contract_id = :contract_id AND deleted_at IS NULL";
+        $stmt = $conn->prepare($sql_str);
+        $stmt->bindParam(':contract_id', $id);
+        $stmt->execute();
+        $files = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        print_r($files);
+        echo "count=>" . count($files);
+        $files_count = count($files);
     }
     catch (PDOException $e ){
         die("ERROR!!!: ". $e->getMessage());
     }
-    echo $buy_total_price;
 }
 ?>
 <link rel="stylesheet" href="./styles/style.css">
@@ -113,7 +119,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
         <input type="number" x-model="buyfill2">
     </label> -->
     <?php } ?>
-    <label for="">
+    <!-- <label for="">
         <p>附件數</p>
         <select x-model="buyAffix">
             <option value="1">1</option>
@@ -122,9 +128,9 @@ if(isset($_GET['id']) && $_GET['id']!=""){
             <option value="4">4</option>
             <option value="5">5</option>
         </select>
-    </label>
+    </label> -->
     <label for="">
-        <button @click="sendBuyInputFn()">確認</button>
+        <button @click="sendBuyInputFn()">生成買賣合約書</button>
     </label>
 </div>
 <div class="contract-material-component" x-show="isbuyShow && !isBuyInputIng">
@@ -238,7 +244,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
         <p>免費保養月數(月)</p>
         <input type="number" x-model="installfill2" @keyup="sendInstallInputKeyupFn($event)" />
     </label> -->
-    <label for="">
+    <!-- <label for="">
         <p>附件數</p>
         <select x-model="installAffix" @keyup="sendInstallInputKeyupFn($event)">
             <option value="1">1</option>
@@ -247,9 +253,9 @@ if(isset($_GET['id']) && $_GET['id']!=""){
             <option value="4">4</option>
             <option value="5">5</option>
         </select>
-    </label>
+    </label> -->
     <label for="">
-        <button @click="sendInstallInputFn()">確認</button>
+        <button @click="sendInstallInputFn()">生成安裝合約書</button>
     </label>
 </div>
 <div class="contract-install-component" x-show="!isbuyShow && !isInstallInputIng" x-cloak >
@@ -348,7 +354,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
         </table>
     </div>
 
-   <form action="prviewPdf.php?&<?php echo $token_link; ?>" id="form" method="post" x-ref="form" style="display:none">
+   <form action="prviewPdf.php?id=<?php echo $id; ?>&<?php echo $token_link; ?>" id="form" method="post" x-ref="form" style="display:none">
         <input type="hidden" name="list" id="prview-list" />
         <input type="hidden" name="prviewType" id="prview-type" />
         <input type="hidden" name="standardList" id="standard-prview-list" />
@@ -390,7 +396,8 @@ if(isset($_GET['id']) && $_GET['id']!=""){
     const people = <?php echo $noteArr[1]; ?>;
     const floor = <?php echo $noteArr[2]; ?>;
     const speed = <?php echo $noteArr[3]; ?>;
-    console.log(buyArr);
+    const buyAffix =' <?php echo $files_count; ?>';
+    console.log(buyAffix);
     console.log(installArr);
     buyArr.forEach((item, idx) => {
         if(item.scale > 0){
diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index 7cf65fe2..1f2948ec 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -460,7 +460,7 @@ $person = $contract['person'];
                             <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                             <?php endif; ?>
                             <?php foreach($files as $file): ?>
-                             <a href="./images/contracts_new_files/<?php echo $file['file_name']; ?>" download ?><?php echo $file['file_name']; ?></a>
+                             <a href="./images/contracts_new_files/<?php echo $file['file_name']; ?>" download><?php echo $file['file_name']; ?></a> <?php if($status < 1): ?><span style="margin-left:10px;cursor:pointer;color:#f019">X</span><?php endif; ?><br />
                             <?php endforeach; ?>
                         </td>
                     </tr>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index 7dc17355..cad94a2d 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -18,7 +18,7 @@ const contractDownload = ()=> {
         installAffix:1,
         buyfill1: buyfill1,
         buyfill2: secondPayDeadline,
-        buyAffix:1,
+        buyAffix: buyAffix,
         css: `table { background-color: #fff; border: none; margin-top: 30px; font-family: '標楷體'; width: 600px; } table tr:nth-child(even), table tr:nth-child(odd) { background-color: #fff; } table tr { font-size: 12pt; width: 100%; } table tr h2 { font-size: 18pt; } table tr td { width: 100%; height: 100%; line-height: 2; display: flex; } table tr td.center { display: flex; justify-content: center; align-items: center; } table tr td.list { width: 100%; height: 100%; white-space: nowrap; display: flex; } table tr td.list span { width: 60px; min-height: 100%; display: block; } table tr td.list > p { display: block; text-align: justify; } table tr td.list div { max-width: calc(100% - 60px); white-space: normal; } table tr td.list div.text-justify { display: flex; width: 100%; justify-content: space-between; } table tr.date td > div { width: 100%; text-align: right; } table tr.date td > div.text-justify { display: flex; justify-content: space-between; } table td, table th { padding: 8px; }`,
         data:{
             illustrate:{
diff --git a/wms/contract/prviewPdf.php b/wms/contract/prviewPdf.php
index b31ec39e..74e54d9a 100644
--- a/wms/contract/prviewPdf.php
+++ b/wms/contract/prviewPdf.php
@@ -2,6 +2,7 @@
 include "../header.php";
 require_once('./conn.php');
 if($_POST['list']){
+    $contract_id = $_GET['id'];
     if($_POST['prviewType'] == 1){
         $isStand = ($_POST['buystandard']=="true") ? 1 : 0;
     }else{
@@ -50,6 +51,12 @@ if($_POST['list']){
             window.history.back();
         </script>";
     }
+
+    $sql_str = "SELECT file_name FROM contract_apply_files WHERE contract_id = :contract_id AND deleted_at IS NULL";
+    $stmt = $conn->prepare($sql_str);
+    $stmt->bindParam(':contract_id', $contract_id);
+    $stmt->execute();
+    $files = $stmt->fetchAll(PDO::FETCH_ASSOC);
     function numberToChinese($num) {
         $chineseNumbers = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九','十'];
         $units = ['', '十', '百', '千', '万'];
@@ -163,6 +170,7 @@ if($_POST['list']){
         css:'',
         random:'',
         init(){
+            
             const characters = '012345678901234567890123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
             const charactersLength = characters.length;
             let randomString = '';
@@ -172,7 +180,8 @@ if($_POST['list']){
                 const randomIndex = Math.floor(Math.random() * charactersLength);
                 randomString += characters.charAt(randomIndex);
             }
-            this.random = randomString
+            this.random = randomString;
+            console.log(files);
         },
         exportFn(){
             
@@ -224,6 +233,16 @@ if($_POST['list']){
                 link.click();
                 document.body.removeChild(link);
                 this.store(newtoken, formattedDate)
+
+                for(let i=0;i<files.length;i++){
+                    let filename = document.createElement('a');
+                    filename.href = './images/contracts_new_files/' + files[i].file_name;
+                    filename.setAttribute('download', filename.href); // 指定下载的文件名
+                    document.body.appendChild(filename);
+                    filename.click();
+                    document.body.removeChild(filename);
+                }
+                
             })
         },  
         store(newtoken, formattedDate){
@@ -583,6 +602,7 @@ if($_POST['list']){
    
 <script>
     
+    const files = <?php echo json_encode($files); ?>;
     const axiosClient = axios.create({
         baseURL : ``, 
     });

From b0a04ee28530c32fae0d6e8ec643e51c43102667 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Wed, 20 Dec 2023 10:40:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=88=E7=B4=84=E6=9B=B8=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6bug=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract/contract-download.php | 8 ++++----
 wms/contract/js/alpine.js          | 8 ++++----
 wms/contract/prviewPdf.php         | 6 ++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/wms/contract/contract-download.php b/wms/contract/contract-download.php
index 17410b24..b2f16d90 100644
--- a/wms/contract/contract-download.php
+++ b/wms/contract/contract-download.php
@@ -25,6 +25,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
         $stmt->execute();
         $contracts = $stmt->fetchAll(PDO::FETCH_ASSOC);
         $contract = $contracts[0];
+        $contract_apply_id = $contract['id'];
         if(($contract['status'] !== "YY" && $user_id != 'M0107') && $user_id != 'M0174'){
             echo '<script type="text/javascript">
                     alert("非法訪問。");
@@ -79,14 +80,12 @@ if(isset($_GET['id']) && $_GET['id']!=""){
             
             }
         }
-
         $sql_str = "SELECT  file_name FROM contract_apply_files WHERE contract_id = :contract_id AND deleted_at IS NULL";
+        $sql_str = "SELECT contract_apply_files.*, contract_new_apply.id as apply_id FROM contract_apply_files LEFT JOIN contract_new_apply ON contract_apply_files.contract_id = contract_new_apply.id WHERE contract_new_apply.mid = :mid AND contract_apply_files.deleted_at IS NULL";
         $stmt = $conn->prepare($sql_str);
-        $stmt->bindParam(':contract_id', $id);
+        $stmt->bindParam(':mid', $id);
         $stmt->execute();
         $files = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        print_r($files);
-        echo "count=>" . count($files);
         $files_count = count($files);
     }
     catch (PDOException $e ){
@@ -355,6 +354,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
     </div>
 
    <form action="prviewPdf.php?id=<?php echo $id; ?>&<?php echo $token_link; ?>" id="form" method="post" x-ref="form" style="display:none">
+        <input type="hidden" name="contract_apply_id" id="contract_apply_id" value="<?php echo $contract_apply_id; ?>" />
         <input type="hidden" name="list" id="prview-list" />
         <input type="hidden" name="prviewType" id="prview-type" />
         <input type="hidden" name="standardList" id="standard-prview-list" />
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index cad94a2d..fe060601 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -686,8 +686,8 @@ const contractDownload = ()=> {
                 alert('請輸入免費保養月數');
                 return;
             }
-            if(this.installfill1 < 45){
-                alert('安裝試車期限不得低於45日');
+            if(this.installfill1 < 10){
+                alert('安裝試車期限不得低於10日');
                 return;
             }
             if(this.installfill1 < 1){
@@ -1305,11 +1305,11 @@ const contractNewApply = ()=>{
                 if(res.status === 201){
                     alert('暫存成功');
                     console.log(res.data);
-                    // window.location.reload();
+                    window.location.reload();
                 }else if(res.status === 200){
                     alert('更新成功');
                     console.log(res.data);
-                    // window.location.reload();
+                    window.location.reload();
                 }
                 this.isLoading = false
             }).catch(error=>{
diff --git a/wms/contract/prviewPdf.php b/wms/contract/prviewPdf.php
index 74e54d9a..6c57d5e9 100644
--- a/wms/contract/prviewPdf.php
+++ b/wms/contract/prviewPdf.php
@@ -2,7 +2,7 @@
 include "../header.php";
 require_once('./conn.php');
 if($_POST['list']){
-    $contract_id = $_GET['id'];
+    $contract_id = $_POST['contract_apply_id'];
     if($_POST['prviewType'] == 1){
         $isStand = ($_POST['buystandard']=="true") ? 1 : 0;
     }else{
@@ -51,7 +51,6 @@ if($_POST['list']){
             window.history.back();
         </script>";
     }
-
     $sql_str = "SELECT file_name FROM contract_apply_files WHERE contract_id = :contract_id AND deleted_at IS NULL";
     $stmt = $conn->prepare($sql_str);
     $stmt->bindParam(':contract_id', $contract_id);
@@ -164,7 +163,6 @@ if($_POST['list']){
             background-color: #40C474;
         }
     </style>
-<div>123132132132</div>
 
     <div class="container"  x-data="{
         css:'',
@@ -625,7 +623,7 @@ if($_POST['list']){
 
 
     const btn =document.getElementById('btn')
-   
+   console.log(<?php echo $contract_id; ?>);
 </script>
 <?php 
 }else{