Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/BsServer/MsgPlacardController.cs

@@ -164,16 +164,6 @@ namespace MySystem.Areas.Admin.Controllers
             AddSysLog(Id.ToString(), "MsgPlacard", "add");
             db.SaveChanges();
 
-            SetRedis(Id, true);
-
-            List<int> uids = db.Users.Select(m => m.Id).ToList();
-            foreach (int uid in uids)
-            {
-                MsgNotRead msg = RedisDbconn.Instance.Get<MsgNotRead>("MsgNotRead:" + uid) ?? new MsgNotRead();
-                msg.PlacardCount += 1;
-                RedisDbconn.Instance.Set("MsgNotRead:" + uid, msg);
-            }
-
             return "success";
         }
 

Areas/Admin/Controllers/MainServer/PosMachinesTwoController.cs

@@ -772,7 +772,7 @@ namespace MySystem.Areas.Admin.Controllers
             decimal AmountYks = 0;//已扣
             decimal AmountDks = 0;//待扣
             var time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            string condition = " and Status>-1 and RecycEndDate<" + time + " and ScanQrTrade>0 and ScanQrTrade<999 and BindingState=0";
+            string condition = " and Status>-1 and RecycEndDate<'" + time + "' and ScanQrTrade>0 and ScanQrTrade<999 and BindingState=0";
 
             //所属创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))

Areas/Admin/Controllers/MainServer/RecycMachineOrderController.cs

@@ -51,19 +51,19 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具回收申请列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(RecycMachineOrder data, string UserIdMakerCode, string UserIdRealName, string RecycStoreIdStoreNo, string RecycStoreIdStoreName, string RecycStoreIdManageMobile, string PostTypeSelect, string BrandIdSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(RecycMachineOrder data, string UserIdMakerCode, string UserIdRealName, string RecycStoreIdStoreNo, string PostTypeSelect, string BrandIdSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("ErpName", "1"); //快递名称
             Fields.Add("ErpCode", "1"); //快递单号
             Fields.Add("RecycOrderNo", "1"); //申请单号
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
                 condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
@@ -73,21 +73,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
             }
-            //退回仓库仓库编号
+            //退回仓库编号
             if (!string.IsNullOrEmpty(RecycStoreIdStoreNo))
             {
                 condition += " and RecycStoreId in (select RecycStoreId from StoreHouseForStoreNo where StoreNo='" + RecycStoreIdStoreNo + "')";
             }
-            //退回仓库仓库名称
-            if (!string.IsNullOrEmpty(RecycStoreIdStoreName))
-            {
-                condition += " and RecycStoreId in (select RecycStoreId from StoreHouseForStoreName where StoreName='" + RecycStoreIdStoreName + "')";
-            }
-            //退回仓库管理者手机号
-            if (!string.IsNullOrEmpty(RecycStoreIdManageMobile))
-            {
-                condition += " and RecycStoreId in (select RecycStoreId from StoreHouseForManageMobile where ManageMobile='" + RecycStoreIdManageMobile + "')";
-            }
             //寄回方式
             if (!string.IsNullOrEmpty(PostTypeSelect))
             {
@@ -98,6 +88,13 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BrandId=" + BrandIdSelect;
             }
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("RecycMachineOrder", Fields, "Id desc", "0", page, limit, condition);

Areas/Admin/Controllers/MainServer/RecycMachineOrderPosController.cs

@@ -52,17 +52,24 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具回收明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(RecycMachineOrderPos data, string OrderIdSelect, string BrandIdSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(RecycMachineOrderPos data, string OrderIdSelect, string CreateDateData, string BrandIdSelect, string StatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("OrderId", "1");
+            // Fields.Add("OrderId", "1");
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("SnNo", "1"); //机具SN
 
 
-            string condition = " and Status>-1";
+            string condition = " and Status>=-1";
+            if (!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
             //申请订单Id
             if (!string.IsNullOrEmpty(OrderIdSelect))
             {
@@ -73,6 +80,11 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and BrandId=" + BrandIdSelect;
             }
+            //状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("RecycMachineOrderPos", Fields, "Id desc", "0", page, limit, condition);
@@ -82,6 +94,13 @@ namespace MySystem.Areas.Admin.Controllers
                 //机具品牌
                 dic["BrandId"] = RelationClass.GetKqProductsInfo(int.Parse(dic["BrandId"].ToString()));
 
+                //状态
+                int Status = int.Parse(dic["Status"].ToString());//Status(-1 撤回 0 待处理 1 已确认 2 驳回)
+                if (Status == -1) dic["Status"] = "撤回";
+                if (Status == 0) dic["Status"] = "待处理";
+                if (Status == 1) dic["Status"] = "已确认";
+                if (Status == 2) dic["Status"] = "驳回";
+
             }
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -308,6 +308,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
                     }
+                    
                     Fields.Add("UserId", user.UserId); //仓库归属人
                     Fields.Add("Areas", data.Areas); //所属地区
                     Fields.Add("Address", data.Address); //仓库地址
@@ -336,6 +337,8 @@ namespace MySystem.Areas.Admin.Controllers
                     }
 
                     int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+                    int StoreId = Id;
+                    var StoreNos = "";
                     //添加分仓创建时间
                     var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
                     if (users.Id > 0)
@@ -356,6 +359,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                         No = "S" + No;
                         edit.StoreNo = No;
+                        StoreNos = No;
                         db.StoreForCode.Add(new StoreForCode()
                         {
                             Code = No,
@@ -391,10 +395,35 @@ namespace MySystem.Areas.Admin.Controllers
                         account.FixedAmount = 20000;
                         account.ValidAmount = 20000;
                     }
-
+                    var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                    var OpId = 0;
+                    if (check)
+                    {
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                        OpId = store.OpId;
+                        edit.OpId = OpId;
+                        var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Sort == m.Id && m.UserId == OpId) ?? new OpModels.SysAdmin();
+                        sysAdmin.StoreCount += 1;
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == user.UserId && m.Status == 0);
+                        if (query == null)
+                        {
+                            query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                            {
+                                CreateDate = DateTime.Now, //创建时间
+                                CreateMan = SysUserName + "_" + SysRealName,
+                                QueryCount = user.UserId,//分仓所属人Id
+                                SeoTitle = user.MakerCode,
+                                SeoKeyword = StoreNos,
+                                SeoDescription = data.StoreName,
+                                OpId = sysAdmin.UserId,
+                                StoreId = StoreId,
+                            }).Entity;
+                        }
+                    }
                     RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
                     AddSysLog(data.Id.ToString(), "StoreHouse", "add");
                     db.SaveChanges();
