diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index 2e12fdee..bc6e5f10 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -642,6 +642,7 @@ namespace AMESCoreStudio.Web.Controllers var result = await _basApi.GetLineInfoes(); var LineItems = new List(); + for (int i = 0; i < result.Count; i++) { LineItems.Add(new SelectListItem(result[i].LineDesc, result[i].LineID.ToString())); @@ -656,15 +657,19 @@ namespace AMESCoreStudio.Web.Controllers var item = new List(); + item.Add(new SelectListItem("全部", "0")); + for (int i = 0; i < result.Count; i++) { item.Add(new SelectListItem(result[i].LineDesc, result[i].LineID.ToString())); } + /* if (item.Count == 0) { item.Add(new SelectListItem("全部", "*")); } + */ //将数据Json化并传到前台视图 return Json(new { data = item }); diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs index fe5c1884..bed2b238 100644 --- a/AMESCoreStudio.Web/Controllers/REPController.cs +++ b/AMESCoreStudio.Web/Controllers/REPController.cs @@ -99,7 +99,7 @@ namespace AMESCoreStudio.Web.Controllers if (item.Count == 0) { - item.Add(new SelectListItem("全部", "*")); + item.Add(new SelectListItem("全部", "0")); } //将数据Json化并传到前台视图 diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml index 0d0f2dae..66843600 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml @@ -171,7 +171,7 @@ { $.ajax( { - url: '@Url.Action("GetUnitLineJson", "REP")', + url: '@Url.Action("GetUnitLineJson", "QRS")', dataType: 'json', data: { "unit_no": $("#unit").val() }, type: 'post', @@ -181,7 +181,7 @@ $.each(result.data, function (index, item) { $("#line").append($("