From 7b37600f41cc4845375cb236b783fbe3f6618944 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Thu, 16 Nov 2023 18:05:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=88=E7=B4=84=E6=9B=B8=E7=94=B3?=
 =?UTF-8?q?=E8=AB=8B=20=E6=96=B0=E6=A2=AF=201116?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract/api/postNewContractData.php    |   5 +-
 wms/contract/api/putContractData.php        |   5 +-
 wms/contract/contract-new-apply.php         | 460 ++++++++++++++++++++
 wms/contract/contract-newelevator-edit.php  |  34 +-
 wms/contract/contract-newelevator-input.php |  17 +-
 wms/contract/js/alpine.js                   |  30 ++
 wms/contract/styles/style.css               |  40 +-
 wms/contract/styles/style.css.map           |   2 +-
 wms/contract/styles/style.scss              |   6 +-
 wms/mkt/pricereview-index.php               |  10 +-
 10 files changed, 566 insertions(+), 43 deletions(-)
 create mode 100644 wms/contract/contract-new-apply.php

diff --git a/wms/contract/api/postNewContractData.php b/wms/contract/api/postNewContractData.php
index dc08c30c..001fe1f5 100644
--- a/wms/contract/api/postNewContractData.php
+++ b/wms/contract/api/postNewContractData.php
@@ -22,6 +22,7 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['co
       $lm_tel = $_POST["lm_tel"];
       $address = $_POST["address"];
       $salesman = $_POST["salesman"];
+      $qc = $_POST["qc"];
       $contracttype = $_POST["contracttype"];
       $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
       $files_id = null;
@@ -36,6 +37,7 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['co
       if(empty($lm_tel)) $fail_arr[] = '聯絡人電話為必填';
       if(empty($address)) $fail_arr[] = '地址為必填';
       if(empty($salesman)) $fail_arr[] = '營業員為必填';
+      if(empty($qc)) $fail_arr[] = '請選擇QC或官檢';
       if(count($fail_arr) > 0) {
         header("HTTP/1.1 422 Unprocessable Entity");
         echo json_encode($fail_arr);
@@ -105,7 +107,7 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['co
         $files = null;
       }
   
-      $sql_str = "INSERT INTO contract_m_signed_back (contract_no, customer, manager, vat, case_name, linkman, lm_tel, address, salesman, salesman_name, files_id, created_at, created_by) VALUES (:contract_no, :customer, :manager, :vat, :case_name, :linkman, :lm_tel, :address, :salesman, :salesman_name, :files_id, :created_at, :created_by)";
+      $sql_str = "INSERT INTO contract_m_signed_back (contract_no, customer, manager, vat, case_name, linkman, lm_tel, address, salesman, salesman_name, files_id, created_at, created_by, qc_official_type) VALUES (:contract_no, :customer, :manager, :vat, :case_name, :linkman, :lm_tel, :address, :salesman, :salesman_name, :files_id, :created_at, :created_by, :qc)";
       $stmt = $conn -> prepare($sql_str);
       $stmt -> bindParam(":contract_no",$contractno);
       $stmt -> bindParam(":customer",$customer);
@@ -120,6 +122,7 @@ if(isset($_POST["contractno"]) && $_POST["contractno"] != "" && isset($_POST['co
       $stmt -> bindParam(":files_id",$files_id);
       $stmt -> bindParam(":created_at",$created_at);
       $stmt -> bindParam(":created_by",$created_by);
+      $stmt -> bindParam(":qc",$qc);
       $stmt -> execute();
   
   
diff --git a/wms/contract/api/putContractData.php b/wms/contract/api/putContractData.php
index 63694e83..f1e78164 100644
--- a/wms/contract/api/putContractData.php
+++ b/wms/contract/api/putContractData.php
@@ -17,6 +17,7 @@ if(isset($_POST['contractno']) && $_POST['contractno']!="" && isset($_POST["id"]
         $lm_tel = !empty($_POST['lm_tel']) ? $_POST['lm_tel'] : null;
         $address = !empty($_POST['address']) ? $_POST['address'] : null;
         $salesman = !empty($_POST['salesman']) ? $_POST['salesman'] : null;
+        $qc = !empty($_POST['qc']) ? $_POST['qc'] : null;
         $deletefiles = !empty($_POST['deletefiles']) ? $_POST['deletefiles'] : null;
         $files_id = !empty($_POST['files_id']) ? $_POST['files_id'] : null;
         $files = !empty($_FILES['files']) ? $_FILES['files'] : null;
@@ -33,6 +34,7 @@ if(isset($_POST['contractno']) && $_POST['contractno']!="" && isset($_POST["id"]
         if(empty($lm_tel)) $fail_arr[] = '聯絡人電話為必填';
         if(empty($address)) $fail_arr[] = '地址為必填';
         if(empty($salesman)) $fail_arr[] = '營業員為必填';
+        if(empty($qc)) $fail_arr[] = '請選擇QC或管檢';
         if(count($fail_arr) > 0) {
             header("HTTP/1.1 422 Unprocessable Entity");
             echo json_encode($fail_arr);
@@ -41,7 +43,7 @@ if(isset($_POST['contractno']) && $_POST['contractno']!="" && isset($_POST["id"]
 
         $conn->beginTransaction();
 
-        $sql_str = "UPDATE contract_m_signed_back SET contract_no=:contract_no, customer=:customer, manager=:manager, vat=:vat, case_name=:case_name, linkman=:linkman, lm_tel=:lm_tel, address=:address, salesman=:salesman WHERE id = :id";
+        $sql_str = "UPDATE contract_m_signed_back SET contract_no=:contract_no, customer=:customer, manager=:manager, vat=:vat, case_name=:case_name, linkman=:linkman, lm_tel=:lm_tel, address=:address, salesman=:salesman, qc_official_type=:qc WHERE id = :id";
         $stmt = $conn -> prepare($sql_str);
         $stmt -> bindParam(':contract_no' ,$contract_no);
         $stmt -> bindParam(':customer' ,$customer);
@@ -52,6 +54,7 @@ if(isset($_POST['contractno']) && $_POST['contractno']!="" && isset($_POST["id"]
         $stmt -> bindParam(':lm_tel' ,$lm_tel);
         $stmt -> bindParam(':address' ,$address);
         $stmt -> bindParam(':salesman' ,$salesman);
+        $stmt -> bindParam(':qc' ,$qc);
         $stmt -> bindParam(':id' ,$id);
         $stmt -> execute();
         if(!empty($deletefiles)){
diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
new file mode 100644
index 00000000..15eb41f5
--- /dev/null
+++ b/wms/contract/contract-new-apply.php
@@ -0,0 +1,460 @@
+<?php
+include_once("../header.php");
+require_once("./conn.php");
+if(!(isset($_GET['id']) && !empty($_GET['id']))){
+    $para = "function_name=pricereview&".$token_link;
+    echo "<script>alert('非法訪問!!!');</script>";
+    echo "<script>window.history.go(-1);</script>";
+    exit;
+}
+$id = $_GET["id"];
+$sql_str = "SELECT pricereview_main.*, account.name as accountname
+            FROM pricereview_main
+            JOIN account ON pricereview_main.person = account.accountid
+            WHERE pricereview_main.id = :id";
+$stmt = $conn->prepare($sql_str);
+$stmt->bindParam(':id',$id);
+$stmt->execute();
+$contract = $stmt->fetch(PDO::FETCH_ASSOC);
+
+$accounttype = "M";
+$sql_str = "SELECT * FROM account WHERE accounttype = :accounttype";
+$stmt = $conn->prepare($sql_str);
+$stmt->bindParam(':accounttype',$accounttype);
+$stmt->execute();
+$persons = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+$sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC";
+$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" />
+<script defer src="./js/alpinejs/cdn.min.js"></script>
+<script src="./js/axios/axios.min.js"></script>
+
+<div class="contract-new-apply-component" x-data="contractNewApply">
+<div class="form" method="post" id="form" enctype="multipart/form-data" >
+        <input type="hidden" name='form_name' value="main_form" />
+        <div>
+            <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
+                <thead>
+                    <tr>
+                        <td colspan="8">
+                            <h3 style='text-align:center'>合約書申請(新梯)</h3>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody style="font-weight: bolder;margin-bottom: 20px" x-show="step==1">
+                    <tr>
+                        <td colspan="7" style='vertical-align: middle;border-right:0px;'>
+                            <h4>業務確認項</h4>
+                        </td>
+                        <td class="text-right" style='border-left:0px;'>
+                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
+                            <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">卷號</td>
+                        <td>
+                            <input class="form-control disabled_select" type="text"  x-model="data.vol_no" >
+                            <p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">營業員</td>
+                        <td>
+                            <select name="" id="" x-model="data.salesman">
+                                <option value="">請選擇營業員</option>
+                                <?php foreach($persons as $person) : ?>
+                                    <option value="<?= $person["accountid"] ?>"><?= $person['accountid'] . ' - ' . $person["name"] ?></option>
+                                <?php endforeach ?>        
+                            </select>
+                            <p class="alerttext" x-show="data.salesman==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">合約書申請日期</td>
+                        <td>
+                            <input class="form-control disabled_select" type="date" x-model="data.apply_date" >
+                            <p class="alerttext" x-show="data.apply_date==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">申請類別</td>
+                        <td style="vertical-align: middle">
+                            <select class="" id="apply_type" x-model="data.apply_type">
+                                <option value="A">制式新合約</option>
+                            </select>
+                            <p class="alerttext" x-show="data.apply_type==''"><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.case_name" >
+                            <p class="alerttext" x-show="data.case_name==''"><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.company" >
+                            <p class="alerttext" x-show="data.company==''"><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.manager" >
+                            <p class="alerttext" x-show="data.manager==''"><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.vat" >
+                            <p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">含稅給約總價</td>
+                        <td colspan="3" style="vertical-align: middle">
+                            <input class="form-control disabled_select" type="number"  x-model="data.total_price" >
+                            <p class="alerttext" x-show="data.total_price==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">含稅貸款(A)</td>
+                        <td style="vertical-align: middle">
+                            <input class="form-control disabled_select" type="number"  x-model="data.price_a" >
+                            <p class="alerttext" x-show="data.price_a==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">含稅安裝款(A)</td>
+                        <td style="vertical-align: middle">
+                            <input class="form-control disabled_select" type="number"  x-model="data.price_b" >
+                            <p class="alerttext" x-show="data.price_b==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="vertical-align: middle">聯絡地址</td>
+                        <td style="vertical-align: middle" colspan=3>
+                            <input class="form-control disabled_select" type="text"  x-model="data.address" >
+                            <p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </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" >
+                            <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" >
+                            <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" >
+                            <p class="alerttext" x-show="data.freedeadline==''"><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.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" >
+                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
+                <thead style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td colspan="1">
+                            <p style='text-align:center'>項次</p>
+                        </td>
+                        <td colspan="3">
+                            <p style='text-align:center'>規格</p>
+                        </td>
+                        <td colspan="1">
+                            <p style='text-align:center'>數量</p>
+                        </td>
+                        <td colspan="3">
+                            <p style='text-align:center'>金額</p>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td style="vertical-align: middle">1</td>
+                        <td colspan="3" style="vertical-align: middle">
+                            <input class="form-control disabled_select" type="text"  value="MAE100-6 *4-2S45" >
+                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td style="vertical-align: middle">
+                            <input class="form-control disabled_select" type="number"  value="6" >
+                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                        <td colspan="3" style="vertical-align: middle">
+                            <input class="form-control disabled_select" type="number"  value="3180000" >
+                            <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
+                <thead style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td>
+                            <p style='text-align:center'>合約類別</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>款別</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>條件名稱</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>收款條件日期區分</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>條件日期</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>票期</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>付款比率</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>金額</p>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody style="font-weight: bolder;margin-bottom: 20px">
+                    <tr>
+                        <td>
+                            <p style='text-align:center'>銷售</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>訂金</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>簽約後X天付訂金</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>合約日</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>20%</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>636000</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p style='text-align:center'>銷售</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>二次款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>簽約後X天付二次款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>合約日</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>0%%</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>0</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p style='text-align:center'>銷售</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>貨到款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>貨抵工地付貨到款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>出貨日</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>-</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>50%</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>1590000</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p style='text-align:center'>安裝</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>安裝款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>安裝完成後X天收款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>竣檢日</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>20%</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>636000</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p style='text-align:center'>安裝</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>尾款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>交車後X天付尾款</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>交車日</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>0天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>30天</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>10%</p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'>318000</p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'></p>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
+                <thead style="font-weight: bolder;margin-bottom: 20px;">
+                    <tr>
+                        <td colspan=8>
+                            <h4 style='text-align:center;font-weight: bolder'>簽核流程</h4>
+                        </td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td style="font-weight:bold">業務部協理</td>
+                        <td><span class="successtext">已通過</span></td>
+                        <td style="font-weight:bold">業務部承辦人</td>
+                        <td><span class="successtext">已通過</span></td>
+                        <td style="font-weight:bold">營業經理</td>
+                        <td><span class="successtext">已通過</span></td>
+                        <td style="font-weight:bold">營業員</td>
+                        <td><span class="successtext">已通過</span></td>
+                    </tr>
+                </tbody>
+            </table>
+            <button x-show="true" x-on:click="" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+                <template x-if="!isLoading">
+                    <span>送審</span>
+                </template>
+                <template x-if="isLoading">
+                    <div class="loader"></div>
+                </template>
+            </button>
+        </div>
+    </div>
+</div>
+
+<script src="./js/alpine.js"></script>
+<script>
+    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'] ?>
+
+
+    console.log(123)
+</script>
\ No newline at end of file
diff --git a/wms/contract/contract-newelevator-edit.php b/wms/contract/contract-newelevator-edit.php
index 3aef11fa..424a0d01 100644
--- a/wms/contract/contract-newelevator-edit.php
+++ b/wms/contract/contract-newelevator-edit.php
@@ -54,6 +54,7 @@ $persons = array_map(function($person){
         files:<?php echo $files; ?>,
         newfiles:[],
         deletefiles:[],
+        qc:"<?php echo $contract["qc_official_type"]; ?>",
         files_id: "<?php echo $contract["files_id"]; ?>",
     },
     fail_arr:[],
@@ -74,11 +75,13 @@ $persons = array_map(function($person){
         form.append("case_name", this.data.case_name);
         form.append("linkman", this.data.linkman);
         form.append("lm_tel", this.data.lm_tel);
-        form.append("address", this.data.address);
+        form.append("address", this.data.address);user_id
         form.append("salesman", this.data.salesman);
+        form.append("qc", this.data.qc);
         form.append("deletefiles", this.data.deletefiles);
         form.append("files_id", this.data.files_id);
         form.append("user_id", "<?php echo $user_id; ?>");
+        form.append("", "<?php echo $user_id; ?>");
 
         for (var i = 0; i < this.data.newfiles.length; i++) {
             form.append("files[]", this.data.newfiles[i]);
@@ -87,19 +90,8 @@ $persons = array_map(function($person){
         axios.post("./api/putContractData.php", form).then(res=>{
             console.log(res.data)
             if(res.status === 200){
-                alert("更新成功")
-                this.step = 1
-                this.data.contractno=""
-                this.data.customer=""
-                this.data.manager=""
-                this.data.vat=""
-                this.data.case_name=""
-                this.data.linkman=""
-                this.data.lm_tel=""
-                this.data.address=""
-                this.data.salesman=""
-                this.data.files=[]
-                this.customize = false
+                alert("更新成功");
+                window.location.reload();
             }
             this.isLoading = false
         }).catch(error=>{
@@ -186,8 +178,18 @@ $persons = array_map(function($person){
                         <input class="form-control disabled_select" type="text" name="uscc" x-model="data.lm_tel" >
                             <p class="alerttext" x-show="data.lm_tel==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
+                        <td style="vertical-align: middle">QC和官檢</td>
+                        <td>
+                            <select class="" id="qc" x-model="data.qc">
+                                <option value="">請選擇QC或官檢</option>
+                                <option value="Q">只需QC</option>
+                                <option value="O">只需官檢</option>
+                                <option value="QO">QC和官檢</option>
+                            </select>
+                            <p class="alerttext" x-show="data.qc==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                        </td>
                         <td style="vertical-align: middle">案件名稱</td>
-                        <td colspan=3>
+                        <td>
                             <input class="form-control disabled_select" type="text" name="uscc" x-model="data.case_name" >
                             <p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
@@ -239,6 +241,8 @@ $persons = array_map(function($person){
 <script src="semantic/dist/semantic.min.js" ></script>
 
 <script>
+    const user_id = '<?php echo $user_id; ?>';
+    const user_name = '<?php echo $user_name; ?>';
     $('#table_index').DataTable(
           {
             "order": [
diff --git a/wms/contract/contract-newelevator-input.php b/wms/contract/contract-newelevator-input.php
index a3aeccd0..77146fe4 100644
--- a/wms/contract/contract-newelevator-input.php
+++ b/wms/contract/contract-newelevator-input.php
@@ -1,5 +1,5 @@
 <?php 
-include("../header.php");
+include_once("../header.php");
 require_once("./conn.php");
 $accounttype = "M";
 $sql_str = "SELECT accountid, name FROM account WHERE accounttype = :accounttype";
@@ -99,8 +99,18 @@ $persons = array_map(function($person){
                         <input class="form-control disabled_select" type="text" name="uscc" x-model="data.lm_tel" >
                             <p class="alerttext" x-show="data.lm_tel==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
+                        <td style="vertical-align: middle">QC和官檢</td>
+                        <td>
+                            <select class="" id="qc" x-model="data.qc">
+                                <option value="">請選擇QC或官檢</option>
+                                <option value="Q">只需QC</option>
+                                <option value="O">只需官檢</option>
+                                <option value="QO">QC和官檢</option>
+                            </select>
+                            <p class="alerttext" x-show="data.qc==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
+                        </td>
                         <td style="vertical-align: middle">案件名稱</td>
-                        <td colspan=3>
+                        <td >
                             <input class="form-control disabled_select" type="text" name="uscc" x-model="data.case_name" >
                             <p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
                         </td>
@@ -111,8 +121,9 @@ $persons = array_map(function($person){
                         <input class="form-control disabled_select" type="text" name="uscc" x-model="data.address" >
                             <p class="alerttext" x-show="data.address==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>   
                         </td>
+                        
                         <td style="vertical-align: middle">附件上傳</td>
-                        <td colspan=3>
+                        <td colspan="3">
                         <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                         </td>
                     </tr>
diff --git a/wms/contract/js/alpine.js b/wms/contract/js/alpine.js
index a024da90..75318a5d 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -812,6 +812,7 @@ const contractNewInput =()=> {
             lm_tel:'',
             address:'',
             salesman:'',
+            qc:'',
             files:[],
         },
         step:1,
@@ -853,6 +854,7 @@ const contractNewInput =()=> {
                         this.data.lm_tel = res.data.lm_tel
                         this.data.address = res.data.address
                         this.data.salesman = res.data.salesman
+                        this.data.qc = res.data.qc
                 }
                 this.step = 2
                 this.isLoading = false
@@ -873,6 +875,7 @@ const contractNewInput =()=> {
             form.append('lm_tel', this.data.lm_tel);
             form.append('address', this.data.address);
             form.append('salesman', this.data.salesman);
+            form.append('qc', this.data.qc);
             form.append('contracttype', 'm');
             form.append('user_id', user_id);
             for (var i = 0; i < this.data.files.length; i++) {
@@ -892,6 +895,7 @@ const contractNewInput =()=> {
                     this.data.lm_tel=''
                     this.data.address=''
                     this.data.salesman=''
+                    this.data.qc=''
                     this.data.files=[]
                     this.customize = false
 
@@ -1167,3 +1171,29 @@ const contractInput =()=> {
     }
 
 };
+
+const contractNewApply = ()=>{
+    return {
+        step:1,
+        isLoading:false,
+        data:{
+            vol_no: contractno,
+            salesman: salesman,
+            apply_date: apply_date,
+            apply_type:'A',
+            case_name: case_name,
+            company: company,
+            manager: manager,
+            vat: vat,
+            total_price: price_total,
+            price_a:'',
+            price_b:'',
+            address:'',
+            deadline:'',
+            regulations:'', //附則
+            freedeadline:'', //免保期限
+            tradeaddress:'', //交貨地點
+            tradedeadline:'', //交貨期限
+        }
+    }
+}
\ No newline at end of file
diff --git a/wms/contract/styles/style.css b/wms/contract/styles/style.css
index d18e339a..03ec31c1 100644
--- a/wms/contract/styles/style.css
+++ b/wms/contract/styles/style.css
@@ -541,14 +541,14 @@ main table td, main table th {
     transform: rotate(360deg);
   }
 }
-.contract-input-component .form, .contract-management .form {
+.contract-input-component .form, .contract-management .form, .contract-new-apply-component .form {
   margin: 0 auto;
 }
-.contract-input-component .form .dropdown, .contract-management .form .dropdown {
+.contract-input-component .form .dropdown, .contract-management .form .dropdown, .contract-new-apply-component .form .dropdown {
   width: 100%;
   margin-top: 7px;
 }
-.contract-input-component .form .savebtn, .contract-management .form .savebtn {
+.contract-input-component .form .savebtn, .contract-management .form .savebtn, .contract-new-apply-component .form .savebtn {
   margin-right: 13px;
   display: flex;
   justify-content: center;
@@ -557,7 +557,7 @@ main table td, main table th {
   height: 45px;
   font-size: 15px;
 }
-.contract-input-component .form table .alerttext, .contract-management .form table .alerttext {
+.contract-input-component .form table .alerttext, .contract-management .form table .alerttext, .contract-new-apply-component .form table .alerttext {
   font-size: 13px;
   color: #a00;
   font-weight: 500;
@@ -565,64 +565,68 @@ main table td, main table th {
   font-weight: 900;
   padding: 0;
 }
-.contract-input-component .form input[type=file], .contract-management .form input[type=file] {
+.contract-input-component .form input[type=file], .contract-management .form input[type=file], .contract-new-apply-component .form input[type=file] {
   padding: 12px 20px;
   margin: 8px 0;
 }
-.contract-input-component .error, .contract-management .error {
+.contract-input-component .form .successtext, .contract-management .form .successtext, .contract-new-apply-component .form .successtext {
+  color: #0a0;
+  font-weight: 900;
+}
+.contract-input-component .error, .contract-management .error, .contract-new-apply-component .error {
   display: flex;
   flex-direction: column;
   margin: 15px;
 }
-.contract-input-component .error .errortext, .contract-management .error .errortext {
+.contract-input-component .error .errortext, .contract-management .error .errortext, .contract-new-apply-component .error .errortext {
   font-size: 16px;
   font-weight: 500;
   color: #a00;
 }
-.contract-input-component .input-group-btn, .contract-management .input-group-btn {
+.contract-input-component .input-group-btn, .contract-management .input-group-btn, .contract-new-apply-component .input-group-btn {
   font-size: 16px;
 }
 @media screen and (max-width: 600px) {
-  .contract-input-component table, .contract-management table {
+  .contract-input-component table, .contract-management table, .contract-new-apply-component table {
     border: 0;
   }
-  .contract-input-component table thead, .contract-management table thead {
+  .contract-input-component table thead, .contract-management table thead, .contract-new-apply-component table thead {
     display: none;
   }
-  .contract-input-component table tr, .contract-management table tr {
+  .contract-input-component table tr, .contract-management table tr, .contract-new-apply-component table tr {
     margin-bottom: 10px;
     display: block;
     border-bottom: 2px solid #ddd;
   }
-  .contract-input-component table td, .contract-management table td {
+  .contract-input-component table td, .contract-management table td, .contract-new-apply-component table td {
     display: block;
     text-align: left;
     font-size: 14px;
     border-bottom: 1px dotted #ccc;
   }
-  .contract-input-component table td:last-child, .contract-management table td:last-child {
+  .contract-input-component table td:last-child, .contract-management table td:last-child, .contract-new-apply-component table td:last-child {
     border-bottom: 0;
   }
-  .contract-input-component table td:before, .contract-management table td:before {
+  .contract-input-component table td:before, .contract-management table td:before, .contract-new-apply-component table td:before {
     content: attr(data-label);
     float: left;
     text-transform: uppercase;
     font-weight: bold;
   }
 }
-.contract-input-component .images, .contract-management .images {
+.contract-input-component .images, .contract-management .images, .contract-new-apply-component .images {
   display: flex;
   flex-wrap: wrap;
   padding: 20px;
 }
-.contract-input-component .images > .image, .contract-management .images > .image {
+.contract-input-component .images > .image, .contract-management .images > .image, .contract-new-apply-component .images > .image {
   position: relative;
   margin: 10px;
 }
-.contract-input-component .images > .image:hover > i, .contract-management .images > .image:hover > i {
+.contract-input-component .images > .image:hover > i, .contract-management .images > .image:hover > i, .contract-new-apply-component .images > .image:hover > i {
   opacity: 1;
 }
-.contract-input-component .images > .image > i, .contract-management .images > .image > i {
+.contract-input-component .images > .image > i, .contract-management .images > .image > i, .contract-new-apply-component .images > .image > i {
   position: absolute;
   top: -12px;
   right: -12px;
diff --git a/wms/contract/styles/style.css.map b/wms/contract/styles/style.css.map
index ec9c08d7..bc122c56 100644
--- a/wms/contract/styles/style.css.map
+++ b/wms/contract/styles/style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACEhB;EAEI,aAAA;EACA,2BAAA;EACA,iBAAA;ADDJ;ACFI;EAAY,wBAAA;ADKhB;ACDI;EACI,YAAA;EACA,iBAAA;EACA,4BAAA;EACA,4BAAA;EACA,kBAAA;ADGR;ACFQ;EACI,cAAA;EACA,aAAA;EACA,YAAA;EACA,cAAA;EACA,6BAAA;EACA,mBAAA;EACA,6BAAA;EACA,aAAA;ADIZ;ACHY;EACI,UAAA;ADKhB;ACHY;EACI,UAAA;ADKhB;ACFQ;EACI,cAAA;EACA,YAAA;EACA,YAAA;EACA,kBAAA;EACA,iBAAA;EACA,qBAAA;EACA,yBAAA;EACA,WAAA;EACA,gBAAA;ADIZ;ACDI;EACI,aAAA;EACA,aAAA;EACA,sBAAA;ADGR;ACFQ;EACI,mBAAA;ADIZ;ACHY;EACI,sBAAA;EACA,aAAA;EACA,kBAAA;EACA,YAAA;EACA,YAAA;EACA,eAAA;ADKhB;ACHY;EACI,yBAAA;EACA,WAAA;EACA,aAAA;EACA,YAAA;EACA,sBAAA;EACA,YAAA;EACA,YAAA;EACA,iBAAA;EACA,gBAAA;ADKhB;ACDI;EAKI,WAAA;EACA,gBAAA;EACA,iBAAA;EACA,oCAAA;ADDR;ACNQ;EACI,SAAA;ADQZ;ACDQ;EACI,aAAA;EACA,mBAAA;ADGZ;ACFY;EACI,YAAA;EACA,aAAA;ADIhB;ACDQ;EACI,gBAAA;EACA,WAAA;EACA,gBAAA;EACA,aAAA;EACA,kBAAA;ADGZ;ACFY;EACI,eAAA;EACA,kBAAA;ADIhB;ACFY;EACI,gBAAA;ADIhB;ACFY;EACI,aAAA;EACA,mBAAA;ADIhB;ACFY;EACI,yBAAA;EACA,eAAA;ADIhB;ACFY;EACI,eAAA;EACA,gBAAA;ADIhB;ACFgB;EACI,WAAA;EACA,aAAA;EACA,mBAAA;EACA,8BAAA;ADIpB;ACHoB;EACI,iBAAA;ADKxB;ACHoB;EACI,iBAAA;EACA,mBAAA;ADKxB;ACFgB;EACI,iBAAA;ADIpB;ACDgB;EACI,aAAA;EACA,uBAAA;ADGpB;ACFoB;EACI,eAAA;ADIxB;ACAY;EACI,kBAAA;EACA,cAAA;ADEhB;ACEY;EACI,aAAA;EACA,mBAAA;EACA,WAAA;EACA,iBAAA;ADAhB;ACCgB;EACI,UAAA;EACA,oBAAA;ADCpB;ACCgB;EACI,UAAA;EACA,aAAA;EACA,8BAAA;EACA,2BAAA;ADCpB;ACEY;EACI,kBAAA;EACA,MAAA;EACA,QAAA;EACA,aAAA;EACA,UAAA;ADAhB;ACCgB;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,UAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,sBAAA;EACA,aAAA;EACA,WAAA;EACA,aAAA;ADCpB;ACAoB;EACI,eAAA;ADExB;ACAoB;EACI,yBAAA;ADExB;ACAoB;EACI,yBAAA;ADExB;ACAoB;EACI,gCAAA;ADExB;ACGQ;EACI,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,YAAA;ADDZ;ACEY;EACI,sBAAA;ADAhB;ACEY;EACI,eAAA;EACA,WAAA;EACA,kBAAA;ADAhB;ACCgB;EACI,yBAAA;ADCpB;ACCgB;EACI,eAAA;ADCpB;ACCgB;EACI,WAAA;EACA,YAAA;EACA,cAAA;EAMA,aAAA;ADJpB;ACDoB;EACI,aAAA;EACA,uBAAA;EACA,mBAAA;ADGxB;ACAoB;EACI,WAAA;EACA,YAAA;EACA,mBAAA;EACA,aAAA;ADExB;ACDwB;EACI,YAAA;EACA,gBAAA;EACA,cAAA;ADG5B;ACDwB;EACI,cAAA;EACA,mBAAA;ADG5B;ACDwB;EACI,6BAAA;EACA,mBAAA;ADG5B;ACF4B;EACI,uBAAA;EACA,wCAAA;EACA,WAAA;EACA,aAAA;EACA,kBAAA;ADIhC;ACF4B;EACI,aAAA;EACA,WAAA;EACA,8BAAA;ADIhC;ACKwB;EACI,WAAA;EACA,iBAAA;ADH5B;ACI4B;EACI,aAAA;EACA,8BAAA;ADFhC;ACSY;EACI,YAAA;ADPhB;ACWQ;EACI;IACI,UAAA;EDTd;AACF;ACYI;EACI,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,aAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,YAAA;EACA,gCAAA;ADVR;ACWQ;EACI,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,oCAAA;ADTZ;ACWQ;EACI,YAAA;EACA,gBAAA;EACA,WAAA;EACA,kBAAA;EACA,gBAAA;EACA,uBAAA;ADTZ;ACUY;EACI,WAAA;EACA,yBAAA;EACA,YAAA;EACA,aAAA;EACA,8BAAA;EACA,mBAAA;EACA,eAAA;ADRhB;ACSgB;EACI,YAAA;EACA,wCAAA;EACA,eAAA;ADPpB;ACQoB;EACI,WAAA;ADNxB;ACSgB;EACI,WAAA;ADPpB;ACUY;EACI,aAAA;ADRhB;ACSgB;EACI,WAAA;EACA,gBAAA;EACA,aAAA;EACA,sBAAA;EACA,aAAA;EACA,kBAAA;ADPpB;ACYI;EACI,yBAAA;EACA,WAAA;EACA,aAAA;EACA,YAAA;EACA,sBAAA;EACA,YAAA;EACA,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,iBAAA;ADVR;ACYI;EACI,yBAAA;ADVR;;ACaA;EACI,kBAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,iDAAA;EACA,wBAAA;EACA,eAAA;EACA,mBAAA;ADVJ;ACWI;EACI,WAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,4BAAA;EACA,gBAAA;ADTR;ACWI;EACI,uDAAA;ADTR;ACUQ;EACI,UAAA;ADRZ;ACYI;EACI,WAAA;ADVR;;ACeA;EACI,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,YAAA;EACA,sBAAA;ADZJ;ACaI;EACI,sBAAA;ADXR;ACaI;EACI,eAAA;EACA,WAAA;EACA,kBAAA;ADXR;ACYQ;EACI,yBAAA;ADVZ;ACYQ;EACI,eAAA;ADVZ;ACYQ;EACI,WAAA;EACA,YAAA;EACA,cAAA;EAMA,aAAA;ADfZ;ACUY;EACI,aAAA;EACA,uBAAA;EACA,mBAAA;ADRhB;ACWY;EACI,WAAA;EACA,YAAA;EACA,mBAAA;EACA,aAAA;ADThB;ACUgB;EACI,YAAA;EACA,gBAAA;EACA,cAAA;ADRpB;ACUgB;EACI,cAAA;EACA,mBAAA;ADRpB;ACUgB;EACI,6BAAA;EACA,mBAAA;ADRpB;ACSoB;EACI,aAAA;EACA,WAAA;EACA,8BAAA;ADPxB;ACcgB;EACI,WAAA;EACA,iBAAA;ADZpB;ACaoB;EACI,aAAA;EACA,8BAAA;ADXxB;ACkBI;EACI,YAAA;ADhBR;;ACoBI;EACI,YAAA;EACA,gBAAA;EACA,kBAAA;EACA,YAAA;ADjBR;ACkBQ;EACI,sBAAA;ADhBZ;ACkBQ;EACI,eAAA;EACA,WAAA;EACA,kBAAA;ADhBZ;ACiBY;EACI,sBAAA;ADfhB;ACiBY;EACI,eAAA;ADfhB;ACiBY;EACI,WAAA;EACA,YAAA;EACA,cAAA;EAMA,aAAA;ADpBhB;ACegB;EACI,aAAA;EACA,uBAAA;EACA,mBAAA;ADbpB;ACgBgB;EACI,WAAA;EACA,YAAA;EACA,mBAAA;EACA,aAAA;ADdpB;ACeoB;EACI,WAAA;EACA,gBAAA;EACA,cAAA;ADbxB;ACeoB;EACI,cAAA;EACA,mBAAA;ADbxB;ACeoB;EACI,4BAAA;EACA,mBAAA;ADbxB;ACcwB;EACI,aAAA;EACA,WAAA;EACA,8BAAA;ADZ5B;ACqBoB;EACI,WAAA;EACA,iBAAA;ADnBxB;ACoBwB;EACI,aAAA;EACA,8BAAA;ADlB5B;ACyBQ;EACI,YAAA;ADvBZ;;AC4BA;EACI,YAAA;EACA,cAAA;EACA,sBAAA;EACA,aAAA;EACA,kBAAA;ADzBJ;AC0BI;EACI,aAAA;ADxBR;AC0BI;EACI,eAAA;EACA,kBAAA;ADxBR;AC0BI;EACI,eAAA;ADxBR;;AC2BA;EACI,yBAAA,EAAA,eAAA;EACA,0BAAA,EAAA,SAAA;EACA,kBAAA;EACA,WAAA;EACA,YAAA;EACA,kCAAA;ADxBJ;;AC2BA;EACI;IAAK,uBAAA;EDvBP;ECwBE;IAAO,yBAAA;EDrBT;AACF;ACuBI;EACI,cAAA;ADrBR;ACsBQ;EACI,WAAA;EACA,eAAA;ADpBZ;ACsBQ;EACI,kBAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,WAAA;EACA,YAAA;EACA,eAAA;ADpBZ;ACuBY;EACI,eAAA;EACA,WAAA;EACA,gBAAA;EACA,WAAA;EACA,gBAAA;EACA,UAAA;ADrBhB;ACwBQ;EACI,kBAAA;EACA,aAAA;ADtBZ;ACyBI;EACI,aAAA;EACA,sBAAA;EACA,YAAA;ADvBR;ACwBQ;EACI,eAAA;EACA,gBAAA;EACA,WAAA;ADtBZ;AC0BI;EACI,eAAA;ADxBR;AC0BI;EACI;IACI,SAAA;EDxBV;EC2BM;IACI,aAAA;EDzBV;EC4BM;IACI,mBAAA;IACA,cAAA;IACA,6BAAA;ED1BV;EC6BM;IACI,cAAA;IACA,gBAAA;IACA,eAAA;IACA,8BAAA;ED3BV;EC8BM;IACI,gBAAA;ED5BV;EC+BM;IACI,yBAAA;IACA,WAAA;IACA,yBAAA;IACA,iBAAA;ED7BV;AACF;AC+BI;EACI,aAAA;EACA,eAAA;EACA,aAAA;AD7BR;AC8BQ;EACI,kBAAA;EACA,YAAA;AD5BZ;AC6BY;EACI,UAAA;AD3BhB;AC6BY;EACI,kBAAA;EACA,UAAA;EACA,YAAA;EACA,WAAA;EACA,eAAA;EACA,UAAA;EACA,gBAAA;AD3BhB;;ACiCA;EACI,mBAAA;EACA,WAAA;AD9BJ;;ACiCA;EACI,qBAAA;AD9BJ;;ACiCA;EACI,YAAA;AD9BJ;;ACiCA;EACC,YAAA;AD9BD;;ACiCA;EACI,WAAA;AD9BJ;;ACgCA;EACI,YAAA;AD7BJ;;AC+BA;EACI,YAAA;AD5BJ;;AC8BA;EACI,oBAAA;EACA,qBAAA;EACA,kBAAA;AD3BJ","file":"style.css"}
\ No newline at end of file
+{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file
diff --git a/wms/contract/styles/style.scss b/wms/contract/styles/style.scss
index 3dcaff88..023bc3e3 100644
--- a/wms/contract/styles/style.scss
+++ b/wms/contract/styles/style.scss
@@ -562,7 +562,7 @@ main{
     0% { transform: rotate(0deg); }
     100% { transform: rotate(360deg); }
 }
-.contract-input-component, .contract-management{
+.contract-input-component, .contract-management, .contract-new-apply-component{
     .form{
         margin:0 auto;
         .dropdown{
@@ -592,6 +592,10 @@ main{
             padding: 12px 20px;
             margin: 8px 0;
         }
+        .successtext{
+            color:#0a0;
+            font-weight: 900;
+        }
     }
     .error{
         display: flex;
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 8dccb19c..44e06e1f 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -425,9 +425,13 @@ if ($user_id=="M0023") {
                 </p> 
             </td>-->
             <td>
-                <?php if($data['status'] === 'YY' || $user_id=="M0107" || $user_id == "M0174"){ ?>
-                <a href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para?>">合約書申請</a>
-                <?php }else{ echo "-"; } ?>
+                <?php if($data['status'] !== 'YY'): ?>
+                    <a href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">合約書申請</a>
+                <?php endif; ?>
+                <!-- 工號M0107、M0174有所有權限 -->
+                <?php if($data['status'] === 'YY' || $user_id == "M0174"): ?>
+                <a href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para?>">合約書下載</a>
+                <?php endif; ?>
             </td>
         </tr>
         <?php endforeach; ?>

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 2/3] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=90=88=E7=B4=84?=
 =?UTF-8?q?=E7=94=B3=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

From 0b7ddd7828a8ca376d9c4c6479e2b10e24c29f7c Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 21 Nov 2023 17:38:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E5=90=88=E7=B4=84?=
 =?UTF-8?q?=E7=94=B3=E8=AB=8B=201121?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract/contract-new-apply.php | 283 ++++++++++------------------
 wms/contract/js/alpine.js           |  21 +++
 wms/contract/styles/style.css       |  10 +
 wms/contract/styles/style.css.map   |   2 +-
 wms/contract/styles/style.scss      |   8 +
 5 files changed, 143 insertions(+), 181 deletions(-)

diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index ee154a62..8d8b0046 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -8,7 +8,6 @@ if(!(isset($_GET['id']) && !empty($_GET['id']))){
     exit;
 }
 $id = $_GET["id"];
-echo $id;
 $sql_str = "SELECT pricereview_main.*, account.name as accountname, pricereview_item.*
             FROM pricereview_main
             JOIN account ON pricereview_main.person = account.accountid
@@ -18,7 +17,6 @@ $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);
@@ -31,6 +29,14 @@ $stmt = $conn->prepare($sql_str);
 $stmt->bindParam(':vol_no', $contract['contractno']);
 $stmt->execute();
 $customer = $stmt->fetch(PDO::FETCH_ASSOC);
+
+$mid = $contract['id'];
+$sql_str = "SELECT * FROM pricereview_pay WHERE mid = :mid ORDER BY pay_kind ASC";
+$stmt = $conn->prepare($sql_str);
+$stmt->bindParam(':mid', $mid);
+$stmt->execute();
+$pays = $stmt->fetchAll(PDO::FETCH_ASSOC);
+print_r($pays);
 ?>
 <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" />
@@ -140,11 +146,11 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
                             <div class="ui label">
                                 貨抵工地
                             </div>
-                            <input type="text" placeholder="30" style="width:45px;padding:0 8px;" x-model="data.workdeadline_a">
+                            <input type="text" placeholder="30" style="width:45px;padding:0 12px;" 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">
+                            <input type="text" placeholder="7" style="width:45px;padding:0 12px;" x-model="data.workdeadline_b">
                             <div class="ui label">
                                 天完成並整理完善。
                             </div>
@@ -160,7 +166,7 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
                                 <div class="ui label">
                                     乙方應於
                                 </div>
-                                <input type="text" placeholder="10" style="width:45px;padding:0 8px;" x-model="data.regulations">
+                                <input type="text" placeholder="10" style="width:45px;padding:0 12px;" x-model="data.regulations">
                                 <div class="ui label">
                                     天內試車完成
                                 </div>
@@ -170,7 +176,7 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
                         <td style="vertical-align: middle">免保期限</td>
                         <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">
+                                <input type="text" placeholder="18" style="width:45px;padding:0 12px;" x-model="data.freedeadline">
                                 <div class="ui label">
                                     個月
                                 </div>
@@ -191,7 +197,7 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
                                 <div class="ui label">
                                     圖色確認第
                                 </div>
-                                <input type="text" placeholder="90" style="width:45px;padding:0 8px;" x-model="data.tradedeadline">
+                                <input type="text" placeholder="90" style="width:45px;padding:0 12px;" x-model="data.tradedeadline">
                                 <div class="ui label">
                                     天出貨
                                 </div>
@@ -265,189 +271,100 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
                         </td>
                     </tr>
                 </thead>
-                <tbody style="font-weight: bolder;margin-bottom: 20px">
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>銷售</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>訂金</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>簽約後X天付訂金</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>合約日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>20%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>636000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>銷售</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>二次款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>簽約後X天付二次款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>合約日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>0%%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>0</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>銷售</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>貨到款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>貨抵工地付貨到款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>出貨日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>-</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>50%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>1590000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'>安裝</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>安裝款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>安裝完成後X天收款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>竣檢日</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>20%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>636000</p>
-                        </td>
-                    </tr>
+                <tbody style="font-weight: bolder;margin-bottom: 20px" >
+                <?php 
+                    $day = 0;
+                    $styles = [
+                        1=> "訂金",
+                        2=> "二次款",
+                        3=>"貨到款",
+                        4=>"",
+                        5=>"安裝款",
+                        6=>"尾款",
+                        7=>"",
+                    ];
+                    $paydate = [
+                        1=>"合約日",
+                        2=>"合約日",
+                        3=>"出貨日",
+                        4=>"",
+                        5=>"竣檢日",
+                        6=>"交車日",
+                        7=>""
+                    ];
+                ?>
+                    <?php foreach($pays as $pay): 
+                        if($pay['pay_scale'] == 0) continue;
+                    ?>
                     <tr>
                         <td>
-                            <p style='text-align:center'>安裝</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>尾款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>交車後X天付尾款</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>交車日</p>
+                            <p style='text-align:center'><?php echo ($pay['pay_kind'] <=4) ? "銷售" : "按裝"; ?></p>
+                        </td>
+                        <td>
+                            <p style='text-align:center'><?php echo $styles[$pay['pay_kind']]; ?></p>
+                        </td>
+                        <td>
+                            <?php if($pay['pay_kind'] == 1){ ?>
+                                <template x-if="pays[1] > 0">
+                                <p style='text-align:center'>簽約後<span x-text="pays[1]"></span>天付訂金</p>
+                                </template>
+                                <template x-if="pays[1] <= 0">
+                                <p style='text-align:center'>簽約後付訂金</p>
+                                </template>
+                            <?php } elseif($pay['pay_kind'] == 2){ ?>
+                                <template x-if="pays[2] > 0">
+                                <p style='text-align:center'>簽約後<span x-text="pays[2]"></span>天付二次款</p>
+                                </template>
+                                <template x-if="pays[2] <= 0">
+                                <p style='text-align:center'>簽約後付二次款</p>
+                                </template>
+                            <?php } elseif($pay['pay_kind'] == 3){ ?>
+                                <p style='text-align:center'>貨抵工地付貨到款</p>
+                            <?php } elseif($pay['pay_kind'] == 5){ ?>
+                                <template x-if="pays[5] > 0">
+                                <p style='text-align:center'>安裝完成後<span x-text="pays[5]"></span>天收款</p>
+                                </template>
+                                <template x-if="pays[5] <= 0">
+                                <p style='text-align:center'>安裝完成後收款</p>
+                                </template>
+                            <?php } elseif($pay['pay_kind'] == 6){ ?>
+                                <template x-if="pays[6] > 0">
+                                <p style='text-align:center'>交車後<span x-text="pays[6]"></span>天付尾款</p>
+                                </template>
+                                <template x-if="pays[6] <= 0">
+                                <p style='text-align:center'>交車後付尾款</p>
+                                </template>
+                            <?php } else{ ?>
+                                <p style='text-align:center'>-</p>
+                            <?php } ?>
+                        </td>
+                        <td>
+                            <p style='text-align:center'><?php echo $paydate[$pay['pay_kind']]; ?></p>
                         </td>
                         <td>
-                            <p style='text-align:center'>0天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>30天</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>10%</p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'>318000</p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
-                        </td>
-                        <td>
-                            <p style='text-align:center'></p>
+                            <div class="ui labeled input">
+                                <input type="number" placeholder="90" style="width:45px;padding:0 12px;" x-model="pays[<?php echo $pay['pay_kind'];?>]">
+                                <div class="ui label">
+                                    天
+                                </div>
+                            </div>
                         </td>
                         <td>
-                            <p style='text-align:center'></p>
+                            <div class="ui labeled input">
+                                <input type="number" placeholder="90" style="width:45px;padding:0 12px;" x-model="tickets[<?php echo $pay['pay_kind'];?>]">
+                                <div class="ui label">
+                                    天
+                                </div>
+                            </div>
                         </td>
                         <td>
-                            <p style='text-align:center'></p>
+                            <p style='text-align:center'><?php echo $pay['pay_scale'] ?>%</p>
                         </td>
                         <td>
-                            <p style='text-align:center'></p>
+                            <p style='text-align:center' x-text="localnumber(data.total_price * <?php echo $pay['pay_scale']/100  ?>)"></p>
                         </td>
                     </tr>
+                    <?php endforeach; ?>
                 </tbody>
             </table>
             <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@@ -479,6 +396,14 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
                     <div class="loader"></div>
                 </template>
             </button>
+            <button x-show="true" x-on:click="" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
+                <template x-if="!isLoading">
+                    <span>暫存</span>
+                </template>
+                <template x-if="isLoading">
+                    <div class="loader"></div>
+                </template>
+            </button>
         </div>
     </div>
 </div>
@@ -496,6 +421,4 @@ $customer = $stmt->fetch(PDO::FETCH_ASSOC);
     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 09168a20..96499533 100644
--- a/wms/contract/js/alpine.js
+++ b/wms/contract/js/alpine.js
@@ -1195,6 +1195,27 @@ const contractNewApply = ()=>{
             freedeadline:18, //免保期限(月)
             tradeaddress:'', //交貨地點
             tradedeadline: 90, //交貨期限
+        },
+        pays:{
+            1:10,
+            2:0,
+            3:0,
+            4:0,
+            5:0,
+            6:0,
+            7:0,
+        },
+        tickets:{
+            1:0,
+            2:0,
+            3:0,
+            4:0,
+            5:0,
+            6:0,
+            7:0,
+        },
+        localnumber(num){
+            return num.toLocaleString();
         }
     }
 }
\ No newline at end of file
diff --git a/wms/contract/styles/style.css b/wms/contract/styles/style.css
index 03ec31c1..edc9ad73 100644
--- a/wms/contract/styles/style.css
+++ b/wms/contract/styles/style.css
@@ -573,6 +573,16 @@ main table td, main table th {
   color: #0a0;
   font-weight: 900;
 }
+.contract-input-component .form input[type=number]::-webkit-outer-spin-button,
+.contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .form input[type=number]::-webkit-outer-spin-button,
+.contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button,
+.contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.contract-input-component .form input[type=number], .contract-management .form input[type=number], .contract-new-apply-component .form input[type=number] {
+  -moz-appearance: textfield;
+}
 .contract-input-component .error, .contract-management .error, .contract-new-apply-component .error {
   display: flex;
   flex-direction: column;
diff --git a/wms/contract/styles/style.css.map b/wms/contract/styles/style.css.map
index bc122c56..06d5ce77 100644
--- a/wms/contract/styles/style.css.map
+++ b/wms/contract/styles/style.css.map
@@ -1 +1 @@
-{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file
+{"version":3,"sources":["style.css","style.scss"],"names":[],"mappings":"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","file":"style.css"}
\ No newline at end of file
diff --git a/wms/contract/styles/style.scss b/wms/contract/styles/style.scss
index 023bc3e3..e180ac21 100644
--- a/wms/contract/styles/style.scss
+++ b/wms/contract/styles/style.scss
@@ -596,6 +596,14 @@ main{
             color:#0a0;
             font-weight: 900;
         }
+        input[type=number]::-webkit-outer-spin-button,
+        input[type=number]::-webkit-inner-spin-button {
+            -webkit-appearance: none;
+            margin: 0;
+        }
+        input[type=number] {
+            -moz-appearance: textfield;
+          }
     }
     .error{
         display: flex;