+                    opdb.SaveChanges();
 
                     SetRedis(Id, user.UserId);
                 }
@@ -614,6 +643,8 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("Status", 1);
 
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("StoreHouse", Fields, 0);
+            int StoreId = Id;
+            var StoreNos = "";
             //添加分仓创建时间
             var users = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
             if (users.Id > 0)
@@ -634,6 +665,7 @@ namespace MySystem.Areas.Admin.Controllers
                 }
                 No = "S" + No;
                 edit.StoreNo = No;
+                StoreNos = No;
                 db.StoreForCode.Add(new StoreForCode()
                 {
                     Code = No,
@@ -654,10 +686,35 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 storeForName.StoreId = Id;
             }
+            var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+            var OpId = 0;
+            if (check)
+            {
+                var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                OpId = store.OpId;
+                edit.OpId = OpId;
+                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Sort == m.Id && m.UserId == OpId) ?? new OpModels.SysAdmin();
+                sysAdmin.StoreCount += 1;
+                var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId && m.Sort == 0 && m.QueryCount == user.UserId && m.Status == 0);
+                if (query == null)
+                {
+                    query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
+                    {
+                        CreateDate = DateTime.Now, //创建时间
+                        CreateMan = SysUserName + "_" + SysRealName,
+                        QueryCount = user.UserId,//分仓所属人Id
+                        SeoTitle = user.MakerCode,
+                        SeoKeyword = StoreNos,
+                        SeoDescription = data.StoreName,
+                        OpId = sysAdmin.UserId,
+                        StoreId = StoreId,
+                    }).Entity;
+                }
+            }
             RedisDbconn.Instance.Set("StoreForName:" + data.StoreName, Id);
             AddSysLog(data.Id.ToString(), "StoreHouse", "add");
             db.SaveChanges();
-
+            opdb.SaveChanges();
             SetRedis(Id, user.UserId);
             return "success";
         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1475,10 +1475,10 @@ namespace MySystem.Areas.Admin.Controllers
                 // {
                 //     return "原机具未绑定";
                 // }
-                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId);
+                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.PreUserId == 0);//添加新机是否为预发机判断
                 if (newpos == null)
                 {
-                    return "新机具SN不正确";
+                    return "新机具SN不正确或不满足条件";
                 }
                 oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
@@ -1653,10 +1653,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                     if (newpos.Id == 0)
                     {
-                        return "您输入的新机SN不存在";
+                        return "您输入的新机SN不存在或不满足条件";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
                     if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(newpos.BrandId))
@@ -1862,10 +1862,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                     if (newpos.Id == 0)
                     {
-                        return "您输入的新机SN不存在";
+                        return "您输入的新机SN不存在或不满足条件";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
                     if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -51,30 +51,37 @@ namespace MySystem.Areas.Admin.Controllers
         /// 待扣款明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string UserIdRealName, string ChargeTypeSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(ToChargeBackRecord data, string UserIdMakerCode, string CreateDateData, string ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
 
 
             string condition = " and Status>-1";
-            //创客创客编号
-            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
-            //创客真实姓名
-            if (!string.IsNullOrEmpty(UserIdRealName))
+            //创客编号
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //待扣类型
             if (!string.IsNullOrEmpty(ChargeTypeSelect))
             {
                 condition += " and ChargeType=" + ChargeTypeSelect;
             }
+            //扣款状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ToChargeBackRecord", Fields, "Id desc", "0", page, limit, condition);
@@ -89,9 +96,15 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("UserId");
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
-                if (ChargeType == 1) dic["ChargeType"] = "过期机具扣款";
-                if (ChargeType == 2) dic["ChargeType"] = "人工预扣";
-                if (ChargeType == 0) dic["ChargeType"] = "";
+                if (ChargeType == 124) dic["ChargeType"] = "过期机具扣款";
+                // if (ChargeType == 2) dic["ChargeType"] = "人工预扣";
+                // if (ChargeType == 0) dic["ChargeType"] = "";
+
+                //扣款状态
+                int Status = int.Parse(dic["Status"].ToString());
+                if (Status == 0) dic["Status"] = "待扣款";
+                if (Status == 1) dic["Status"] = "已扣款";
+                if (Status == 2) dic["Status"] = "已退还";
 
             }
             return Json(obj);
@@ -286,18 +299,43 @@ namespace MySystem.Areas.Admin.Controllers
         {
             ExcelData = HttpUtility.UrlDecode(ExcelData);
             JsonData list = JsonMapper.ToObject(ExcelData);
+            var info = "";
+            var error = "";
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
             for (int i = 1; i < list.Count; i++)
             {
                 JsonData dr = list[i];
-
-                db.ToChargeBackRecord.Add(new ToChargeBackRecord()
+                string PosSn = dr[0].ToString(); // 机具Sn
+                var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Status == 1 && m.Remark == PosSn) ?? new ToChargeBackRecord();
+                if (toChargeBackRecord.Id == 0)
                 {
-                    CreateDate = DateTime.Now,
-                    UpdateDate = DateTime.Now,
-
-                });
-                db.SaveChanges();
+                    error += "以下操作失败" + PosSn + ',' + "不符合退还条件" + '\n';
+                }
+                else
+                {
+                    var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
+                    var userAccountRecord = db.UserAccountRecord.Add(new UserAccountRecord
+                    {
+                        CreateDate = DateTime.Now,
+                        UserId = toChargeBackRecord.UserId,
+                        BeforeBalanceAmount = userAccount.BalanceAmount,
+                        AfterBalanceAmount = userAccount.BalanceAmount + toChargeBackRecord.ChargeAmount,
+                        ChangeAmount = toChargeBackRecord.ChargeAmount,
+                        ChangeType = 126,
+                        Remark = "机具货款退还",
+
+                    }).Entity;
+                    userAccount.BalanceAmount += toChargeBackRecord.ChargeAmount;
+                    toChargeBackRecord.Status = 2;
+                    info += toChargeBackRecord.Remark + "," + toChargeBackRecord.ChargeAmount + "<br/>";
+                }
             }
