暂存

AppStart/Helper/InstallmentDeductionService.cs

@@ -86,7 +86,7 @@ namespace MySystem
                                                 CreateDate = DateTime.Now,
                                                 UserId = toChargeByStage.UserId,
                                                 ChargeAmount = toChargeBackRecordSubs.ChargeAmount,
-                                                ChargeType = 2,//分期扣款
+                                                ChargeType = 2,//2 分期扣款 1 普通预扣
                                                 Remark = "分期扣款",
 
                                             }).Entity;

Areas/Admin/Controllers/MainServer/ToChargeBackRecordController.cs

@@ -100,10 +100,10 @@ namespace MySystem.Areas.Admin.Controllers
                 dic.Remove("UserId");
                 //待扣类型
                 int ChargeType = int.Parse(dic["ChargeType"].ToString());
-                if (ChargeType == 124) dic["ChargeType"] = "过期机具扣款";
-                if (ChargeType == 1) dic["ChargeType"] = "预扣款";
-                if (ChargeType == 2) dic["ChargeType"] = "分期扣款";
-                if (ChargeType == 0) dic["ChargeType"] = "";
+                if (ChargeType == 124) dic["ChargeTypeName"] = "过期机具扣款";
+                if (ChargeType == 1) dic["ChargeTypeName"] = "普通扣款";
+                if (ChargeType == 2) dic["ChargeTypeName"] = "分期扣款";
+                if (ChargeType == 0) dic["ChargeTypeName"] = "";
 
                 //扣款状态
                 int Status = int.Parse(dic["Status"].ToString());
@@ -177,7 +177,9 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             ToChargeBackRecord editData = db.ToChargeBackRecord.FirstOrDefault(m => m.Id == Id) ?? new ToChargeBackRecord();
+            var user = db.Users.FirstOrDefault(m => m.Id == editData.UserId) ?? new Users();
             ViewBag.data = editData;
+            ViewBag.MakerCode = user.MakerCode;
             return View();
         }
 

Areas/Admin/Controllers/MainServer/ToChargeBackRecordSubController.cs

@@ -52,23 +52,64 @@ namespace MySystem.Areas.Admin.Controllers
         /// 待扣款明细列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(ToChargeBackRecordSub data, int page = 1, int limit = 30)
+        public JsonResult IndexData(ToChargeBackRecordSub data, string OrderNo, string StatusSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
-            Fields.Add("ParentId", "1");
-
-            Fields.Add("CreateDate", "3"); //时间
 
 
             string condition = " and Status>-1";
 
+            //分期单号
+            if (!string.IsNullOrEmpty(OrderNo))
+            {
+                var toChargeByStage = db.ToChargeByStage.FirstOrDefault(m => m.SeoKeyword == OrderNo) ?? new ToChargeByStage();
+                var toChargeBackRecordSub = db.ToChargeBackRecordSub.FirstOrDefault(m => m.ParentId == toChargeByStage.Id) ?? new ToChargeBackRecordSub();
+                condition += " and ParentId=" + toChargeByStage.Id;
+            }
+
+            //状态
+            if (!string.IsNullOrEmpty(StatusSelect))
+            {
+                if (StatusSelect == "0")//待扣款
+                {
+                    condition += " and Status=0";
+                }
+                if (StatusSelect == "1")//已扣款
+                {
+                    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'";
+            }
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("ToChargeBackRecordSub", Fields, "Id desc", "0", page, limit, condition);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
+                //状态
+                int Status = int.Parse(function.CheckInt(dic["Status"].ToString()));
+                dic["StatusName"] = "";
+                if (Status == 0)
+                {
+                    dic["StatusName"] = "待扣款";
+                }
+                if (Status == 1)
+                {
+                    dic["StatusName"] = "已扣款";
+                }
 
+                //分期单号
+                int ParentId = int.Parse(function.CheckInt(dic["ParentId"].ToString()));
+                var toChargeByStage = db.ToChargeByStage.FirstOrDefault(m => m.Id == ParentId) ?? new ToChargeByStage();
+                dic["OrderNo"] = toChargeByStage.SeoKeyword;
             }
             return Json(obj);
         }

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

@@ -35,20 +35,12 @@
                     </ul>
                     <div class="layui-tab-content mt20">
                         <div class="layui-tab-item layui-show">
-                            @{
-                                Dictionary<string, string> UsersDic = new MySystem.DictionaryClass().getUsersDic();
-                            }
                             <div class="layui-form-item">
-                                <label class="layui-form-label">创客</label>
+                                <label class="layui-form-label">创客编号</label>
                                 <div class="layui-input-inline">
