Browse Source

修改FQC014UV欄位名稱

修正FQC014輸入日期條件無作用
修改FQC014UV 選完結時需要判斷QA人員是否已輸入
master
Yiru 4 days ago
parent
commit
88e27599ed
  1. 4
      AMESCoreStudio.Web/Controllers/FQCController.cs
  2. 4
      AMESCoreStudio.Web/Views/FQC/FQC014.cshtml
  3. 4
      AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml
  4. 4
      AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml

4
AMESCoreStudio.Web/Controllers/FQCController.cs

@ -2929,13 +2929,13 @@ namespace AMESCoreStudio.Web.Controllers
{ {
if (ModelState.IsValid) 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"]; var tt = Request.Cookies["UserID"];
ViewBag.UserID = tt; ViewBag.UserID = tt;
ModelState.AddModelError("error", "請選擇QA人員"); ModelState.AddModelError("error", "請選擇QA人員");
await GetUserInfo("1004,1009");
} }
else else
{ {

4
AMESCoreStudio.Web/Views/FQC/FQC014.cshtml

@ -301,7 +301,7 @@
var statusNo = $("#statusNo").val(); var statusNo = $("#statusNo").val();
var dateStart = $("#dateStart").val(); var dateStart = $("#dateStart").val();
var dateEnd = $("#dateEnd").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 statusNo = $("#statusNo").val();
var dateStart = $("#dateStart").val(); var dateStart = $("#dateStart").val();
var dateEnd = $("#dateEnd").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']);

4
AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml

@ -187,7 +187,7 @@
{ {
field: 'createDate', field: 'createDate',
width: 100, width: 100,
title: '警報異常時間', title: '警報開始時間',
templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>', templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
sort: true sort: true
}, },
@ -212,7 +212,7 @@
{ {
field: 'repairDesc', field: 'repairDesc',
width: 100, width: 100,
title: '維修原因', title: '維修描述',
sort: true sort: true
}, },
{ {

4
AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml

@ -172,7 +172,7 @@
{ {
field: 'createDate', field: 'createDate',
width: 100, width: 100,
title: '警報異常時間', title: '警報開始時間',
templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>', templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
sort: true sort: true
}, },
@ -197,7 +197,7 @@
{ {
field: 'repairDesc', field: 'repairDesc',
width: 100, width: 100,
title: '維修原因', title: '維修描述',
sort: true sort: true
}, },
{ {

Loading…
Cancel
Save