diff --git a/AMESCoreStudio.Web/Controllers/SPCController.cs b/AMESCoreStudio.Web/Controllers/SPCController.cs index 458687c1..845ee828 100644 --- a/AMESCoreStudio.Web/Controllers/SPCController.cs +++ b/AMESCoreStudio.Web/Controllers/SPCController.cs @@ -309,6 +309,9 @@ namespace AMESCoreStudio.Web.Controllers //新增頁面 public IActionResult SPC001C() { + var tt = Request.Cookies["UserID"]; + ViewBag.UserID = tt; + return View(); } @@ -316,6 +319,9 @@ namespace AMESCoreStudio.Web.Controllers [HttpGet] public async Task SPC001UAsync(int id) { + var tt = Request.Cookies["UserID"]; + ViewBag.UserID = tt; + var result = await _spcApi.GetInspectionType(id); if (result.Count == 0) @@ -327,6 +333,7 @@ namespace AMESCoreStudio.Web.Controllers public async Task SPC001DAsync(int id) { + var result = await _spcApi.DeleteInspectionType(id); return Json(new Result() { success = true, msg = "" }); } @@ -420,6 +427,7 @@ namespace AMESCoreStudio.Web.Controllers { await GetInspectionTypesList(); await GetFactoryUnitsList3(); + await GetUserID(); return View(); } @@ -429,6 +437,7 @@ namespace AMESCoreStudio.Web.Controllers { await GetInspectionTypesList(); await GetFactoryUnitsList3(); + await GetUserID(); var result = await _spcApi.GetInspectionForm(id); if (result.Count == 0) @@ -559,6 +568,7 @@ namespace AMESCoreStudio.Web.Controllers var result = await _spcApi.GetInspectionForm(id); ViewBag.FormID = result[0].InspectionFormID; ViewBag.FormName = "正在新增["+result[0].InspectionName+"]細項"; + await GetUserID(); return View(); } //修改页面 @@ -566,12 +576,13 @@ namespace AMESCoreStudio.Web.Controllers public async Task SPC003UAsync(int id) { var result = await _spcApi.GetInspectionItem(id); + if (result.Count == 0) { return View(); } - + await GetUserID(); var resultForm = await _spcApi.GetInspectionForm(result[0].InspectionFormID); ViewBag.FormID = resultForm[0].InspectionFormID; ViewBag.FormName = "正在修改[" + resultForm[0].InspectionName + "]細項"; diff --git a/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml index 3f9c4f65..905b89eb 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC001.cshtml @@ -48,7 +48,7 @@ templet: function (d) { var btn = ""; if (@ViewBag.UserID == d.createUserID) - btn = '删除' + btn = '修改 删除' return btn; } diff --git a/AMESCoreStudio.Web/Views/SPC/SPC001C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC001C.cshtml index e3c4425a..05d6c038 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC001C.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC001C.cshtml @@ -16,8 +16,8 @@
- - + + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC001U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC001U.cshtml index 520bf004..27857a92 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC001U.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC001U.cshtml @@ -17,7 +17,7 @@
- + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC002C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC002C.cshtml index 5e95e510..d6ae4b7c 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC002C.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC002C.cshtml @@ -16,8 +16,8 @@
- - + + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC002U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC002U.cshtml index d7ebd0bf..f3829728 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC002U.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC002U.cshtml @@ -17,7 +17,7 @@
- + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC003C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC003C.cshtml index 072d5c52..61214c24 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC003C.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC003C.cshtml @@ -17,8 +17,8 @@
- - + + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC003U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC003U.cshtml index 948109dc..a318c134 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC003U.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC003U.cshtml @@ -17,8 +17,8 @@
- - + + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC004C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC004C.cshtml index dca6ea73..866ecf8b 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC004C.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC004C.cshtml @@ -17,8 +17,8 @@
- - + + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml index 5f1fe7dc..d4cc5e1b 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml @@ -25,7 +25,7 @@ - +