1.修改流程规则维护等

AMESCoreStudio.Web/Controllers/BASController.cs

@@ -1337,20 +1337,22 @@ namespace AMESCoreStudio.Web.Controllers
             return View(result[0]);
         }
 
-        public async Task<IActionResult> BAS011DAsync(int id)
+        public async Task<IActionResult> BAS011DAsync(int id,string status)
         {
-            var result = await _basApi.DeleteRules(id);
+            var result = await _basApi.DeleteRules(id, status);
             return Json(new Result() { success = true, msg = "" });
         }
 
-        public async Task<IActionResult> BAS011DAllAsync(int[] ids)
+        public async Task<IActionResult> BAS011DAllAsync(string[] ids)
         {
             if (ids.Length > 0)
             {
-                var result = await _basApi.DeleteRules(ids[0]);
+                int id = int.Parse(ids[0].Split('_')[0]);
+                string status = ids[0].Split('_')[1];
+                var result = await _basApi.DeleteRules(id,status);
                 for (int i = 1; i < ids.Length; i++)
                 {
-                    result = await _basApi.DeleteRules(ids[i]);
+                    result = await _basApi.DeleteRules(int.Parse(ids[i].Split('_')[0]), ids[i].Split('_')[1]);
                 }
 
                 return Json(new Result() { success = true, msg = "" });

AMESCoreStudio.Web/HttpApis/IBAS.cs

@@ -362,7 +362,7 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
-        #region BAS010流程資料維護相關 
+        #region BAS010流程站别維護相關 
 
         /// <summary>
         /// 新增流程站別
@@ -436,7 +436,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpDelete("api/Rules/{id}")]
-        ITask<ResultModel<string>> DeleteRules(int id);
+        ITask<ResultModel<string>> DeleteRules(int id,string ruleStatus);
 
         /// <summary>
         /// 根據ID獲取指定流程站別資料

AMESCoreStudio.Web/Views/BAS/BAS011.cshtml

@@ -129,7 +129,7 @@
                 hg.confirm("流程規則：" + obj.data.nextStation['stationName'] + "，确定要删除吗？", function () {
                     $.ajax({
                         url: '/BAS/BAS011D',
-                        data: { id: obj.data.ruleStationID },
+                        data: { id: obj.data.ruleStationID, status: obj.data.ruleStatus },
                         type: 'POST',
                         success: function (data) {
                             if (data.success) {
@@ -153,14 +153,13 @@
             layuiicon: '',
             class: 'layui-btn-danger',
             handler: function (obj, row) {
-                if (obj.checkstatus && obj.checkstatus.data.length > 0)
+                if (obj.checkstatus && obj.checkstatus.data.length > 0) {
-                {
+                    console.log(obj.checkstatus.data.map(function (x) { return x.ruleStationID + '_' + x.ruleStatus }).join(','))
-                    console.log(obj.checkstatus.data.map(function (x) { return x.ruleStationID }).join(','))
 
                     hg.confirm("批量删除所有选中的数据，确定要删除吗？", function () {
                         $.ajax({
                             url: '/BAS/BAS011DAll',
-                            data: { ids: obj.checkstatus.data.map(function (x) { return x.ruleStationID }) },
+                            data: { ids: obj.checkstatus.data.map(function (x) { return x.ruleStationID + '_' + x.ruleStatus }) },
                             type: 'POST',
                             success: function (data) {
                                 if (data.success) {

AMESCoreStudio.Web/Views/BAS/BAS011U.cshtml

@@ -20,7 +20,7 @@
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="RuleStationID" class="control-label col-sm-3"></label>
-                <select asp-for="RuleStationID" asp-items="@ViewBag.RuleStationList" class="custom-select col-sm-9"></select>
+                <select asp-for="RuleStationID" asp-items="@ViewBag.RuleStationList" class="custom-select col-sm-9" disabled></select>
                 <span asp-validation-for="RuleStationID" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
             <div class="form-group form-inline my-sm-1">
@@ -32,11 +32,11 @@
                 <label asp-for="RuleStatus" class="control-label col-sm-3"></label>
                 <div class="col-sm-9">
                     <div class="radio icheck-primary form-check-inline">
-                        <input type="radio" id="P" asp-for="RuleStatus" value="P" />
+                        <input type="radio" id="P" asp-for="RuleStatus" value="P" disabled />
                         <label for="P">&nbsp;PASS&nbsp;</label>
                     </div>
                     <div class="radio icheck-primary form-check-inline">
-                        <input type="radio" id="F" asp-for="RuleStatus" value="F" />
+                        <input type="radio" id="F" asp-for="RuleStatus" value="F" disabled />
                         <label for="F">&nbsp;FAIL&nbsp;</label>
                     </div>
                 </div>

AMESCoreStudio.Web/Views/SYS/SYS001.cshtml

@@ -100,17 +100,7 @@
                 hg.open('新增系統', '/SYS/SYS001C', 720, 600);
                 
             }
-        },
+        }];
-            {
-                text: '維修過站測試',
-                layuiicon: '',
-                class: 'layui-btn-normal',
-                handler: function () {
-                    hg.open('新增系統', '/SYS/SYS001T', 720, 600);
-
-                }
-            }
-        ];
         //基本数据表格
         var table = hg.table.datatable('test', '系統資料管理', '/SYS/GetSystemInfoes', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>

AMESCoreStudio.Web/Views/SYS/SYS003.cshtml

@@ -81,7 +81,7 @@
 
             form.on('select(module)', function (data) {
                 $("#moduleID").val(data.value);
-                alert(moduleID.value);
+                //alert(moduleID.value);
 
                 var qs = $('button[lay-filter="querysubmit"]');
                 qs.click();

AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs

@@ -241,10 +241,12 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         /// <returns></returns>
         // DELETE: api/Rules/5
         [HttpDelete("{id}")]
-        public async Task<ResultModel<Rules>> DeleteRules(int id)
+        public async Task<ResultModel<Rules>> DeleteRules(int id,string ruleStatus)
         {
             ResultModel<Rules> result = new ResultModel<Rules>();
-            var rules = await _context.Ruleses.FindAsync(id);
+
+            var rules = await _context.Ruleses.Where(p => p.RuleStationID.Equals(id) && p.RuleStatus.Equals(ruleStatus)).FirstOrDefaultAsync();
+
             if (rules == null)
             {
                 result.Success = false;