From 93bb2fd094d0d80159c1da9b8dd241bd2a21f2d1 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Wed, 24 Jan 2024 15:01:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=83=B9=E5=AF=A9=20=E7=89=8C=E5=83=B9?=
 =?UTF-8?q?=E5=B0=87=E8=88=8A=E7=89=88=E5=81=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/fun_global.php                   | 45 ++++++++--------------------
 wms/mkt/price_option-index.php       |  2 ++
 wms/mkt/price_option-select.php      |  2 ++
 wms/mkt/pricereview-check.php        |  2 +-
 wms/mkt/pricereview-record-check.php |  3 +-
 wms/mkt/pricereview_mi-api.php       |  5 ++--
 6 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/wms/fun_global.php b/wms/fun_global.php
index b468f413..501fbb2e 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -83,13 +83,12 @@ function manage_class($user_id, &$ret = [])
  * @return array
  * 
  */
-function pricereview_class($rate, $user_id, &$ret = [], $special_fee)
+function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
 {
     global $link;
 
     $sql = "select manager from account where accountid = '$user_id'";
     $res = mysqli_query($link, $sql);
-    $i = 0;
     while ($row = mysqli_fetch_assoc($res)) {
         if ($row["manager"] == "M0001") return; // 董事長略過
         if ($user_id == 'TEST01') {
@@ -100,6 +99,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee)
             return $ret;
             exit;
         } else {
+            // 若為第一層且使用者ID為區經理，直接訂好接下來的簽核人員並跳出。
             if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) {
                 $ret[1] = $user_id . ",,";
                 $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
@@ -108,22 +108,21 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee)
                     $ret[4] = "M0006,,";    // 總經理
                 }
                 return $ret;
-                exit();
+                exit;
             }
             if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
