合并

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string BrandId, string ActivationDateData, string BindingDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -97,6 +97,22 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and BrandId =" + BrandId;
             }
 
+            if (!string.IsNullOrEmpty(ActivationDateData))
+            {
+                string[] datelist = ActivationDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and ActivationTime>='" + start + " 00:00:00' and ActivationTime<='" + end + " 23:59:59'";
+            }
+
+            if (!string.IsNullOrEmpty(BindingDateData))
+            {
+                string[] datelist = BindingDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and BindingTime>='" + start + " 00:00:00' and BindingTime<='" + end + " 23:59:59'";
+            }
+
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesTwo", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
@@ -249,6 +265,49 @@ namespace MySystem.Areas.Admin.Controllers
 
         #endregion
 
+
+        #region 未使用机具归位总仓
+
+        /// <summary>
+        /// 未使用机具归位总仓
+        /// </summary>
+        /// <returns></returns>
+        public IActionResult Home(string right, int Id = 0)
+        {
+            ViewBag.RightInfo = RightInfo;
+            ViewBag.right = right;
+
+
+            PosMachinesTwo editData = db.PosMachinesTwo.FirstOrDefault(m => m.Id == Id) ?? new PosMachinesTwo();
+            ViewBag.data = editData;
+            return View();
+        }
+
+        #endregion
+
+        #region 未使用机具归位总仓
+
+        /// <summary>
+        /// 未使用机具归位总仓
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public string Home(PosMachinesTwo data)
+        {
+            Dictionary<string, object> Fields = new Dictionary<string, object>();
+            Fields.Add("SeoTitle", "");
+            Fields.Add("SeoKeyword", "");
+            Fields.Add("PosSnType", 0);
+            new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("PosMachinesTwo", Fields, data.Id);
+            AddSysLog(data.Id.ToString(), "PosMachinesTwo", "home");
+            db.SaveChanges();
+            RedisDbconn.Instance.Clear("PosMachinesTwo:" + data.Id);
+            return "success";
+        }
+
+        #endregion
+
+
         #region 删除机具库信息
 
         /// <summary>

Areas/Admin/Controllers/MainServer/SmallStoreHouseController.cs

@@ -51,33 +51,25 @@ namespace MySystem.Areas.Admin.Controllers
         /// 小仓库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(SmallStoreHouse data, string UserIdSelect, string FromStoreIdStoreNo, string FromStoreIdStoreName, int page = 1, int limit = 30)
+        public JsonResult IndexData(SmallStoreHouse data, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
             Fields.Add("StoreNo", "1"); //仓库编号
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("StoreName", "1"); //仓库名称
-            Fields.Add("BrandId", "2"); //产品类型
             Fields.Add("Mobile", "1"); //仓库归属人手机号
 
 
             string condition = " and Status>-1";
-            //仓库归属人
-            if (!string.IsNullOrEmpty(UserIdSelect))
+            //创建时间
+            if(!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and UserId=" + UserIdSelect;
-            }
-            //出货仓库仓库编号
-            if (!string.IsNullOrEmpty(FromStoreIdStoreNo))
-            {
-                condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreNo where StoreNo='" + FromStoreIdStoreNo + "')";
-            }
-            //出货仓库仓库名称
-            if (!string.IsNullOrEmpty(FromStoreIdStoreName))
-            {
-                condition += " and FromStoreId in (select FromStoreId from StoreHouseForStoreName where StoreName='" + FromStoreIdStoreName + "')";
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
 
 

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -171,7 +171,7 @@ namespace MySystem.Areas.Admin.Controllers
                 foreach (string BrandId in BrandIdList)
                 {
                     Dictionary<string, object> Fields = new Dictionary<string, object>();
-
+                    Fields.Add("CreateMan", SysUserName); //创建人
                     Fields.Add("StoreName", data.StoreName); //仓库名称
                     UserForMakerCode user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
                     if (user == null)
@@ -269,7 +269,7 @@ namespace MySystem.Areas.Admin.Controllers
         public string Edit(StoreHouse data, string ManageMakerCode, string MakerCode)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
-
+            Fields.Add("CreateMan", SysUserName); //创建人
             Fields.Add("StoreName", data.StoreName); //仓库名称
             UserForMakerCode user = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == MakerCode);
             if (user == null)
@@ -365,6 +365,7 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "您输入的仓库负责人编号不存在，请重新输入正确的仓库负责人编号";
             }
