分仓申请机具完成

Areas/Admin/Controllers/MainServer/StoreMachineApplyController.cs

@@ -287,7 +287,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 int id = int.Parse(subid);
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
-                Fields.Add("Status", 0);
+                Fields.Add("Status", 2);
                 new AdminContent(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreMachineApply", Fields, id);
             }
             db.SaveChanges();
@@ -406,6 +406,7 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
         #region 审核发货
 
         public IActionResult AuditSend(string right, int Id = 0)
@@ -488,7 +489,6 @@ namespace MySystem.Areas.Admin.Controllers
                 string OutNote = itemJson.Contains("\"D\"") ? dr["D"].ToString() : "";
 
                 BrandId = Convert.ToInt32(Brand);
-                // PosMachinesTwo posMachinesTwo = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == SnNo && m.StoreId == FromStoreId);
 
                 if (BrandId == 1) FromStoreId = 7;
                 if (BrandId == 2) FromStoreId = 721;
@@ -585,6 +585,10 @@ namespace MySystem.Areas.Admin.Controllers
                     machine.StoreId = tostore.Id;
                     machine.UpdateDate = DateTime.Now;
                 }
+                else
+                {
+                    return "总仓无该机具";
+                }
 
             }
             //判断发货数和申请数

Areas/Admin/Views/MainServer/StoreMachineApply/Index.cshtml

@@ -132,10 +132,12 @@
                     }
                     @if (RightInfo.Contains("," + right + "_audit,"))
                     {
+                        @("{{# if(d.Status == 0 ) { }}")
                         <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="audit"><i class="layui-icon layui-icon-edit"></i>审核发货</a>
+                        @("{{# } }}")
                     }
                     {{# if(d.Status == 0) { }}
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="reduce"><i class="layui-icon layui-icon-edit"></i>驳回</a>
+                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Close"><i class="layui-icon layui-icon-edit"></i>驳回</a>
                     {{# } }}
                 </script>
             </div>

wwwroot/layuiadmin/modules_main/StoreMachineApply_Admin.js

@@ -197,6 +197,26 @@ layui.config({
                 }
             });
             // layer.full(perContent);
+        } else if (obj.event === 'Close') {
+            var index = layer.confirm('是否确定驳回', function (index)
+            {
+                $.ajax({
+                    type: "POST",
+                    url: "/Admin/StoreMachineApply/Close?r=" + Math.random(1),
+                    data: "Id=" + data.Id,
+                    dataType: "text",
+                    success: function (data) {
+                        layer.close(index); //关闭弹层
+                        if (data == "success") {
+                            layer.msg("已驳回", { time: 1500 }, function () {
+                                table.reload('LAY-list-manage'); //数据刷新
+                            });
+                        } else {
+                            parent.layer.msg(data);
+                        }
+                    }
+                });
+            });
         } else if (obj.event === 'audit') {
             var tr = $(obj.tr);
             var perContent = layer.open({
@@ -244,7 +264,7 @@ layui.config({
                                     }, function () {
                                         table.reload('LAY-list-manage'); //数据刷新
                                     });
-                                } else if (data == "warning") {
+                                } else if (data == "Warning") {
                                     var datalist = data.split('|');
                                     layer.alert(datalist[0], { time: 20000 }, function () {
                                         window.location.reload();