DuGuYang 2 лет назад
Родитель
Сommit
3724ceff6d

+ 3 - 3
Areas/Admin/Controllers/OperateServer/AmountRecordOperateController.cs

@@ -244,7 +244,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerName"] = sysAdmin.MakerName;
                 var DataType = int.Parse(dic["DataType"].ToString());//来源类型,区分表(1订单,2机具,3申请记录,4购买运营中心,5预扣款 6兑换大盟主)
                 var Id = int.Parse(dic["DataId"].ToString());//来源Id,表的主键Id
-                dic["SourceInfo"] = "";
+                var SourceInfo = "";
                 if (DataType > 0 && Id > 0)
                 {
                     var SourceUserId = 0;
@@ -279,9 +279,9 @@ namespace MySystem.Areas.Admin.Controllers
                         SourceUserId = userExchangeLeaderRecord.UserId;
                     }
                     var userInfo = db.Users.FirstOrDefault(m => m.Id == SourceUserId) ?? new Models.Users();
-                    var SourceInfo = userInfo.MakerCode + "_" + userInfo.RealName;
-                    dic["SourceInfo"] = SourceInfo;
+                    SourceInfo = userInfo.MakerCode + "_" + userInfo.RealName;
                 }
+                dic["SourceInfo"] = SourceInfo;
                 int OperateType = int.Parse(dic["OperateType"].ToString());
                 dic["OperateTypeName"] = "";
                 if (OperateType == 1) dic["OperateTypeName"] = "收入";

+ 7 - 1
wwwroot/layuiadmin/modules_operate/AmountRecord_Admin.js

@@ -91,6 +91,7 @@ layui.config({
         , url: '/Admin/AmountRecordOperate/IndexData' //模拟接口
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
+            , { field: 'CreateDate', width: 180, title: '交易时间', sort: true }
             , { field: 'OpCode', width: 150, title: '运营中心编号', sort: true }
             , { field: 'MakerCode', width: 105, title: '创客编号', sort: true }
             , { field: 'MakerName', width: 105, title: '创客姓名', sort: true }
@@ -100,7 +101,12 @@ layui.config({
             , { field: 'UseAmount', width: 110, title: '交易金额', sort: true }
             , { field: 'BeforeAmount', width: 130, title: '交易前总金额', sort: true }
             , { field: 'AfterAmount', width: 130, title: '交易后总金额', sort: true }
-            , { field: 'CreateDate', width: 180, title: '交易时间', sort: true }
+            , { field: 'UseValidAmount', width: 160, title: '使用关联分仓金额', sort: true }
+            , { field: 'AfterValidAmount', width: 175, title: '交易后关联分仓金额', sort: true }
+            , { field: 'UseTotalAmt', width: 160, title: '使用未使用金额', sort: true }
+            , { field: 'AfterTotalAmt', width: 160, title: '交易后未使用金额', sort: true }
+            , { field: 'UseValidForGetAmount', width: 160, title: '使用可提现金额', sort: true }
+            , { field: 'AfterValidForGetAmount', width: 160, title: '交易后可提现金额', sort: true }
             , { field: 'SourceInfo', width: 200, title: '来源创客信息', sort: true }
         ]]
         , where: {