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

wms/mkt/pricereview-edit.php

@@ -909,7 +909,7 @@ $(function(){
         $("input[name='mn_memo']").each(function(){ mnMemoArr.push($(this).val()+"@@"); })
         $('#mn_memo_all').val(mnMemoArr);
         var mnRelateFacilArr = [];
-        $("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html()); })
+        $("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html().trim()); })
         $('#mn_relate_facil_all').val(mnRelateFacilArr);
         var exNoteArr = [];
         $("input[name='except_note']").each(function(){ exNoteArr.push($(this).val()); })

wms/mkt/pricereview_renovate-edit.php

@@ -984,7 +984,7 @@ $(function(){
         $("input[name='mn_memo']").each(function(){ mnMemoArr.push($(this).val()+"@@"); })
         $('#mn_memo_all').val(mnMemoArr);
         var mnRelateFacilArr = [];
-        $("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html()); })
+        $("td[name='mn_relate_facil']").each(function(){ mnRelateFacilArr.push($(this).html().trim()); })
         $('#mn_relate_facil_all').val(mnRelateFacilArr);
         var exNoteArr = [];
         $("input[name='except_note']").each(function(){ exNoteArr.push($(this).val()); })

wms/mkt/pricereview_renovate-record-update.php

@@ -223,6 +223,7 @@ if(isset($_POST['pmstatus'])) {
                 if (empty($iid) && $op_act_arr[$k] == "I") {
                     $to_ins_arr[] = $k;
                 } else {
+                    $option_relate_spec = "";
                     $tmp_arr = explode("<br>", $option_relate_facil_arr[$k]);
                     foreach ($tmp_arr as $val) {
                         $option_relate_spec .= substr($val, 0, strpos($val, ".")).",";

wms/schedule-index.php

@@ -4,12 +4,16 @@ include "header.php";
 $tourl = $_SERVER["SCRIPT_NAME"]."?function_name=schedule&token=".$token;
 
 // 工務總處可瀏覽全部資料
-$sql = "select department_id from account where accountid = '$user_id'";
+$sql = "select department_id, role_id from account where accountid = '$user_id'";
 $res = mysqli_query($link, $sql);
 $row = mysqli_fetch_row($res);
 $user_department_id = $row[0];
+$user_role_id = $row[1];
 mysqli_free_result($res);
 
+// 各區工務助理專員可瀏覽全部
+$dr_arr = ['3114', '3133', '3144', '3152'];
+
 if (!isset($_GET["p"]) || $_GET["p"] <= 0) $p = 1;
 else $p = $_GET["p"];
 $page_each = 50;
@@ -22,6 +26,7 @@ $page_close = 0;
 $sql_cmd2 = "";
 $sql_cmd = sql_myself($user_id);
 if ($user_department_id == "501" || $user_department_id == "322" || $user_id == "M0012" || $user_id == "M0105") $sql_cmd = "";
+if (in_array($user_department_id.$user_role_id, $dr_arr)) $sql_cmd = "";
 //if (empty($sql_cmd)) $sql_cmd = "where ";
 if (!empty($_GET["contractno"])) $sql_cmd2 .= "and contractno = '".$_GET["contractno"]."' ";
 if (!empty($_GET["facilityno"])) $sql_cmd2 .= "and facilityno = '".$_GET["facilityno"]."' ";