From 11294b35f1821bcb75a2848f4de6e58a0bcf8279 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Wed, 13 Dec 2023 18:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E7=B4=84=E6=9B=B8=E7=94=B3=E8=AB=8B?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E3=80=81=E6=96=B0=E6=A2=AF=E6=9C=89=E6=9C=9B?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B6=E4=BF=AE=E5=BE=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/crm/crmm01-index.php      |  1 -
 wms/crm/crmm02-index.php      | 42 +++++++++++++++++++----------------
 wms/crm/crmm04-view.php       |  2 +-
 wms/header.php                |  2 +-
 wms/mkt/pricereview-index.php | 29 +++++++++++++++---------
 5 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/wms/crm/crmm01-index.php b/wms/crm/crmm01-index.php
index d9aae78b..a754b475 100644
--- a/wms/crm/crmm01-index.php
+++ b/wms/crm/crmm01-index.php
@@ -1,7 +1,6 @@
 <?php
 require_once "../header.php";
 // 載入db.php來連結資料庫
-
 #錶
 $table = 'hope_elevator_customer';
 #可編輯的列
diff --git a/wms/crm/crmm02-index.php b/wms/crm/crmm02-index.php
index 671b7b2f..0568fb9f 100644
--- a/wms/crm/crmm02-index.php
+++ b/wms/crm/crmm02-index.php
@@ -43,7 +43,7 @@ $lm_name = empty($_GET['linkman']) ? "%" : $_GET['linkman'];
 $where .= " and  linkman like '$lm_name'";
 $sql_cmd = sql_myself($user_id, "salesman");
 if (in_array($user_department_id, $depart_arr) || $user_id == "M0060" || $user_id == "M0149") $sql_cmd = "";  // M0060:Max,鄭伊岑
-if (!empty($sql_cmd)) $where .= " and ".str_replace("where", "", $sql_cmd);
+if (!empty($sql_cmd)) $where .= " and " . str_replace("where", "", $sql_cmd);
 
 $sql = "SELECT  vol_no,customer,manager,f_return_content('customer_source',source ) source,
 linkman,lm_tel,f_return_name(salesman) salesman,num ,date_format(pre_order_date,'%Y/%m/%d')  pre_order_date,
@@ -53,25 +53,29 @@ linkman,lm_tel,f_return_name(salesman) salesman,num ,date_format(pre_order_date,
 $data = mysqli_query($link, $sql);
 ?>
 <style>
-#table_index2 {
-    table-layout:fixed;
-    /*width: 100%;*/
-    display:inline-block;
-}
-.col-sm-12 {
-    width: auto;
-}
-.pagination {
-    margin: 0;
-}
+    #table_index2 {
+        table-layout: fixed;
+        /*width: 100%;*/
+        display: inline-block;
+    }
+
+    .col-sm-12 {
+        width: auto;
+    }
+
+    .pagination {
+        margin: 0;
+    }
 </style>
 <script>
-$(function () {
-    $('#table_index2').DataTable({
-        order: [[14, 'desc']]
+    $(function() {
+        $('#table_index2').DataTable({
+            order: [
+                [14, 'desc']
+            ]
+        });
+        document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
     });
-    document.querySelector("#table_index2_filter > label > input").placeholder = "快速搜尋";
-});
 </script>
 <?php
 
@@ -104,7 +108,7 @@ if ($data) :
                         <th style='width:50px'>卷號</th>
                         <td><input type="text" class='form-control' name='vol_no'></td>
                         <th>營業員</th>
-                        <td><input type="text" class='form-control' name='salesman'></td> 
+                        <td><input type="text" class='form-control' name='salesman'></td>
                         <th>下單地區</th>
                         <td><input type="text" class='form-control' name='order_province'></td>
                         <th>聯係人姓名</th>
@@ -121,7 +125,7 @@ if ($data) :
                     </tr>
                 </tfoot>
             </table>
-            <table id="table_index2" class="table table-striped table-bordered">
+            <table id="table_index" class="table table-striped table-bordered">
                 <thead>
                     <?php
                     echo "<tr>";
diff --git a/wms/crm/crmm04-view.php b/wms/crm/crmm04-view.php
index d1b42594..8b3fdce9 100644
--- a/wms/crm/crmm04-view.php
+++ b/wms/crm/crmm04-view.php
@@ -141,7 +141,7 @@ $option_price_column = [
 ];
 $sql = " SELECT  * FROM $table_option_price  where 1=1 $where  ";
 $hope_project_elevator_option = DB::result($sql);
-$sql = " SELECT * FROM option_price    ";
+$sql = " SELECT model_no,seat,spec,unit,price_a ,price_b,memo,status  FROM option_price    ";
 $option_price = DB::result($sql);
 
 $hpeoRow = "  <tr>";
diff --git a/wms/header.php b/wms/header.php
index 4d0fa00b..bc79911e 100644
--- a/wms/header.php
+++ b/wms/header.php
@@ -1,5 +1,5 @@
 <?php
-ini_set('display_errors', 'off');
+// ini_set('display_errors', 'off');
 
 // 維護專用 
 // include "maintenance.php";
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index f5ad06f3..8662b68b 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -10,17 +10,19 @@ $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "Y
 $data = array();
 // sql語法存在變數中
 $sql_cmd = sql_myself($user_id);
+$sql = "select pricereview_main.*, contract_new_apply.status as applystatus from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where pricereview_main.creater  = '$user_id' and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 // M0024許伃廷,M0107許紓晴權限全開
-if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0174") {
+if ($user_id == "M0024" || $user_id == "M0107" || $user_id == "M0174" ) {
     $sql_cmd = "where create_at >= '2023-01-01 00:00:00'";
+    $sql = "select pricereview_main.*, contract_new_apply.status as applystatus from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where create_at >= '2023-01-01 00:00:00' and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 }
 if ($user_id == "M0060" ) {
     $sql_cmd = "where creater in (select accountid from account where (department_id like '3%' or department_id like '5%'))";
+    $sql = "select pricereview_main.*,contract_new_apply.status as applystatus from pricereview_main left join contract_new_apply on pricereview_main.id = contract_new_apply.mid where creater in (select accountid from account where (department_id like '3%' or department_id like '5%')) and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.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";
+if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus from pricereview_main left 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;
 ?>
 <style>
@@ -439,18 +441,25 @@ if ($user_id=="M0023") {
                 }
             </style>
             <td>
-                <?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 if(($data['status'] == 'YY' && $oneself) || $user_id == "M0174"): ?>
+                    <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
+                    <?php if($data['applystatus'] <=1){
+                        echo "申請";
+                    }else{
+                        echo "檢視";
+                    } ?>    
+                </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 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>
+                    <span  style="font-size:13px;font-weight:600">--</span>
                 <?php endif; ?>
                 <!-- 工號M0107、M0174有所有權限 -->
                 <?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>
+                <a class="applybtn" href="../contract/contract-download.php?id=<?php echo $data['id'] . '&' . $para?>">下載</a>
                 <?php endif; ?>
             </td>
         </tr>