From 84aa3da50c5332cac5e1ee4ab5a5440ffaeb93c8 Mon Sep 17 00:00:00 2001 From: Marvin Date: Thu, 30 Mar 2023 10:50:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=9B=B4=E9=80=9A=E7=8E=87?= =?UTF-8?q?=E6=9F=A5=E8=A9=A2=201.1.=E5=A2=9E=E5=8A=A0=E6=98=8E=E7=B4=B0&?= =?UTF-8?q?=E5=8C=AF=E7=B8=BD=201.2.=E6=98=8E=E7=B4=B0=E5=A2=9E=E5=8A=A0ex?= =?UTF-8?q?cel=E5=B0=8E=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/QRSController.cs | 2 +- AMESCoreStudio.Web/Views/QRS/QRS014.cshtml | 23 ++++++++-- AMESCoreStudio.Web/Views/QRS/QRS014A.cshtml | 45 +++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index 61b13d9e..15ba6cd3 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -2367,7 +2367,7 @@ namespace AMESCoreStudio.Web.Controllers if (ft_stations.Count > 0) { int tdQty = ft_stations.Count * 4 + 3; - rateDataList = rateDataList + ""; + rateDataList = rateDataList + "
"; for (int i = 0; i < ft_stations.Count; i++) { rateDataList = rateDataList + ""; diff --git a/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml index 3cee2cb1..d4186dd9 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS014.cshtml @@ -54,10 +54,13 @@ -
+
- +
@@ -87,7 +90,19 @@ }); }); - function result() { + function result_a() { + var unitNo = $("#unit").val(); + var itemNO = $("#itemNO").val(); + var wipNO = $("#wipNO").val(); + var dateStart = $("#dateStart").val(); + var dateEnd = $("#dateEnd").val(); + + var query = "?unitNo=" + unitNo + "&itemNO=" + itemNO + "&wipNO=" + wipNO + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd; + hg.open('直通率', '/QRS/QRS014A' + query, '', '', true); + + }; + + function result_b() { var unitNo = $("#unit").val(); var itemNO = $("#itemNO").val(); var wipNO = $("#wipNO").val(); diff --git a/AMESCoreStudio.Web/Views/QRS/QRS014A.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS014A.cshtml index 878fb2f1..ccc7d40a 100644 --- a/AMESCoreStudio.Web/Views/QRS/QRS014A.cshtml +++ b/AMESCoreStudio.Web/Views/QRS/QRS014A.cshtml @@ -18,6 +18,9 @@
+ +
+
@Html.Raw(ViewData["RateDataList"])
@@ -27,6 +30,48 @@ await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
" + ft_stations[i].StationName + "