diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index 8ee8b81d..0919e468 100644
--- a/wms/mkt/pricereview-index.php
+++ b/wms/mkt/pricereview-index.php
@@ -125,7 +125,7 @@ if (!empty($res_get) || (!empty($_GET['check']) && $_GET['check'] == 1)) {
     // echo $sql;
 }
 
-if($user_id === "M0137"){
+if ($user_id === "M0137") {
     $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 
@@ -307,7 +307,7 @@ function get_pending($token)
             t.flow_name
         LIMIT 0, 6    
     ";
-    
+
     // echo '<pre>';
     // print_r($sql);
     // echo '</pre>';
@@ -332,7 +332,7 @@ function get_pending($token)
 
 $result = get_pending($token);
 // print_r($result);
-if(count($result) > 0){
+if (count($result) > 0) {
     $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm';
     $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';
 }
@@ -348,27 +348,35 @@ if ($data) :
     }
     */
 ?>
-<style>
-    .categoryBtn{
-        width:120px;
-        height: 32px;
-        padding: 0;
-        line-height: 30px;
-    }
-</style>
+    <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;">
-        <?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>
-        <?php if(count($result) > 0): ?>
-        <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>
-        <?php else: ?>
-        <a href="javascript:;" onclick="alert('無待簽資料')" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
-        <?php endif ;?>
-        <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 } ?>
+        <<<<<<< HEAD <?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>
+            <?php if (count($result) > 0) : ?>
+                <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>
+            <?php else : ?>
+                <a href="javascript:;" onclick="alert('無待簽資料')" class=" btn <?php echo (isset($_GET['system_id'])) ? "btn-primary" : "btn-secondary"; ?> btn-sm categoryBtn"> 待我簽核</a>
+            <?php endif; ?>
+            <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 } ?>
+        =======
+        <?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 } ?>
+        >>>>>>> c91540c2 (0125)
         <table id="table_index" class="table table-striped table-bordered" style="width:100%">
             <thead>
                 <tr>
@@ -712,7 +720,7 @@ if ($data) :
                                 <?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; ?>">
+                                    <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">
                                         <?php if ($data['applystatus'] < 1) {
                                             echo "申請";
                                         } else {
@@ -720,7 +728,7 @@ if ($data) :
                                         } ?>
                                     </a><br>
                                 <?php else : ?>
-                                    <a class="applybtn"  href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">審請已通過</a><br>
+                                    <a class="applybtn" href="../contract/contract-new-apply.php?id=<?php echo $data['id'] . '&' . $para; ?>">審請已通過</a><br>
                                 <?php endif; ?>
                             <?php else : ?>