diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index cd138c77..a9628727 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -2929,13 +2929,13 @@ namespace AMESCoreStudio.Web.Controllers { if (ModelState.IsValid) { - if (model.StatusNo == "F" & model.UpdateUserID == -1) + if (model.StatusNo == "F" && (model.UpdateUserID == -1 || model.UpdateUserID == 0)) { var tt = Request.Cookies["UserID"]; ViewBag.UserID = tt; ModelState.AddModelError("error", "請選擇QA人員"); - + await GetUserInfo("1004,1009"); } else { diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml index cc00c1dd..41cfaf88 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml @@ -301,7 +301,7 @@ var statusNo = $("#statusNo").val(); var dateStart = $("#dateStart").val(); var dateEnd = $("#dateEnd").val(); - var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=&dateEnd=", {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=" + dateStart + "&dateEnd="+dateEnd, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); }; @@ -313,7 +313,7 @@ var statusNo = $("#statusNo").val(); var dateStart = $("#dateStart").val(); var dateEnd = $("#dateEnd").val(); - var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=&dateEnd=", {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertMasterByQuery?caseID=' + caseID + "&itemNoF=" + itemNoF + "&modelName=" + modelName + "&wipNoF=" + wipNoF + "&errorCode=" + errorCode + "&statusNo=" + statusNo + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml index 8f8764e5..592be6cf 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml @@ -187,7 +187,7 @@ { field: 'createDate', width: 100, - title: '警報異常時間', + title: '警報開始時間', templet: '