+            string text = string.Format("退款信息: '" + info + "'，Time'" + DateTime.Now + "'");
+            function.WriteLog(text, "人工退还过期机具扣款");//人工退还过期机具扣款
+            db.SaveChanges();
             AddSysLog("0", "ToChargeBackRecord", "Import");
             return "success";
         }
@@ -309,59 +347,93 @@ namespace MySystem.Areas.Admin.Controllers
         /// 导出Excel
         /// </summary>
         /// <returns></returns>
-        public JsonResult ExportExcel(ToChargeBackRecord data, string UserIdMakerCode, string UserIdRealName, string ChargeTypeSelect)
+        public JsonResult ExportExcel(ToChargeBackRecord data, string CreateDateData, string UserIdMakerCode, string ChargeTypeSelect, string StatusSelect)
         {
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("CreateDate", "3"); //时间
-
+            // Fields.Add("CreateDate", "3"); //时间
 
             string condition = " and Status>-1";
-            //创客创客编号
-            if (!string.IsNullOrEmpty(UserIdMakerCode))
+            if (!string.IsNullOrEmpty(CreateDateData))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
             }
-            //创客真实姓名
-            if (!string.IsNullOrEmpty(UserIdRealName))
+            //创客编号
+            if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForRealName where RealName='" + UserIdRealName + "')";
+                condition += " and UserId in (select UserId from UserForMakerCode where MakerCode='" + UserIdMakerCode + "')";
             }
             //待扣类型
             if (!string.IsNullOrEmpty(ChargeTypeSelect))
             {
                 condition += " and ChargeType=" + ChargeTypeSelect;
             }
+            //扣款状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                condition += " and Status=" + StatusSelect;
+            }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ToChargeBackRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,ChargeAmount,ChargeType,Remark,Field1", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ToChargeBackRecord", Fields, "Id desc", "0", 1, 20000, condition, "Id,UserId,ChargeAmount,ChargeType,Remark", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                // 机具sn 机具品牌 机具类型 循环过期时间 创客编号 创客姓名 创客手机号 应扣金额 实扣金额 是否已返还
                 //创客
                 int UserId = int.Parse(function.CheckInt(dic["UserId"].ToString()));
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic["UserIdRealName"] = userid_Users.RealName;
+                dic["UserIdMobile"] = userid_Users.Mobile;
                 dic.Remove("UserId");
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
-                if (ChargeType == 1) dic["ChargeType"] = "过期机具扣款";
-                if (ChargeType == 2) dic["ChargeType"] = "人工预扣";
-                if (ChargeType == 0) dic["ChargeType"] = "";
+                if (ChargeType == 124) dic["ChargeType"] = "过期机具扣款";
+                // if (ChargeType == 2) dic["ChargeType"] = "人工预扣";
+                // if (ChargeType == 0) dic["ChargeType"] = "";
+
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == Id) ?? new ToChargeBackRecord();
+                //扣款状态
+                if (toChargeBackRecord.Status == 0) dic["Status"] = "待扣款未返还";
+                if (toChargeBackRecord.Status == 1) dic["Status"] = "已扣款未返还";
+                if (toChargeBackRecord.Status == 2) dic["Status"] = "已返还";
+                decimal ChargeAmount = decimal.Parse(dic["ChargeAmount"].ToString());//应扣金额
+                decimal ChargeAmountf = 0;//实扣金额
+                dic["ChargeAmountf"] = "";
+                if (toChargeBackRecord.Status == 1)//已扣款
+                {
+                    ChargeAmountf = ChargeAmount;
+                    dic["ChargeAmountf"] = ChargeAmountf;
+                }
+                var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == toChargeBackRecord.Remark) ?? new PosMachinesTwo();
+                dic["BrandId"] = RelationClass.GetKqProductBrandInfo(pos.BrandId);
+                if (pos.PosSnType == 0) dic["PosSnType"] = "购买机";
+                if (pos.PosSnType == 1) dic["PosSnType"] = "循环机";
+                dic["RecycEndDate"] = pos.RecycEndDate;
 
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
-            result.Add("Status", "1");
+            // result.Add("Status", "1");
             result.Add("Info", "Excel报表-" + DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss") + ".xlsx");
             result.Add("Obj", diclist);
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
-            ReturnFields.Add("UserIdMakerCode", "创客创客编号");
-            ReturnFields.Add("UserIdRealName", "创客真实姓名");
-            ReturnFields.Add("ChargeAmount", "待扣金额");
-            ReturnFields.Add("ChargeType", "待扣类型");
-            ReturnFields.Add("Remark", "备注");
-            ReturnFields.Add("Field1", "备用字段");
+            ReturnFields.Add("Id", "Id");
+            ReturnFields.Add("ChargeType", "类型");
+            ReturnFields.Add("Remark", "机具sn");
+            ReturnFields.Add("BrandId", "品牌");
+            ReturnFields.Add("PosSnType", "机具类型");
+            ReturnFields.Add("RecycEndDate", "循环过期时间");
+            ReturnFields.Add("UserIdMakerCode", "创客编号");
+            ReturnFields.Add("UserIdRealName", "创客姓名");
+            ReturnFields.Add("UserIdMobile", "创客手机号");
+            ReturnFields.Add("ChargeAmount", "应扣金额");
+            ReturnFields.Add("ChargeAmountf", "实扣金额");
+            ReturnFields.Add("Status", "扣款状态");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "ToChargeBackRecord", "ExportExcel");

