Merge branch 'jrbin'

wms/cont/sign_list.php

@@ -43,6 +43,15 @@ $user_department_id = $row[0];
 mysqli_free_result($res);
 if (in_array($user_department_id, $depart_arr) || $user_id == "M0008" || $user_id == "M0012" || $user_id == "M0006") $where = "";
 
+// 電梯廠牌
+$elevator_brand_arr = [];
+$sql = "select code_name ,content  from code where field_name='elevator_brand'";
+$res = mysqli_query($link, $sql);
+while ($row = mysqli_fetch_row($res)) {
+    $elevator_brand_arr[$row[0]] = $row[1];
+}
+mysqli_free_result($res);
+
 $sql = "SELECT  
  apply_key,
  vol_no,
@@ -114,11 +123,10 @@ if ($data) :
                             foreach ($editableColumn as $key => $val) {
                                 if ( $key =='apply_key') {
                                     echo "<td> <a href='query_form.php?apply_key=$row[$key]&token=".$_GET['token']."'>" . $row[$key] . "</td>";
-
+                                } elseif ($key == 'brand') {
+                                    echo "<td>" . (!empty($row[$key])?$elevator_brand_arr[$row[$key]]:"") . "</td>";
                                 } else {
-
                                     echo "<td>" . $row[$key] . "</td>";
-
                                 }
                             }
                     //list($signer)=DB::fields(");