+            Fields.Add("CreateMan", SysUserName); //创建人
             Fields.Add("ManageUserId", manage.UserId); //仓库管理员
             Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱
             Fields.Add("ManageMobile", data.ManageMobile);

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -103,7 +103,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string CheckMachineDo(string MakerCode, string PosSn, string MerNo = "", int AddActPrize = 0, int IsPre = 0)
+        public string CheckMachineDo(string MakerCode, string PosSn, string MerNo = "", int AddActPrize = 0, int IsPre = 0, int IsSend = 0)
         {
             if (string.IsNullOrEmpty(MakerCode))
             {
@@ -114,6 +114,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入机具SN";
             }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
             {
                 return "机具SN不存在";
@@ -123,13 +124,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "创客编号不存在";
             }
-            if(IsPre == 1)
+            if (IsPre == 1)
             {
-                if(pos.BuyUserId == 0)
+                if (pos.BuyUserId == 0)
                 {
                     pos.BuyUserId = user.Id;
                 }
-                if(pos.UserId == 0)
+                if (pos.UserId == 0)
                 {
                     pos.UserId = user.Id;
                 }
@@ -201,9 +202,9 @@ namespace MySystem.Areas.Admin.Controllers
                         AddAct(pos.Id);
                     }
                 }
-            }            
+            }
             decimal CheckMoney = 1000;
-            if(pos.BrandId == 6)
+            if (pos.BrandId == 6)
             {
                 CheckMoney = 5000;
             }
@@ -238,6 +239,18 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     if (AddActPrize == 1)
                     {
+                        if (IsSend == 1)
+                        {
+                            RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                            {
+                                UserId = user.Id, //接收创客
+                                Title = "补录成功通知", //标题
+                                // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
+                                Summary = "您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。",
+                                CreateDate = DateTime.Now,
+
+                            }));
+                        }
                         return "激活奖励已补录";
                     }
                     else
@@ -607,18 +620,18 @@ namespace MySystem.Areas.Admin.Controllers
                             else if (ActPrize == 249)
                             {
                                 ActPrize = 260;
-                            }                            
+                            }
                             prizes.Add(ActPrize);
                             if (pos.BrandId == 6 && pos.ActivationState == 1 && pos.CreditTrade >= 10000 && pos.BindingTime > DateTime.Now.AddDays(-60))
                             {
                                 prizes.Add(40);
                             }
                         }
-                        else if(pos.BrandId == 6 && ActPrize == 0)
+                        else if (pos.BrandId == 6 && ActPrize == 0)
                         {
                             prizes.Add(50);
                         }
-                        foreach(decimal prize in prizes)
+                        foreach (decimal prize in prizes)
                         {
                             int ChangeType = prize == 40 ? 12 : 0;
                             bool check = db.ActiveReward.Any(m => m.KqSnNo == pos.PosSn && m.RewardAmount == prize);
@@ -760,7 +773,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string SetMerAgentDo(string MakerCode, string PosSn, string MerNo)
+        public string SetMerAgentDo(string MakerCode, string PosSn, string MerNo, int IsSend = 0)
         {
             if (string.IsNullOrEmpty(MakerCode))
             {
@@ -775,6 +788,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入商户编号";
             }
             PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosSn);
+            KqProducts kqProducts = db.KqProducts.FirstOrDefault(m => m.Id == pos.BrandId);
             if (pos == null)
             {
                 return "机具SN不存在";
@@ -794,6 +808,18 @@ namespace MySystem.Areas.Admin.Controllers
             if (pos.BindMerchantId == 0)
             {
                 pos.BindMerchantId = merchant.Id;
+                if (IsSend == 1)
+                {
+                    RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                    {
+                        UserId = pos.UserId, //接收创客
+                        Title = "商户型代理设置成功", //标题
+                        // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
+                        Summary = "您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功给下级代理" + user.RealName + "" + MakerCode + "<br/>，设置为商户型代理，设置成功后的新增交易的分润归商户型代理所有",
+                        CreateDate = DateTime.Now,
+
+                    }));
+                }
             }
             user.MerchantType = 1;
             merchant.UserId = user.Id;
@@ -843,10 +869,12 @@ namespace MySystem.Areas.Admin.Controllers
                 return "该机具为故障机";
             }
             string merInfo = "";
