diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs
index 905e2d5e..16baa8f5 100644
--- a/AMESCoreStudio.Web/Controllers/REPController.cs
+++ b/AMESCoreStudio.Web/Controllers/REPController.cs
@@ -151,6 +151,22 @@ namespace AMESCoreStudio.Web.Controllers
             ViewBag.RMAReasonList = RMAReasonList;
         }
 
+        [HttpPost]
+        public async Task<JsonResult> GetRepairTypeJson(string repair_type_no)
+        {
+            var result = await _ppsApi.GetRepairType(repair_type_no);
+
+            var item = new List<SelectListItem>();
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].RepairTypeDesc, result[i].RepairTypeNo.ToString()));
+            }
+
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
+        }
+
 
         private async Task GetRepairTypeList()
         {
diff --git a/AMESCoreStudio.Web/Views/REP/REP001R.cshtml b/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
index 828fdf2f..2e7413d6 100644
--- a/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
@@ -20,7 +20,7 @@
 
 <div class="layui-card">
     <div class="col-sm-12">
-        <form enctype="multipart/form-data" class="layui-form" method="post" asp-action="REP001RSave">
+        <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 type="hidden" asp-for="ngComponent.NgID" />
@@ -289,7 +289,8 @@
                     </div>
                     <label asp-for="ngRepair.RepairTypeNo" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="ngRepair.RepairTypeNo" asp-items="@ViewBag.RepairTypeList" class=""></select>
+                        <input id="txtRepairTypeNo" asp-for="ngRepair.RepairTypeNo" class="layui-input" autocomplete="off" />
+                        <input id="txtRepairTypeDesc" class="layui-input" autocomplete="off" readonly />
                         <span asp-validation-for="ngRepair.RepairTypeNo" class="layui-bg-red"></span>
                     </div>
                     <label asp-for="ngRepair.NgTypeNo" class="layui-form-label"></label>
@@ -346,7 +347,8 @@
             <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>
-                    <input type="submit" value="確認" class="btn btn-primary offset-sm-3" />
+                    
+                    <button id="btnOK" type="button" class="layui-btn" lay-submit lay-filter="*">確認</button>
                 </div>
             </div>
         </form>
@@ -366,12 +368,48 @@
         }
     });
 
+    function getRepairType(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetRepairTypeJson", "REP")",
+                    dataType: 'json',
+                    data: { "repair_type_no": data},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $.each(result.data, function (index, item) {
+                            $("#txtRepairTypeDesc").val(item.text);
+                        });
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
     $("#saveimage1").click(function (event) {
         alert('save1');
 
 
     });
 
+    $("#btnOK").click(function (event) {
+        $("#form").submit();
+    });
+
+    $('#txtRepairTypeNo').on('keypress', function (event) {
+
+        if (event.keyCode == 13) {
+            //alert($('#txtRepairTypeNo').val());
+            getRepairType($('#txtRepairTypeNo').val());
+        }
+
+    });
+
+
     var tableCols = [[
         {
             field: 'repairID',