From 5083ca938eafd479b8c4d5cee2cf07b3847281e1 Mon Sep 17 00:00:00 2001
From: Cheng <lkmd555@masada.com.tw>
Date: Tue, 9 Jan 2024 15:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E8=A1=9D=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms/frame/pending.php         |  2 +-
 wms/mkt/pricereview-index.php |  4 ++--
 wms/sign/list.php             | 20 +-------------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/wms/frame/pending.php b/wms/frame/pending.php
index 0b0f2caa..c98d40df 100644
--- a/wms/frame/pending.php
+++ b/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) {
diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php
index c47f4c26..cbc2fbb3 100644
--- a/wms/mkt/pricereview-index.php
+++ b/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'];
 // 設置一個空陣列來放資料
 
 // 從待我簽核進來
@@ -65,7 +65,7 @@ $data = array();
 $sql_cmd = sql_myself($user_id, "pricereview_main .creater");
 $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許紓晴,,M0175陳君敏,M0189權限全開
-if ($user_id == "M0024" || $user_id == 'M0026' || $user_id == "M0107" || $user_id == "M0174" || $user_id == "M0175" ||$user_id == "M0189" || $user_id == "TEST01" || $user_id == "TEST02" || $user_id == "TEST03" || $user_id == "TEST04") {
+if ($user_id == "M0024" || $user_id == 'M0026' || $user_id == "M0107" || $user_id == "M0174" || $user_id == "M0175" || $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, 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";
 }
diff --git a/wms/sign/list.php b/wms/sign/list.php
index d6cc8899..7b4ab5b0 100644
--- a/wms/sign/list.php
+++ b/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) :
                     //嘗試將已結案隱藏起來 : 測試使用者體驗