From f8065a9e96897befb511230c492abc4d1f7536a6 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Tue, 12 Dec 2023 17:47:23 +0800
Subject: [PATCH] =?UTF-8?q?1212=20=E5=90=88=E7=B4=84=E6=9B=B8=E7=94=B3?=
 =?UTF-8?q?=E8=AB=8B=EF=BC=8C=E6=AC=8A=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/contract/contract-new-apply.php | 18 ++++++++-------
 wms/mkt/pricereview-index.php       | 35 +++++++++++++++++++++++------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/wms/contract/contract-new-apply.php b/wms/contract/contract-new-apply.php
index 05a76318..53eac32d 100644
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@@ -93,10 +93,11 @@ if(empty($contract_new_apply)){
             $price_b = $price_b + $pay['pay_amount'];
         }
     }
-}
 
+}
+$secondPayDeadline = $contract['secondPayDeadline'] ?? 0;
 $status = isset($contract['status']) ? $contract['status'] : -1;
-
+$person = $contract['person'];
 ?>
 <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" />
@@ -490,7 +491,7 @@ $status = isset($contract['status']) ? $contract['status'] : -1;
                 </tbody>
             </table>
             <button @click="window.history.go(-1)" type="button" class="btn btn-primary btn-lg pull-right savebtn" >回前頁</button>
-            <?php if($isFirst == 1 || ($isFirst==0 && $status == 0) ): ?>
+            <?php if(($isFirst == 1 && $person == $user_id) || ($isFirst==0 && $status == 0 && $person == $user_id) ): ?>
             <button x-show="true" x-on:click="submit()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
                 <template x-if="!isLoading">
                     <span>送審</span>
@@ -508,7 +509,7 @@ $status = isset($contract['status']) ? $contract['status'] : -1;
                 </template>
             </button>
             <?php endif; ?>
-            <?php if($status == 1 && ($user_id == "M0107" || $user_id == "M0174")): ?>
+            <?php if($status == 1 && ($user_id == "M0107" || $user_id == "M0060" || $user_id == "M0174")): ?>
             <button x-show="true" x-on:click="agree()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
                 <template x-if="!isLoading">
                     <span>同意(結案)</span>
@@ -586,12 +587,14 @@ $status = isset($contract['status']) ? $contract['status'] : -1;
     const regulations = '<?php echo $contract['test_time'] ?>';
     const workdeadline_a = '<?php echo $contract['workdeadline_a'] ?>';
     const workdeadline_b = '<?php echo $contract['workdeadline_b'] ?>';
-    const secondPayDeadline = <?php echo $contract['secondPayDeadline'] ?>;
+    const secondPayDeadline = <?php echo $secondPayDeadline; ?>;
 
     const contract_new_apply_id = <?php echo $contract_new_apply_id; ?>;
 </script>
 
-<?php if($status > 0): ?>
+
+<?php endif; ?>
+<?php if($status > 0 || $person != $user_id): ?>
 <script>
     const input = document.querySelectorAll('input');
     for(let i=0;i<input.length;i++){
@@ -603,5 +606,4 @@ $status = isset($contract['status']) ? $contract['status'] : -1;
     }
 </script>
 
-<?php endif; ?>
-<?php endif; ?>
+<?php endif; ?>
\ No newline at end of file
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index f620e169..f5ad06f3 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -11,14 +11,14 @@ $data = array();
 // sql語法存在變數中
 $sql_cmd = sql_myself($user_id);
 // M0024許伃廷,M0107許紓晴權限全開
-if ($user_id == "M0024" || $user_id == "M0107") {
+if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0174") {
     $sql_cmd = "where create_at >= '2023-01-01 00:00:00'";
 }
 if ($user_id == "M0060" ) {
     $sql_cmd = "where creater in (select accountid from account where (department_id like '3%' or department_id like '5%'))";
 }
-if (empty($sql_cmd)) $sql = "select * from pricereview_main where status like 'Y%' and ekind = '新梯' order by id";
-else $sql = "select * from pricereview_main $sql_cmd and status like 'Y%' and ekind = '新梯' order by id";
+if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus from pricereview_main join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
+else $sql = "select pricereview_main.* from pricereview_main  $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 $data = mysqli_query($link,$sql);
 
 $para = "function_name=pricereview&".$token_link;
@@ -423,13 +423,34 @@ if ($user_id=="M0023") {
                     </a>
                 </p> 
             </td>-->
+            <style>
+                .applybtn{
+                    color:#fff;
+                    background-color: #1484c4;
+                    display: block;
+                    border-radius: 4px;
+                    padding: 4px 2px;
+                    font-size: 13px;
+
+                }
+                .applybtn:hover{
+                    background-color: #1494f9;
+                    color:#fff;
+                }
+            </style>
             <td>
-                <?php if($data['status'] !== 'YY'): ?>
-                    <a style="font-size:12px" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">合約書申請</a><br>
+                <?php if(($data['status'] == 'YY' && $oneself ) || $user_id == "M0174"): ?>
+                    <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">合約書申請</a><br>
+                <?php endif; ?>
+                <?php if($data['status'] == 'YY' &&  ($user_id == "M0060" || $user_id == "M0107" || $user_id == "M0174") && $data['applystatus'] == 1): ?>
+                    <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">合約書簽核</a><br>
+                <?php endif; ?>
+                <?php if($data['status'] != 'YY' ): ?>
+                    <span  style="font-size:13px;font-weight:600">價格審查中</span>
                 <?php endif; ?>
                 <!-- 工號M0107、M0174有所有權限 -->
-                <?php if($data['status'] === 'YY' || $user_id == "M0174"): ?>
-                <a style="font-size:12px" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para?>">合約書下載</a>
+                <?php if(($data['status'] === 'YY' && $data['applystatus'] == 3 && ($user_id == "M0107" || $user_id == "M0060")) || $user_id == "M0174"): ?>
+                <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para?>">合約書下載</a>
                 <?php endif; ?>
             </td>
         </tr>