Преглед изворни кода

调整降扣后台查询条件
sp查询功能初步完成

DuGuYang пре 3 година
родитељ
комит
1e7aecde9f
23 измењених фајлова са 974 додато и 816 уклоњено
  1. 13 13
      Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs
  2. 3 7
      Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs
  3. 57 57
      Areas/Admin/Controllers/MainServer/SysToolsController.cs
  4. 9 6
      Areas/Admin/Controllers/SpServer/ActivateRecordController.cs
  5. 2 1
      Areas/Admin/Controllers/SpServer/BindRecordController.cs
  6. 2 1
      Areas/Admin/Controllers/SpServer/ChangeBindRecordController.cs
  7. 8 6
      Areas/Admin/Controllers/SpServer/TradeFluxRecordController.cs
  8. 8 6
      Areas/Admin/Controllers/SpServer/TradeRecordController.cs
  9. 2 1
      Areas/Admin/Controllers/SpServer/UnBindRecordController.cs
  10. 1 1
      Areas/Admin/Views/MainServer/PosMachinesFeeChangeRecord/Index.cshtml
  11. 1 1
      Areas/Admin/Views/MainServer/PosMachinesTwoChange/Index.cshtml
  12. 91 66
      Areas/Admin/Views/SpServer/ActivateRecord/Index.cshtml
  13. 114 88
      Areas/Admin/Views/SpServer/BindRecord/Index.cshtml
  14. 93 67
      Areas/Admin/Views/SpServer/ChangeBindRecord/Index.cshtml
  15. 73 48
      Areas/Admin/Views/SpServer/SpTradeRecord/Index.cshtml
  16. 72 48
      Areas/Admin/Views/SpServer/TradeFluxRecord/Index.cshtml
  17. 87 61
      Areas/Admin/Views/SpServer/UnBindRecord/Index.cshtml
  18. 47 47
      wwwroot/layuiadmin/modules_sp/ActivateRecord_Admin.js
  19. 69 69
      wwwroot/layuiadmin/modules_sp/BindRecord_Admin.js
  20. 67 67
      wwwroot/layuiadmin/modules_sp/ChangeBindRecord_Admin.js
  21. 45 45
      wwwroot/layuiadmin/modules_sp/TradeFluxRecord_Admin.js
  22. 45 45
      wwwroot/layuiadmin/modules_sp/TradeRecord_Admin.js
  23. 65 65
      wwwroot/layuiadmin/modules_sp/UnBindRecord_Admin.js

+ 13 - 13
Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具费率调整申请列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string StatusSelect, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesFeeChangeRecord data, string UserIdMakerCode, string UserIdRealName, string PosUserIdMakerCode, string PosUserIdRealName, string StatusSelect = "2", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -62,7 +62,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Sort", "0"); //品牌
 
 
-            string condition = " and Status>=-1";
+            string condition = " and Status >=-1";
             //创客创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
@@ -84,22 +84,22 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and PosUserId in (select PosUserId from UsersForRealName where RealName='" + PosUserIdRealName + "')";
             }
             //品牌
-            if (data.Sort == 0)
-            {
-                condition += " and Sort = 1";
-            }
-            if (data.Sort != 0)
+            if (data.Sort > 0)
             {
                 condition += " and Sort = " + data.Sort;
             }
-            if (data.Status > 0)
+            if (!string.IsNullOrEmpty(StatusSelect))
             {
-                if(data.Status == 2) data.Status = 0;
-                if(data.Status == 3) data.Status = -1;
-                condition += " and Status = " + data.Status;
+                if (Convert.ToInt32(StatusSelect) > 0)
+                {
+                    if (Convert.ToInt32(StatusSelect) == 1) condition += " and Status = 1";
+                    if (Convert.ToInt32(StatusSelect) == 2) condition += " and Status = 0";
+                    if (Convert.ToInt32(StatusSelect) == 3) condition += " and Status = -1";
+                }
             }
 
 
+
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("PosMachinesFeeChangeRecord", 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)
@@ -479,8 +479,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             if (data.Status > 0)
             {
-                if(data.Status == 2) data.Status = 0;
-                if(data.Status == 3) data.Status = -1;
+                if (data.Status == 2) data.Status = 0;
+                if (data.Status == 3) data.Status = -1;
                 condition += " and Status = " + data.Status;
             }
 

+ 3 - 7
Areas/Admin/Controllers/MainServer/PosMachinesTwoChangeController.cs