Areas/Admin/Views/BsServer/MsgPersonal/Add.cshtml

@@ -41,8 +41,7 @@
                                 <div class="layui-upload">
                                     <input type="hidden" id="BgPic" name="BgPic" value="">
                                     <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                    <div class="layui-inline layui-word-aux">@(new
-                                        MySystem.PublicFunction().GetUploadHint("MsgPersonalBgPic"))</div>
+                                    <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPersonalBgPic"))</div>
                                 </div>
                                 <div style="margin-top:10px;" id="BgPicImage">
                                 </div>

Areas/Admin/Views/BsServer/MsgPlacard/Add.cshtml

@@ -1,163 +1,170 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-    
+
 }
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="utf-8">
     <title>公告消息(增加)</title>
     <meta name="renderer" content="webkit">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <link rel="stylesheet" href="/layuiadmin/layui/css/layui.css" media="all">
     <script src="/admin/js/jquery-1.10.1.min.js"></script>
     <script src="/admin/js/LAreaData2.js"></script>
     <style>
-        .layui-form-label{
+        .layui-form-label {
             width: 115px !important;
         }
-        .layui-form-item .layui-input-inline{
+
+        .layui-form-item .layui-input-inline {
             width: 250px !important;
         }
-        .layui-form-item .layui-input-block{
+
+        .layui-form-item .layui-input-block {
             margin-left: 145px !important;
         }
     </style>
 </head>
+
 <body>
 
     <div class="layui-form" lay-filter="layuiadmin-form-useradmin" id="layuiadmin-form-useradmin">
-        
+
         <div class="layui-card">
-          <div class="layui-card-body">
-            <div class="layui-tab" lay-filter="mytabbar">
-                <div class="layui-tab-content mt20">
-                    <div class="layui-tab-item layui-show">
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">展示类型</label>
-                            <div class="layui-input-inline">
-                                <select id="ShowType" name="ShowType" lay-search="">
-                                    <option value="">请选择</option>
-                                    <option value="0">系统消息</option>
-                                    <option value="1">首页弹层提示</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">消息类型</label>
-                            <div class="layui-input-inline">
-                                <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
-                                    <option value="0">html页面</option>
-                                    <option value="1">指定url</option>
-                                    <option value="2">简单中文描述</option>
-                                </select>
+            <div class="layui-card-body">
+                <div class="layui-tab" lay-filter="mytabbar">
+                    <div class="layui-tab-content mt20">
+                        <div class="layui-tab-item layui-show">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">展示类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="ShowType" name="ShowType" lay-search="">
+                                        <option value="">请选择</option>
+                                        <option value="0">系统消息</option>
+                                        <option value="1">首页弹层提示</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">标题</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
-                                    lay-verify="required," autocomplete="off" placeholder="请输入标题">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">消息类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="MsgType" name="MsgType" lay-search="" lay-filter="MsgType">
+                                        <option value="0">html页面</option>
+                                        <option value="1">指定url</option>
+                                        <option value="2">简单中文描述</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item layui-form-text">
-                            <label class="layui-form-label">推送内容</label>
-                            <div class="layui-input-inline">
-                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
-                                    lay-verify="" placeholder="请输入推送内容"></textarea>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">标题</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="Title" name="Title" maxlength="50"
+                                        lay-verify="required," autocomplete="off" placeholder="请输入标题">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">有效开始时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="EffectStartDate" name="EffectStartDate"
-                                    lay-verify="" autocomplete="off" placeholder="请输入有效开始时间">
+                            <div class="layui-form-item layui-form-text">
+                                <label class="layui-form-label">简介</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
+                                        lay-verify="" placeholder="请输入简介"></textarea>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">有效结束时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="EffectEndDate" name="EffectEndDate"
-                                    lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有效开始时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="EffectStartDate" name="EffectStartDate"
+                                        lay-verify="" autocomplete="off" placeholder="请输入有效开始时间">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">背景图片</label>
-                            <div class="layui-input-block">
-                                <div class="layui-upload">
-                                    <input type="hidden" id="BgPic" name="BgPic" value="">
-                                    <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                    <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPlacardBgPic"))</div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">有效结束时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="EffectEndDate" name="EffectEndDate"
+                                        lay-verify="" autocomplete="off" placeholder="请输入有效结束时间">
                                 </div>
-                                <div style="margin-top:10px;" id="BgPicImage">
+                            </div>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">背景图片</label>
+                                <div class="layui-input-block">
+                                    <div class="layui-upload">
+                                        <input type="hidden" id="BgPic" name="BgPic" value="">
+                                        <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgPlacardBgPic"))</div>
+                                    </div>
+                                    <div style="margin-top:10px;" id="BgPicImage">
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label">推送类型</label>
-                            <div class="layui-input-inline">
-                                <select id="PushType" name="PushType" lay-search="" lay-filter="PushType">
-                                    <option value="0">不推送</option>
-                                    <option value="1">立即推送</option>
-                                    <option value="2">定时推送</option>
-                                </select>
+                            <div class="layui-form-item">
+                                <label class="layui-form-label">推送类型</label>
+                                <div class="layui-input-inline">
+                                    <select id="PushType" name="PushType" lay-search="" lay-filter="PushType">
+                                        <option value="0">不推送</option>
+                                        <option value="1">立即推送</option>
+                                        <option value="2">定时推送</option>
+                                    </select>
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="PushParamDiv" style="display: none;">
-                            <label class="layui-form-label">推送参数</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushParam" name="PushParam" maxlength="255"
-                                    lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                            <div class="layui-form-item" id="PushParamDiv" style="display: none;">
+                                <label class="layui-form-label">推送参数</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                        maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="PushTimeDiv" style="display: none;">
-                            <label class="layui-form-label">推送时间</label>
-                            <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
-                                    autocomplete="off" placeholder="请输入推送时间">
+                            <div class="layui-form-item" id="PushTimeDiv" style="display: none;">
+                                <label class="layui-form-label">推送时间</label>
+                                <div class="layui-input-inline">
+                                    <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
+                                        autocomplete="off" placeholder="请输入推送时间">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item" id="UrlDiv" style="display: none;">
-                            <label class="layui-form-label">跳转Url</label>
-                            <div class="layui-input-block">
-                                <input class="layui-input" type="text" id="Url" name="Url" maxlength="500" lay-verify=""
-                                    autocomplete="off" placeholder="请输入跳转Url">
+                            <div class="layui-form-item" id="UrlDiv" style="display: none;">
+                                <label class="layui-form-label">跳转Url</label>
+                                <div class="layui-input-block">
+                                    <input class="layui-input" type="text" id="Url" name="Url" maxlength="500"
+                                        lay-verify="" autocomplete="off" placeholder="请输入跳转Url">
+                                </div>
                             </div>
-                        </div>
-                        <div class="layui-form-item layui-form-text" id="ContentDiv">
-                            <label class="layui-form-label">内容</label>
-                            <div class="layui-input-block">
-                                <textarea class="layui-textarea" id="Content" name="Content" placeholder="请输入内容"
-                                    style="width:100%;height:500px;"></textarea>
+                            <div class="layui-form-item layui-form-text" id="ContentDiv">
+                                <label class="layui-form-label">内容</label>
+                                <div class="layui-input-block">
+                                    <textarea class="layui-textarea" id="Content" name="Content" placeholder="请输入内容"
+                                        style="width:100%;height:500px;"></textarea>
+                                </div>
                             </div>
+
                         </div>
 
                     </div>
-
+                </div>
+                <div class="layui-form-item layui-hide">
+                    <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit"
+                        value="确认">
                 </div>
             </div>
-            <div class="layui-form-item layui-hide">
-                <input type="button" lay-submit lay-filter="LAY-list-front-submit" id="LAY-list-front-submit" value="确认">
-            </div>
-          </div>
         </div>
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script
+        src="/other/oss/upload-min@(MySystem.OssHelper.Instance.OssStatus ? "-oss" : "").js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script src="/other/mybjq/kindeditor-min.js"></script>
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
- @(Html.Raw(Library.Control.kindeditorVar("Content")))
+        @(Html.Raw(Library.Control.kindeditorVar("Content")))
+
 
-                    
-        //编辑器
-        KindEditor.ready(function (K) {
-            //内容
- @(Html.Raw(Library.Control.kindeditor("Content", 1)))
+            //编辑器
+            KindEditor.ready(function (K) {
+                //内容
+                @(Html.Raw(Library.Control.kindeditor("Content", 1)))
 
         });
 
@@ -264,7 +271,7 @@
             });
         }
 
-        
+
         var tree;
         var element;
         var upload;
@@ -284,7 +291,7 @@
             tree = layui.tree;
             element = layui.element;
             upload = layui.upload;
-        
+
             //Hash地址的定位
             var layid = location.hash.replace(/^#test=/, '');
             element.tabChange('test', layid);
@@ -293,69 +300,70 @@
             });
 
             form.on('select(MsgType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#UrlDiv').hide();
                     $('#ContentDiv').show();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#UrlDiv').show();
                     $('#ContentDiv').hide();
-                } else if(data.value == '2') {
+                } else if (data.value == '2') {
                     $('#UrlDiv').hide();
                     $('#ContentDiv').hide();
                 }
                 form.render();
             });
             form.on('select(PushType)', function (data) {
-                if(data.value == '0') {
+                if (data.value == '0') {
                     $('#PushParamDiv').hide();
                     $('#PushTimeDiv').hide();
-                } else if(data.value == '1') {
+                } else if (data.value == '1') {
                     $('#PushParamDiv').show();
                     $('#PushTimeDiv').hide();
-                } else if(data.value == '2') {
+                } else if (data.value == '2') {
                     $('#PushParamDiv').show();
                     $('#PushTimeDiv').show();
                 }
                 form.render();
             });
 
-            
-    
+
+
             //日期
             laydate.render({
-            elem: '#EffectStartDate',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#EffectStartDate',
+                type: 'datetime',
+                trigger: 'click'
             });
             laydate.render({
-            elem: '#EffectEndDate',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#EffectEndDate',
+                type: 'datetime',
+                trigger: 'click'
             });
             laydate.render({
-            elem: '#PushTime',
-            type: 'datetime',
-            trigger: 'click'
+                elem: '#PushTime',
+                type: 'datetime',
+                trigger: 'click'
             });
 
 
             //上传文件
             WebUploadJs('BgPicBtn', '@(Library.ConfigurationManager.AppSettings["Database"].ToString())/upload/v2', @(Html.Raw(new MySystem.PublicFunction().GetUploadParam("MsgPlacardBgPic"))), function (filename) {
-            $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
-            $('#BgPic').val(filename);
+                $('#BgPicImage').html('<img src="' + osshost + filename + '" class="layui-upload-img" style="max-width:85px; max-height:85px;" onclick="showBigPic(\'' + osshost + filename + '\')">')
+                $('#BgPic').val(filename);
             });
 
 
             //穿梭框
-            
+
 
             //TreeView，比如权限管理
-            
+
 
             //省市区
-            
+
         })
 
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml

@@ -82,8 +82,7 @@
                                     <div class="layui-upload">
                                         <input type="hidden" id="BgPic" name="BgPic" value="">
                                         <button class="layui-btn" type="button" id="BgPicBtn">选择图片</button>
-                                        <div class="layui-inline layui-word-aux">@(new
-                                            MySystem.PublicFunction().GetUploadHint("MsgAlertBgPic"))</div>
+                                        <div class="layui-inline layui-word-aux">@(new MySystem.PublicFunction().GetUploadHint("MsgAlertBgPic"))</div>
                                     </div>
                                     <div style="margin-top:10px;" id="BgPicImage">
                                     </div>

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

@@ -1,112 +1,118 @@
 @{
     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="UserIdMakerCode" 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="UserIdRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div><div class="layui-inline">
-<label class="layui-form-label">退回仓库仓库编号</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="RecycStoreIdStoreNo" 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="RecycStoreIdStoreName" 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="RecycStoreIdManageMobile" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">寄回方式</label>
-<div class="layui-input-inline">
-<select id="PostTypeSelect" name="PostTypeSelect" 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="ErpName" 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="ErpCode" 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="RecycOrderNo" placeholder="" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">机具品牌</label>
-<div class="layui-input-inline">
-<select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
-<option value="">全部...</option>
-</select>
-</div>
-</div>
+                        <label class="layui-form-label">创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="UserIdMakerCode" 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="UserIdRealName" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">退回仓库编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="RecycStoreIdStoreNo" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">寄回方式</label>
+                        <div class="layui-input-inline">
+                            <select id="PostTypeSelect" name="PostTypeSelect" 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="ErpName" 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="ErpCode" 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="RecycOrderNo" 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="BrandIdSelect" name="BrandIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                    <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -123,32 +129,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,"))
                     {
-                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/RecycMachineOrderPos/Index?right=@right&OrderId=@("{{d.Id}}")">机具回收明细</a>
+                        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-href="/Admin/RecycMachineOrderPos/Index?right=@right&OrderId=@("{{d.Id}}")">机具回收明细</a>
 
                     }
                 </script>
