From 02daa402de87a5b7d1b88c844b064f82e9befea0 Mon Sep 17 00:00:00 2001 From: Yiru Date: Wed, 5 Feb 2025 16:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=95=B0=E5=B8=B8=E8=AD=A6?= =?UTF-8?q?=E5=A0=B1=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FQCController.cs | 36 ++++++++++++------ AMESCoreStudio.Web/Views/FQC/FQC014.cshtml | 37 +++++++++++++------ .../AMES/NgInfoAlertMasterController.cs | 2 +- .../Models/AMES/NgInfoAlertMaster.cs | 2 +- 4 files changed, 51 insertions(+), 26 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index ea84cfa9..e2afa9ef 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -2776,13 +2776,13 @@ namespace AMESCoreStudio.Web.Controllers } // 檢查檔案副檔名 - var allowedExtensions = new[] { ".png", ".jpg", ".bmp", ".gif", ".xlsx",".xls",".docx",".pdf",".pptx",".txt",".eml",".etc" }; + var allowedExtensions = new[] { ".png", ".jpg", ".bmp", ".gif", ".xlsx",".xls",".docx",".pdf",".pptx",".txt",".eml",".etc", ".msg" }; var fileExtension = Path.GetExtension(formFile.FileName).ToLower(); if (!allowedExtensions.Contains(fileExtension)) { string msg = "檔案格式錯誤，請確認\r\n"; - msg += "僅允許上傳 png、jpg、bmp、gif、xlsx、xls、docx、pdf、pptx、txt、eml、etc 格式的檔案！"; + msg += "僅允許上傳 png、jpg、bmp、gif、xlsx、xls、docx、pdf、pptx、txt、eml、etc、msg 格式的檔案！"; ModelState.AddModelError("error", msg); ViewBag.CaseID = model.CaseID; return View("FQC014R"); @@ -2888,7 +2888,7 @@ namespace AMESCoreStudio.Web.Controllers // await GetUserInfo("1004,1009"); var result = await _fqcApi.GetNgInfoAlertMaster(id); - if (result.UpdateUserID != 0) + if (result.UpdateUserID != 0 && result.UpdateUserID != -1) { var user_info = await _sysApi.GetUserInfo(result.UpdateUserID); ViewBag.UpdateUserName = user_info[0].UserName; @@ -2903,22 +2903,33 @@ namespace AMESCoreStudio.Web.Controllers { if (ModelState.IsValid) { - IResultModel result; + if (model.StatusNo == "F" & model.UpdateUserID == -1) + { + var tt = Request.Cookies["UserID"]; + ViewBag.UserID = tt; - result = await _fqcApi.PutNgInfoAlertMaster(model.CaseID, JsonConvert.SerializeObject(model)); + ModelState.AddModelError("error", "請選擇QA人員"); - if (result.Success) - { - var _msg = "修改成功！"; - return RedirectToAction("Refresh", "Home", new { msg = _msg }); } else { - var tt = Request.Cookies["UserID"]; - ViewBag.UserID = tt; + IResultModel result; - ModelState.AddModelError("error", result.Msg); + result = await _fqcApi.PutNgInfoAlertMaster(model.CaseID, JsonConvert.SerializeObject(model)); + if (result.Success) + { + var _msg = "修改成功！"; + return RedirectToAction("Refresh", "Home", new { msg = _msg }); + } + else + { + var tt = Request.Cookies["UserID"]; + ViewBag.UserID = tt; + + ModelState.AddModelError("error", result.Msg); + + } } } return View("FQC014U", model); @@ -2975,6 +2986,7 @@ namespace AMESCoreStudio.Web.Controllers { string[] DeptIDList = DeptIDs.Split(','); var UserItems = new List(); + UserItems.Add(new SelectListItem("請選擇", "0")); // 顯示分割後的結果 foreach (var item1 in DeptIDList) { diff --git a/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml index 873ac81e..cc00c1dd 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC014.cshtml @@ -118,9 +118,24 @@ //监听表单提交事件 hg.form.onsubmit('querysubmit', function (data) { - hg.msghide("重新載入資料.."); - // table && table.reload(data); - tt(); + var dateStart = $("#dateStart").val(); + var dateEnd = $("#dateEnd").val(); + + // Convert the date strings to Date objects for comparison + var startDate = new Date(dateStart); + var endDate = new Date(dateEnd); + + // Check if dateStart is greater than dateEnd + if (startDate > endDate) { + alert("開始日期不可大於結束日期"); + $("#dateStart").val(''); // Example of resetting the start date + $("#dateEnd").val(''); // Example of resetting the end date + } + else { + hg.msghide("重新載入資料.."); + // table && table.reload(data); + tt(); + } }); @@ -195,8 +210,6 @@ field: 'right', width: 150, title: '操作', - fixed: 'right', - templet: function (d) { var btn = '檢視' if (d.statusNo != "已結案") { @@ -214,12 +227,12 @@ templet: '#statusNo1' }, { - field: 'updateDate', + field: 'createDate', // templet: '
{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}
', - title: '警報處理時間', + title: '警報開始時間', width: 100, sort: true, - templet: '#updateDate' + templet: '#createDate' }, { field: 'finishDate', // templet: '
{{ layui.util.toDateString(d.finishDate, "yyyy/MM/dd") }}
', @@ -405,13 +418,13 @@ {{ d.userName }} {{# } }} -