@@ -51,7 +51,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UpFeeFlagSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string ActivationDateData, string BindingDateData, int page = 1, int limit = 30)
+        public JsonResult IndexData(PosMachinesTwo data, string BindingStateSelect, string ActivationStateSelect, string UserIdMakerCode, string UserIdRealName, string StoreIdCode, string StoreIdName, string ActivationDateData, string BindingDateData, string UpFeeFlagSelect = "0", int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -59,7 +59,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("PosSn", "1"); //SN编号
             Fields.Add("BrandId", "0"); //品牌
 
-            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 180 DAY) >= date(BindingTime)";
+            string condition = " and Status>-1 AND BindingState = 1 AND DATE_SUB(CURDATE(), INTERVAL 180 DAY) >= date(BindingTime) and DownFeeFlag =0";
             //绑定状态
             if (!string.IsNullOrEmpty(BindingStateSelect))
             {
@@ -91,11 +91,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and StoreId in (select StoreId from StoreForName where Name='" + StoreIdName + "')";
             }
             //品牌
-            if (data.BrandId == 0)
-            {
-                condition += " and BrandId = 1";
-            }
-            if (data.BrandId != 0)
+            if (data.BrandId > 0)
             {
                 condition += " and BrandId = " + data.BrandId;
             }

+ 57 - 57
Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1971,47 +1971,47 @@ namespace MySystem.Areas.Admin.Controllers
             ViewBag.SwapSnExpand = SwapSnExpand;
             ViewBag.SnNos = SnNos;
 