+            string merName = "";
             PosMerchantInfo mer = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
             if (mer != null)
             {
                 merInfo = mer.KqMerNo;
+                merName = mer.MerchantName;
             }
             else
             {
@@ -972,7 +1000,7 @@ namespace MySystem.Areas.Admin.Controllers
             string ActiveTime6 = lisreward.CreateDate == null ? "" : lisreward.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
             string result = "";
             result += "机具SN：" + pos.PosSn + "\n";
-            result += "商户编号：" + merInfo + "\n";
+            result += "商户编号：" + merInfo + "，商户姓名：" + merName + "\n";
             result += "商户型机器/直拓机器：创客编号：" + posSubUser.MakerCode + "，姓名：" + posSubUser.RealName + "，手机号：" + posSubUser.Mobile + "\n";
             if (change.Id > 0)
             {
@@ -981,7 +1009,7 @@ namespace MySystem.Areas.Admin.Controllers
             result += "机具所属人：创客编号：" + posUser.MakerCode + "，姓名：" + posUser.RealName + "，手机号：" + posUser.Mobile + "\n";
             result += "机器持有人顶级：创客编号：" + posTopUser.MakerCode + "，姓名：" + posTopUser.RealName + "，手机号：" + posTopUser.Mobile + "\n";
             result += "机器所属仓库：仓库编号：" + store.StoreNo + "，仓库名称：" + store.StoreName + "\n";
-            if(pos.PreUserId > 0)
+            if (pos.PreUserId > 0)
             {
                 Users smallStoreUser = db.Users.FirstOrDefault(m => m.Id == pos.PreUserId) ?? new Users();
                 PreSendStockDetail preSend = db.PreSendStockDetail.FirstOrDefault(m => m.SnId == pos.Id && m.ToUserId == pos.PreUserId && m.Status == 1) ?? new PreSendStockDetail();
@@ -1180,7 +1208,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string ChangePosDo(string OldSn, string NewSn, string BackStoreNo, string OutStoreNo, string MerNo = "")
+        public string ChangePosDo(string OldSn, string NewSn, string BackStoreNo, string OutStoreNo, string MerNo = "", int IsSend = 0)
         {
             if (string.IsNullOrEmpty(OldSn))
             {
@@ -1202,10 +1230,13 @@ namespace MySystem.Areas.Admin.Controllers
             StoreHouse BackStore = db.StoreHouse.FirstOrDefault(m => m.Id == storeForBack.StoreId) ?? new StoreHouse();
             StoreHouse OutStore = db.StoreHouse.FirstOrDefault(m => m.Id == storeForOut.StoreId) ?? new StoreHouse();
             string ChangeNo = "BMC" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(3);
+            KqProducts oldPosBrand = new KqProducts();
+            KqProducts newPosBrand = new KqProducts();
             MachineChange add = db.MachineChange.Add(new MachineChange()
             {
                 CreateDate = DateTime.Now,
                 UpdateDate = DateTime.Now,
+                CreateMan = SysUserName,
                 ChangeNo = ChangeNo, //转换单号
                 UserId = 0, //创客
                 ChangeTime = DateTime.Now, //转换时间
@@ -1243,12 +1274,12 @@ namespace MySystem.Areas.Admin.Controllers
                 //     return "原机具未绑定";
                 // }
                 PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId);
-                if (oldpos == null)
+                if (newpos == null)
                 {
                     return "新机具SN不正确";
                 }
-                KqProducts oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
-                KqProducts newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
+                oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
+                newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
                 PosMerchantInfo merchant = new PosMerchantInfo();
                 if (!string.IsNullOrEmpty(MerNo))
                 {
@@ -1277,7 +1308,7 @@ namespace MySystem.Areas.Admin.Controllers
                 // {
                 newpos.SeoKeyword = oldpos.SeoKeyword;
                 newpos.PrizeParams = oldpos.PrizeParams;
-                newpos.LeaderUserId= oldpos.LeaderUserId;
+                newpos.LeaderUserId = oldpos.LeaderUserId;
                 // }
                 // oldpos.BuyUserId = 0;
                 // oldpos.UserId = 0;
@@ -1292,6 +1323,7 @@ namespace MySystem.Areas.Admin.Controllers
                 {
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now,
+                    CreateMan = SysUserName,
                     ChangeNo = ChangeNo, //订单号
                     ChangeId = add.Id, //订单Id
                     BackProductType = oldpos.BrandId, //退回产品类型
@@ -1321,6 +1353,18 @@ namespace MySystem.Areas.Admin.Controllers
             OutStore.LaveNum -= OldSnList.Length; //出货仓库库存
             db.SaveChanges();
             db.Dispose();
+            if (IsSend == 1)
+            {
+                RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                {
+                    UserId = OutStore.UserId, //接收创客
+                    Title = "换绑成功通知", //标题
+                    // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
+                    Summary = "您的 " + oldPosBrand.Name + " SN:<br/>" + OldSn + "<br/>已经成功为客户换绑为" + newPosBrand.Name + "SN:<br/>" + NewSn + "<br/>已经成功补录，请查收。",
+                    CreateDate = DateTime.Now,
+
+                }));
+            }
             return "success";
         }
         #endregion
@@ -1336,7 +1380,7 @@ namespace MySystem.Areas.Admin.Controllers
         }
 
         [HttpPost]
-        public string UnbindDo(string PosSn, string MakerCode, string MerNo)
+        public string UnbindDo(string PosSn, string MakerCode, string MerNo, int IsSend = 0)
         {
             if (string.IsNullOrEmpty(PosSn))
             {
@@ -1415,6 +1459,18 @@ namespace MySystem.Areas.Admin.Controllers
             string IdBrand = pos.BuyUserId + "_" + pos.BrandId;
             db.SaveChanges();
             PublicFunction.SycnMachineCount(pos.BuyUserId, pos.BrandId);
+            if (IsSend == 1)
+            {
+                RedisDbconn.Instance.AddList("MsgPersonalQueue", Newtonsoft.Json.JsonConvert.SerializeObject(new MsgPersonal()
+                {
+                    UserId = forMakerCode.UserId, //接收创客
+                    Title = "解绑成功通知", //标题
+                    // Content = "<div class='f16'>您的 " + kqProducts.Name + " SN:<br/>" + pos.PosSn + "<br/>已经成功补录，请查收。</div>", //内容
+                    Summary = "" + PosSn + "<br/>机具已成功解绑，当前机具如需绑定同一客户请再2个工作日后再进行绑定，<br/>直接绑定会导致数控异常，相关损失由您本人承担。",
+                    CreateDate = DateTime.Now,
+
+                }));
+            }
             return "success";
         }
         #endregion
@@ -1718,7 +1774,7 @@ namespace MySystem.Areas.Admin.Controllers
                 return "请输入机具SN或者创客编号";
             }
             SetMerchantTypeRecord pos = new SetMerchantTypeRecord();
-            if(PosSn.StartsWith("K"))
+            if (PosSn.StartsWith("K"))
             {
                 UserForMakerCode userfor = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == PosSn) ?? new UserForMakerCode();
                 pos = db.SetMerchantTypeRecord.FirstOrDefault(m => m.ToUserId == userfor.UserId) ?? new SetMerchantTypeRecord();

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

@@ -6,139 +6,150 @@
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>预发货库存明细</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">仓库仓库名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="StoreIdStoreName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">仓库仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="StoreIdStoreNo" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div>@{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductsDic();}
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
-<option value="">全部...</option>
-@foreach (string key in KqProductsDic.Keys)
-{
-<option value="@key">@KqProductsDic[key]</option>
-}
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">SN编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">收货人创客编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ToUserIdMakerCode" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">收货人真实姓名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ToUserIdRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">收货仓库仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ToStoreIdStoreNo" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">收货仓库仓库名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="ToStoreIdStoreName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">源仓库编号仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="SourceStoreIdStoreNo" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">源仓库编号仓库名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="SourceStoreIdStoreName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">申请时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="ApplyDateData" id="ApplyDate" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">出货创客创客编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="FromUserIdMakerCode" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">出货创客真实姓名</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="FromUserIdRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">出货仓库仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="FromStoreIdStoreNo" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">出货仓库仓库名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="FromStoreIdStoreName" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="StoreIdStoreName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="StoreIdStoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductsDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in KqProductsDic.Keys)
+                                {
+                                    <option value="@key">@KqProductsDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">SN编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">收货人创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ToUserIdMakerCode" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">收货人真实姓名</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ToUserIdRealName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">收货仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ToStoreIdStoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">收货仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="ToStoreIdStoreName" autocomplete="off">
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">源仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SourceStoreIdStoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">源仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SourceStoreIdStoreName" autocomplete="off">
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">申请时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="ApplyDateData" id="ApplyDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">出货创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="FromUserIdMakerCode" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">出货创客姓名</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="FromUserIdRealName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">出货仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="FromStoreIdStoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">出货仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="FromStoreIdStoreName" autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -155,32 +166,35 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    
+
                     }
                 </script>
             </div>
@@ -212,10 +226,12 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules_main/PreSendStockDetail_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/layuiadmin/modules_main/PreSendStockDetail_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        var StoreId='@StoreId';
+        var StoreId = '@StoreId';
 
     </script>
 </body>
+
 </html>

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

@@ -1,90 +1,102 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>小仓库</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="/layuiadmin/style/admin.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <style>
-        .layui-input-inline{
+        .layui-input-inline {
             width: 175px !important;
         }
-        .layui-form-label{
+
+        .layui-form-label {
             width: 85px !important;
         }
-        .layui-inline{
+
+        .layui-inline {
             margin-right: 0px !important;
         }
-        .w100{
+
+        .w100 {
             width: 100px !important;
         }
-        .ml50{
+
+        .ml50 {
             margin-left: 50px !important;
         }
     </style>
 </head>
+
 <body>
     <div class="layui-fluid">
         <div class="layui-card">
             <div class="layui-form layui-card-header layuiadmin-card-header-auto">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-<label class="layui-form-label">仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="StoreNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div><div class="layui-inline">
-<label class="layui-form-label">仓库名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="StoreName" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">仓库归属人</label>
-<div class="layui-input-inline">
-<select id="UserIdSelect" name="UserIdSelect" lay-search="">
-<option value="">全部...</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="BrandId" name="BrandId" lay-search="">
-<option value="">全部...</option>
-</select>
-</div>
-</div><div class="layui-inline">
-<label class="layui-form-label">仓库归属人手机号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="Mobile" placeholder="" autocomplete="off">
-</div>
-</div><div class="layui-inline">
-<label class="layui-form-label">出货仓库仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="FromStoreIdStoreNo" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">出货仓库仓库名称</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="FromStoreIdStoreName" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="StoreNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="StoreName" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">仓库归属人</label>
+                        <div class="layui-input-inline">
+                            <select id="UserIdSelect" name="UserIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="BrandId" name="BrandId" lay-search="">
+                                <option value="">全部...</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    <div class="layui-inline">
+                        <label class="layui-form-label">仓库归属人手机号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="Mobile" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">出货仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="FromStoreIdStoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">出货仓库名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="FromStoreIdStoreName" autocomplete="off">
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -101,33 +113,37 @@
                 <div style="padding-bottom: 10px;">
                     @if (RightInfo.Contains("," + right + "_add,"))
                     {
-                        <button class="layui-btn" data-type="add"><i class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
+                        <button class="layui-btn" data-type="add"><i
+                            class="layui-icon layui-icon-add-1 layuiadmin-button-btn"></i>添加</button>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                        <button class="layui-btn" data-type="batchdel"><i class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
+                        <button class="layui-btn" data-type="batchdel"><i
+                            class="layui-icon layui-icon-delete layuiadmin-button-btn"></i>删除</button>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <button class="layui-btn" data-type="ImportData"><i class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入</button>
-<button class="layui-btn" data-type="ExportExcel"><i class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
+                        <button class="layui-btn" data-type="ImportData"><i
+                            class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>导入</button>
+                        <button class="layui-btn" data-type="ExportExcel"><i
+                            class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
 
                     }
                 </div>
-                
+
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>编辑</a>
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
-                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
+                        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon layui-icon-delete"></i>删除</a>
                     }
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/PreSendStockDetail/Index?right=@right&StoreId=@("{{d.Id}}")">预发货库存明细</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/PreSendStockDetail/Index?right=@right&StoreId=@("{{d.Id}}")">预发货库存明细</a>
 
                     }
                 </script>
@@ -162,7 +178,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_main/SmallStoreHouse_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/SysTools/ChangePos.cshtml

@@ -1,20 +1,23 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>更换机具</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
@@ -30,36 +33,45 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">原机具SN</label>
                                     <div class="layui-input-block">
-                                        <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn" placeholder="请输入原机具SN,多个SN用回车隔开"></textarea>
+                                        <textarea class="layui-textarea" lay-verify="required|" name="OldSn" id="OldSn"
+                                            placeholder="请输入原机具SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">新机具SN</label>
                                     <div class="layui-input-block">
-                                        <textarea class="layui-textarea" lay-verify="required|" name="NewSn" id="NewSn" placeholder="请输入新机具SN,多个SN用回车隔开"></textarea>
+                                        <textarea class="layui-textarea" lay-verify="required|" name="NewSn" id="NewSn"
+                                            placeholder="请输入新机具SN,多个SN用回车隔开"></textarea>
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">退回仓库编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="BackStoreNo"
-                                            name="BackStoreNo" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入退回仓库编号">
+                                        <input class="layui-input" type="text" id="BackStoreNo" name="BackStoreNo"
+                                            maxlength="50" lay-verify="required|" autocomplete="off"
+                                            placeholder="请输入退回仓库编号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">出货仓库编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="OutStoreNo"
-                                            name="OutStoreNo" maxlength="50" lay-verify="required|"
-                                            autocomplete="off" placeholder="请输入出货仓库编号">
+                                        <input class="layui-input" type="text" id="OutStoreNo" name="OutStoreNo"
+                                            maxlength="50" lay-verify="required|" autocomplete="off"
+                                            placeholder="请输入出货仓库编号">
                                     </div>
                                 </div>
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">商户编号</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="MerNo"
-                                            name="MerNo" maxlength="50" autocomplete="off" placeholder="请输入商户编号">
+                                        <input class="layui-input" type="text" id="MerNo" name="MerNo" maxlength="50"
+                                            autocomplete="off" placeholder="请输入商户编号">
+                                    </div>
+                                </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否推送消息</label>
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" id="IsSend" name="IsSend" value="1" lay-skin="switch"
+                                            lay-filter="switchTest" title="开关">
                                     </div>
                                 </div>
                             </div>
@@ -101,11 +113,11 @@
                 }
             });
         }
-        
-                    
+
+
         //编辑器
         KindEditor.ready(function (K) {
-            
+
         });
 
         var ids = "";
@@ -211,7 +223,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -231,30 +243,31 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
             element.on('tab(test)', function (elem) {
                 location.hash = 'test=' + $(this).attr('lay-id');
             });
-    
+
             //日期
-            
+
 
             //上传文件
-            
+
 
             //穿梭框
-            
+
 
             //TreeView，比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/SysTools/CheckMachine.cshtml

@@ -64,6 +64,13 @@
                                             lay-skin="switch" lay-filter="switchTest" title="开关">
                                     </div>
                                 </div>
+                                <div class="layui-form-item">
+                                    <label class="layui-form-label">是否推送消息</label>
+                                    <div class="layui-input-block">
+                                        <input type="checkbox" id="IsSend" name="IsSend" value="1"
+                                            lay-skin="switch" lay-filter="switchTest" title="开关">
+                                    </div>
+                                </div>
                             </div>
 
                         </div>

Areas/Admin/Views/MainServer/SysTools/Unbind.cshtml

@@ -56,6 +56,13 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">是否推送消息</label>
+                                <div class="layui-input-block">
+                                    <input type="checkbox" id="IsSend" name="IsSend" value="1" lay-skin="switch"
+                                        lay-filter="switchTest" title="开关">
+                                </div>
+                            </div>
                             <div class="layui-tab-item layui-show">
                                 <div class="layui-form-item">
                                     <label class="layui-form-label"></label>

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

@@ -141,9 +141,9 @@
 
             <div class="layui-card-body">
                 <blockquote class="layui-elem-quote layui-text">
-                    激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　|直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">0.00</span>　|红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
+                    激活奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount0">0.00</span>　|　交易分润(元)：<span style="color: #f00;" id="ChangeTypeAmount1">0.00</span>　|　创客开机奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount50">0.00</span>　|　分润补贴(元)：<span style="color: #f00;" id="ChangeTypeAmount111">0.00</span>　| 直推奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount112">0.00</span>　|　流量卡分佣(元)：<span style="color: #f00;" id="ChangeTypeAmount60">0.00</span>　|　红包奖励(元)：<span style="color: #f00;" id="ChangeTypeAmount31">0.00</span>
                     <br />
-                    提现申请(元)：<span style="color: #f00;" id="ChangeTypeAmount2">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　人工冻结(元)：<span style="color: #f00;" id="ChangeTypeAmount61">0.00</span>　|人工解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount62">0.00</span>　|人工扣减(元)：<span style="color: #f00;" id="ChangeTypeAmount63">0.00</span>　|人工增加(元)：<span style="color: #f00;" id="ChangeTypeAmount64">0.00</span>
+                    提现申请(元)：<span style="color: #f00;" id="ChangeTypeAmount2">0.00</span>　|　提现失败，解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount6">0.00</span>　|　人工冻结(元)：<span style="color: #f00;" id="ChangeTypeAmount61">0.00</span>　| 人工解冻(元)：<span style="color: #f00;" id="ChangeTypeAmount62">0.00</span>　| 人工扣减(元)：<span style="color: #f00;" id="ChangeTypeAmount63">0.00</span>　|　人工增加(元)：<span style="color: #f00;" id="ChangeTypeAmount64">0.00</span>
                 </blockquote>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">

wwwroot/layuiadmin/modules_main/PreSendStockDetail_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,76 +31,76 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'datetime',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
-var layApplyDate = laydate.render({
-elem: '#ApplyDate',
-trigger: 'click',
-type: 'datetime',
-range: true,
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layApplyDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layApplyDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#ApplyDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'datetime',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
+    var layApplyDate = laydate.render({
+        elem: '#ApplyDate',
+        trigger: 'click',
+        type: 'datetime',
+        range: true,
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layApplyDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layApplyDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#ApplyDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/PreSendStockDetail/Sort?r=" + Math.random(1),
@@ -111,37 +111,36 @@ $('#ApplyDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/PreSendStockDetail/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'StoreIdStoreName', width: 200, title:'仓库仓库名称', sort: true}
-,{field:'StoreIdStoreNo', width: 200, title:'仓库仓库编号', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'BrandId', width: 200, title:'产品类型', sort: true}
-,{field:'SnNo', width: 200, title:'SN编号', sort: true}
-,{field:'SnId', width: 200, title:'SNID', sort: true}
-,{field:'ToUserIdMakerCode', width: 200, title:'收货人创客编号', sort: true}
-,{field:'ToUserIdRealName', width: 200, title:'收货人真实姓名', sort: true}
-,{field:'ToStoreIdStoreNo', width: 200, title:'收货仓库仓库编号', sort: true}
-,{field:'ToStoreIdStoreName', width: 200, title:'收货仓库仓库名称', sort: true}
-,{field:'SourceStoreIdStoreNo', width: 200, title:'源仓库编号仓库编号', sort: true}
-,{field:'SourceStoreIdStoreName', width: 200, title:'源仓库编号仓库名称', sort: true}
-,{field:'ApplyFlagName', width: 200, title:'申请标记', sort: true}
-,{field:'ApplyDate', width: 200, title:'申请时间', sort: true}
-,{field:'FromUserIdMakerCode', width: 200, title:'出货创客创客编号', sort: true}
-,{field:'FromUserIdRealName', width: 200, title:'出货创客真实姓名', sort: true}
-,{field:'FromStoreIdStoreNo', width: 200, title:'出货仓库仓库编号', sort: true}
-,{field:'FromStoreIdStoreName', width: 200, title:'出货仓库仓库名称', sort: true}
-,{field:'CancelFlagName', width: 200, title:'撤回标记', sort: true}
-,{field:'CancelDate', width: 200, title:'撤回时间', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'StoreIdStoreName', width: 200, title: '仓库名称', sort: true }
+            , { field: 'StoreIdStoreNo', width: 200, title: '仓库编号', sort: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'BrandId', width: 200, title: '产品类型', sort: true }
+            , { field: 'SnNo', width: 200, title: 'SN编号', sort: true }
+            , { field: 'SnId', width: 200, title: 'SNID', sort: true }
+            , { field: 'ToUserIdMakerCode', width: 200, title: '收货人创客编号', sort: true }
+            , { field: 'ToUserIdRealName', width: 200, title: '收货人真实姓名', sort: true }
+            , { field: 'ToStoreIdStoreNo', width: 200, title: '收货仓库编号', sort: true }
+            , { field: 'ToStoreIdStoreName', width: 200, title: '收货仓库名称', sort: true }
+            // , { field: 'SourceStoreIdStoreNo', width: 200, title: '源仓库编号', sort: true }
+            // , { field: 'SourceStoreIdStoreName', width: 200, title: '源仓库名称', sort: true }
+            , { field: 'ApplyFlagName', width: 200, title: '申请标记', sort: true }
+            , { field: 'ApplyDate', width: 200, title: '申请时间', sort: true }
+            , { field: 'FromUserIdMakerCode', width: 200, title: '出货创客编号', sort: true }
+            , { field: 'FromUserIdRealName', width: 200, title: '出货创客真实姓名', sort: true }
+            , { field: 'FromStoreIdStoreNo', width: 200, title: '出货仓库编号', sort: true }
+            , { field: 'FromStoreIdStoreName', width: 200, title: '出货仓库名称', sort: true }
+            , { field: 'CancelFlagName', width: 200, title: '撤回标记', sort: true }
+            , { field: 'CancelDate', width: 200, title: '撤回时间', sort: true }
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }s
+            , { title: '操作', width: 180, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
             StoreId: StoreId
@@ -166,7 +165,7 @@ $('#ApplyDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -189,20 +188,20 @@ $('#ApplyDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -213,7 +212,7 @@ $('#ApplyDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/PreSendStockDetail/Edit?r=" + Math.random(1),
@@ -306,20 +305,20 @@ $('#ApplyDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -330,7 +329,7 @@ $('#ApplyDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/PreSendStockDetail/Add?r=" + Math.random(1),
@@ -387,9 +386,9 @@ $('#ApplyDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -416,9 +415,9 @@ $('#ApplyDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/SmallStoreHouse_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'datetime',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'datetime',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/SmallStoreHouse/Sort?r=" + Math.random(1),
@@ -84,29 +84,28 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/SmallStoreHouse/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'StoreNo', width: 200, title:'仓库编号', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'StoreName', width: 200, title:'仓库名称', sort: true}
-,{field:'BrandId', width: 200, title:'产品类型', sort: true}
-,{field:'TotalNum', width: 200, title:'总库存数', sort: true}
-,{field:'LaveNum', width: 200, title:'剩余库存数', sort: true}
-,{field:'Mobile', width: 200, title:'仓库归属人手机号', sort: true}
-,{field:'FromStoreIdStoreNo', width: 200, title:'出货仓库仓库编号', sort: true}
-,{field:'FromStoreIdStoreName', width: 200, title:'出货仓库仓库名称', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
-            , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'StoreNo', width: 200, title: '仓库编号', sort: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'StoreName', width: 200, title: '仓库名称', sort: true }
+            // , { field: 'BrandId', width: 200, title: '产品类型', sort: true }
+            , { field: 'TotalNum', width: 200, title: '总库存数', sort: true }
+            , { field: 'LaveNum', width: 200, title: '剩余库存数', sort: true }
+            , { field: 'Mobile', width: 200, title: '仓库归属人手机号', sort: true }
+            // , { field: 'FromStoreIdStoreNo', width: 200, title: '出货仓库仓库编号', sort: true }
+            // , { field: 'FromStoreIdStoreName', width: 200, title: '出货仓库仓库名称', sort: true }
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            , { title: '操作', width: 180, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -128,7 +127,7 @@ $('#CreateDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -151,20 +150,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -175,7 +174,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/SmallStoreHouse/Edit?r=" + Math.random(1),
@@ -268,20 +267,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -292,7 +291,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/SmallStoreHouse/Add?r=" + Math.random(1),
@@ -349,9 +348,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -378,9 +377,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -121,7 +121,7 @@ layui.config({
                 url: "/Admin/StoreHouse/Sort?r=" + Math.random(1),
                 data: "Id=" + data.Id + "&Sort=" + value,
                 dataType: "text",
-                success: function (data) {}
+                success: function (data) { }
             });
         }
     });
@@ -130,130 +130,115 @@ layui.config({
     table.render({
         elem: '#LAY-list-manage',
         url: '/Admin/StoreHouse/IndexData' //模拟接口
-            ,
+        ,
         cols: [
             [{
-                    type: 'checkbox',
-                    fixed: 'left'
-                }, {
-                    field: 'Id',
-                    fixed: 'left',
-                    title: 'ID',
-                    width: 80,
-                    sort: true,
-                    unresize: true
-                }, {
-                    field: 'StoreNo',
-                    width: 200,
-                    title: '仓库编号',
-                    sort: true
-                }, {
-                    field: 'StoreName',
-                    width: 200,
-                    title: '仓库名称',
-                    sort: true
-                }, {
-                    field: 'ManageUserIdMakerCode',
-                    width: 200,
-                    title: '仓库负责人编号',
-                    sort: true,
-                    templet: '#ManageTpl'
-                }, {
-                    field: 'ManageUserIdRealName',
-                    width: 200,
-                    title: '仓库管理员',
-                    sort: true
-                }, {
-                    field: 'UserIdMakerCode',
-                    width: 200,
-                    title: '仓库归属创客编号',
-                    sort: true,
-                    templet: '#MakerCodeTpl'
-                }, {
-                    field: 'UserIdRealName',
-                    width: 200,
-                    title: '仓库归属人真实姓名',
-                    sort: true
-                }, {
-                    field: 'BrandId',
-                    width: 300,
-                    title: '产品类型',
-                    sort: true
-                }, {
-                    field: 'Address',
-                    width: 200,
-                    title: '仓库地址',
-                    sort: true
-                }, {
-                    field: 'ManageUserIdMobile',
-                    width: 200,
-                    title: '仓库管理员手机号',
-                    sort: true
-                }, {
-                    field: 'ManagerEmail',
-                    width: 200,
-                    title: '管理者邮箱',
-                    sort: true
-                }, {
-                    field: 'StoreType',
-                    width: 200,
-                    title: '仓库类型',
-                    sort: true
-                }, {
-                    field: 'TotalNum',
-                    width: 200,
-                    title: '总库存数',
-                    sort: true
-                }, {
-                    field: 'LaveNum',
-                    width: 200,
-                    title: '剩余库存数',
-                    sort: true
-                }, {
-                    field: 'OutNum',
-                    width: 200,
-                    title: '出库数',
-                    sort: true
-                }, {
-                    field: 'LimitTopUserId',
-                    width: 200,
-                    title: '限制创客特殊仓库',
-                    sort: true
-                }, {
-                    field: 'StoreStatus',
-                    width: 200,
-                    title: '仓库状态',
-                    sort: true
-                }, {
-                    field: 'StoreKind',
-                    width: 200,
-                    title: '仓库归属类型',
-                    sort: true
-                }, {
-                    field: 'CreateMan',
-                    width: 200,
-                    title: '创建人',
-                    sort: true
-                }, {
-                    field: 'CreateDate',
-                    width: 200,
-                    title: '创建时间',
-                    sort: true
-                }
-
-                , {
-                    field: 'Sort',
-                    fixed: 'right',
-                    title: '排序',
-                    width: 80,
-                    edit: 'text'
-                }, {
-                    title: '操作',
-                    width: 300,
-                    align: 'center',
-                    fixed: 'right',
-                    toolbar: '#table-list-tools'
-                }
+                type: 'checkbox',
+                fixed: 'left'
+            },{
+                field: 'StoreNo',
+                width: 110,
+                title: '仓库编号',
+                sort: true
+            }, {
+                field: 'StoreName',
+                width: 110,
+                title: '仓库名称',
+                sort: true
+            }, {
+                field: 'ManageUserIdMakerCode',
+                width: 145,
+                title: '仓库负责人编号',
+                sort: true,
+                templet: '#ManageTpl'
+            }, {
+                field: 'ManageUserIdRealName',
+                width: 120,
+                title: '仓库管理员',
+                sort: true
+            }, {
+                field: 'UserIdMakerCode',
+                width: 160,
+                title: '仓库归属创客编号',
+                sort: true,
+                templet: '#MakerCodeTpl'
+            }, {
+                field: 'UserIdRealName',
+                width: 175,
+                title: '仓库归属人真实姓名',
+                sort: true
+            }, {
+                field: 'BrandId',
+                width: 110,
+                title: '产品类型',
+                sort: true
+            }, {
+                field: 'Address',
+                width: 110,
+                title: '仓库地址',
+                sort: true
+            }, {
+                field: 'ManageUserIdMobile',
+                width: 160,
+                title: '仓库管理员手机号',
+                sort: true
+            }, {
+                field: 'ManagerEmail',
+                width: 120,
+                title: '管理者邮箱',
+                sort: true
+            }, {
+                field: 'StoreType',
+                width: 110,
+                title: '仓库类型',
+                sort: true
+            }, {
+                field: 'TotalNum',
+                width: 110,
+                title: '总库存数',
+                sort: true
+            }, {
+                field: 'LaveNum',
+                width: 120,
+                title: '剩余库存数',
+                sort: true
+            }, {
+                field: 'OutNum',
+                width: 100,
+                title: '出库数',
+                sort: true
+            }, {
+                field: 'LimitTopUserId',
+                width: 160,
+                title: '限制创客特殊仓库',
+                sort: true
+            }, {
+                field: 'StoreStatus',
+                width: 110,
+                title: '仓库状态',
+                sort: true
+            }, {
+                field: 'StoreKind',
+                width: 130,
+                title: '仓库归属类型',
+                sort: true
+            }, {
+                field: 'CreateMan',
+                width: 130,
+                title: '创建/修改人',
+                sort: true
+            }, {
+                field: 'CreateDate',
+                width: 110,
+                title: '创建时间',
+                sort: true
+            }, {
+                title: '操作',
+                width: 200,
+                align: 'center',
+                fixed: 'right',
+                toolbar: '#table-list-tools'
+            }
             ]
         ],
         where: {