+                // 新梯的部分 桃竹本該給陳家文，改為劉永德
                 if ($row["manager"] == 'M0029') {
-                    $ret[1] = "M0147,,";
+                    $ret[1] = "M0137,,";
                     $i++;
-                    pricereview_class($rate, $row["manager"], $ret,  $special_fee);
+                    pricereview_class($rate, $row["manager"], $ret,  $special_fee, $i);
                 } else {
                     $ret[1] = $row["manager"] . ",,";
                     $i++;
-                    pricereview_class($rate, $row["manager"], $ret,  $special_fee);
+                    pricereview_class($rate, $row["manager"], $ret,  $special_fee, $i);
                 }
             } else {
-                // if ($user_id == 'M0033' || $user_id == 'M0137' || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == 'M0086') {
-                //     $ret[1] = $user_id . ",,";
-                // }
+                
                 $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
                 $ret[3] = "M0060,,";                    // 業務協理
                 if ($rate < 80 || $special_fee > 0) {
@@ -152,19 +151,10 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
     $res = mysqli_query($link, $sql);
     if ($row = mysqli_fetch_assoc($res)) {
         if ($row["manager"] == "M0001") return; // 董事長略過
-        if ($row["manager"] == "TEST04" || $user_id == 'TEST01') {
-            $ret[1] =   "test04,,";
-            $ret[2] =   "test02,,";
-            $ret[3] =   "test03,,";
-            $ret[4] =   "test05,,";
-            return $ret;
-            exit();
+        if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
+            $ret[1] = $row["manager"];
         } else {
-            if ($row["manager"] != "M0060" && $row["manager"] != "M0006" && $row["manager"] != "M0008") {
-                $ret[1] = $row["manager"];
-            } else {
-                $ret[1] = $user_id;
-            }
+            $ret[1] = $user_id;
         }
     }
     // $ret[1] = "M0029";
@@ -183,17 +173,6 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
     return $ret;
 }
 
-/**
- * 汰改(契約)價審簽核順位
- * @param string $rate:破價比
- * @param string $user_id:使用者ID
- * @param string $renovate_flag:REN=M1改
- * @return array
- * 
- */
-function pricereview_maintainance_class($rate, $user_id, $renovate_flag)
-{
-}
 /**
  * 檢查使用者選單權限
  * 
@@ -257,7 +236,7 @@ function accountid2name()
     global $link;
 
     $arr = [];
-    $sql = "select accountid, name from account where 1=1";
+    $sql = "select accountid, name from account where accounttype in ('B','E','M')";
     $res = mysqli_query($link, $sql);
     while ($row = mysqli_fetch_row($res)) {
         $arr[$row[0]] = $row[1];
diff --git a/wms/mkt/price_option-index.php b/wms/mkt/price_option-index.php
index 05388f59..ecf0afa6 100644
--- a/wms/mkt/price_option-index.php
+++ b/wms/mkt/price_option-index.php
@@ -67,6 +67,7 @@ $optional_arr = [1 => '標', 2 => '選'];
             <table id="table_index2" class="table table-striped table-bordered" style="width:100%">
                 <thead>
                     <tr class="kind-col">
+                        <th scope="col" nowrap>ID</th>
                         <th scope="col" nowrap>名稱</th>
                         <th scope="col" nowrap>規格</th>
                         <th scope="col" nowrap>備註</th>
@@ -88,6 +89,7 @@ $optional_arr = [1 => '標', 2 => '選'];
                     </template>
                     <template x-for="option in options">
                         <tr>
+                            <td x-text="option.id"></td>
                             <td x-text="option.group_name"></td>
                             <td x-text="option.spec"></td>
                             <td x-text="option.memo"></td>
diff --git a/wms/mkt/price_option-select.php b/wms/mkt/price_option-select.php
index 910a2ce7..a352c5ea 100644
--- a/wms/mkt/price_option-select.php
+++ b/wms/mkt/price_option-select.php
@@ -51,6 +51,7 @@ $optional_arr = [1 => '標配', 2 => '選配',3=>'加價'];
             <table id="table_index2" class="table table-striped table-bordered" style="width:100%">
                 <thead>
                     <tr class="kind-col">
+                        <th scope="col" nowrap>ID</th>
                         <th scope="col" nowrap>名稱</th>
                         <th scope="col" nowrap>規格</th>
                         <th scope="col" nowrap>備註</th>
@@ -72,6 +73,7 @@ $optional_arr = [1 => '標配', 2 => '選配',3=>'加價'];
                     </template>
                     <template x-for="option in options">
                         <tr>
+                            <td x-text="option.id"></td>
                             <td x-text="option.group_name"></td>
                             <td x-text="option.spec"></td>
                             <td x-text="option.memo"></td>
diff --git a/wms/mkt/pricereview-check.php b/wms/mkt/pricereview-check.php
index 79f5eec1..64db1e44 100644
--- a/wms/mkt/pricereview-check.php
+++ b/wms/mkt/pricereview-check.php
@@ -368,7 +368,7 @@ foreach ($res as $data) {
                         console.log(data.content[k][12]);
                         Object.keys(data.content[k][14]).forEach(function(m) {
                             if (data.content[k][14][m][0] != '') {
-                                mihtml += "<li>" + data.content[k][14][m][0].replace("&lt;br&gt;", "").replace("&amp;", "").replace("amp;", "").replace("()", "").replace(/\s+/g, '') + "：" + commafy(data.content[k][14][m][1]) + "</li>";
+                                mihtml += "<li>" + data.content[k][14][m][0].replace("&amp;lt;br&amp;gt;", "").replace("&lt;br&gt;", "").replace("&amp;", "").replace("amp;", "").replace("()", "").replace(/\s+/g, '') + "：" + commafy(data.content[k][14][m][1]) + "</li>";
                             }
                         });
                         Object.keys(data.content[k][16]).forEach(function(m) {
diff --git a/wms/mkt/pricereview-record-check.php b/wms/mkt/pricereview-record-check.php
index 3b915215..c2c81143 100644
--- a/wms/mkt/pricereview-record-check.php
+++ b/wms/mkt/pricereview-record-check.php
@@ -1,6 +1,6 @@
 <?php
 include "../header.php";
-
+require_once("./conn.php");
 if (isset($_POST['status'])) {
     $fromsign = $_POST['fromsign'];
     foreach ($_POST as $k => $v) {
@@ -60,6 +60,7 @@ if (isset($_POST['status'])) {
                 } else {
                     $sql2 .= "status = 'YY'";
                 }
+                $sql_str = "";
             } else {
                 $sql2 .= "status = 'YY'";
             }
diff --git a/wms/mkt/pricereview_mi-api.php b/wms/mkt/pricereview_mi-api.php
index adea44c3..0d8438c4 100644
--- a/wms/mkt/pricereview_mi-api.php
+++ b/wms/mkt/pricereview_mi-api.php
@@ -330,10 +330,11 @@ $sql4 = "SELECT option_price.id, elevator_quotation_rule.equipment, option_mi.ba
 FROM option_price
 LEFT JOIN option_mi ON option_price.id = option_mi.option_price_id
 LEFT JOIN elevator_quotation_rule ON option_mi.quotation_no = elevator_quotation_rule.quotation_no
-WHERE option_price.status = 'Y' 
-AND option_mi.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " 
+WHERE option_mi.option_price_id = " . $opt_elev_arr[$val]["price_id"] . " 
 AND (" . $v["item_weight"] . " BETWEEN option_mi.min_weight AND option_mi.max_weight) 
 AND option_mi.open_kind = '" . $v["item_op"] . "'";
+
+
                     $res_om = mysqli_query($link, $sql4);
                     if ($row_om = mysqli_fetch_assoc($res_om)) {
                         $row_om['price'] = (int)ceil($row_om['price']);

From 3afa9580bfca76378b73cdd2ca864df127c98ec7 Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Wed, 24 Jan 2024 15:23:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E6=A2=AF=E6=9E=B6=E5=AF=A9?=
 =?UTF-8?q?=E5=88=86=E9=A1=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/fun_global.php            | 8 ++++----
 wms/mkt/pricereview-index.php | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/wms/fun_global.php b/wms/fun_global.php
index 5a57531d..436a91e8 100644
--- a/wms/fun_global.php
+++ b/wms/fun_global.php
@@ -102,7 +102,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
             // 若為第一層且使用者ID為區經理，直接訂好接下來的簽核人員並跳出。
             if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) {
                 $ret[1] = $user_id . ",,";
-                $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
+                $ret[2] = "M0175,,<##>M0107,,";         // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
                 $ret[3] = "M0060,,";                    // 業務協理
                 if ($rate < 80 || $special_fee > 0) {
                     $ret[4] = "M0006,,";    // 總經理
@@ -123,7 +123,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0)
                 }
             } else {
                 
-                $ret[2] = "M0024,,<##>M0107,,";         // 業務部專員：M0024許伃廷、M0107許紓晴(第2關有多位審核人)
+                $ret[2] = "M0175,,<##>M0107,,";         // 業務部專員：M0175陳君敏、M0107許紓晴(第2關有多位審核人)
                 $ret[3] = "M0060,,";                    // 業務協理
                 if ($rate < 80 || $special_fee > 0) {
                     $ret[4] = "M0006,,";    // 總經理
@@ -163,11 +163,11 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag)
     if ($renovate_flag == "REN") {
         // $ret[2] = 'M0012';
         if ($rate <= 100) $ret[3] = "M0008";  // 詹總
-        if ($rate < 75) $ret[4] = "M0006";  // 總經理
+        if ($rate < 80) $ret[4] = "M0006";  // 總經理
     } else {
         // 全汰改
         if ($rate <= 100) $ret[3] = "M0008";  // 詹總
-        if ($rate < 75) $ret[4] = "M0006";  // 總經理
+        if ($rate < 80) $ret[4] = "M0006";  // 總經理
     }
     mysqli_free_result($res);
     return $ret;
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 677038fa..6ad19e7b 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -297,6 +297,7 @@ function get_pending($token)
             t.flow_name
         LIMIT 0, 6    
     ";
+    
     // echo '<pre>';
     // print_r($sql);
     // echo '</pre>';
@@ -320,6 +321,7 @@ function get_pending($token)
 }
 
 $result = get_pending($token);
+print_r($result);
 $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm';
 $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';
 

From 47458fa0052fec0634ea57d32d91c9223b5d296c Mon Sep 17 00:00:00 2001
From: 10994015 <a0938599191@gmail.com>
Date: Wed, 24 Jan 2024 16:17:53 +0800
Subject: [PATCH 3/3] 0124

---
 wms/mkt/pricereview-index.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 6907542a..ec517324 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -116,7 +116,7 @@ if ($user_id == "M0060") {
 if (empty($sql_cmd)) $sql = "select pricereview_main.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress 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.*, contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress from pricereview_main left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id $sql_cmd and pricereview_main.status like 'Y%' and pricereview_main.ekind = '新梯' order by pricereview_main.id";
 
-if (!empty($res_get) || $_GET['check'] == 1) {
+if (!empty($res_get) || (!empty($_GET['check']) && $_GET['check'] == 1)) {
     $sql = "SELECT pricereview_main.*,contract_new_apply.status as applystatus, contract_new_apply.progress as applyprogress 
     from pricereview_main 
     left join contract_new_apply on  contract_new_apply.mid = pricereview_main.id 
@@ -338,14 +338,23 @@ if ($data) :
     }
     */
 ?>
+<style>
+    .categoryBtn{
+        width:120px;
+        height: 32px;
+        padding: 0;
+        line-height: 30px;
+    }
+</style>
     <link rel="stylesheet" href="common.css">
     <div style="overflow-x:auto; white-space:nowrap;">
-        <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 所有價審</a>
-        <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 待我簽核</a>
-        <a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 簽核完畢</a>
-        <a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 結案同意</a>
-        <a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn btn-primary btn-sm"> 結案不同意</a>
-
+        <?php if($user_id=== "M0060" || $user_id==="M0107" || $user_id==="M0175" || $user_id==="M0174" || $user_id==="M0225"){ ?>
+        <a href="/wms/mkt/pricereview-index.php?&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (!isset($_GET['system_id']) && !isset($_GET['check'])) ? "btn btn-primary" : "btn-secondary"; ?>   btn-sm categoryBtn"> 所有價審</a>
+        <a href="/wms/mkt/pricereview-index.php?system_id=<?= $result[1]['sid'] ?>&flow_id=<?= $result[1]['fid'] ?>&function_name=pricereview&token=<?php echo $token; ?>" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
+        <a href="/wms/mkt/pricereview-index.php?check=1&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 1) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 簽核完畢</a>
+        <a href="/wms/mkt/pricereview-index.php?check=2&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 2) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案同意</a>
+        <a href="/wms/mkt/pricereview-index.php?check=3&function_name=pricereview&token=<?php echo $token; ?>" class=" btn  <?php echo (isset($_GET['check']) && $_GET['check'] == 3) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 結案不同意</a>
+            <?php } ?>
         <table id="table_index" class="table table-striped table-bordered" style="width:100%">
             <thead>
                 <tr>