-            // List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            // var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
-
-            // if (!string.IsNullOrEmpty(SwapSnExpand))
-            // {
-            //     machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
-            //     foreach (var item in machineApplie)
-            //     {
-            //         var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-            //         Dictionary<string, object> data = new Dictionary<string, object>();
-            //         data["ApplyNo"] = item.ApplyNo.ToString();
-            //         data["OrderNo"] = orders.OrderNo.ToString();
-            //         data["MakerCode"] = item.ApplyNo.ToString();
-            //         data["RealName"] = item.ApplyNo.ToString();
-            //         data["ComeSn"] = item.ApplyNo.ToString();
-            //         data["SendSn"] = item.ApplyNo.ToString();
-            //         data["CreateDate"] = item.ApplyNo.ToString();
-            //         data["Status"] = item.ApplyNo.ToString();
-            //         dataList.Add(data);
-            //     }
-            // }
-            // if (!string.IsNullOrEmpty(SnNos))
-            // {
-            //     machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
-            //     foreach (var item in machineApplie)
-            //     {
-            //         var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
-            //         Dictionary<string, object> data = new Dictionary<string, object>();
-            //         data["ApplyNo"] = item.ApplyNo.ToString();
-            //         data["OrderNo"] = orders.OrderNo.ToString();
-            //         data["MakerCode"] = item.ApplyNo.ToString();
-            //         data["RealName"] = item.ApplyNo.ToString();
-            //         data["ComeSn"] = item.ApplyNo.ToString();
-            //         data["SendSn"] = item.ApplyNo.ToString();
-            //         data["CreateDate"] = item.ApplyNo.ToString();
-            //         data["Status"] = item.ApplyNo.ToString();
-            //         dataList.Add(data);
-            //     }
-            // }
-            // return View(dataList);
-            return View();
+            List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
+            var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
+            var orders = db.Orders.Where(m => m.Status > -1).ToList();
+            if (!string.IsNullOrEmpty(SwapSnExpand))
+            {
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
+                foreach (var item in machineApplie1)
+                {
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            if (!string.IsNullOrEmpty(SnNos))
+            {
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
+                foreach (var item in machineApplie1)
+                {
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    Dictionary<string, object> data = new Dictionary<string, object>();
+                    data["ApplyNo"] = item.ApplyNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
+                    data["MakerCode"] = item.ApplyNo.ToString();
+                    data["RealName"] = item.ApplyNo.ToString();
+                    data["ComeSn"] = item.ApplyNo.ToString();
+                    data["SendSn"] = item.ApplyNo.ToString();
+                    data["CreateDate"] = item.ApplyNo.ToString();
+                    data["Status"] = item.ApplyNo.ToString();
+                    dataList.Add(data);
+                }
+            }
+            return View(dataList);
+            // return View();
         }
 
         #endregion
@@ -2030,16 +2030,17 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SnNos", "1"); //发货机具SN
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             var machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
+            var orders = db.Orders.Where(m => m.Status > -1).ToList();
 
             if (!string.IsNullOrEmpty(SwapSnExpand))
             {
-                machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
-                foreach (var item in machineApplie)
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SwapSnExpand)).ToList();
+                foreach (var item in machineApplie1)
                 {
-                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
                     Dictionary<string, object> data = new Dictionary<string, object>();
                     data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
                     data["MakerCode"] = item.ApplyNo.ToString();
                     data["RealName"] = item.ApplyNo.ToString();
                     data["ComeSn"] = item.ApplyNo.ToString();
@@ -2051,13 +2052,13 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else if (!string.IsNullOrEmpty(SnNos))
             {
-                machineApplie = db.MachineApply.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
-                foreach (var item in machineApplie)
+                var machineApplie1 = machineApplie.Where(m => m.Status > -1 && m.SwapSnExpand.Contains(SnNos)).ToList();
+                foreach (var item in machineApplie1)
                 {
-                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount);
                     Dictionary<string, object> data = new Dictionary<string, object>();
                     data["ApplyNo"] = item.ApplyNo.ToString();
-                    data["OrderNo"] = orders.OrderNo.ToString();
+                    data["OrderNo"] = orders1.OrderNo.ToString();
                     data["MakerCode"] = item.ApplyNo.ToString();
                     data["RealName"] = item.ApplyNo.ToString();
                     data["ComeSn"] = item.ApplyNo.ToString();
@@ -2069,26 +2070,25 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                machineApplie = db.MachineApply.Where(m => m.Status > -1).ToList();
                 foreach (var item in machineApplie)
                 {
-                    var orders = db.Orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount) ?? new Orders();
+                    var orders1 = orders.FirstOrDefault(m => m.Sort == item.Id && m.Id == item.QueryCount) ?? new Orders();
                     var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
                     Dictionary<string, object> data = new Dictionary<string, object>();
                     data["ApplyNo"] = item.ApplyNo.ToString();
-                    if (!string.IsNullOrEmpty(orders.OrderNo))
+                    if (!string.IsNullOrEmpty(orders1.OrderNo))
                     {
-                        data["OrderNo"] = orders.OrderNo.ToString();
+                        data["OrderNo"] = orders1.OrderNo.ToString();
                     }
-                    if (string.IsNullOrEmpty(orders.OrderNo))
+                    if (string.IsNullOrEmpty(orders1.OrderNo))
                     {
                         data["OrderNo"] = "";
                     }
-                    if (!string.IsNullOrEmpty(orders.SnNos))
+                    if (!string.IsNullOrEmpty(orders1.SnNos))
                     {
-                        data["SendSn"] = orders.SnNos.ToString();
+                        data["SendSn"] = orders1.SnNos.ToString();
                     }
-                    if (string.IsNullOrEmpty(orders.SnNos))
+                    if (string.IsNullOrEmpty(orders1.SnNos))
                     {
                         data["SendSn"] = "";
                     }

+ 9 - 6
Areas/Admin/Controllers/SpServer/ActivateRecordController.cs

@@ -61,6 +61,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("MerMobile", "1"); //商户手机号
             Fields.Add("SnNo", "1"); //终端机身号
             Fields.Add("ChannelSerial", "1"); //渠道流水号
+            Fields.Add("ProductType", "0"); //产品类型
 
 
             string condition = " and Status>-1";
@@ -85,12 +86,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (ActivateStatus == "0") dic["ActivateStatus"] = "未激活";
                 if (ActivateStatus == "1") dic["ActivateStatus"] = "激活";
                 //产品类型
-                string ProductType = dic["ProductType"].ToString();
-                if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                if (ProductType == "") dic["ProductType"] = "";
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                // //产品类型
+                // string ProductType = dic["ProductType"].ToString();
+                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
+                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
+                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
+                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
+                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

+ 2 - 1
Areas/Admin/Controllers/SpServer/BindRecordController.cs

@@ -87,7 +87,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-
+                //产品类型
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }
             return Json(obj);
         }

+ 2 - 1
Areas/Admin/Controllers/SpServer/ChangeBindRecordController.cs

@@ -77,7 +77,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-
+                //产品类型
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }
             return Json(obj);
         }

+ 8 - 6
Areas/Admin/Controllers/SpServer/TradeFluxRecordController.cs

@@ -88,12 +88,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BankCardType == "0002") dic["BankCardType"] = "借记卡";
                 if (BankCardType == "") dic["BankCardType"] = "";
                 //产品类型
-                string ProductType = dic["ProductType"].ToString();
-                if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                if (ProductType == "") dic["ProductType"] = "";
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                // //产品类型
+                // string ProductType = dic["ProductType"].ToString();
+                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
+                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
+                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
+                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
+                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

+ 8 - 6
Areas/Admin/Controllers/SpServer/TradeRecordController.cs

@@ -88,12 +88,14 @@ namespace MySystem.Areas.Admin.Controllers
                 if (BankCardType == "0002") dic["BankCardType"] = "借记卡";
                 if (BankCardType == "") dic["BankCardType"] = "";
                 //产品类型
