解決衝突

wms/frame/pending.php

@@ -118,7 +118,7 @@ $token = $_REQUEST["token"];
                             } else if (obj.content[i].fname == '契约價審流程') {
                                 myhtml += '<li class="nav-item"><a href="/wms/cont/sign_list.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
                             } else {
-                                myhtml += '<li class="nav-item"><a href="/wms/sign/sign_list.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
+                                myhtml += '<li class="nav-item"><a href="/wms/sign/list.php?system_id=' + obj.content[i].sid + '&flow_id=' + obj.content[i].fid + '&function_name=show&token=<?php echo $token; ?>" class="nav-link" target="_parent">' + obj.content[i].sname + ' > ' + obj.content[i].fname + '(' + obj.content[i].cnt + ')</a></li>';
                             }
                         }
                         if (Object.keys(obj.content).length == 6) {

wms/mkt/pricereview-index.php

@@ -5,7 +5,7 @@ include "../header.php";
 $accountname_arr = accountid2name();
 
 $status_arr = ["Y1" => "暫存", "YS" => "簽核中", "YY" => "結案同意", "YN" => "結案不同意"];
-$pricereviewID = $_GET['id'];
+// $pricereviewID = $_GET['id'];
 // 設置一個空陣列來放資料
 
 // 從待我簽核進來

wms/sign/list.php

@@ -82,6 +82,7 @@ $sql_get = "SELECT  d.form_id,c.form_key, a.system_id,b.flow_id ,a.system_name,c
             AND c.current_assigner='$user_id'
             AND d.flow_id=b.flow_id
             AND c.form_key=d.form_key
+            and b.flow_id NOT IN ('wws04')
 $where_system_id
 $where_flow_id
  ";
@@ -205,25 +206,6 @@ $flow_name_opt = (array_unique($flow_name_opt, SORT_REGULAR));
             <tbody>
 
                 <?php
-                foreach ($res_get as $key => $data) {
-                    if ($data['flow_code'] !== 'Z') {
-                        $test = $data['form_id'];
-                        $sql = "SELECT mid FROM pricereview_sign WHERE id = $test";
-                        $result = mysqli_fetch_all(mysqli_query($link, $sql), MYSQLI_ASSOC);
-                        // echo '<pre>';
-                        // print_r($result);
-                        // echo '</pre>';
-                        $id[] =  $result[0]['mid'];
-                    }
-                }
-
-
-                $inClause = implode(',', $id);
-                echo '<pre>';
-                print_r($inClause);
-                echo '</pre>';
-
-
                 $rowspan = 1;
                 foreach ($res_get as $key => $data) :
                     //嘗試將已結案隱藏起來 : 測試使用者體驗