From 24f430172768bcc401f72ed6397543fc431d76f3 Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Sun, 27 Mar 2022 20:34:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E7=AB=99?=
 =?UTF-8?q?=E5=88=AB=E7=BB=B4=E6=8A=A4=201.1.=E4=BF=AE=E6=94=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E/=E4=BF=AE=E6=94=B9=E5=90=8E=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E5=9C=A8=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BASController.cs              | 23 +++++++++++++++++++
 AMESCoreStudio.Web/Views/BAS/BAS010.cshtml    | 12 ++++++++++
 2 files changed, 35 insertions(+)

diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs
index d18d02df..48ced661 100644
--- a/AMESCoreStudio.Web/Controllers/BASController.cs
+++ b/AMESCoreStudio.Web/Controllers/BASController.cs
@@ -1338,6 +1338,27 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> GetRuleStationsByFlowAsync(int flowId, int page = 0, int limit = 10)
         {
+            var flow_id = "";
+            HttpContext.Request.Cookies.TryGetValue("FlowID4BAS010", out flow_id);
+            if (flow_id != null)
+            {
+                if (flowId == 0)
+                {
+                    flowId = int.Parse(flow_id.ToString());
+                }
+                else
+                {
+                    HttpContext.Response.Cookies.Append("FlowID4BAS010", flowId.ToString());
+                }
+            }
+            else
+            {
+                if (flowId > 0)
+                {
+                    HttpContext.Response.Cookies.Append("FlowID4BAS010", flowId.ToString());
+                }
+            }
+
             var result_total = await _basApi.GetRuleStationsByFlow(flowId, 0, limit);
 
             var result = await _basApi.GetRuleStationsByFlow(flowId, page, limit);
@@ -1459,6 +1480,8 @@ namespace AMESCoreStudio.Web.Controllers
                 {
                     var _msg = model.CreateDate == System.DateTime.MinValue ? "添加成功！" : "修改成功！";
                     return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    //return RedirectToPage("/BAS/BAS010");
+                    
                 }
                 else
                 {
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml
index f5bed63a..0460c6d7 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS010.cshtml
@@ -76,6 +76,7 @@
                     {
                         console.info(result.data);
                         $("#flow").empty();//清空下拉框的值
+                        $("#flow").prepend("<option value='0'>全部</option>");
                         $.each(result.data, function (index, item) {
                             $("#flow").append($("<option>").text(item.text).val(item.value))
                         });
@@ -101,6 +102,11 @@
                 qs.click();
             });
 
+            if (flowId.value != 0)
+            {
+                $("#flow").val(flowId.value);
+            }
+
             form.on('select(flow)', function (data) {
                 $("#flowId").val(data.value);
 
@@ -163,6 +169,7 @@
         function edit(obj) {
             if (obj.data.ruleStationID) {
                 hg.open('修改流程站別', '/BAS/BAS010U/' + obj.data.ruleStationID, 600, 400);
+                
             }
         }
         //通过行tool删除，lay-event="del"
@@ -231,10 +238,15 @@
             handler: function () {
                 var id = flowId.value;
                 hg.open('新增流程站別', '/BAS/BAS010C/' + id, 600, 400);
+                
             }
         }
         ];
 
+        if (flowId.value != 0) {
+            $("#flow").val(flowId.value);
+        }
+
         //基本数据表格
         var table = hg.table.datatable('test', '流程站別管理', '/BAS/GetRuleStationsByFlow/' + flowId.value, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);