Merge branch 'cheng' of http://10.10.1.6:3080/masada-admin/httpdocs into cheng

wms/crm/crmm02-index.php

@@ -170,7 +170,7 @@ if ($data) :
                                         <span class="glyphicon glyphicon-pencil"></span>
                                     </a>
                                     <?php if ($user_name === $row['salesman'] || $user_id = 'M0225') : ?>
-                                        <a href="../cont/apply_form.php?<?= $token_link ?>&vol_no=<?php echo $row['vol_no']; ?>" class="btn btn-info btn-sm">
+                                        <a href="https://bpm.masada.com.tw/km/review/km_review_main/kmReviewMain.do?method=add&fdTemplateId=18cf68c8bc2a8ec3c80950e4e2389f0a&s_css=default&vol_no=<?= $row['vol_no'] ?>" class="btn btn-info btn-sm">
                                             轉價審
                                         </a>
                                     <?php endif ?>

wms/mkt/pricereview-create.php

@@ -750,6 +750,7 @@ $option_str .= "</tbody></table>";
         });
         $('#tb2').on('focus', 'tr[name=option_templ] a[name=option_href]', function() {
 
+
             $("#optionModal").modal('show');
             var jobj = $(this); // 父視窗
             $("#optionModal .modal-body td").unbind().click(function() {