@@ -181,9 +190,10 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/RecycMachineOrder_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/RecycMachineOrder_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

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

@@ -6,69 +6,93 @@
 }
 <!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">申请订单Id</label>
-<div class="layui-input-inline">
-<select id="OrderIdSelect" name="OrderIdSelect" lay-search="">
-<option value="">全部...</option>
-</select>
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div><div class="layui-inline">
-<label class="layui-form-label">机具SN</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
-</div>
-</div>
-@{Dictionary<string, string> KqProductsDic = new MySystem.DictionaryClass().getKqProductsDic();}
-<div class="layui-inline">
-<label class="layui-form-label">机具品牌</label>
-<div class="layui-input-inline">
-<select id="BrandIdSelect" name="BrandIdSelect" lay-search="">
-<option value="">全部...</option>
-@foreach (string key in KqProductsDic.Keys)
-{
-<option value="@key">@KqProductsDic[key]</option>
-}
-</select>
-</div>
-</div>
+                        <label class="layui-form-label">申请订单Id</label>
+                        <div class="layui-input-inline">
+                            <select id="OrderIdSelect" name="OrderIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">机具SN</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="SnNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">激活状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="-1">已撤回</option>
+                                <option value="0">待处理</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="BrandIdSelect" name="BrandIdSelect" lay-search="">
+                                <option value="">全部...</option>
+                                @foreach (string key in ProfitObjectsActivesDic.Keys)
+                                {
+                                    <option value="@key">@ProfitObjectsActivesDic[key]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -85,31 +109,33 @@
                 <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,"))
                     {
-                    
+
                     }
                 </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>
@@ -141,10 +167,11 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/RecycMachineOrderPos_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/RecycMachineOrderPos_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        var OrderId='@OrderId';
+        var OrderId = '@OrderId';
 
     </script>
 </body>
+
 </html>

Areas/Admin/Views/MainServer/StoreHouse/Edits.cshtml

@@ -169,7 +169,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">*押金</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value=""
+                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value="@editData.Deposit"
                                         maxlength="32" lay-verify="required|" autocomplete="off" placeholder="请输入押金">
                                 </div>
                             </div>
@@ -177,7 +177,7 @@
                                 <label class="layui-form-label">附件</label>
                                 <div class="layui-input-block">
                                     <div class="layui-upload">
-                                        <input type="hidden" id="FilePath" name="FilePath" value=""
+                                        <input type="hidden" id="FilePath" name="FilePath" value="@editData.FilePath"
                                             lay-verify="required|">
                                         <button class="layui-btn" type="button" id="FilePathBtn">选择文件</button>
                                         <div class="layui-inline layui-word-aux">

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

@@ -1,68 +1,83 @@
 @{
     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="UserIdMakerCode" 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="UserIdRealName" autocomplete="off">
-</div>
-</div>
-<div class="layui-inline">
-<label class="layui-form-label">创建时间</label>
-<div class="layui-input-inline">
-<input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate" placeholder="" autocomplete="off">
-</div></div><div class="layui-inline">
-<label class="layui-form-label">待扣类型</label>
-<div class="layui-input-inline">
-<select id="ChargeTypeSelect" name="ChargeTypeSelect" lay-search="">
-<option value="">全部...</option>
-<option value="1">过期机具扣款</option>
-<option value="2">人工预扣</option>
-</select>
-</div>
-</div>
+                        <label class="layui-form-label">创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="UserIdMakerCode" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创建时间</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" readonly name="CreateDateData" id="CreateDate"
+                                placeholder="" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">状态</label>
+                        <div class="layui-input-inline">
+                            <select id="StatusSelect" name="StatusSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="0">待扣款</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="ChargeTypeSelect" name="ChargeTypeSelect" lay-search="">
+                                <option value="">全部...</option>
+                                <option value="124">过期机具扣款</option>
+                                @* <option value="2">人工预扣</option> *@
+                            </select>
+                        </div>
+                    </div>
 
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
@@ -79,32 +94,39 @@
                 <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,"))
+                    @if (RightInfo.Contains("," + right + "_export,"))
                     {
-                    <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>
+                    }
+                    @if (RightInfo.Contains("," + right + "_import,"))
+                    {
+                        <button class="layui-btn" data-type="ImportData"><i
+                            class="layui-icon layui-icon-upload 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>
@@ -136,9 +158,10 @@
     </div>
 
     <script src="/layuiadmin/layui/layui.js"></script>
-    <script src="/layuiadmin/modules/ToChargeBackRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
+    <script src="/layuiadmin/modules_main/ToChargeBackRecord_Admin.js?r=@DateTime.Now.ToString("yyyyMMddHHmmss")"></script>
     <script>
-        
+
     </script>
 </body>
+
 </html>

Areas/Admin/Views/OperateServer/SysAdminOperate/Index.cshtml

@@ -47,7 +47,7 @@
                     <div class="layui-inline">
                         <label class="layui-form-label">运营中心编号</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="AdminName" placeholder="" autocomplete="off">
+                            <input class="layui-input" type="text" name="OpCode" placeholder="" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">

Config/MysqlConn.cs

@@ -0,0 +1,13 @@
+using Library;
+
+/// <summary>
+/// MySql链接
+/// </summary>
+namespace MySystem
+{
+    public class MysqlConn
+    {
+        public static string connstr = ConfigurationManager.AppSettings["SqlConnStr"].ToString();
+
+    }
+}

Startup.cs

@@ -141,6 +141,7 @@ namespace MySystem
             ExcelHelper.Instance.Start();
             OpExcelHelper.Instance.Start();
             TestHelper.Instance.Start();
+            
         }
 
 

wwwroot/layuiadmin/modules_main/RecycMachineOrderPos_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'datetime',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/RecycMachineOrderPos/Sort?r=" + Math.random(1),
@@ -84,21 +84,21 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/RecycMachineOrderPos/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'SnNo', width: 200, title:'机具SN', sort: true}
-,{field:'ResultDate', width: 200, title:'确认或驳回时间', sort: true}
-,{field:'CancelDate', width: 200, title:'创客撤销时间', sort: true}
-,{field:'BrandId', 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: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'SnNo', width: 200, title: '机具SN', sort: true }
+            , { field: 'ResultDate', width: 200, title: '确认或驳回时间', sort: true }
+            , { field: 'CancelDate', width: 200, title: '创客撤销时间', sort: true }
+            , { field: 'BrandId', width: 200, title: '机具品牌', sort: true }
+
+            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {
@@ -124,7 +124,7 @@ $('#CreateDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -147,20 +147,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -171,7 +171,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/RecycMachineOrderPos/Edit?r=" + Math.random(1),
@@ -264,20 +264,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -288,7 +288,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/RecycMachineOrderPos/Add?r=" + Math.random(1),
@@ -345,9 +345,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -374,9 +374,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/RecycMachineOrder_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -31,49 +31,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'datetime',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/RecycMachineOrder/Sort?r=" + Math.random(1),
@@ -84,32 +84,32 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/RecycMachineOrder/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
-,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'RecycStoreIdStoreNo', width: 200, title:'退回仓库仓库编号', sort: true}
-,{field:'RecycStoreIdStoreName', width: 200, title:'退回仓库仓库名称', sort: true}
-,{field:'RecycStoreIdManageMobile', width: 200, title:'退回仓库管理者手机号', sort: true}
-,{field:'PostType', width: 200, title:'寄回方式', sort: true}
-,{field:'ErpName', width: 200, title:'快递名称', sort: true}
-,{field:'ErpCode', width: 200, title:'快递单号', sort: true}
-,{field:'ResultDate', width: 200, title:'确认或驳回时间', sort: true}
-,{field:'CancelDate', width: 200, title:'创客撤销时间', sort: true}
-,{field:'RecycOrderNo', 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: 'UserIdMakerCode', width: 200, title: '创客编号', sort: true }
+            , { field: 'UserIdRealName', width: 200, title: '创客真实姓名', sort: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'RecycStoreIdStoreNo', width: 200, title: '退回仓库编号', sort: true }
+            , { field: 'RecycStoreIdStoreName', width: 200, title: '退回仓库名称', sort: true }
+            , { field: 'RecycStoreIdManageMobile', width: 200, title: '退回仓库管理者手机号', sort: true }
+            , { field: 'PostType', width: 200, title: '寄回方式', sort: true }
+            , { field: 'ErpName', width: 200, title: '快递名称', sort: true }
+            , { field: 'ErpCode', width: 200, title: '快递单号', sort: true }
+            , { field: 'ResultDate', width: 200, title: '确认或驳回时间', sort: true }
+            , { field: 'CancelDate', width: 200, title: '创客撤销时间', sort: true }
+            , { field: 'RecycOrderNo', 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 @@ $('#CreateDate').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 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -178,7 +178,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/RecycMachineOrder/Edit?r=" + Math.random(1),
@@ -271,20 +271,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -295,7 +295,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/RecycMachineOrder/Add?r=" + Math.random(1),
@@ -352,9 +352,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -381,9 +381,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";

wwwroot/layuiadmin/modules_main/ToChargeBackRecord_Admin.js

@@ -1,4 +1,4 @@
-var ExcelData,ExcelKind;
+var ExcelData, ExcelKind;
 function ConfirmImport() {
     $.ajax({
         type: "POST",
@@ -10,6 +10,11 @@ function ConfirmImport() {
                 layer.msg("导入成功", { time: 2000 }, function () {
                     window.location.reload();
                 });
+            } else if (data.indexOf("warning") == 0) {
+                var datalist = data.split('|');
+                layer.alert(datalist[0], { time: 20000 }, function () {
+                    window.location.reload();
+                });
             } else {
                 layer.msg(data);
             }
@@ -31,49 +36,49 @@ layui.config({
     //- 筛选条件-日期
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
-elem: '#CreateDate',
-type: 'datetime',
-range: true,
-trigger: 'click',
-change: function (value, date, endDate) {
-var op = true;
-if (date.year == endDate.year && endDate.month - date.month <= 1) {
-if (endDate.month - date.month == 1 && endDate.date > date.date) {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-} else {
-op = false;
-layCreateDate.hint('日期范围请不要超过1个月');
-setTimeout(function () {
-$(".laydate-btns-confirm").addClass("laydate-disabled");
-}, 1);
-}
-if (op) {
-$('#CreateDate').val(value);
-}
-}
-});
+        elem: '#CreateDate',
+        type: 'date',
+        range: true,
+        trigger: 'click',
+        change: function (value, date, endDate) {
+            var op = true;
+            if (date.year == endDate.year && endDate.month - date.month <= 1) {
+                if (endDate.month - date.month == 1 && endDate.date > date.date) {
+                    op = false;
+                    layCreateDate.hint('日期范围请不要超过1个月');
+                    setTimeout(function () {
+                        $(".laydate-btns-confirm").addClass("laydate-disabled");
+                    }, 1);
+                }
+            } else {
+                op = false;
+                layCreateDate.hint('日期范围请不要超过1个月');
+                setTimeout(function () {
+                    $(".laydate-btns-confirm").addClass("laydate-disabled");
+                }, 1);
+            }
+            if (op) {
+                $('#CreateDate').val(value);
+            }
+        }
+    });
 
 
     //excel导入
-    excel = layui.excel;        
+    excel = layui.excel;
     $('#ExcelFile').change(function (e) {
         var files = e.target.files;
-        excel.importExcel(files, { }, function (data) {
+        excel.importExcel(files, {}, function (data) {
             ExcelData = data[0].sheet1;
         });
     });
 
     //监听单元格编辑
-    table.on('edit(LAY-list-manage)', function(obj){
+    table.on('edit(LAY-list-manage)', function (obj) {
         var value = obj.value //得到修改后的值
-        ,data = obj.data //得到所在行所有键值
-        ,field = obj.field; //得到字段
-        if(field == "Sort"){
+            , data = obj.data //得到所在行所有键值
+            , field = obj.field; //得到字段
+        if (field == "Sort") {
             $.ajax({
                 type: "POST",
                 url: "/Admin/ToChargeBackRecord/Sort?r=" + Math.random(1),
@@ -84,26 +89,27 @@ $('#CreateDate').val(value);
             });
         }
     });
-    
+
     //列表数据
     table.render({
         elem: '#LAY-list-manage'
         , url: '/Admin/ToChargeBackRecord/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
-    		, {field:'Id', fixed: 'left', title:'ID', width:80, sort: true, unresize: true}
-            ,{field:'UserIdMakerCode', width: 200, title:'创客创客编号', sort: true}
-,{field:'UserIdRealName', width: 200, title:'创客真实姓名', sort: true}
-,{field:'CreateDate', width: 200, title:'创建时间', sort: true}
-,{field:'ChargeAmount', width: 200, title:'待扣金额', sort: true}
-,{field:'ChargeType', width: 200, title:'待扣类型', sort: true}
-,{field:'Field1', 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: 'UserIdMakerCode', width: 200, title: '创客创客编号', sort: true }
+            , { field: 'UserIdRealName', width: 200, title: '创客真实姓名', sort: true }
+            , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
+            , { field: 'ChargeAmount', width: 200, title: '待扣金额', sort: true }
+            , { field: 'ChargeType', width: 200, title: '待扣类型', sort: true }
+            , { field: 'Status', width: 200, title: '扣款状态', sort: true }
+            , { field: 'Remark', width: 200, title: '机具Sn', 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
@@ -125,7 +131,7 @@ $('#CreateDate').val(value);
                     data: "Id=" + data.Id,
                     dataType: "text",
                     success: function (data) {
-                        if (data == "success") {                            
+                        if (data == "success") {
                             obj.del();
                             layer.close(index);
                         } else {
@@ -148,20 +154,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -172,7 +178,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ToChargeBackRecord/Edit?r=" + Math.random(1),
@@ -265,20 +271,20 @@ $('#CreateDate').val(value);
                         , submitID = 'LAY-list-front-submit'
                         , submit = layero.find('iframe').contents().find('#' + submitID);
 
-                    setTimeout(function () { 
+                    setTimeout(function () {
                         layero.find('iframe').contents().find('.layui-tab-item').each(function (i) {
                             var errObj = $(this).find('.layui-form-danger');
                             if (errObj.length > 0) {
                                 iframeWindow.element.tabChange('mytabbar', String(i + 1));
                                 submit.click();
                             }
-                        });                        
+                        });
                     }, 300);
 
-                    
-                    
-                    
-                    
+
+
+
+
 
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
@@ -289,7 +295,7 @@ $('#CreateDate').val(value);
                         }
                         //提交 Ajax 成功后，静态更新表格中的数据
                         //$.ajax({});
-                        
+
                         $.ajax({
                             type: "POST",
                             url: "/Admin/ToChargeBackRecord/Add?r=" + Math.random(1),
@@ -322,7 +328,7 @@ $('#CreateDate').val(value);
                 cancel: function () {
                 }
             });
-            $("#excelTemp").html('<a href="/excelfile/模板文件.xlsx">点击下载模板文件</a>');
+            $("#excelTemp").html('<a href="/users/机具扣款退还模版.xlsx">点击下载机具扣款退还模版文件</a>');
         }
         , ExportExcel: function () {
             var userdata = '';
@@ -346,9 +352,9 @@ $('#CreateDate').val(value);
         , Open: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要开启的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";
@@ -375,9 +381,9 @@ $('#CreateDate').val(value);
         , Close: function () {
             var checkStatus = table.checkStatus('LAY-list-manage')
                 , data = checkStatus.data; //得到选中的数据
-            if(data.length < 1){
+            if (data.length < 1) {
                 parent.layer.msg("请选择要关闭的项");
-            }else{
+            } else {
                 var ids = "";
                 $.each(data, function (index, value) {
                     ids += data[index].Id + ",";