diff --git a/wms/fun_global.php b/wms/fun_global.php index 5a57531d..436a91e8 100644 --- a/wms/fun_global.php +++ b/wms/fun_global.php @@ -102,7 +102,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0) // 若為第一層且使用者ID為區經理,直接訂好接下來的簽核人員並跳出。 if ($i == 0 && ($user_id == 'M0033' || $user_id == "M0137" || $user_id == 'M0029' || $user_id == 'M0054' || $user_id == "M0086")) { $ret[1] = $user_id . ",,"; - $ret[2] = "M0024,,<##>M0107,,"; // 業務部專員:M0024許伃廷、M0107許紓晴(第2關有多位審核人) + $ret[2] = "M0175,,<##>M0107,,"; // 業務部專員:M0175陳君敏、M0107許紓晴(第2關有多位審核人) $ret[3] = "M0060,,"; // 業務協理 if ($rate < 80 || $special_fee > 0) { $ret[4] = "M0006,,"; // 總經理 @@ -123,7 +123,7 @@ function pricereview_class($rate, $user_id, &$ret = [], $special_fee, $i = 0) } } else { - $ret[2] = "M0024,,<##>M0107,,"; // 業務部專員:M0024許伃廷、M0107許紓晴(第2關有多位審核人) + $ret[2] = "M0175,,<##>M0107,,"; // 業務部專員:M0175陳君敏、M0107許紓晴(第2關有多位審核人) $ret[3] = "M0060,,"; // 業務協理 if ($rate < 80 || $special_fee > 0) { $ret[4] = "M0006,,"; // 總經理 @@ -163,11 +163,11 @@ function pricereview_renovate_class($rate, $user_id, $renovate_flag) if ($renovate_flag == "REN") { // $ret[2] = 'M0012'; if ($rate <= 100) $ret[3] = "M0008"; // 詹總 - if ($rate < 75) $ret[4] = "M0006"; // 總經理 + if ($rate < 80) $ret[4] = "M0006"; // 總經理 } else { // 全汰改 if ($rate <= 100) $ret[3] = "M0008"; // 詹總 - if ($rate < 75) $ret[4] = "M0006"; // 總經理 + if ($rate < 80) $ret[4] = "M0006"; // 總經理 } mysqli_free_result($res); return $ret; diff --git a/wms/mkt/pricereview-index.php b/wms/mkt/pricereview-index.php index 677038fa..6ad19e7b 100644 --- a/wms/mkt/pricereview-index.php +++ b/wms/mkt/pricereview-index.php @@ -297,6 +297,7 @@ function get_pending($token) t.flow_name LIMIT 0, 6 "; + // echo '
'; // print_r($sql); // echo ''; @@ -320,6 +321,7 @@ function get_pending($token) } $result = get_pending($token); +print_r($result); $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm'; $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';