新梯價審option修正1227

wms/mkt/pricereview-check.php

@@ -105,7 +105,7 @@ foreach ($res as $data) {
     } elseif ($status2 == "N") {
         $checker_2_result = "不同意";
     }
-    if ($status3 == "Y") {
+    if ($status3 == "Y" || $status3 == "YY") {
         $checker_3_result = "同意";
     } elseif ($status3 == "N") {
         $checker_3_result = "不同意";
@@ -874,7 +874,7 @@ foreach ($res as $data) {
                 <input type="text" name="qty_total" id="qty_total" value="<?= number_format($data["qty_total"]); ?>">
             </div>
             <div>
-                <label for="special_fee">特殊費用</label>
+                <label for="special_fee">服務費</label>
                 <input type="text" name="special_fee" id="special_fee" value="<?php echo number_format($data["special_fee"]); ?>">
             </div>
             <div>

wms/mkt/pricereview-create.php

@@ -2109,13 +2109,9 @@ if (count($last_pritem_arr) > 0 && isset($last_pritem_arr["B"])) {
             <label for="qty_total">總台數</label>
             <input type="text" name="qty_total" id="qty_total" value="<?php echo $qty_total; ?>" readonly>
         </div>
-        <div>
-            <label for="special_fee">特殊費用</label>
-            <input type="text" name="special_fee" id="special_fee" value="<?php if (isset($last_pr_arr["special_fee"])) echo number_format($last_pr_arr["special_fee"]); ?>">
-        </div>
         <div>
             <label for="special_fee">服務費</label>
-            <input type="text" name="service_fee" id="service_fee" value="0">
+            <input type="text" name="special_fee" id="special_fee" value="<?php if (isset($last_pr_arr["special_fee"])) echo number_format($last_pr_arr["special_fee"]); ?>">
         </div>
         <div>
             <label for="price_broken">破價(台)</label>
@@ -2167,7 +2163,7 @@ if (count($last_pritem_arr) > 0 && isset($last_pritem_arr["B"])) {
         </div>
 
         <ul>
-            <li>業務員權限>=80%以上；<80-75%呈至業務協理審核；<75%以下呈至總經理審核。</li>
+            <li>營業權限>=85%以上；<88-80%呈至區處長審核；<80%以下呈至總經理審核。</li>
         </ul>
         <div class="nextline"></div>
         <label for="attatch1">報價單</label>

wms/mkt/pricereview-edit.php

@@ -1684,7 +1684,7 @@ $(function(){
             <input type="text" name="qty_total" id="qty_total" readonly>
         </div>
         <div>
-            <label for="special_fee">特殊費用</label>
+            <label for="special_fee">服務費</label>
             <input type="text" name="special_fee" id="special_fee" value="<?php echo number_format($data["special_fee"]); ?>">
         </div>
         <div>
@@ -1735,7 +1735,7 @@ $(function(){
         </div>
 
         <ul>
-            <li>業務員權限>=80%以上；<80-75%呈至業務協理審核；<75%以下呈至總經理審核。</li>
+            <li>業務員權限>=85%以上；<80-75%呈至業務協理審核；<75%以下呈至總經理審核。</li>
         </ul>
         <div class="nextline"></div>
         <label for="attatch1">報價單</label>

wms/mkt/pricereview-index.php

@@ -10,18 +10,18 @@ $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "Y
 $data = array();
 // sql語法存在變數中
 $sql_cmd = sql_myself($user_id, "pricereview_main .creater");
-$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";
+$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.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" || $user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") {
     $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";
+    $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 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 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 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($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";
 
 $data = mysqli_query($link, $sql);
 // echo $sql;
@@ -269,7 +269,7 @@ if ($data) :
                                 elseif ($ustatus == "N") $str = "<span class=\"glyphicon glyphicon-ban-circle\" title=\"不同意\"></span>";
                                 $str .= "<br>" . $accountname_arr[$uperson] . "<br>" . $udtte;
                             } else {
-                                if ($ss_arr["sign_st"] == 1 && in_array($user_id, $ss_arr["sign_nt"]) && $data["status"] == "YS" || $user_id = 'TEST04') {
+                                if ($ss_arr["sign_st"] == 1 && in_array($user_id, $ss_arr["sign_nt"]) && $data["status"] == "YS" || $user_id == 'TEST04') {
                                     $str = "<span class=\"glyphicon glyphicon-user\"></span>";
                                     $str = "待簽核";
                                     $str = "<a href=\"pricereview-check.php?st=1&id=" . $data["id"] . "&" . $para . "\" class=\"btn btn-primary btn-sm\">" . $str . "</a>";
@@ -457,17 +457,23 @@ if ($data) :
                             }
                         </style>
                         <td>
-                            <?php if (($data['status'] == 'YY' && $oneself) || $user_id == "M0174" || $user_id == 'M0225') : ?>
-                                <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
+                            <?php if (($data['status'] == 'YY' && $oneself) || ($data['status'] == 'YY' &&( $user_id == "M0174" || $user_id == 'M0225' || $user_id === "M0107" || $user_id === "M0060"))) : ?>
+                                <?php if(($user_id === "M0107" || $user_id === "M0060") && $data['applystatus'] < 3):?>
+                                    <span style="font-size:13px;font-weight:600">待申請</span>
+                                <?php elseif($data['applystatus'] < 3): ?>
+                                    <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 else: ?>
+
                             <?php endif; ?>
 
-                            <?php if ($data['status'] == 'YY' && ($user_id == "M0060" || $user_id == "M0107" || $user_id == "M0174" || $user_id == 'M0225') && $data['applystatus'] == 1) : ?>
+                            <?php if ($data['status'] == 'YY' && (($user_id == "M0060" && $data['applyprogress'] == 2) || ($user_id == "M0107" && $data['applyprogress'] <= 1) || $user_id == "M0174" || $user_id == 'M0225') && $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') : ?>

wms/mkt/pricereview-record-submit.php

@@ -282,7 +282,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         // <75%以下呈至總經理審核. ($price_rate)
         // 上級主管 > 伃廷 > MAX > 總經理
         if ($status == "YS") {
-            $manager_arr = pricereview_class($price_rate, $user_id);
+            $ret = [];
+            $manager_arr = pricereview_class($price_rate, $user_id, $ret, $special_fee);
             if ($manager_arr) {
                 $sign1 = $sign2 = $sign3 = $sign4 = "";
                 foreach ($manager_arr as $k => $v) {

wms/mkt/pricereview_mi-api.php

@@ -83,7 +83,7 @@ try {
     $row = mysqli_fetch_row($res);
     $special_fee = $row[0];
     mysqli_free_result($res);
-    $specarr[0] = "特殊費用";
+    $specarr[0] = "服務費";
     $specarr[1] = round($special_fee/$elev_qty_all, 0);
 
     // 電梯所屬OPTION