1.修改前判维修输入，增加“维修描述暂存”

AMESCoreStudio.Web/Controllers/REPController.cs

@@ -396,6 +396,46 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Result() { success = true, msg = "" });
         }
 
+        public async Task<JsonResult> SaveRepairDesc(int ng_id,int component_id,string repair_desc)
+        {
+            IResultModel result;
+            var userID = "";
+            HttpContext.Request.Cookies.TryGetValue("UserID", out userID);
+            int user_id = 0;
+            if (userID != null)
+            {
+                if (int.Parse(userID.ToString()) >= 0)
+                {
+                    user_id = int.Parse(userID.ToString());
+                }
+            }
+
+            var repair_record = await _repApi.GetRepairRecord(component_id);
+
+            if (repair_record.Count > 0)
+            {
+                repair_record[0].NgID = ng_id;
+                repair_record[0].UpdateUserID = user_id;
+                repair_record[0].UpdateDate = System.DateTime.Now;
+                repair_record[0].RepairDesc = repair_desc;
+                result = await _repApi.PutRepairRecord((int)repair_record[0].ComponentID, JsonConvert.SerializeObject(repair_record[0]));
+            }
+            else
+            {
+                RepairRecord repairRecord = new RepairRecord();
+                repairRecord.UpdateUserID = user_id;
+                repairRecord.UpdateDate = System.DateTime.Now;
+                repairRecord.CreateUserID = user_id;
+                repairRecord.CreateDate = System.DateTime.Now;
+                repairRecord.NgID = ng_id;
+                repairRecord.ComponentID = component_id;
+                repairRecord.RepairDesc = repair_desc;
+                result = await _repApi.PostRepairRecord(JsonConvert.SerializeObject(repairRecord));
+            }
+
+            return Json(new { _msg = string.Format("維修描述保存成功!") });
+        }
+
         public async Task<IActionResult> REP001R(int id)
         {
             await GetRMAReasonList();
@@ -442,8 +482,6 @@ namespace AMESCoreStudio.Web.Controllers
                     model.repairRecord.RepairDesc = repair_desc;
                 }
 
-                
-
                 var result4 = await _repApi.GetNgRepairByComponent((int)result1[0].ComponentID);
                 if (result4.Count != 0)
                 {

AMESCoreStudio.Web/Views/REP/REP001R.cshtml

@@ -22,7 +22,7 @@
     <div class="col-sm-12">
         <form id="form" enctype="multipart/form-data" class="layui-form" method="post" asp-action="REP001RSave">
             <div asp-validation-summary="ModelOnly" class="text-danger"></div>
-            <input type="hidden" asp-for="ngComponent.ComponentID" />
+            <input id="txtComponentID" name="txtComponentID" type="hidden" asp-for="ngComponent.ComponentID" />
             <input type="hidden" asp-for="ngComponent.NgID" />
             <input type="hidden" asp-for="ngComponent.PinQty" />
             <input type="hidden" asp-for="ngComponent.CreateUserID" />
@@ -42,7 +42,7 @@
             <input type="hidden" asp-for="ngRepair.CreateUserID" />
             <input type="hidden" asp-for="ngRepair.CreateDate" />
 
-            <input type="hidden" asp-for="ngInfo.NgID" />
+            <input id="txtNgID" name="txtNgID" type="hidden" asp-for="ngInfo.NgID" />
             <input type="hidden" asp-for="ngInfo.TypeNo" />
             <input type="hidden" asp-for="ngInfo.OperatorID" />
             <input type="hidden" asp-for="ngInfo.ProgramNo" />
@@ -241,7 +241,7 @@
                 <div class="layui-inline">
                     <label asp-for="repairRecord.RepairDesc" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="repairRecord.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" readonly />
+                        <input asp-for="repairRecord.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
                         <span asp-validation-for="repairRecord.RepairDesc" class="layui-bg-red"></span>
                     </div>
                 </div>
@@ -330,7 +330,7 @@
                 <div class="layui-inline">
                     <label asp-for="ngRepair.RepairDesc" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <input asp-for="ngRepair.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
+                        <input id="txtRepairDesc" name="txtRepairDesc" asp-for="ngRepair.RepairDesc" class="layui-input" autocomplete="off" style="width:810px;" />
                         <span asp-validation-for="ngRepair.RepairDesc" class="layui-bg-red"></span>
                     </div>
                 </div>
@@ -354,7 +354,7 @@
             <div style="text-align:center">
                 <div class="layui-inline">
                     <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-
+                    <button type="button" id="btnSave" class="layui-btn">維修描述暫存</button>&nbsp;&nbsp;
                     <button id="btnOK" type="button" class="layui-btn" lay-submit lay-filter="*">確認</button>
                 </div>
             </div>
@@ -513,6 +513,27 @@
 
     });
 
+    $('#btnSave').click(function () {
+        var ng_id = $('#txtNgID').val();
+        var component_id = $('#txtComponentID').val();
+        var repair_desc = $('#txtRepairDesc').val();
+        $.ajax({
+            url: '@Url.Action("SaveRepairDesc", "REP")',
+            dataType: 'json',
+            data: { "ng_id": ng_id, "component_id": component_id, "repair_desc": repair_desc },
+            cache: false,
+            type: "POST",
+            success: function (data, textStatus, jqXHR) {
+                if (data._msg != undefined) {
+                    parent.hg.msg(data._msg);
+                }
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                alert("Found error when using Ajax!!");
+            }
+        });
+
+    });
 
     var tableCols = [[
         {