1.品質不良單

2.修正 mkt/database.php 的 .env 路徑

.gitignore

@@ -23,3 +23,4 @@ wms/excel/estimated_shipping_date_report.xlsx
 *.docx
 wms/mkt/WriteOffRepair.xlsx
 wms/contract/images/contracts
+wms/test.php

mkt/database.php

@@ -1,6 +1,6 @@
 <?php 
 $envFile = __DIR__ . '\.env'; // .env 文件的路径
-
+$envFile = __DIR__ . '/../.env'; // .env 文件的路径
 if (file_exists($envFile)) {
     $lines = file($envFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
     if ($lines !== false) {
@@ -18,6 +18,7 @@ $host = getenv('DB_HOST');
 $dbuser = getenv('DB_USERNAME');
 $dbpassword = getenv('DB_PASSWORD');
 $dbname = getenv('DB_DATABASE');
+// exit;
 $link = mysqli_connect($host,$dbuser,$dbpassword,$dbname);
 //print_r($link);exit;
 if($link){

wms/ngfeedback-create.php

@@ -3,16 +3,33 @@ require_once "database.php";
 include "header.php";
 
 include "ngfeedback-create-submit.php";
+
+$sql = "
+	SELECT
+		facilityno
+	FROM facility
+";
+$result = mysqli_query($link, $sql);
+$opts = mysqli_fetch_all($result, MYSQLI_ASSOC);
+
 ?>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/css/autoComplete.02.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/css/selectize.default.min.css" integrity="sha512-pTaEn+6gF1IeWv3W1+7X7eM60TFu/agjgoHmYhAfLEU8Phuf6JKiiE8YmsNC0aCgQv4192s4Vai8YZ6VNM6vyQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+<script src="https://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.15.2/js/selectize.min.js" integrity="sha512-IOebNkvA/HZjMM7MxL0NYeLYEalloZ8ckak+NDtOViP7oiYzG5vn6WVXyrJDiJPhl4yRdmNAG49iuLmhkUdVsQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<link rel="stylesheet" href="/wms/css/autoComplete.02.min.css">
 <style>
-select, textarea {
+	select,
+	textarea {
 		margin: 8px 0;
 	}
-.autoComplete_wrapper { width: 100%; }
+
+	.autoComplete_wrapper {
+		width: 100%;
+	}
+
 	.autoComplete_wrapper>input,
 	input[type=file]+.img-preview,
-input[type=file], textarea {
+	input[type=file],
+	textarea {
 		width: 100%;
 		padding: 12px 20px;
 		margin: 8px 0;
@@ -23,10 +40,12 @@ input[type=file], textarea {
 		font-size: inherit;
 		height: auto;
 	}
+
 	.img-preview {
 		position: relative;
 		background-color: var(--bs-white, #fff);
 	}
+
 	.img-preview>.btn-icon {
 		position: absolute;
 		top: 1px;
@@ -34,16 +53,20 @@ input[type=file], textarea {
 		font-weight: 600;
 		cursor: pointer;
 	}
+
 	.btn-icon>svg {
 		width: 32px;
 		height: 32px;
 	}
+
 	.autoComplete_wrapper>ul[role=listbox] {
 		margin-top: -12px;
 	}
+
 	input[type=file][accept^=image].preview {
 		display: none;
 	}
+
 	input[type=file][accept^=image]:not(.preview)+.img-preview {
 		display: none;
 	}
@@ -53,9 +76,18 @@ input[type=file][accept^=image]:not(.preview) + .img-preview {
 		<input type="hidden" name="token" value="<?= $token; ?>">
 		<input type="hidden" name="creater" value="<?= $user_id; ?>">
 		<div class="form-group">
+			<div class="row">
 				<div class="col-md-3">
 					<label for="facilityno">電梯ID</label>
-				<input type="text" name="facilityno" id="facilityno" maxlength="15" required>
+					<!-- <input type="text" name="facilityno" id="facilityno" maxlength="15" required> -->
+					<select name="facilityno" id="facilityno" required>
+						<?php
+							echo "<option value=''>請選擇</option>";
+							foreach($opts as $opt){
+								echo "<option value='" . $opt["facilityno"] . "'>" . $opt["facilityno"] . "</option>";
+							}
+						?>
+					</select>
 				</div>
 				<div class="col-md-3">
 					<label for="sitename">現場名稱</label>
@@ -65,6 +97,7 @@ input[type=file][accept^=image]:not(.preview) + .img-preview {
 					<label for="siteaddress">現場地址</label>
 					<input type="text" name="siteaddress" id="siteaddress" maxlength="255" required>
 				</div>
+			</div>
 			<div class="col-md-6">
 				<label for="ngdescribe">簡述不良內容</label>
 				<textarea name="ngdescribe" id="ngdescribe" rows="4" maxlength="128" required></textarea>
@@ -91,6 +124,11 @@ input[type=file][accept^=image]:not(.preview) + .img-preview {
 </div>
 <script src="https://cdn.jsdelivr.net/npm/@tarekraafat/autocomplete.js@10.2.7/dist/autoComplete.min.js"></script>
 <script>
+	$(document).ready(function() {
+		// $('#facilityno').select2();
+		$("#facilityno").selectize();
+	});
+
 	function image_preview(event) {
 		var input = event.target;
 		var image = document.querySelector(`#${input.id}-preview > img`);
@@ -105,6 +143,7 @@ function image_preview (event) {
 		}
 		$(`#${input.id}`).removeClass("preview");
 	}
+
 	function image_remove(el) {
 		var pid = $(el).attr("data-pid");
 		var input = document.querySelector(`input#${pid}`);

wms/ngfeedback-update-reply.php

@@ -27,10 +27,13 @@ $result = $stmt->get_result();
 $opts = mysqli_fetch_all($result, MYSQLI_ASSOC);
 ?>
 <style>
-select, textarea {
+	select,
+	textarea {
 		margin: 8px 0;
 	}
-div.input-style, textarea {
+
+	div.input-style,
+	textarea {
 		width: 100%;
 		padding: 12px 20px;
 		margin: 8px 0;
@@ -41,6 +44,7 @@ div.input-style, textarea {
 		background: var(--bs-white, #fff);
 		white-space: pre;
 	}
+
 	div.input-style:empty:after {
 		content: " ";
 	}
@@ -167,4 +171,3 @@ div.input-style:empty:after {
 		</div>
 	</form>
 </div>
-

wms/ngfeedback-update.php

@@ -4,13 +4,15 @@ include "header.php";
 
 include "ngfeedback-update-submit.php";
 
-$db_query = "SELECT *, 
+$db_query = "
-				f_return_account_name(verify) as verify_name, 
+    SELECT *, 
-				f_return_account_name(creater) as creater_name, 
+        f_return_account_name(verify) AS verify_name, 
-				f_return_account_name(responsibledepartmentleader) as responsibledepartmentleader_name,
+        f_return_account_name(creater) AS creater_name, 
-				f_return_account_name(responder) as responder_name,
+        f_return_account_name(responsibledepartmentleader) AS responsibledepartmentleader_name,
-				f_return_department_name(responsibledepartment) as responsibledepartment_name
+        f_return_account_name(responder) AS responder_name,
-			FROM ngfeedback WHERE id = ?";
+        f_return_department_name(responsibledepartment) AS responsibledepartment_name
+    FROM ngfeedback WHERE id = ?
+";
 $stmt = $link->prepare($db_query);
 // 此處僅有字串格式
 $stmt->bind_param("i", ...[$_REQUEST["no"]]);
@@ -26,10 +28,13 @@ $progress = array(
 );
 ?>
 <style>
-select, textarea {
+    select,
+    textarea {
         margin: 8px 0;
     }
-div.input-style, textarea {
+
+    div.input-style,
+    textarea {
         width: 100%;
         padding: 12px 20px;
         margin: 8px 0;
@@ -40,11 +45,13 @@ div.input-style, textarea {
         background: var(--bs-white, #fff);
         white-space: pre;
     }
+
     div.input-style:empty:after {
         content: " ";
     }
 </style>
-<?php if ($data["progress"] == "9") { // determination ?>
+<?php if ($data["progress"] == "9") { // determination 
+?>
     <div class="container">
         <form role="form" class="form-horizontal" method="post" action="<?php echo htmlspecialchars($_SERVER["PHP_SELF"]); ?>" enctype="multipart/form-data">
             <input type="hidden" name="token" value="<?= $token; ?>">
@@ -155,6 +162,7 @@ div.input-style:empty:after {
                         <option value="543">桃竹工事部</option>
                         <option value="544">中區工事部</option>
                         <option value="545">南區工事部</option>
+                        <option value="platform">普來特富</option>
                     </select>
                 </div>
             </div>
@@ -219,4 +227,3 @@ div.input-style:empty:after {
         </div>
     </form>
 </div>
-