Merge branch 'feature-dgy-创客分期扣款和预扣款' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -243,6 +243,9 @@ namespace MySystem.Areas.Admin.Controllers
             foreach (string subid in idlist)
             {
                 int id = int.Parse(subid);
+                var toChargeBackRecord = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == id) ?? new ToChargeBackRecord();
+                var userAccount = db.UserAccount.FirstOrDefault(m => m.Id == toChargeBackRecord.UserId) ?? new UserAccount();
+                userAccount.ToChargeAmount -= toChargeBackRecord.ChargeAmount;//删除预扣款记录时扣减相应预扣额度
                 Dictionary<string, object> Fields = new Dictionary<string, object>();
                 Fields.Add("Status", -1);
                 new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("ToChargeBackRecord", Fields, id);

Areas/Admin/Controllers/MainServer/ToChargeByStageController.cs

@@ -111,15 +111,15 @@ namespace MySystem.Areas.Admin.Controllers
                 int Status = int.Parse(function.CheckInt(dic["Status"].ToString()));
                 if (QueryCount < TimeNumber && QueryCount == 0 && Status == 0)
                 {
-                    dic["Status"] = "待扣款";
+                    dic["StatusName"] = "待扣款";
                 }
                 if (QueryCount == TimeNumber && Status == 1)
                 {
-                    dic["Status"] = "已扣款";
+                    dic["StatusName"] = "已扣款";
                 }
                 if (QueryCount < TimeNumber && QueryCount > 0 && Status == 0)
                 {
-                    dic["Status"] = "扣款中";
+                    dic["StatusName"] = "扣款中";
                 }
 
             }

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

@@ -141,7 +141,9 @@
                     }
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
+                        @("{{#if (d.Status == 0 || d.Status == 3){ }}")
                         <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 + "_BreakOrStart,"))
                     {

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

@@ -87,11 +87,11 @@
                         <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,"))
+                    @* @if (RightInfo.Contains("," + right + "_delete,"))
                     {
                         <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
@@ -104,12 +104,16 @@
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
+                        @("{{#if ( d.Status == 0){ }}")
                         <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,"))
+                    @* @if (RightInfo.Contains("," + right + "_delete,"))
                     {
+                        @("{{#if ( d.Status == 0){ }}")
                         <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,"))
                     {
 

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

@@ -104,11 +104,11 @@
                         <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,"))
+                    @* @if (RightInfo.Contains("," + right + "_delete,"))
                     {
                         <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
@@ -125,7 +125,9 @@
                     } *@
                     @if (RightInfo.Contains("," + right + "_delete,"))
                     {
+                        @("{{#if (d.QueryCount == 0){ }}")
                         <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,"))
                     {

wwwroot/layuiadmin/modules_main/ToChargeByStage_Admin.js

@@ -94,7 +94,7 @@ layui.config({
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
-            , { field: 'Status', width: 200, title: '扣款状态', sort: true }
+            , { field: 'StatusName', width: 200, title: '扣款状态', sort: true }
             , { field: 'MakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'MakerName', width: 200, title: '创客姓名', sort: true }
             , { field: 'MakerMobile', width: 200, title: '创客手机号', sort: true }