-                                    <select id="UserId" name="UserId" lay-search="">
-                                        <option value="">请选择</option>
-                                        @foreach (string key in UsersDic.Keys)
-                                        {
-                                            <option value="@key">@UsersDic[key]</option>
-                                        }
-                                    </select>
-                                    <script>$("#UserId").val("@editData.UserId");</script>
+                                    <input class="layui-input" type="text" id="ChargeAmount" name="ChargeAmount"
+                                        value="@ViewBag.MakerCode" maxlength="20" lay-verify="required|"
+                                        autocomplete="off" placeholder="请输入待扣金额">
                                 </div>
                             </div>
                             <div class="layui-form-item">
@@ -64,8 +56,9 @@
                                 <div class="layui-input-inline">
                                     <select id="ChargeType" name="ChargeType" lay-search="">
                                         <option value="">请选择</option>
-                                        <option value="1">过期机具扣款</option>
-                                        <option value="2">人工预扣</option>
+                                        <option value="124">过期机具扣款</option>
+                                        <option value="1">普通预扣</option>
+                                        <option value="2">分期扣款</option>
                                     </select>
                                     <script>$("#ChargeType").val("@editData.ChargeType");</script>
                                 </div>
@@ -73,16 +66,8 @@
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">备注</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" id="Remark" name="Remark" maxlength="500"
-                                        lay-verify="" placeholder="请输入备注">@editData.Remark</textarea>
-                                </div>
-                            </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">备用字段</label>
-                                <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="Field1" name="Field1"
-                                        value="@editData.Field1" maxlength="200" lay-verify="" autocomplete="off"
-                                        placeholder="请输入备用字段">
+                                    <textarea class="layui-textarea" id="SeoDescription" name="SeoDescription" maxlength="500"
+                                        lay-verify="" placeholder="请输入备注">@editData.SeoDescription</textarea>
                                 </div>
                             </div>
 

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

@@ -135,7 +135,9 @@
                 <script type="text/html" id="table-list-tools">
                     @if (RightInfo.Contains("," + right + "_edit,"))
                     {
+                        @("{{#if (d.ChargeType != 2){ }}")
                         <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,"))
                     {

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

@@ -45,6 +45,12 @@
         <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="OrderNo" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
@@ -52,6 +58,16 @@
                                 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>
+                            </select>
+                        </div>
+                    </div>
                     <div class="layui-inline ml50">
                         <button class="layui-btn" lay-submit lay-filter="LAY-list-front-search">
                             <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>查询

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

@@ -119,10 +119,10 @@
 
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
-                    @if (RightInfo.Contains("," + right + "_edit,"))
+                    @* @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>
-                    }
+                    } *@
                     @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>

wwwroot/layuiadmin/modules_main/ToChargeBackRecordSub_Admin.js

@@ -96,8 +96,9 @@ layui.config({
             , { field: 'ChargeAmount', width: 200, title: '待扣金额', sort: true }
             , { field: 'StartDate', width: 200, title: '扣款开始时间', sort: true }
             , { field: 'TimeNumber', width: 200, title: '期数', sort: true }
+            , { field: 'OrderNo', width: 200, title: '分期单号', sort: true }
+            , { field: 'StatusName', width: 200, title: '状态', sort: true }
 
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {

wwwroot/layuiadmin/modules_main/ToChargeBackRecord_Admin.js

@@ -153,14 +153,13 @@ layui.config({
             , { field: 'UserIdMobile', 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: 'ChargeTypeName', width: 200, title: '扣款类型', sort: true }
             , { field: 'UpdateDate', width: 200, title: '扣款时间', sort: true }
             , { field: 'StatusName', width: 200, title: '扣款状态', sort: true }
             , { field: 'Remark', width: 200, title: '机具Sn', sort: true }
             , { field: 'SeoDescription', width: 200, title: '备注', sort: true }
             , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
 
-            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', width: 400, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {

wwwroot/layuiadmin/modules_main/ToChargeByStage_Admin.js

@@ -102,6 +102,7 @@ layui.config({
             , { field: 'ChargeAmount', width: 200, title: '已扣金额', sort: true }
             , { field: 'StartDate', width: 200, title: '扣款开始时间', sort: true }
             , { field: 'Remark', width: 200, title: '备注', sort: true }
+            , { field: 'SeoKeyword', width: 200, title: '分期单号', sort: true }
             , { field: 'SeoTitle', width: 200, title: '操作人', sort: true }
 
             , { title: '操作', width: 300, align: 'center', fixed: 'right', toolbar: '#table-list-tools' }