no message

AppStart/Helper/TimeOutPosChargeReturnService.cs

@@ -37,7 +37,7 @@ namespace MySystem
                         {
                             function.WritePage("/TimeOutPosChargeReturn/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
                             WebCMSEntities db = new WebCMSEntities();
-                            DataTable dt = CustomerSqlConn.dtable("SELECT a.Id Id FROM ToChargeBackRecord a LEFT JOIN PosMachinesTwo b ON a.Remark=b.PosSn WHERE a.`Status`=1 AND a.Sort=0 AND b.PosSnType=0  AND b.BindingState=1 AND b.ActivationState=1", MysqlConn.connstr);//循环过期超过15天激活机具退费创客
+                            DataTable dt = CustomerSqlConn.dtable("SELECT a.Id Id FROM ToChargeBackRecord a LEFT JOIN PosMachinesTwo b ON a.Remark=b.PosSn WHERE a.`Status`=1 AND b.PosSnType=0  AND b.BindingState=1 AND b.ActivationState=1", MysqlConn.connstr);//循环过期超过15天激活机具退费创客
                             foreach (DataRow item in dt.Rows)
                             {
                                 int Id = int.Parse(item["Id"].ToString());
@@ -54,7 +54,7 @@ namespace MySystem
                                     Remark = "机具货款退还",
 
                                 }).Entity;
-                                toChargeBackRecord.Sort = 1;//过期购买机具循环截止时间超过15天激活扣费退还标识
+                                toChargeBackRecord.Status = 2;//过期购买机具循环截止时间超过15天激活扣费退还标识
                                 userAccount.BalanceAmount += toChargeBackRecord.ChargeAmount;
                                 db.SaveChanges();
                             }

AppStart/Helper/TimeOutPosChargeService.cs

@@ -38,7 +38,7 @@ namespace MySystem
                             function.WritePage("/TimeOutPosCharge/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
                             WebCMSEntities db = new WebCMSEntities();
                             var date = DateTime.Now.AddDays(-15).ToString("yyyy-MM-dd 00:00:00");//过期限制时间
-                            var time = DateTime.Parse(DateTime.Now.AddDays(-10).ToString("yyyy-MM-dd 00:00:00"));//过期限制时间
+                            var time = DateTime.Parse(date);//过期限制时间
                             // DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//扣费创客
                             // var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.RecycEndDate < time).ToList();//循环过期超过15天机具
 

AppStart/Helper/TimeOutPosSendMessageService.cs

@@ -38,7 +38,7 @@ namespace MySystem
                             function.WritePage("/TimeOutPosSendMessage/", "check" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", DateTime.Now.ToString("HH:mm:ss"));
                             WebCMSEntities db = new WebCMSEntities();
                             var date = DateTime.Now.AddDays(-10).ToString("yyyy-MM-dd 00:00:00");//过期限制时间
-                            var time = DateTime.Parse(DateTime.Now.AddDays(-10).ToString("yyyy-MM-dd 00:00:00"));//过期限制时间
+                            var time = DateTime.Parse(date);//过期限制时间
                             // DataTable dt = CustomerSqlConn.dtable("SELECT BuyUserId FROM PosMachinesTwo WHERE `Status`>-1 AND BuyUserId>0 AND BindingState=0 AND ActivationState=0 AND RecycEndDate <'" + date + "' GROUP BY BuyUserId", MysqlConn.connstr);//消息推送创客
                             // var query = db.PosMachinesTwo.Where(m => m.Status > -1 && m.BuyUserId > 0 && m.BindingState == 0 && m.ActivationState == 0 && m.RecycEndDate < time).ToList();//循环过期超过10天机具
 

Areas/Admin/Controllers/MainServer/RecycMachineOrderPosController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 机具回收明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(RecycMachineOrderPos data, string OrderIdSelect, string BrandIdSelect, string StatusSelect, 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>();
@@ -63,6 +63,13 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             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))
             {

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -51,7 +51,7 @@ 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 ChargeTypeSelect, string StatusSelect, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -60,21 +60,21 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             string condition = " and Status>-1";
-            //创客创客编号
+            //创客编号
             if (!string.IsNullOrEmpty(UserIdMakerCode))
             {
-                condition += " and UserId in (select UserId from UsersForMakerCode where MakerCode='" + UserIdMakerCode + "')";
-            }
-            //创客真实姓名
-            if (!string.IsNullOrEmpty(UserIdRealName))
-            {
-                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 +89,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 +292,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 +340,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/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>

Program.cs

@@ -22,7 +22,7 @@ namespace MySystem
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder
-                    .UseUrls("http://*:5145")
+                    .UseUrls("http://*:5144")
                     .UseKestrel()
                     .UseContentRoot(Directory.GetCurrentDirectory())
                     .UseIISIntegration()

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 + ",";