diff --git a/wms/wipwholeinstall-index.php b/wms/wipwholeinstall-index.php
index eea8c46a..a148c22a 100644
--- a/wms/wipwholeinstall-index.php
+++ b/wms/wipwholeinstall-index.php
@@ -1,5 +1,5 @@
@@ -150,6 +166,12 @@ $data = mysqli_query($link, $sql);
+ />
+
+ />
+
+ />
+
@@ -208,6 +230,7 @@ mysqli_close($link);
formData.append("real_arrival_date_start", "");
formData.append("real_arrival_date_end", "");
formData.append("area_no", "");
+ formData.append("erro_mesage_search", "");
function generateButton() {
var xhr = new XMLHttpRequest();
@@ -307,6 +330,7 @@ mysqli_close($link);
var real_arrival_date_start = $("#real_arrival_date_start").val();
var real_arrival_date_end = $("#real_arrival_date_end").val();
var area_no = $("#area_no").val();
+ var erro_mesage_search = $('input[name=erro_mesage_search]:checked').val();
var showNum = ;
var nowPage = ;
@@ -356,6 +380,6 @@ mysqli_close($link);
"&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
"&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
"&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
- "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no;
+ "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no + "&erro_mesage_search=" + erro_mesage_search;
}
\ No newline at end of file
diff --git a/wms/wipwholeinstall-renovate-index.php b/wms/wipwholeinstall-renovate-index.php
index 3de83dfc..875f4fca 100644
--- a/wms/wipwholeinstall-renovate-index.php
+++ b/wms/wipwholeinstall-renovate-index.php
@@ -43,11 +43,27 @@ $site_survey_contact_verify = !isset($_REQUEST['site_survey_contact_verify']) ?
$real_arrival_date_start = empty($_REQUEST['real_arrival_date_start']) ? null : $_REQUEST['real_arrival_date_start'];
$real_arrival_date_end = empty($_REQUEST['real_arrival_date_end']) ? null : $_REQUEST['real_arrival_date_end'];
$area_no = !isset($_REQUEST['area_no']) ? '' : $_REQUEST['area_no'];
+$erro_mesage_search = !isset($_REQUEST['erro_mesage_search']) ? 'A' : $_REQUEST['erro_mesage_search'];
// 取得資料 sql
$sql = getDataSql($department_id, $role_id, $user_id);
$data = mysqli_query($link, $sql);
+$Tdata = [];
+$Fdata = [];
+
+foreach ($data as $row) {
+ if (!empty(warningMessage($row))) {
+ array_push($Tdata, $row);
+ } else {
+ array_push($Fdata, $row);
+ }
+}
+if ($erro_mesage_search == 'T')
+ $data = $Tdata;
+if ($erro_mesage_search == 'F')
+ $data = $Fdata;
+
?>
@@ -150,6 +166,12 @@ $data = mysqli_query($link, $sql);
|
+ />
+
+ />
+
+ />
+
@@ -207,7 +229,7 @@ mysqli_close($link);
formData.append("real_arrival_date_start", "");
formData.append("real_arrival_date_end", "");
formData.append("area_no", "");
-
+ formData.append("erro_mesage_search", "");
function generateButton() {
var xhr = new XMLHttpRequest();
@@ -302,6 +324,7 @@ mysqli_close($link);
var real_arrival_date_start = $("#real_arrival_date_start").val();
var real_arrival_date_end = $("#real_arrival_date_end").val();
var area_no = $("#area_no").val();
+ var erro_mesage_search = $('input[name=erro_mesage_search]:checked').val();
var showNum = ;
var nowPage = ;
@@ -354,6 +377,6 @@ mysqli_close($link);
"&orderColumn=" + orderColumn + "&orderDirection=" + orderDirection +
"&contractno=" + contractno + "&facilityno=" + facilityno + "&custom=" + custom +
"&site_survey_contact_verify=" + site_survey_contact_verify + "&real_arrival_date_start=" + real_arrival_date_start +
- "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no;
+ "&real_arrival_date_end=" + real_arrival_date_end + "&area_no=" + area_no + "&erro_mesage_search=" + erro_mesage_search;
}
\ No newline at end of file
|