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] =?UTF-8?q?=E5=90=88=E7=B4=84=E6=9B=B8=E9=99=84=E4=BB=B6bu?=
 =?UTF-8?q?g=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{