-                string ProductType = dic["ProductType"].ToString();
-                if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
-                if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
-                if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
-                if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
-                if (ProductType == "") dic["ProductType"] = "";
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
+                // //产品类型
+                // string ProductType = dic["ProductType"].ToString();
+                // if (ProductType == "KYSPOS") dic["ProductType"] = "快益刷";
+                // if (ProductType == "KPOS") dic["ProductType"] = "快联盟大POS";
+                // if (ProductType == "SIGNPOS") dic["ProductType"] = "快联盟电签POS";
+                // if (ProductType == "SUPPOS") dic["ProductType"] = "超级Mpos";
+                // if (ProductType == "") dic["ProductType"] = "";
 
             }
             return Json(obj);

+ 2 - 1
Areas/Admin/Controllers/SpServer/UnBindRecordController.cs

@@ -76,7 +76,8 @@ namespace MySystem.Areas.Admin.Controllers
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
-
+                //产品类型
+                dic["ProductType"] = RelationClass.GetKqProductBrandList(dic["ProductType"].ToString());
             }
             return Json(obj);
         }

+ 1 - 1
Areas/Admin/Views/MainServer/PosMachinesFeeChangeRecord/Index.cshtml

@@ -108,8 +108,8 @@
                         <div class="layui-input-inline">
                             <select id="StatusSelect" name="StatusSelect" lay-search="">
                                 <option value="">全部...</option>
-                                <option value="2">处理中</option>
                                 <option value="1">成功</option>
+                                <option value="2" selected="selected">处理中</option>
                                 <option value="3">失败</option>
                             </select>
                         </div>

+ 1 - 1
Areas/Admin/Views/MainServer/PosMachinesTwoChange/Index.cshtml

@@ -79,8 +79,8 @@
                         <div class="layui-input-inline">
                             <select id="UpFeeFlagSelect" name="UpFeeFlagSelect" lay-search="">
                                 <option value="">全部...</option>
+                                <option value="0" selected="selected">未调升</option>
                                 <option value="1">已调升</option>
-                                <option value="0">未调升</option>
                             </select>
                         </div>
                     </div>

+ 91 - 66
Areas/Admin/Views/SpServer/ActivateRecord/Index.cshtml

