價審簽核流程bug修正

wms/mkt/api/postPricereviewSign.php

@@ -52,6 +52,7 @@ try{
     $currentsign = $stmt->fetch(PDO::FETCH_ASSOC);
     $permissions = [];
     $content = "";
+    $url = "mkt/pricereviewCheck.php?id=" . $mid;
     if($signOff == "YY"){
         if($currentsign['sign1']!=NULL){ $permissions[] = explode(",", $currentsign['sign1'])[0] ; }
         if($currentsign['sign2']!=NULL){ $permissions[] = explode(",", $currentsign['sign2'])[0] ; }
@@ -75,6 +76,7 @@ try{
         $permissions[] = $signer;
         $title =  $ekind . "價審退回通知(".$contract['contractno']."," .$contract['company']. ")";
         $content = "狀態:退回<br>";
+        $url = "mkt/pricereviewCreate.php?id=" . $mid;
     }
     
 
@@ -88,7 +90,6 @@ try{
     $havaread = null;
     $creater = "system";
     $create_at = date("Y-m-d H:i:s");
-    $url = "mkt/pricereviewCheck.php?id=" . $mid;
     sendSystemNotice($kind, $related_id, $title, $content, $havaread, $permissions, $creater, $create_at, $url);
 
     echo 1;

wms/mkt/pricereviewCheck.php

@@ -929,7 +929,7 @@ function getSignerName($signer){
             <?php if($contract['status'] == "YS"){ ?>
                 <?php if($currentSigner == $user_id): ?>
                     <button class="btn btn-primary" @click="check(<?php echo $currentSign; ?>, 'YN')">不同意(退回)</button>
-                    <?php if($sign1=='W' || ($sign1=='Y' && $sign2 =='W') || ($sign1=='Y' && $sign2 ==NULL && $sign1 == 'Y') || ($sign1 == 'Y' && $sign2 == 'Y' && $sign3 == 'W' && $sign4 == 'W')): ?>
+                    <?php if($sign1=='W' || ($sign1=='Y' && $sign2 =='W') || ($sign1 == 'Y' && ($sign2 == 'Y' || $sign2 == NULL) && $sign3 == 'W' && $sign4 == 'W')): ?>
                     <button class="btn btn-primary" @click="check(<?php echo $currentSign; ?>, 'YS')">同意(上呈)</button>
                     <?php endif ; ?>
                     <?php if(($sign3 == 'W' && $sign2 == 'Y') || ($sign3 == 'W' && $sign2 == null && $sign1 == 'Y') || ($sign3 == 'Y' && $sign4 == 'W') ): ?>