@@ -1,94 +1,115 @@
 @{
     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="MerNo" 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="MerName" 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="MerMobile" 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="SnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">激活状态</label>
-<div class="layui-input-inline">
-<select id="ActivateStatusSelect" name="ActivateStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="0">未激活</option>
-<option value="1">激活</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="KYSPOS">快益刷</option>
-<option value="KPOS">快联盟大POS</option>
-<option value="SIGNPOS">快联盟电签POS</option>
-<option value="SUPPOS">超级Mpos</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="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" 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="MerName" 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="MerMobile" 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="SnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">激活状态</label>
+                        <div class="layui-input-inline">
+                            <select id="ActivateStatusSelect" name="ActivateStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">未激活</option>
+                                <option value="1">激活</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="KYSPOS">快益刷</option>
+                                <option value="KPOS">快联盟大POS</option>
+                                <option value="SIGNPOS">快联盟电签POS</option>
+                                <option value="SUPPOS">超级Mpos</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="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -105,32 +126,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>
@@ -164,7 +188,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/ActivateRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

+ 114 - 88
Areas/Admin/Views/SpServer/BindRecord/Index.cshtml

@@ -1,116 +1,138 @@
 @{
     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="AgentName" 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="MerNo" 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="MerName" 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="MerSnNo" 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="AgentName" 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="MerNo" 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="MerName" 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="MerSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">操作类型</label>
-<div class="layui-input-inline">
-<select id="MerOperateTypeSelect" name="MerOperateTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="绑定">绑定</option>
-<option value="解绑">解绑</option>
-<option value="换绑">换绑</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">商户状态</label>
-<div class="layui-input-inline">
-<select id="MerStatusSelect" name="MerStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="正常">正常</option>
-<option value="禁用">禁用</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="MPOS">MPOS</option>
-<option value="传统POS">传统POS</option>
-<option value="电签POS">电签POS</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="MerNewSnNo" 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="CreateTimeData" id="CreateTime" 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="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">操作类型</label>
+                        <div class="layui-input-inline">
+                            <select id="MerOperateTypeSelect" name="MerOperateTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="绑定">绑定</option>
+                                <option value="解绑">解绑</option>
+                                <option value="换绑">换绑</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">商户状态</label>
+                        <div class="layui-input-inline">
+                            <select id="MerStatusSelect" name="MerStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="正常">正常</option>
+                                <option value="禁用">禁用</option>
+                            </select>
+                        </div>
+                    </div> *@
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="MPOS">MPOS</option>
+                                <option value="传统POS">传统POS</option>
+                                <option value="电签POS">电签POS</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="MerNewSnNo" 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="CreateTimeData" id="CreateTime"
+                                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="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -127,32 +149,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>
@@ -186,7 +211,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/BindRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

+ 93 - 67
Areas/Admin/Views/SpServer/ChangeBindRecord/Index.cshtml

@@ -1,95 +1,117 @@
 @{
     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="AgentName" 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="MerNo" 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="MerName" 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="MerSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="MPOS">MPOS</option>
-<option value="传统POS">传统POS</option>
-<option value="电签POS">电签POS</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="MerNewSnNo" 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="ConfirmTimeData" id="ConfirmTime" 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="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">机构名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AgentName" 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="MerNo" 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="MerName" 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="MerSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="MPOS">MPOS</option>
+                                <option value="传统POS">传统POS</option>
+                                <option value="电签POS">电签POS</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="MerNewSnNo" 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="ConfirmTimeData" id="ConfirmTime"
+                                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="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -106,32 +128,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>
@@ -165,7 +190,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/ChangeBindRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

+ 73 - 48
Areas/Admin/Views/SpServer/SpTradeRecord/Index.cshtml

@@ -1,76 +1,97 @@
 @{
     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="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">交易状态</label>
-<div class="layui-input-inline">
-<select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="1">成功</option>
-<option value="2">失败</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="KYSPOS">快益刷</option>
-<option value="KPOS">快联盟大POS</option>
-<option value="SIGNPOS">快联盟电签POS</option>
-<option value="SUPPOS">超级Mpos</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="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易状态</label>
+                        <div class="layui-input-inline">
+                            <select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">成功</option>
+                                <option value="2">失败</option>
+                            </select>
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="KYSPOS">快益刷</option>
+                                <option value="KPOS">快联盟大POS</option>
+                                <option value="SIGNPOS">快联盟电签POS</option>
+                                <option value="SUPPOS">超级Mpos</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="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -87,32 +108,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>
@@ -146,7 +170,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/TradeRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

+ 72 - 48
Areas/Admin/Views/SpServer/TradeFluxRecord/Index.cshtml

@@ -1,76 +1,96 @@
 @{
     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="MerNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">交易状态</label>
-<div class="layui-input-inline">
-<select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
-<option value="">全部...</option>
-<option value="1">成功</option>
-<option value="2">失败</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="KqTradeSeq" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="KYSPOS">快益刷</option>
-<option value="KPOS">快联盟大POS</option>
-<option value="SIGNPOS">快联盟电签POS</option>
-<option value="SUPPOS">超级Mpos</option>
-</select>
-</div>
-</div>
+                        <label class="layui-form-label">商户编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MerNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">交易状态</label>
+                        <div class="layui-input-inline">
+                            <select id="TradeStatusSelect" name="TradeStatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="1">成功</option>
+                                <option value="2">失败</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="KqTradeSeq" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="KYSPOS">快益刷</option>
+                                <option value="KPOS">快联盟大POS</option>
+                                <option value="SIGNPOS">快联盟电签POS</option>
+                                <option value="SUPPOS">超级Mpos</option>
+                            </select>
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -87,32 +107,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>
@@ -146,7 +169,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/TradeFluxRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

+ 87 - 61
Areas/Admin/Views/SpServer/UnBindRecord/Index.cshtml

@@ -1,89 +1,111 @@
 @{
     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="AgentName" 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="MerNo" 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="MerName" 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="MerSnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">产品类型</label>
-<div class="layui-input-inline">
-<select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="MPOS">MPOS</option>
-<option value="传统POS">传统POS</option>
-<option value="电签POS">电签POS</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" readonly name="UnBindTimeData" id="UnBindTime" 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="ChannelSerial" placeholder="" autocomplete="off">
-</div>
-</div>
+                        <label class="layui-form-label">机构名称</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="AgentName" 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="MerNo" 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="MerName" 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="MerSnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    @{Dictionary<string, string> ProfitObjectsActivesDic = new MySystem.DictionaryClass().getKqProductBrandDic();}
+                    <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    @* <div class="layui-inline">
+                        <label class="layui-form-label">产品类型</label>
+                        <div class="layui-input-inline">
+                            <select id="ProductTypeSelect" name="ProductTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="MPOS">MPOS</option>
+                                <option value="传统POS">传统POS</option>
+                                <option value="电签POS">电签POS</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" readonly name="UnBindTimeData" id="UnBindTime"
+                                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="ChannelSerial" placeholder=""
+                                autocomplete="off">
+                        </div>
+                    </div> *@
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -100,32 +122,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>
@@ -159,7 +184,8 @@
     <script src="/layuiadmin/layui/layui.js"></script>
     <script src="/layuiadmin/modules_sp/UnBindRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

+ 47 - 47
wwwroot/layuiadmin/modules_sp/ActivateRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -30,23 +30,23 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
-    
+
 
     //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/ActivateRecord/Sort?r=" + Math.random(1),
@@ -57,35 +57,35 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/ActivateRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerMobile', width: 200, title:'商户手机号', sort: true}
-,{field:'SnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'MerRegDate', width: 200, title:'注册日期', sort: true}
-,{field:'AssessMonth', width: 200, title:'考核月', sort: true}
-,{field:'AssessMonthCount', width: 200, title:'考核第几月', sort: true}
-,{field:'ActivateStatus', width: 200, title:'激活状态', sort: true}
-,{field:'ActivateDate', width: 200, title:'激活日期', sort: true}
-,{field:'MerRealName', width: 200, title:'商户真实姓名', sort: true}
-,{field:'MerIdcardNo', width: 200, title:'商户身份证号', sort: true}
-,{field:'Remark', width: 200, title:'备注', sort: true}
-,{field:'AgentNo', width: 200, title:'代理商编号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            // , { field: 'MerMobile', width: 200, title: '商户手机号', sort: true }
+            // , { field: 'SnNo', width: 200, title: '终端机身号', sort: true }
+            // , { field: 'MerRegDate', width: 200, title: '注册日期', sort: true }
+            // , { field: 'AssessMonth', width: 200, title: '考核月', sort: true }
+            // , { field: 'AssessMonthCount', width: 200, title: '考核第几月', sort: true }
+            // , { field: 'ActivateStatus', width: 200, title: '激活状态', sort: true }
+            , { field: 'ActivateDate', width: 200, title: '激活日期', sort: true }
+            // , { field: 'MerRealName', width: 200, title: '商户真实姓名', sort: true }
+            // , { field: 'MerIdcardNo', width: 200, title: '商户身份证号', sort: true }
+            // , { field: 'Remark', width: 200, title: '备注', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -107,7 +107,7 @@ layui.config({
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -130,20 +130,20 @@ layui.config({
                         , 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) {
@@ -154,7 +154,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ActivateRecord/Edit?r=" + Math.random(1),
@@ -247,20 +247,20 @@ layui.config({
                         , 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) {
@@ -271,7 +271,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ActivateRecord/Add?r=" + Math.random(1),
@@ -328,9 +328,9 @@ layui.config({
         , 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 + ",";
@@ -357,9 +357,9 @@ layui.config({
         , 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 + ",";

+ 69 - 69
wwwroot/layuiadmin/modules_sp/BindRecord_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 layCreateTime = laydate.render({
-elem: '#CreateTime',
-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;
-layCreateTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateTime').val(value);
-}
-}
-});
+        elem: '#CreateTime',
+        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;
+                    layCreateTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateTime').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/BindRecord/Sort?r=" + Math.random(1),
@@ -84,32 +84,32 @@ $('#CreateTime').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/BindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'AgentName', width: 200, title:'机构名称', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerSnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'MerOperateDate', width: 200, title:'操作时间', sort: true}
-,{field:'MerOperateType', width: 200, title:'操作类型', sort: true}
-,{field:'MerStatus', width: 200, title:'商户状态', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'MerNewSnNo', width: 200, title:'新终端机身号', sort: true}
-,{field:'CreateTime', width: 200, title:'创建时间', sort: true}
-,{field:'UpdateTime', width: 200, title:'更新时间', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            // , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'MerOperateDate', width: 200, title: '操作时间', sort: true }
+            // , { field: 'MerOperateType', width: 200, title: '操作类型', sort: true }
+            // , { field: 'MerStatus', width: 200, title: '商户状态', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'MerNewSnNo', width: 200, title: '新终端机身号', sort: true }
+            , { field: 'CreateTime', width: 200, title: '创建时间', sort: true }
+            , { field: 'UpdateTime', width: 200, title: '更新时间', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -131,7 +131,7 @@ $('#CreateTime').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -154,20 +154,20 @@ $('#CreateTime').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) {
@@ -178,7 +178,7 @@ $('#CreateTime').val(value);
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/BindRecord/Edit?r=" + Math.random(1),
@@ -271,20 +271,20 @@ $('#CreateTime').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) {
@@ -295,7 +295,7 @@ $('#CreateTime').val(value);
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/BindRecord/Add?r=" + Math.random(1),
@@ -352,9 +352,9 @@ $('#CreateTime').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 + ",";
@@ -381,9 +381,9 @@ $('#CreateTime').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 + ",";

+ 67 - 67
wwwroot/layuiadmin/modules_sp/ChangeBindRecord_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 layConfirmTime = laydate.render({
-elem: '#ConfirmTime',
-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;
-layConfirmTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layConfirmTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#ConfirmTime').val(value);
-}
-}
-});
+        elem: '#ConfirmTime',
+        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;
+                    layConfirmTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layConfirmTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#ConfirmTime').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/ChangeBindRecord/Sort?r=" + Math.random(1),
@@ -84,30 +84,30 @@ $('#ConfirmTime').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/ChangeBindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'AgentName', width: 200, title:'机构名称', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerSnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'MerNewSnNo', width: 200, title:'新终端机身号', sort: true}
-,{field:'ConfirmTime', width: 200, title:'提交时间', sort: true}
-,{field:'ReBindTime', width: 200, title:'重新绑定时间', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-,{field:'AgentNo', width: 200, title:'机构号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            // , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            // , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'MerNewSnNo', width: 200, title: '新终端机身号', sort: true }
+            , { field: 'ConfirmTime', width: 200, title: '提交时间', sort: true }
+            , { field: 'ReBindTime', width: 200, title: '重新绑定时间', sort: true }
+            , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -129,7 +129,7 @@ $('#ConfirmTime').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -152,20 +152,20 @@ $('#ConfirmTime').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) {
@@ -176,7 +176,7 @@ $('#ConfirmTime').val(value);
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ChangeBindRecord/Edit?r=" + Math.random(1),
@@ -269,20 +269,20 @@ $('#ConfirmTime').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) {
@@ -293,7 +293,7 @@ $('#ConfirmTime').val(value);
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ChangeBindRecord/Add?r=" + Math.random(1),
@@ -350,9 +350,9 @@ $('#ConfirmTime').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 + ",";
@@ -379,9 +379,9 @@ $('#ConfirmTime').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 + ",";

+ 45 - 45
wwwroot/layuiadmin/modules_sp/TradeFluxRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -30,23 +30,23 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
-    
+
 
     //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/TradeFluxRecord/Sort?r=" + Math.random(1),
@@ -57,33 +57,33 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/TradeFluxRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'TradeSerialNo', width: 200, title:'交易单号', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'TradeAmount', width: 200, title:'交易金额', sort: true}
-,{field:'TradeStatus', width: 200, title:'交易状态', sort: true}
-,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
-,{field:'TradeTime', width: 200, title:'交易时间', sort: true}
-,{field:'BankCardType', width: 200, title:'银行卡类型', sort: true}
-,{field:'DigAmt', width: 200, title:'挖款金额', sort: true}
-,{field:'BankCardNo', width: 200, title:'交易卡号', sort: true}
-,{field:'FeeAmount', width: 200, title:'手续费', sort: true}
-,{field:'KqTradeSeq', width: 200, title:'快钱交易流水号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'AgentNo', width: 200, title:'代理商编号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'TradeSerialNo', width: 200, title: '交易单号', sort: true }
+            // , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            // , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
+            // , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
+            // , { field: 'TradeDate', width: 200, title: '交易日期', sort: true }
+            // , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
+            // , { field: 'BankCardType', width: 200, title: '银行卡类型', sort: true }
+            // , { field: 'DigAmt', width: 200, title: '挖款金额', sort: true }
+            // , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
+            , { field: 'FeeAmount', width: 200, title: '手续费', sort: true }
+            // , { field: 'KqTradeSeq', width: 200, title: '快钱交易流水号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -105,7 +105,7 @@ layui.config({
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -128,20 +128,20 @@ layui.config({
                         , 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) {
@@ -152,7 +152,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeFluxRecord/Edit?r=" + Math.random(1),
@@ -245,20 +245,20 @@ layui.config({
                         , 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) {
@@ -269,7 +269,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeFluxRecord/Add?r=" + Math.random(1),
@@ -326,9 +326,9 @@ layui.config({
         , 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 + ",";
@@ -355,9 +355,9 @@ layui.config({
         , 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 + ",";

+ 45 - 45
wwwroot/layuiadmin/modules_sp/TradeRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -30,23 +30,23 @@ layui.config({
 
     //- 筛选条件-日期
     var laydate = layui.laydate;
-    
+
 
     //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/TradeRecord/Sort?r=" + Math.random(1),
@@ -57,33 +57,33 @@ layui.config({
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/TradeRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'TradeSerialNo', width: 200, title:'交易单号', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'TradeAmount', width: 200, title:'交易金额', sort: true}
-,{field:'TradeStatus', width: 200, title:'交易状态', sort: true}
-,{field:'TradeDate', width: 200, title:'交易日期', sort: true}
-,{field:'TradeTime', width: 200, title:'交易时间', sort: true}
-,{field:'BankCardType', width: 200, title:'银行卡类型', sort: true}
-,{field:'BankCardNo', width: 200, title:'交易卡号', sort: true}
-,{field:'SettleFee', width: 200, title:'出款手续费', sort: true}
-,{field:'Remark', width: 200, title:'备注', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'AgentNo', width: 200, title:'代理商编号', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'TradeSerialNo', width: 200, title: '交易单号', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'TradeAmount', width: 200, title: '交易金额', sort: true }
+            // , { field: 'TradeStatus', width: 200, title: '交易状态', sort: true }
+            // , { field: 'TradeDate', width: 200, title: '交易日期', sort: true }
+            // , { field: 'TradeTime', width: 200, title: '交易时间', sort: true }
+            , { field: 'BankCardType', width: 200, title: '银行卡类型', sort: true }
+            // , { field: 'BankCardNo', width: 200, title: '交易卡号', sort: true }
+            // , { field: 'SettleFee', width: 200, title: '出款手续费', sort: true }
+            // , { field: 'Remark', width: 200, title: '备注', sort: true }
+            // , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            // , { field: 'AgentNo', width: 200, title: '代理商编号', sort: true }
+            // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -105,7 +105,7 @@ layui.config({
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -128,20 +128,20 @@ layui.config({
                         , 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) {
@@ -152,7 +152,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeRecord/Edit?r=" + Math.random(1),
@@ -245,20 +245,20 @@ layui.config({
                         , 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) {
@@ -269,7 +269,7 @@ layui.config({
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/TradeRecord/Add?r=" + Math.random(1),
@@ -326,9 +326,9 @@ layui.config({
         , 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 + ",";
@@ -355,9 +355,9 @@ layui.config({
         , 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 + ",";

+ 65 - 65
wwwroot/layuiadmin/modules_sp/UnBindRecord_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 layUnBindTime = laydate.render({
-elem: '#UnBindTime',
-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;
-layUnBindTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layUnBindTime.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#UnBindTime').val(value);
-}
-}
-});
+        elem: '#UnBindTime',
+        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;
+                    layUnBindTime.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layUnBindTime.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#UnBindTime').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/UnBindRecord/Sort?r=" + Math.random(1),
@@ -84,28 +84,28 @@ $('#UnBindTime').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/UnBindRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'AgentName', width: 200, title:'机构名称', sort: true}
-,{field:'MerNo', width: 200, title:'商户编号', sort: true}
-,{field:'MerName', width: 200, title:'商户名称', sort: true}
-,{field:'MerSnNo', width: 200, title:'终端机身号', sort: true}
-,{field:'ProductType', width: 200, title:'产品类型', sort: true}
-,{field:'UnBindTime', width: 200, title:'解绑时间', sort: true}
-,{field:'ChannelSerial', width: 200, title:'渠道流水号', sort: true}
-,{field:'AgentNo', width: 200, title:'机构号', sort: true}
-
-            , {field:'Sort', fixed: 'right', title:'排序', width:80, edit: 'text'}
+            , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
+            , { field: 'AgentName', width: 200, title: '机构名称', sort: true }
+            , { field: 'MerNo', width: 200, title: '商户编号', sort: true }
+            , { field: 'MerName', width: 200, title: '商户名称', sort: true }
+            , { field: 'MerSnNo', width: 200, title: '终端机身号', sort: true }
+            , { field: 'ProductType', width: 200, title: '产品类型', sort: true }
+            , { field: 'UnBindTime', width: 200, title: '解绑时间', sort: true }
+            // , { field: 'ChannelSerial', width: 200, title: '渠道流水号', sort: true }
+            , { field: 'AgentNo', width: 200, title: '机构号', sort: true }
+
+            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
-            
+
         }
         , page: true
         , limit: 30
@@ -127,7 +127,7 @@ $('#UnBindTime').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -150,20 +150,20 @@ $('#UnBindTime').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) {
@@ -174,7 +174,7 @@ $('#UnBindTime').val(value);
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/UnBindRecord/Edit?r=" + Math.random(1),
@@ -267,20 +267,20 @@ $('#UnBindTime').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) {
@@ -291,7 +291,7 @@ $('#UnBindTime').val(value);
                         }
                         //提交 Ajax 成功后,静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/UnBindRecord/Add?r=" + Math.random(1),
@@ -348,9 +348,9 @@ $('#UnBindTime').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 + ",";
@@ -377,9 +377,9 @@ $('#UnBindTime').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 + ",";